Refactored entity class form