Started EventBus refactoring