Improve storage functions