Update accoring to new syntax