Enhance UX
Add storage to scope