Added support for full-year courses.