Optimized indexing