Added ability to declare model types directly in template