Storage updates for 2.0.5.1