Added Class updates