CourseOriented database rework