Added support for gadget categories and new REST resources