Add support for network_name