Updated grapes to the new syntax