Fixed up the Entity package