Added support for categories.