Added support for new EventBus library version