Latest templating changes