Revert "Revert "Revert "Revert "Add index""""

This reverts commit 7815e1ef31792a0e2897351d35f852cc7b29eb70.