Changes to templating