Further template refinements...