Improved indexing efficiency by 40x