Improved storage scheme