Improve storage form