Updated the classes