Add storage wrapper
Merge