Add support for Categories.