Removed EventAggregator, going through Application now