updated to work with later split network, network-uri packages