General updates to classes