Added Support for EventBus