Speeded up indexing