Update index and improve network perf