Updated all the classes