Add support for long term retrieval