Updated classes with additional features.