Restructuring of the Gateway Factory to contemplate Training Authorization