Support for network-2.6