Added support for Class Schedules