Adjust code for new syntax