Improved store/retrieve functionality.