Create new Storage component to reduce code duplication between components