Reworked the indexer, new representation, of index