refactor storage and add any