Indexing is now much faster.