Updates to template