Refactor storage functions