Added a new Entity, refactored