More template updating