More refactoring, EventBus can now be chained