Switched to event bus and made corresponding infrastructure