Refactored ModelEntities