Decomplecting shape and optionality

Separation between the shape of an entity and the optionality of its fields as a way of improving reusability and simplicity.