Replaced EventBus with a rx.PublishSubject