Added multi-course and multi-semester support