Refactored Networking to use EventAggregator