Class updates