Refactor storage event system