Add support for non-view secondary indexes