Update to support cloudflare >= 2.0.0