Replace listeners by EventBus