Reworked the Entity Model based on design discussions.