Additional index refactoring