Added the Gateways namespace.