Add support for gateways