Added storage and retrieval structures