Adding category support in the store