updates to constraint definitions for  new syntax