Modify EventBus flow chart