Improved indexing speed.