Massive index overhaul