Updated all classes