Added support for categories and course idnumber