Updates to Templating Structure