Rework of entities' fields definition and manipulation