Make GatewayFactory methods static