More updates with classes
Class updates