Modify header and implementation of class Storage.