Refactoring in Field-Model_entity