Adding category support