replaced storageGetter with dataStorage