Added CoursePlan and updated the services