Refactor for eventBus