Added support for CATEGORY and MAXJOBS