additional refactorings for entities.