Update to use new syntax