#2 refactor storage usage repository