Make CurriculumService and StudentService consistent with other services