Added support for categories in addition to tags