Retrieval improvements