Updated retrieval functionality