Add support for secondary indexes (2i)