Added fixes for a new course model