Update for templates