Further template enhancement