Networking refactored