Revert "Remove Index"

This reverts commit cf2d3f6287a85accf966405b50f69e0a563d0f4c.