Improve the way in which EventBus library is used.