Updates to classes