ISSUE#198

Add in additional secondary indices.