More NetworkService refactoring