Added EventBus, Model singleton