Index refactoring.