ENH: Added category support (related to the data store module)