Added support for public_network and public_gateway