Added category indexing.