More updates to the classes