Added CMS and Category support