FIx typos and add class Storage for operations and labels