Added indexing pair generation