Added the ability to specify a gateway name.