Add retrieval by index and key index to batch extension