Refactored indexing into separate namespace, to support (in future) multi-index validations