Refactor storage alias