Revert "Revert "Index added""

This reverts commit 92eed5aa221d60389afedf10f8ad8c912c4608dc.