Improve storage loading and saving format