Added support for Non-Calendar Courses