ENG-6229 Fixed the schema to properly use the new group field