Refactor EventBus API