Changes to template creation