Better data structure for retrieval? Almost there