Streamlining the index flow