Update to new syntax