DI and EventBus related changes