Update for new template