Moved updating of models to EventBus