Added support for categories