Refactor, force EventBusListener