Added eventbus messaging