App.Storage component refactoring