Adding support for categories