Adding support for multiple categories