Revamp of Index