Refactor code to use an storage strategy.