More index management support