Rewrote EventBus and EventStream