Update to use new template syntax