Refactor storage