Refactored the entity model to be static/on-demand rather than built-up.