Added support for Courses and Courses Assigned to User