So now it is necessary to add to both CourseInstructorRole and CourseStaffRole?