Templating improvements