Update: Comments added to all classes