Added support for courses.