adding support for courses.