removed the requirement on the user to manage the addition of new entities
slight updates to how entities are created and used