Update to classes