Changes and updates for classes, citation added.