Enhanced indexing