Implemented support for secondary indexing