Updated all classes with comments