Starting to address/track potential thread-safety issues
[EventBus] Expanding clustering