Revert "Added index"

This reverts commit dee73b4bf8289e09239884d7ad0c9c1f7ff6d1c0.
Revert "Revert "Added index""

This reverts commit daefbc64a4f4c81b70d6293bbc0e7b3bf5fa3373.