Fixed loading of services from entity