Added more 'template' keywords