Refactoring PartitionedNetworkClient to include all features.