Adding proper EVENT_BUS as replacement for old system of event handling