Updated class Storage2.