Flesh out secondary index plans some more