Another update for Storage functionality.