Switch to OPA API