More changes to classes