Rewrite to use Apigee