Removed IEntity dependency