Improved indexing