Further template updates