Slight changes to classes