Event Improvements
Added storage eventBus