Added calls to EventBus