Index front refactoring