Made changes to classes