use CourseId instead of Text (course ident)