A lot of Storage improvements