More structure around storage and retrieval