#47 Added more fields (course, type)