schema definition change to classes