improved indexing api