#3 Logic partly moved in service component(app/component/Course)(fix)