Continuation of index refactor