Removed Distributor to direct distribution via EventBus