Fixed Routing and Templating, Added base entity types