Enhance fields structure / fix entity class