Improved CourseFetcher