updated loading for entity
implemented loader classes