Add support for categories