The GatewayFactory class no longer be called in a static fashion.