Improve storage