Support network-uri >= 2.6