added retrieval support