Moved to EventBus.scala