Updated to use new syntax