fix: cover outer-scope bracket key handling

Agent-Logs-Url: https://github.com/microsoft/regorus/sessions/992f5462-7cc4-4e4f-bd7f-799308063765 Co-authored-by: anakrish <35780660+anakrish@users.noreply.github.com>
chore: clarify bracket-head rule semantics
2026-08-05 02:16:11 +00:00 · 2026-05-07 03:08:59 +00:00 · 2026-05-06 22:31:09 +00:00 · 2026-05-06 22:27:07 +00:00 · 2026-05-06 22:19:56 +00:00 · 2026-05-06 19:38:42 +00:00
67 changed files with 1255 additions and 3619 deletions
--- a/.github/copilot-setup-steps.yml
+++ b/.github/copilot-setup-steps.yml
@@ -8,5 +8,3 @@ steps:
  - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
    with:
      fetch-depth: 0 # full history needed for git diff against main
-  - run: git fetch origin main:refs/remotes/origin/main
-    name: Ensure origin/main ref is available for diff computation
--- a/.github/skills/code-review/SKILL.md
+++ b/.github/skills/code-review/SKILL.md
@@ -25,21 +25,15 @@ Key constraints (details in copilot-instructions.md):
 ## Step 1: Get the Diff

 ```bash
-# Primary: use gh pr diff (works in cloud agent + any PR context).
-# Fallback: git merge-base for local non-PR usage.
-if gh pr diff --name-only >/dev/null 2>&1; then
-  echo "---STAT---"
-  gh pr diff --name-only
-  echo "---DIFF---"
-  gh pr diff
-else
-  BASE=$(git merge-base upstream/main HEAD 2>/dev/null \
-      || git merge-base origin/main HEAD 2>/dev/null \
-      || git merge-base main HEAD 2>/dev/null)
-  echo "Reviewing changes since: $BASE"
-  git diff "$BASE"..HEAD --stat
-  git diff "$BASE"..HEAD
+BASE=$(git merge-base upstream/main HEAD 2>/dev/null \
+    || git merge-base origin/main HEAD 2>/dev/null)
+if [ -z "$BASE" ]; then
+  echo "ERROR: Cannot find upstream/main or origin/main. Cannot determine review scope."
+  exit 1
 fi
+echo "Reviewing changes since: $BASE"
+git diff "$BASE"..HEAD --stat
+git diff "$BASE"..HEAD -- '*.rs' '*.toml' 'examples/'
 ```

 If the diff is empty, stop and report: "No changes found to review."
@@ -202,9 +196,3 @@ one pass. If any were skipped, note them and briefly assess.
 ### Summary

 X findings (N critical, N high, N medium, N low). One sentence overall assessment.
-
-### Output
-
-After generating the report above, write the COMPLETE report to `/tmp/code-review-report.md`
-using the `create` tool or shell. This ensures the full report is preserved even if
-display output is truncated.
--- a/.github/skills/deep-review/SKILL.md
+++ b/.github/skills/deep-review/SKILL.md
@@ -40,25 +40,22 @@ Use `read_agent` with `wait: true` to wait for each background agent.
 ## Step 1: Get the Diff and Build Inventory

 ```bash
-# Primary: use gh pr diff (works in cloud agent + any PR context).
-# Fallback: git merge-base for local non-PR usage.
-if gh pr diff --name-only >/dev/null 2>&1; then
-  echo "---STAT---"
-  gh pr diff --name-only
-  echo "---DIFF---"
-  gh pr diff
-else
-  BASE=$(git merge-base upstream/main HEAD 2>/dev/null \
-      || git merge-base origin/main HEAD 2>/dev/null \
-      || git merge-base main HEAD 2>/dev/null)
-  echo "Reviewing changes since: $BASE"
-  git diff "$BASE"..HEAD --stat
-  git diff "$BASE"..HEAD
+BASE=$(git merge-base upstream/main HEAD 2>/dev/null \
+    || git merge-base origin/main HEAD 2>/dev/null)
+if [ -z "$BASE" ]; then
+  echo "ERROR: Cannot find upstream/main or origin/main."
+  exit 1
 fi
+echo "Reviewing changes since: $BASE"
+git diff "$BASE"..HEAD --stat
+git diff "$BASE"..HEAD -- '*.rs' '*.toml' 'examples/' | head -2000
 ```

 If the diff is empty, stop and report: "No changes found to review."

+**Scope rule:** Focus on code files (`*.rs`, `*.toml`, examples). Do NOT pass
+docs/config diffs to agents.
+
 **Build a risk-classified inventory.** List every changed function, struct,
 impl, trait, pub item, and significant code block. Number them and tag with
 risk predicates:
@@ -109,10 +106,8 @@ Use `model: "gpt-5.4"` in the task tool call (provides model diversity).
 > Get the diff:
 > ```
 > BASE=$(git merge-base upstream/main HEAD 2>/dev/null \
->     || git merge-base origin/main HEAD 2>/dev/null \
->     || git merge-base main HEAD 2>/dev/null)
-> # If no merge-base, use: gh pr diff
-> git diff "$BASE"..HEAD  # or: gh pr diff
+>     || git merge-base origin/main HEAD 2>/dev/null)
+> git diff "$BASE"..HEAD -- '*.rs' '*.toml' 'examples/'
 > ```
 >
 > Key regorus constraints:
@@ -166,10 +161,8 @@ Use `model: "claude-opus-4.6"` in the task tool call.
 > Get the diff AND read full source files for context:
 > ```
 > BASE=$(git merge-base upstream/main HEAD 2>/dev/null \
->     || git merge-base origin/main HEAD 2>/dev/null \
->     || git merge-base main HEAD 2>/dev/null)
-> # If no merge-base, use: gh pr diff
-> git diff "$BASE"..HEAD  # or: gh pr diff
+>     || git merge-base origin/main HEAD 2>/dev/null)
+> git diff "$BASE"..HEAD -- '*.rs' '*.toml' 'examples/'
 > ```
 > Then use `view` to read the full source files that were changed.
 >
@@ -226,10 +219,8 @@ Use the default model (no `model` parameter).
 > Get the diff:
 > ```
 > BASE=$(git merge-base upstream/main HEAD 2>/dev/null \
->     || git merge-base origin/main HEAD 2>/dev/null \
->     || git merge-base main HEAD 2>/dev/null)
-> # If no merge-base, use: gh pr diff
-> git diff "$BASE"..HEAD  # or: gh pr diff
+>     || git merge-base origin/main HEAD 2>/dev/null)
+> git diff "$BASE"..HEAD -- '*.rs' '*.toml' 'examples/'
 > ```
 > Use `view` to read surrounding context.
 >
@@ -448,10 +439,8 @@ Launch **1 general-purpose agent in background mode**.
 > Get the diff:
 > ```
 > BASE=$(git merge-base upstream/main HEAD 2>/dev/null \
->     || git merge-base origin/main HEAD 2>/dev/null \
->     || git merge-base main HEAD 2>/dev/null)
-> # If no merge-base, use: gh pr diff
-> git diff "$BASE"..HEAD  # or: gh pr diff
+>     || git merge-base origin/main HEAD 2>/dev/null)
+> git diff "$BASE"..HEAD -- '*.rs' '*.toml' 'examples/'
 > ```
 > Use `view` to read full source files.
 >
@@ -492,8 +481,8 @@ Launch **1 general-purpose agent in background mode**.

 ## Step 5: Synthesize and Report

-**CRITICAL:** Write the report to `/tmp/deep-review-report.md` FIRST, then display it.
-Use a shell command to write the file before any other output in this step.
+**IMPORTANT:** This is the primary output. Everything above was preparation.
+Keep the report COMPACT — one finding per block, no filler prose.

 Apply verdicts from the adversarial verifier:
 - **CONFIRMED**: keep at stated severity
@@ -533,9 +522,3 @@ would catch it. If not, name the minimal test that should exist.
 X findings (N critical, N high, N medium, N low). Y "likely" findings.
 Z dropped (one-line reasons).
 Risk assessment in one sentence.
-
---
-
-**Remember:** The report above MUST be written to `/tmp/deep-review-report.md` at the
-START of Step 5 (before displaying it). Use shell: `cat > /tmp/deep-review-report.md << 'REPORT_EOF'`
-... report content ... `REPORT_EOF`
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,21 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

-## [0.10.1](https://github.com/microsoft/regorus/compare/regorus-v0.10.0...regorus-v0.10.1) - 2026-05-22
-
-### Fixed
-
- *(ffi)* eliminate aliasing UB + add Azure Policy JSON compilation FFI ([#727](https://github.com/microsoft/regorus/pull/727))
- *(interpreter,rvm)* correct partial object rule iteration and classification ([#718](https://github.com/microsoft/regorus/pull/718))
- *(copilot)* robust diff computation for cloud agent environments ([#709](https://github.com/microsoft/regorus/pull/709))
-
-### Other
-
- *(azure_policy)* reduce AliasRegistry allocations via Rc sharing ([#725](https://github.com/microsoft/regorus/pull/725))
- *(normalizer)* use Rc<str> interning to reduce alias resolution allocations ([#726](https://github.com/microsoft/regorus/pull/726))
- *(deps)* bump the rust-dependencies group across 5 directories with 2 updates ([#724](https://github.com/microsoft/regorus/pull/724))
- *(deps)* bump the rust-dependencies group across 5 directories with 4 updates ([#717](https://github.com/microsoft/regorus/pull/717))
-
 ## [0.10.0] - 2026-05-05

 ### Added
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -180,9 +180,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.2.62"
+version = "1.2.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -474,9 +474,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

 [[package]]
 name = "fancy-regex"
-version = "0.18.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"
+checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"
 dependencies = [
 "bit-set",
 "regex-automata",
@@ -650,12 +650,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.17.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
-dependencies = [
- "foldhash 0.2.0",
-]
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"

 [[package]]
 name = "heck"
@@ -835,7 +832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
- "hashbrown 0.17.1",
+ "hashbrown 0.17.0",
 "serde",
 "serde_core",
 ]
@@ -869,9 +866,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"

 [[package]]
 name = "js-sys"
-version = "0.3.98"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
 dependencies = [
 "cfg-if",
 "futures-util",
@@ -881,9 +878,9 @@ dependencies = [

 [[package]]
 name = "jsonschema"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5fe5206f06e589caf25e79fc05ccdf91fca745685fe9fe1a13bbdfb479a631"
+checksum = "257eb0e588b76827bbddc9e73945a9743693dd2adeaee9da26420f93cfedb798"
 dependencies = [
 "ahash",
 "bytecount",
@@ -950,9 +947,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "lru"
-version = "0.18.0"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"

 [[package]]
 name = "memchr"
@@ -960,12 +957,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"

-[[package]]
-name = "micromap"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a86d3146ed3995b5913c414f6664344b9617457320782e64f0bb44afd49d74"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -1353,16 +1344,14 @@ dependencies = [

 [[package]]
 name = "referencing"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e4e17ef386c5383591d07623d3de49cbc601156e7582973e6db98d66a57de2"
+checksum = "e2f38748ceca8d0b0013e60f534d94a6e23dfd89fd2a88318fc5a2d04fda1010"
 dependencies = [
 "ahash",
 "fluent-uri",
 "getrandom 0.3.4",
 "hashbrown 0.16.1",
- "itoa",
- "micromap",
 "parking_lot",
 "percent-encoding",
 "serde_json",
@@ -1399,7 +1388,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

 [[package]]
 name = "regorus"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "cfg-if",
@@ -1410,7 +1399,7 @@ dependencies = [
 "dashmap",
 "data-encoding",
 "globset",
- "hashbrown 0.17.1",
+ "hashbrown 0.16.1",
 "icu_casemap",
 "indexmap",
 "ipnet",
@@ -1441,7 +1430,7 @@ dependencies = [

 [[package]]
 name = "regorus-mimalloc"
-version = "2.2.7"
+version = "2.2.6"
 dependencies = [
 "regorus-mimalloc-sys",
 ]
@@ -1556,9 +1545,9 @@ checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"

 [[package]]
 name = "siphasher"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"

 [[package]]
 name = "slab"
@@ -1841,9 +1830,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -1854,9 +1843,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
 dependencies = [
 "quote 1.0.45",
 "wasm-bindgen-macro-support",
@@ -1864,9 +1853,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
 dependencies = [
 "bumpalo",
 "proc-macro2 1.0.106",
@@ -1877,9 +1866,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
 dependencies = [
 "unicode-ident",
 ]
@@ -1920,9 +1909,9 @@ dependencies = [

 [[package]]
 name = "web-sys"
-version = "0.3.98"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa"
+checksum = "2eadbac71025cd7b0834f20d1fe8472e8495821b4e9801eb0a60bd1f19827602"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -2193,9 +2182,9 @@ dependencies = [

 [[package]]
 name = "zerofrom"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
 dependencies = [
 "zerofrom-derive",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
 [package]
 name = "regorus"
 description = "A fast, lightweight Rego (OPA policy language) interpreter"
-version = "0.10.1"
+version = "0.10.0"
 edition = "2021"
 license = "MIT AND Apache-2.0 AND BSD-3-Clause"
 repository = "https://github.com/microsoft/regorus"
@@ -99,7 +99,7 @@ rand = ["dep:rand"]
 anyhow = { version = "1.0.102", default-features = false }
 serde = {version = "1.0.150", default-features = false, features = ["derive", "rc", "alloc"] }
 serde_json = { version = "1.0.89", default-features = false, features = ["alloc"] }
-hashbrown = { version = "0.17", default-features = false, features = ["default-hasher"], optional = true }
+hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"], optional = true }
 lazy_static =  { version = "1.4.0", default-features = false }
 thiserror = { version = "2.0", default-features = false }

@@ -114,7 +114,7 @@ regex = {version = "1.12.3", optional = true, default-features = false }
 semver = {version = "1.0.28", optional = true, default-features = false }
 url = { version = "2.5.4", optional = true }
 uuid = { version = "1.22.0", default-features = false, features = ["v4", "fast-rng"], optional = true }
-jsonschema = { version = "0.46.5", default-features = false, optional = true }
+jsonschema = { version = "0.45.1", default-features = false, optional = true }
 chrono = { version = "0.4.44", optional = true }
 chrono-tz = { version = "0.10.1", optional = true }
 ipnet = { version = "2.12.0", optional = true, default-features = false }
@@ -127,8 +127,8 @@ rand = { version = "0.10.0", default-features = false, features = ["thread_rng"]
 # Causes the project to link with the Spectre-mitigated CRT and libs.
 msvc_spectre_libs = { version = "0.1", features = ["error"], optional = true }
 dashmap = { version = "6.1", default-features = false, optional = true }
-lru = { version = "0.18", default-features = false, optional = true }
-mimalloc = { package = "regorus-mimalloc", path = "mimalloc", version = "2.2.7", optional = true }
+lru = { version = "0.16", default-features = false, optional = true }
+mimalloc = { package = "regorus-mimalloc", path = "mimalloc", version = "2.2.6", optional = true }

 # rvm related deps
 indexmap = { version = "2.13.1", default-features = false, features = ["serde"], optional = true }
--- a/bindings/csharp/Directory.Packages.props
+++ b/bindings/csharp/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <RegorusPackageVersion>0.10.1</RegorusPackageVersion>
+    <RegorusPackageVersion>0.10.0</RegorusPackageVersion>
    <RegorusPackageVersionSuffix Condition="'$(VersionSuffix)' != ''">-$(VersionSuffix)</RegorusPackageVersionSuffix>
  </PropertyGroup>

--- a/bindings/csharp/README.md
+++ b/bindings/csharp/README.md
@@ -150,76 +150,3 @@ const string ContextJson = """
 var allowed = RbacEngine.EvaluateCondition(Condition, ContextJson);
 Console.WriteLine($"RBAC condition allowed: {allowed}");
 ```
-
-## Azure Policy JSON Evaluation
-
-Compile and evaluate Azure Policy JSON `policyRule` definitions directly — no Rego translation required.
-The `AzurePolicyCompiler` compiles JSON policy rules into RVM programs that can be executed with the `Rvm` engine.
-
-```csharp
-using Regorus;
-
-// 1. Load alias definitions for the resource provider
-const string AliasesJson = """
-[{
-    "namespace": "Microsoft.Storage",
-    "resourceTypes": [{
-        "resourceType": "storageAccounts",
-        "aliases": [{
-            "name": "Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly",
-            "defaultPath": "properties.supportsHttpsTrafficOnly",
-            "paths": []
-        }]
-    }]
-}]
-""";
-
-using var registry = AliasRegistry.FromJson(AliasesJson);
-
-// 2. Compile a JSON policy rule (the native Azure Policy language)
-const string PolicyRule = """
-{
-    "if": {
-        "allOf": [
-            { "field": "type", "equals": "Microsoft.Storage/storageAccounts" },
-            { "field": "Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly", "equals": false }
-        ]
-    },
-    "then": { "effect": "deny" }
-}
-""";
-
-using var program = AzurePolicyCompiler.CompilePolicyRule(registry, PolicyRule);
-
-// 3. Normalize an ARM resource and evaluate
-var armResource = """
-{
-    "type": "Microsoft.Storage/storageAccounts",
-    "name": "mystorage",
-    "properties": { "supportsHttpsTrafficOnly": false }
-}
-""";
-var envelope = registry.NormalizeAndWrap(armResource);
-
-using var vm = new Rvm();
-vm.LoadProgram(program);
-vm.SetInputJson(envelope!);
-
-var result = vm.ExecuteEntryPoint("main");
-// result: {"effect": "deny"} for non-compliant, "<undefined>" for compliant
-Console.WriteLine($"Policy result: {result}");
-```
-
-**Context-dependent policies:** If your policy uses context functions like
-`subscription()`, `resourceGroup()`, or `requestContext()`, you must also set
-the VM context separately:
-
-```csharp
-// The context JSON from NormalizeAndWrap is in the input envelope,
-// but must also be provided to the VM's ambient context:
-vm.SetContextJson(contextJson);
-```
-
-You can also compile full policy definitions (with parameters) using
-`AzurePolicyCompiler.CompilePolicyDefinition()`. See
-`bindings/csharp/Regorus.Tests/AzurePolicyCompilerTests.cs` for comprehensive examples.
--- a/bindings/csharp/Regorus.Tests/AliasRegistryTests.cs
+++ b/bindings/csharp/Regorus.Tests/AliasRegistryTests.cs
@@ -43,28 +43,31 @@ public class AliasRegistryTests
    [TestMethod]
    public void Create_and_dispose_succeeds()
    {
-        using var registry = AliasRegistry.Empty();
+        using var registry = new AliasRegistry();
        Assert.AreEqual(0, registry.Length);
    }

    [TestMethod]
    public void LoadJson_populates_registry()
    {
-        using var registry = AliasRegistry.FromJson(AliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(AliasesJson);
        Assert.AreEqual(1, registry.Length);
    }

    [TestMethod]
    public void LoadManifest_populates_registry()
    {
-        using var registry = AliasRegistry.FromManifest(ManifestJson);
+        using var registry = new AliasRegistry();
+        registry.LoadManifest(ManifestJson);
        Assert.AreEqual(1, registry.Length);
    }

    [TestMethod]
    public void NormalizeAndWrap_produces_envelope()
    {
-        using var registry = AliasRegistry.FromJson(AliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(AliasesJson);

        var resource = @"{
            ""name"": ""acct1"",
@@ -90,7 +93,8 @@ public class AliasRegistryTests
    [TestMethod]
    public void NormalizeAndWrap_with_context_and_parameters()
    {
-        using var registry = AliasRegistry.FromJson(AliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(AliasesJson);

        var resource = @"{
            ""name"": ""acct1"",
@@ -111,7 +115,8 @@ public class AliasRegistryTests
    [TestMethod]
    public void Denormalize_restores_properties()
    {
-        using var registry = AliasRegistry.FromJson(AliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(AliasesJson);

        var normalized = @"{
            ""name"": ""acct1"",
@@ -132,7 +137,8 @@ public class AliasRegistryTests
    [TestMethod]
    public void Round_trip_normalize_then_denormalize()
    {
-        using var registry = AliasRegistry.FromJson(AliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(AliasesJson);

        var resource = @"{
            ""name"": ""acct1"",
@@ -160,7 +166,8 @@ public class AliasRegistryTests
    [TestMethod]
    public void DataPlane_manifest_normalize()
    {
-        using var registry = AliasRegistry.FromManifest(ManifestJson);
+        using var registry = new AliasRegistry();
+        registry.LoadManifest(ManifestJson);

        var resource = @"{
            ""type"": ""Microsoft.KeyVault.Data/vaults/certificates"",
@@ -178,7 +185,7 @@ public class AliasRegistryTests
    [ExpectedException(typeof(InvalidOperationException))]
    public void LoadJson_invalid_throws()
    {
-        using var builder = new AliasRegistryBuilder();
-        builder.LoadJson("not valid json");
+        using var registry = new AliasRegistry();
+        registry.LoadJson("not valid json");
    }
 }
--- a/bindings/csharp/Regorus.Tests/AzurePolicyCompilerTests.cs
+++ b/bindings/csharp/Regorus.Tests/AzurePolicyCompilerTests.cs
@@ -1,436 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Text.Json.Nodes;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Regorus;
-
-namespace Regorus.Tests;
-
-/// <summary>
-/// Tests for <see cref="AzurePolicyCompiler"/> — compiling Azure Policy JSON
-/// policyRule and policyDefinition into RVM programs and evaluating them.
-/// </summary>
-[TestClass]
-public class AzurePolicyCompilerTests
-{
-    // -----------------------------------------------------------------------
-    // Test data
-    // -----------------------------------------------------------------------
-
-    private const string StorageAliasesJson = @"[{
-        ""namespace"": ""Microsoft.Storage"",
-        ""resourceTypes"": [{
-            ""resourceType"": ""storageAccounts"",
-            ""capabilities"": ""SupportsTags, SupportsLocation"",
-            ""aliases"": [
-                {
-                    ""name"": ""Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly"",
-                    ""defaultPath"": ""properties.supportsHttpsTrafficOnly"",
-                    ""paths"": []
-                },
-                {
-                    ""name"": ""Microsoft.Storage/storageAccounts/minimumTlsVersion"",
-                    ""defaultPath"": ""properties.minimumTlsVersion"",
-                    ""paths"": []
-                }
-            ]
-        }]
-    }]";
-
-    /// <summary>Simple policy rule that checks the resource type.</summary>
-    private const string SimpleAuditRule = @"{
-        ""if"": {
-            ""field"": ""type"",
-            ""equals"": ""Microsoft.Storage/storageAccounts""
-        },
-        ""then"": { ""effect"": ""audit"" }
-    }";
-
-    /// <summary>Policy rule that uses an alias to check HTTPS-only.</summary>
-    private const string HttpsDenyRule = @"{
-        ""if"": {
-            ""allOf"": [
-                { ""field"": ""type"", ""equals"": ""Microsoft.Storage/storageAccounts"" },
-                { ""field"": ""Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly"", ""equals"": false }
-            ]
-        },
-        ""then"": { ""effect"": ""deny"" }
-    }";
-
-    /// <summary>Full policy definition with parameters.</summary>
-    private const string PolicyDefinitionWithParams = @"{
-        ""displayName"": ""Require HTTPS for storage accounts"",
-        ""policyType"": ""Custom"",
-        ""mode"": ""Indexed"",
-        ""parameters"": {
-            ""effect"": {
-                ""type"": ""String"",
-                ""defaultValue"": ""deny""
-            }
-        },
-        ""policyRule"": {
-            ""if"": {
-                ""allOf"": [
-                    { ""field"": ""type"", ""equals"": ""Microsoft.Storage/storageAccounts"" },
-                    { ""field"": ""Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly"", ""equals"": false }
-                ]
-            },
-            ""then"": { ""effect"": ""[parameters('effect')]"" }
-        }
-    }";
-
-    // -----------------------------------------------------------------------
-    // Helper
-    // -----------------------------------------------------------------------
-
-    /// <summary>
-    /// Wrap a normalized resource JSON and parameters into the input envelope
-    /// expected by compiled Azure Policy RVM programs.
-    /// </summary>
-    private static string WrapInput(string resourceJson, string parametersJson = "{}")
-    {
-        return $@"{{""resource"": {resourceJson}, ""parameters"": {parametersJson}}}";
-    }
-
-    /// <summary>
-    /// Compile a policy rule, load it into an RVM, set input, and execute.
-    /// Returns the result string from <c>ExecuteEntryPoint("main")</c>.
-    /// </summary>
-    private static string? CompileAndEval(
-        AliasRegistry? registry,
-        string policyRuleJson,
-        string inputJson)
-    {
-        using var program = AzurePolicyCompiler.CompilePolicyRule(registry, policyRuleJson);
-        using var vm = new Rvm();
-        vm.LoadProgram(program);
-        vm.SetInputJson(inputJson);
-        return vm.ExecuteEntryPoint("main");
-    }
-
-    // -----------------------------------------------------------------------
-    // CompilePolicyRule tests
-    // -----------------------------------------------------------------------
-
-    [TestMethod]
-    public void CompilePolicyRule_no_aliases_succeeds()
-    {
-        using var program = AzurePolicyCompiler.CompilePolicyRule(null, SimpleAuditRule);
-        Assert.IsNotNull(program);
-    }
-
-    [TestMethod]
-    public void CompilePolicyRule_with_aliases_succeeds()
-    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
-
-        using var program = AzurePolicyCompiler.CompilePolicyRule(registry, HttpsDenyRule);
-        Assert.IsNotNull(program);
-    }
-
-    [TestMethod]
-    [ExpectedException(typeof(ArgumentNullException))]
-    public void CompilePolicyRule_null_json_throws()
-    {
-        AzurePolicyCompiler.CompilePolicyRule(null, null!);
-    }
-
-    [TestMethod]
-    [ExpectedException(typeof(InvalidOperationException))]
-    public void CompilePolicyRule_invalid_json_throws()
-    {
-        AzurePolicyCompiler.CompilePolicyRule(null, "not valid json");
-    }
-
-    // -----------------------------------------------------------------------
-    // CompilePolicyDefinition tests
-    // -----------------------------------------------------------------------
-
-    [TestMethod]
-    public void CompilePolicyDefinition_no_aliases_succeeds()
-    {
-        using var program = AzurePolicyCompiler.CompilePolicyDefinition(null, PolicyDefinitionWithParams);
-        Assert.IsNotNull(program);
-    }
-
-    [TestMethod]
-    public void CompilePolicyDefinition_with_aliases_succeeds()
-    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
-
-        using var program = AzurePolicyCompiler.CompilePolicyDefinition(registry, PolicyDefinitionWithParams);
-        Assert.IsNotNull(program);
-    }
-
-    [TestMethod]
-    [ExpectedException(typeof(ArgumentNullException))]
-    public void CompilePolicyDefinition_null_json_throws()
-    {
-        AzurePolicyCompiler.CompilePolicyDefinition(null, null!);
-    }
-
-    [TestMethod]
-    [ExpectedException(typeof(InvalidOperationException))]
-    public void CompilePolicyDefinition_invalid_json_throws()
-    {
-        AzurePolicyCompiler.CompilePolicyDefinition(null, @"{""not"": ""a definition""}");
-    }
-
-    // -----------------------------------------------------------------------
-    // End-to-end evaluation tests
-    // -----------------------------------------------------------------------
-
-    [TestMethod]
-    public void Eval_simple_rule_matching_resource_returns_effect()
-    {
-        var input = WrapInput(
-            @"{""type"": ""microsoft.storage/storageaccounts""}");
-
-        var result = CompileAndEval(null, SimpleAuditRule, input);
-        Assert.IsNotNull(result, "expected a result for matching resource");
-
-        var doc = JsonNode.Parse(result!)!;
-        Assert.AreEqual("audit", doc["effect"]?.GetValue<string>(),
-            $"expected 'audit' effect, got: {result}");
-    }
-
-    [TestMethod]
-    public void Eval_simple_rule_non_matching_resource_returns_undefined()
-    {
-        var input = WrapInput(
-            @"{""type"": ""microsoft.compute/virtualmachines""}");
-
-        var result = CompileAndEval(null, SimpleAuditRule, input);
-        Assert.IsNotNull(result);
-        StringAssert.Contains(result!, "undefined",
-            "expected undefined for non-matching resource type");
-    }
-
-    [TestMethod]
-    public void Eval_alias_rule_non_compliant_returns_deny()
-    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
-
-        // Non-compliant: HTTPS not enabled (normalized/lowercased form)
-        var input = WrapInput(
-            @"{""type"": ""microsoft.storage/storageaccounts"", ""supportshttpstrafficonly"": false}");
-
-        using var program = AzurePolicyCompiler.CompilePolicyRule(registry, HttpsDenyRule);
-        using var vm = new Rvm();
-        vm.LoadProgram(program);
-        vm.SetInputJson(input);
-
-        var result = vm.ExecuteEntryPoint("main");
-        Assert.IsNotNull(result);
-
-        var doc = JsonNode.Parse(result!)!;
-        Assert.AreEqual("deny", doc["effect"]?.GetValue<string>(),
-            $"expected 'deny' for non-compliant resource, got: {result}");
-    }
-
-    [TestMethod]
-    public void Eval_alias_rule_compliant_returns_undefined()
-    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
-
-        // Compliant: HTTPS enabled
-        var input = WrapInput(
-            @"{""type"": ""microsoft.storage/storageaccounts"", ""supportshttpstrafficonly"": true}");
-
-        using var program = AzurePolicyCompiler.CompilePolicyRule(registry, HttpsDenyRule);
-        using var vm = new Rvm();
-        vm.LoadProgram(program);
-        vm.SetInputJson(input);
-
-        var result = vm.ExecuteEntryPoint("main");
-        Assert.IsNotNull(result);
-        StringAssert.Contains(result!, "undefined",
-            "expected undefined for compliant resource");
-    }
-
-    [TestMethod]
-    public void Eval_definition_with_default_parameters()
-    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
-
-        using var program = AzurePolicyCompiler.CompilePolicyDefinition(
-            registry, PolicyDefinitionWithParams);
-        using var vm = new Rvm();
-        vm.LoadProgram(program);
-
-        // Non-compliant resource
-        var input = WrapInput(
-            @"{""type"": ""microsoft.storage/storageaccounts"", ""supportshttpstrafficonly"": false}");
-        vm.SetInputJson(input);
-
-        var result = vm.ExecuteEntryPoint("main");
-        Assert.IsNotNull(result);
-
-        var doc = JsonNode.Parse(result!)!;
-        // Default parameter value is "deny"
-        Assert.AreEqual("deny", doc["effect"]?.GetValue<string>(),
-            $"expected default 'deny' effect, got: {result}");
-    }
-
-    [TestMethod]
-    public void Eval_with_normalized_arm_resource_end_to_end()
-    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
-
-        // Simulate the full production flow:
-        // 1. Start with an ARM resource
-        var armResource = @"{
-            ""type"": ""Microsoft.Storage/storageAccounts"",
-            ""name"": ""mystorage"",
-            ""location"": ""eastus"",
-            ""properties"": {
-                ""supportsHttpsTrafficOnly"": false,
-                ""minimumTlsVersion"": ""TLS1_0""
-            }
-        }";
-
-        // 2. Normalize via AliasRegistry
-        var normalizedEnvelope = registry.NormalizeAndWrap(
-            armResource,
-            apiVersion: null,
-            contextJson: "{}",
-            parametersJson: "{}");
-        Assert.IsNotNull(normalizedEnvelope);
-
-        // 3. Compile the policy rule
-        using var program = AzurePolicyCompiler.CompilePolicyRule(registry, HttpsDenyRule);
-
-        // 4. Execute
-        using var vm = new Rvm();
-        vm.LoadProgram(program);
-        vm.SetInputJson(normalizedEnvelope!);
-
-        var result = vm.ExecuteEntryPoint("main");
-        Assert.IsNotNull(result);
-
-        var doc = JsonNode.Parse(result!)!;
-        Assert.AreEqual("deny", doc["effect"]?.GetValue<string>(),
-            $"expected 'deny' for non-HTTPS storage account, got: {result}");
-    }
-
-    [TestMethod]
-    public void Eval_normalized_compliant_resource_end_to_end()
-    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
-
-        var armResource = @"{
-            ""type"": ""Microsoft.Storage/storageAccounts"",
-            ""name"": ""secureastorage"",
-            ""location"": ""westus"",
-            ""properties"": {
-                ""supportsHttpsTrafficOnly"": true,
-                ""minimumTlsVersion"": ""TLS1_2""
-            }
-        }";
-
-        var normalizedEnvelope = registry.NormalizeAndWrap(
-            armResource,
-            apiVersion: null,
-            contextJson: "{}",
-            parametersJson: "{}");
-        Assert.IsNotNull(normalizedEnvelope);
-
-        using var program = AzurePolicyCompiler.CompilePolicyRule(registry, HttpsDenyRule);
-        using var vm = new Rvm();
-        vm.LoadProgram(program);
-        vm.SetInputJson(normalizedEnvelope!);
-
-        var result = vm.ExecuteEntryPoint("main");
-        Assert.IsNotNull(result);
-        StringAssert.Contains(result!, "undefined",
-            "expected undefined for compliant HTTPS storage account");
-    }
-
-    [TestMethod]
-    public void Program_can_be_serialized_and_reloaded()
-    {
-        using var program = AzurePolicyCompiler.CompilePolicyRule(null, SimpleAuditRule);
-
-        // Serialize to binary
-        var binary = program.SerializeBinary();
-        Assert.IsTrue(binary.Length > 0, "serialized program should not be empty");
-
-        // Deserialize and run
-        using var restored = Program.DeserializeBinary(binary, out var isPartial);
-        Assert.IsFalse(isPartial, "program should not be partial");
-
-        using var vm = new Rvm();
-        vm.LoadProgram(restored);
-        var input = WrapInput(@"{""type"": ""microsoft.storage/storageaccounts""}");
-        vm.SetInputJson(input);
-
-        var result = vm.ExecuteEntryPoint("main");
-        Assert.IsNotNull(result);
-        var doc = JsonNode.Parse(result!)!;
-        Assert.AreEqual("audit", doc["effect"]?.GetValue<string>());
-    }
-
-    [TestMethod]
-    public void Program_generates_listing()
-    {
-        using var program = AzurePolicyCompiler.CompilePolicyRule(null, SimpleAuditRule);
-        var listing = program.GenerateListing();
-        Assert.IsFalse(string.IsNullOrWhiteSpace(listing),
-            "generated listing should not be empty");
-    }
-
-    // -----------------------------------------------------------------------
-    // Context-dependent policy tests
-    // -----------------------------------------------------------------------
-
-    /// Policy rule that uses subscription() context function.
-    private const string ContextPolicyRule = @"{
-        ""if"": {
-            ""allOf"": [
-                { ""field"": ""type"", ""equals"": ""Microsoft.Storage/storageAccounts"" },
-                { ""value"": ""[subscription().subscriptionId]"", ""equals"": ""sub-123"" }
-            ]
-        },
-        ""then"": { ""effect"": ""deny"" }
-    }";
-
-    [TestMethod]
-    public void Eval_context_policy_with_set_context_returns_effect()
-    {
-        using var program = AzurePolicyCompiler.CompilePolicyRule(null, ContextPolicyRule);
-        using var vm = new Rvm();
-        vm.LoadProgram(program);
-
-        vm.SetContextJson(@"{""subscription"": {""subscriptionId"": ""sub-123""}}");
-
-        var input = WrapInput(
-            @"{""type"": ""microsoft.storage/storageaccounts""}");
-        vm.SetInputJson(input);
-
-        var result = vm.ExecuteEntryPoint("main");
-        Assert.IsNotNull(result);
-        var doc = JsonNode.Parse(result!)!;
-        Assert.AreEqual("deny", doc["effect"]?.GetValue<string>(),
-            $"expected 'deny' with matching context, got: {result}");
-    }
-
-    [TestMethod]
-    public void Eval_context_policy_without_context_returns_undefined()
-    {
-        using var program = AzurePolicyCompiler.CompilePolicyRule(null, ContextPolicyRule);
-        using var vm = new Rvm();
-        vm.LoadProgram(program);
-
-        // No context set — subscription() will be undefined
-        var input = WrapInput(
-            @"{""type"": ""microsoft.storage/storageaccounts""}");
-        vm.SetInputJson(input);
-
-        var result = vm.ExecuteEntryPoint("main");
-        Assert.IsNotNull(result);
-        StringAssert.Contains(result!, "undefined",
-            "expected undefined without context set");
-    }
-}
--- a/bindings/csharp/Regorus.Tests/AzurePolicyTests.cs
+++ b/bindings/csharp/Regorus.Tests/AzurePolicyTests.cs
@@ -62,7 +62,8 @@ public class AzurePolicyTests
    [TestMethod]
    public void AliasRegistry_NormalizeAndWrap_produces_input_envelope()
    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(StorageAliasesJson);

        var result = registry.NormalizeAndWrap(
            StorageResourceJson,
@@ -83,7 +84,8 @@ public class AzurePolicyTests
    [TestMethod]
    public void AliasRegistry_NormalizeAndWrap_flattens_properties()
    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(StorageAliasesJson);

        var result = registry.NormalizeAndWrap(StorageResourceJson);
        Assert.IsNotNull(result);
@@ -105,7 +107,8 @@ public class AzurePolicyTests
    [TestMethod]
    public void AliasRegistry_NormalizeAndWrap_preserves_type_field()
    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(StorageAliasesJson);

        var result = registry.NormalizeAndWrap(StorageResourceJson);
        var doc = JsonNode.Parse(result!);
@@ -122,7 +125,8 @@ public class AzurePolicyTests
    [TestMethod]
    public void AliasRegistry_NormalizeAndWrap_includes_parameters()
    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(StorageAliasesJson);

        var parametersJson = @"{ ""effect"": ""Deny"" }";
        var result = registry.NormalizeAndWrap(
@@ -139,7 +143,8 @@ public class AzurePolicyTests
    [TestMethod]
    public void AliasRegistry_Denormalize_roundtrips_correctly()
    {
-        using var registry = AliasRegistry.FromJson(StorageAliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(StorageAliasesJson);

        // Normalize the ARM resource.
        var envelope = registry.NormalizeAndWrap(StorageResourceJson);
@@ -172,7 +177,8 @@ public class AzurePolicyTests
        }

        var aliasesJson = File.ReadAllText(aliasesPath);
-        using var registry = AliasRegistry.FromJson(aliasesJson);
+        using var registry = new AliasRegistry();
+        registry.LoadJson(aliasesJson);

        // The test_aliases.json file contains multiple providers.
        Assert.IsTrue(registry.Length > 0,
--- a/bindings/csharp/Regorus/AliasRegistry.cs
+++ b/bindings/csharp/Regorus/AliasRegistry.cs
@@ -8,43 +8,51 @@ using Regorus.Internal;
 namespace Regorus
 {
    /// <summary>
-    /// Immutable Azure Policy alias registry used for resource normalization
+    /// Manages Azure Policy alias definitions used for resource normalization
    /// and policy compilation.
    /// </summary>
    public unsafe sealed class AliasRegistry : SafeHandleWrapper
    {
-        internal AliasRegistry(RegorusAliasRegistryHandle handle)
-            : base(handle, nameof(AliasRegistry))
+        /// <summary>
+        /// Create an empty alias registry.
+        /// </summary>
+        public AliasRegistry()
+            : base(RegorusAliasRegistryHandle.Create(), nameof(AliasRegistry))
        {
        }

        /// <summary>
-        /// Create an empty immutable alias registry.
+        /// Load control-plane alias data (array of ProviderAliases) from a JSON string.
        /// </summary>
-        public static AliasRegistry Empty()
+        /// <param name="json">JSON array of ProviderAliases (e.g. from Get-AzPolicyAlias or ResourceTypesAndAliases.json)</param>
+        public void LoadJson(string json)
        {
-            using var builder = new AliasRegistryBuilder();
-            return builder.Build();
+            Utf8Marshaller.WithUtf8(json, jsonPtr =>
+            {
+                UseHandle(regPtr =>
+                {
+                    CheckAndDropResult(API.regorus_alias_registry_load_json(
+                        (RegorusAliasRegistry*)regPtr, (byte*)jsonPtr));
+                    return 0;
+                });
+            });
        }

        /// <summary>
-        /// Create an immutable alias registry from control-plane alias JSON.
+        /// Load a data-plane policy manifest from a JSON string.
        /// </summary>
-        public static AliasRegistry FromJson(string json)
+        /// <param name="json">JSON object containing a DataPolicyManifest</param>
+        public void LoadManifest(string json)
        {
-            using var builder = new AliasRegistryBuilder();
-            builder.LoadJson(json);
-            return builder.Build();
-        }
-
-        /// <summary>
-        /// Create an immutable alias registry from a data-plane manifest JSON document.
-        /// </summary>
-        public static AliasRegistry FromManifest(string json)
-        {
-            using var builder = new AliasRegistryBuilder();
-            builder.LoadManifest(json);
-            return builder.Build();
+            Utf8Marshaller.WithUtf8(json, jsonPtr =>
+            {
+                UseHandle(regPtr =>
+                {
+                    CheckAndDropResult(API.regorus_alias_registry_load_manifest(
+                        (RegorusAliasRegistry*)regPtr, (byte*)jsonPtr));
+                    return 0;
+                });
+            });
        }

        /// <summary>
@@ -66,6 +74,11 @@ namespace Regorus
        /// Normalize an ARM resource JSON and wrap it into the standard input envelope
        /// expected by a compiled Azure Policy program.
        /// </summary>
+        /// <param name="resourceJson">Raw ARM resource JSON</param>
+        /// <param name="apiVersion">API version string (e.g. "2023-01-01"), or null to use default alias paths</param>
+        /// <param name="contextJson">Additional context JSON object (pass "{}" if none)</param>
+        /// <param name="parametersJson">Policy parameter values JSON (pass "{}" if none)</param>
+        /// <returns>JSON string: { "resource": &lt;normalized&gt;, "context": &lt;context&gt;, "parameters": &lt;params&gt; }</returns>
        public string? NormalizeAndWrap(string resourceJson, string? apiVersion = null, string contextJson = "{}", string parametersJson = "{}")
        {
            return Utf8Marshaller.WithUtf8(resourceJson, resPtr =>
@@ -83,22 +96,27 @@ namespace Regorus
                                        (byte*)ctxPtr, (byte*)paramsPtr));
                            });
                        }
-
-                        return Utf8Marshaller.WithUtf8(apiVersion, apiPtr =>
-                            UseHandle(regPtr =>
-                            {
-                                return ResultHelpers.GetStringResult(
-                                    API.regorus_alias_registry_normalize_and_wrap(
-                                        (RegorusAliasRegistry*)regPtr,
-                                        (byte*)resPtr, (byte*)apiPtr,
-                                        (byte*)ctxPtr, (byte*)paramsPtr));
-                            }));
+                        else
+                        {
+                            return Utf8Marshaller.WithUtf8(apiVersion, apiPtr =>
+                                UseHandle(regPtr =>
+                                {
+                                    return ResultHelpers.GetStringResult(
+                                        API.regorus_alias_registry_normalize_and_wrap(
+                                            (RegorusAliasRegistry*)regPtr,
+                                            (byte*)resPtr, (byte*)apiPtr,
+                                            (byte*)ctxPtr, (byte*)paramsPtr));
+                                }));
+                        }
                    })));
        }

        /// <summary>
        /// Denormalize a previously-normalized resource JSON back to ARM format.
        /// </summary>
+        /// <param name="normalizedJson">The normalized resource JSON</param>
+        /// <param name="apiVersion">API version string, or null to use default alias paths</param>
+        /// <returns>Denormalized ARM JSON string</returns>
        public string? Denormalize(string normalizedJson, string? apiVersion = null)
        {
            return Utf8Marshaller.WithUtf8(normalizedJson, normPtr =>
@@ -113,16 +131,23 @@ namespace Regorus
                                (byte*)normPtr, null));
                    });
                }
-
-                return Utf8Marshaller.WithUtf8(apiVersion, apiPtr =>
-                    UseHandle(regPtr =>
-                    {
-                        return ResultHelpers.GetStringResult(
-                            API.regorus_alias_registry_denormalize(
-                                (RegorusAliasRegistry*)regPtr,
-                                (byte*)normPtr, (byte*)apiPtr));
-                    }));
+                else
+                {
+                    return Utf8Marshaller.WithUtf8(apiVersion, apiPtr =>
+                        UseHandle(regPtr =>
+                        {
+                            return ResultHelpers.GetStringResult(
+                                API.regorus_alias_registry_denormalize(
+                                    (RegorusAliasRegistry*)regPtr,
+                                    (byte*)normPtr, (byte*)apiPtr));
+                        }));
+                }
            });
        }
+
+        private static string? CheckAndDropResult(RegorusResult result)
+        {
+            return ResultHelpers.GetStringResult(result);
+        }
    }
 }
--- a/bindings/csharp/Regorus/AliasRegistryBuilder.cs
+++ b/bindings/csharp/Regorus/AliasRegistryBuilder.cs
@@ -1,69 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using Regorus.Internal;
-
-#nullable enable
-namespace Regorus
-{
-    /// <summary>
-    /// Mutable, single-threaded builder for <see cref="AliasRegistry"/>.
-    /// Load alias data, then call <see cref="Build"/> to freeze the registry.
-    /// </summary>
-    public unsafe sealed class AliasRegistryBuilder : SafeHandleWrapper
-    {
-        /// <summary>
-        /// Create an empty alias registry builder.
-        /// </summary>
-        public AliasRegistryBuilder()
-            : base(RegorusAliasRegistryBuilderHandle.Create(), nameof(AliasRegistryBuilder))
-        {
-        }
-
-        /// <summary>
-        /// Load control-plane alias data (array of ProviderAliases) from a JSON string.
-        /// </summary>
-        public void LoadJson(string json)
-        {
-            Utf8Marshaller.WithUtf8(json, jsonPtr =>
-            {
-                UseHandle(builderPtr =>
-                {
-                    ResultHelpers.GetStringResult(API.regorus_alias_registry_builder_load_json(
-                        (RegorusAliasRegistryBuilder*)builderPtr,
-                        (byte*)jsonPtr));
-                });
-            });
-        }
-
-        /// <summary>
-        /// Load a data-plane policy manifest from a JSON string.
-        /// </summary>
-        public void LoadManifest(string json)
-        {
-            Utf8Marshaller.WithUtf8(json, jsonPtr =>
-            {
-                UseHandle(builderPtr =>
-                {
-                    ResultHelpers.GetStringResult(API.regorus_alias_registry_builder_load_manifest(
-                        (RegorusAliasRegistryBuilder*)builderPtr,
-                        (byte*)jsonPtr));
-                });
-            });
-        }
-
-        /// <summary>
-        /// Freeze the builder into an immutable, thread-safe alias registry.
-        /// </summary>
-        public AliasRegistry Build()
-        {
-            return UseHandle(builderPtr =>
-            {
-                var registryPtr = ResultHelpers.GetPointerResult(
-                    API.regorus_alias_registry_builder_build((RegorusAliasRegistryBuilder*)builderPtr));
-                return new AliasRegistry(RegorusAliasRegistryHandle.FromPointer(registryPtr));
-            });
-        }
-    }
-}
--- a/bindings/csharp/Regorus/AzurePolicyCompiler.cs
+++ b/bindings/csharp/Regorus/AzurePolicyCompiler.cs
@@ -1,183 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using Regorus.Internal;
-
-#nullable enable
-namespace Regorus
-{
-    /// <summary>
-    /// Provides static methods for compiling Azure Policy JSON definitions
-    /// into RVM programs that can be executed by <see cref="Rvm"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// This class bridges the gap between Azure Policy JSON (the native
-    /// Azure policy language with <c>policyRule</c>, <c>field</c>,
-    /// <c>equals</c>, etc.) and Regorus's RVM execution engine.
-    /// </para>
-    ///
-    /// <para>
-    /// <b>Typical workflow:</b>
-    /// </para>
-    /// <list type="number">
-    /// <item>Load alias definitions with <see cref="AliasRegistryBuilder"/> and freeze them into an <see cref="AliasRegistry"/>.</item>
-    /// <item>Normalize the ARM resource via <see cref="AliasRegistry.NormalizeAndWrap"/>.</item>
-    /// <item>Compile the JSON policyRule with <see cref="CompilePolicyRule"/> or the
-    ///        full definition with <see cref="CompilePolicyDefinition"/>.</item>
-    /// <item>Execute the resulting <see cref="Program"/> in an <see cref="Rvm"/>
-    ///        instance with the normalized input.</item>
-    /// </list>
-    ///
-    /// <para>
-    /// <b>Context-dependent policies:</b> Policies that use context functions
-    /// such as <c>subscription()</c>, <c>resourceGroup()</c>, or
-    /// <c>requestContext()</c> require the VM context to be set separately via
-    /// <see cref="Rvm.SetContextJson"/> before execution. The context JSON
-    /// returned by <see cref="AliasRegistry.NormalizeAndWrap"/> is passed as
-    /// <c>input.context</c> but is <b>not</b> automatically wired into the VM's
-    /// ambient context — the caller must do both:
-    /// <c>vm.SetInputJson(envelope)</c> and <c>vm.SetContextJson(contextJson)</c>.
-    /// </para>
-    /// </remarks>
-    public static unsafe class AzurePolicyCompiler
-    {
-        /// <summary>
-        /// Compile an Azure Policy JSON policy rule into an RVM <see cref="Program"/>.
-        /// </summary>
-        /// <param name="aliasRegistry">
-        /// Alias registry for resolving fully-qualified alias names in field
-        /// references.  Pass <c>null</c> if no alias resolution is needed.
-        /// <para>
-        /// <b>Warning:</b> When <c>null</c>, alias field references compile as raw
-        /// property paths and will silently produce incorrect evaluation results for
-        /// policies that use aliases.  Modify/Append effect policies will also skip
-        /// the compile-time modifiability validation.  Only pass <c>null</c> when the
-        /// policy is known to contain no alias references (e.g. simple type/location
-        /// checks or unit-test scenarios).
-        /// </para>
-        /// </param>
-        /// <param name="policyRuleJson">
-        /// JSON string containing the policyRule object, e.g.
-        /// <c>{ "if": { "field": "type", "equals": "..." }, "then": { "effect": "deny" } }</c>
-        /// </param>
-        /// <returns>
-        /// A compiled <see cref="Program"/> ready to be loaded into an
-        /// <see cref="Rvm"/> instance.
-        /// </returns>
-        /// <exception cref="ArgumentNullException">
-        /// Thrown when <paramref name="policyRuleJson"/> is <c>null</c>.
-        /// </exception>
-        /// <exception cref="Exception">
-        /// Thrown when parsing or compilation fails.
-        /// </exception>
-        public static Program CompilePolicyRule(AliasRegistry? aliasRegistry, string policyRuleJson)
-        {
-            if (policyRuleJson is null)
-            {
-                throw new ArgumentNullException(nameof(policyRuleJson));
-            }
-
-            return Utf8Marshaller.WithUtf8(policyRuleJson, rulePtr =>
-            {
-                if (aliasRegistry is null)
-                {
-                    var result = API.regorus_compile_azure_policy_rule(
-                        null, (byte*)rulePtr);
-                    return GetProgramResult(result);
-                }
-                else
-                {
-                    return aliasRegistry.UseHandleForInterop(regPtr =>
-                    {
-                        var result = API.regorus_compile_azure_policy_rule(
-                            (RegorusAliasRegistry*)regPtr, (byte*)rulePtr);
-                        return GetProgramResult(result);
-                    });
-                }
-            });
-        }
-
-        /// <summary>
-        /// Compile a full Azure Policy definition JSON into an RVM <see cref="Program"/>.
-        /// </summary>
-        /// <param name="aliasRegistry">
-        /// Alias registry for resolving fully-qualified alias names in field
-        /// references.  Pass <c>null</c> if no alias resolution is needed.
-        /// <para>
-        /// <b>Warning:</b> When <c>null</c>, alias field references compile as raw
-        /// property paths and will silently produce incorrect evaluation results for
-        /// policies that use aliases.  Modify/Append effect policies will also skip
-        /// the compile-time modifiability validation.  Only pass <c>null</c> when the
-        /// policy is known to contain no alias references (e.g. simple type/location
-        /// checks or unit-test scenarios).
-        /// </para>
-        /// </param>
-        /// <param name="policyDefinitionJson">
-        /// JSON string containing the full policy definition, which includes
-        /// <c>policyRule</c>, <c>parameters</c>, <c>displayName</c>, etc.
-        /// Accepted in both wrapped and unwrapped forms.
-        /// </param>
-        /// <returns>
-        /// A compiled <see cref="Program"/> ready to be loaded into an
-        /// <see cref="Rvm"/> instance.
-        /// </returns>
-        /// <exception cref="ArgumentNullException">
-        /// Thrown when <paramref name="policyDefinitionJson"/> is <c>null</c>.
-        /// </exception>
-        /// <exception cref="Exception">
-        /// Thrown when parsing or compilation fails.
-        /// </exception>
-        public static Program CompilePolicyDefinition(AliasRegistry? aliasRegistry, string policyDefinitionJson)
-        {
-            if (policyDefinitionJson is null)
-            {
-                throw new ArgumentNullException(nameof(policyDefinitionJson));
-            }
-
-            return Utf8Marshaller.WithUtf8(policyDefinitionJson, defnPtr =>
-            {
-                if (aliasRegistry is null)
-                {
-                    var result = API.regorus_compile_azure_policy_definition(
-                        null, (byte*)defnPtr);
-                    return GetProgramResult(result);
-                }
-                else
-                {
-                    return aliasRegistry.UseHandleForInterop(regPtr =>
-                    {
-                        var result = API.regorus_compile_azure_policy_definition(
-                            (RegorusAliasRegistry*)regPtr, (byte*)defnPtr);
-                        return GetProgramResult(result);
-                    });
-                }
-            });
-        }
-
-        private static Program GetProgramResult(RegorusResult result)
-        {
-            try
-            {
-                if (result.status != RegorusStatus.Ok)
-                {
-                    var message = Utf8Marshaller.FromUtf8(result.error_message);
-                    throw result.status.CreateException(message);
-                }
-
-                if (result.data_type != RegorusDataType.Pointer || result.pointer_value == null)
-                {
-                    throw new Exception("Expected program pointer but got different data type");
-                }
-
-                var handle = RegorusProgramHandle.FromPointer((IntPtr)result.pointer_value);
-                return new Program(handle);
-            }
-            finally
-            {
-                API.regorus_result_drop(result);
-            }
-        }
-    }
-}
--- a/bindings/csharp/Regorus/NativeMethods.cs
+++ b/bindings/csharp/Regorus/NativeMethods.cs
@@ -178,14 +178,6 @@ namespace Regorus.Internal
        [DllImport(LibraryName, EntryPoint = "regorus_rvm_set_input", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
        internal static extern RegorusResult regorus_rvm_set_input(RegorusRvm* vm, byte* input_json);

-        /// <summary>
-        /// Set the context document for the RVM.
-        /// The context provides host-supplied ambient data (e.g. resourceGroup(), subscription())
-        /// that Azure Policy functions can access.
-        /// </summary>
-        [DllImport(LibraryName, EntryPoint = "regorus_rvm_set_context", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern RegorusResult regorus_rvm_set_context(RegorusRvm* vm, byte* context_json);
-
        /// <summary>
        /// Execute the program.
        /// </summary>
@@ -498,20 +490,6 @@ namespace Regorus.Internal
        [DllImport(LibraryName, EntryPoint = "regorus_compile_policy_for_target", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
        internal static extern RegorusResult regorus_compile_policy_for_target(byte* data_json, RegorusPolicyModule* modules, UIntPtr modules_len);

-        /// <summary>
-        /// Compile an Azure Policy JSON policy rule into an RVM program.
-        /// </summary>
-        [DllImport(LibraryName, EntryPoint = "regorus_compile_azure_policy_rule", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern RegorusResult regorus_compile_azure_policy_rule(
-            RegorusAliasRegistry* registry, byte* policy_rule_json);
-
-        /// <summary>
-        /// Compile a full Azure Policy definition JSON into an RVM program.
-        /// </summary>
-        [DllImport(LibraryName, EntryPoint = "regorus_compile_azure_policy_definition", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern RegorusResult regorus_compile_azure_policy_definition(
-            RegorusAliasRegistry* registry, byte* policy_definition_json);
-
        #endregion

        #region Compiled Policy Methods
@@ -695,34 +673,10 @@ namespace Regorus.Internal
        #region Alias Registry Methods

        /// <summary>
-        /// Create a new alias registry builder.
+        /// Create a new, empty AliasRegistry.
        /// </summary>
-        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_builder_new", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern RegorusAliasRegistryBuilder* regorus_alias_registry_builder_new();
-
-        /// <summary>
-        /// Drop an alias registry builder.
-        /// </summary>
-        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_builder_drop", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern void regorus_alias_registry_builder_drop(RegorusAliasRegistryBuilder* builder);
-
-        /// <summary>
-        /// Load control-plane alias data into the builder.
-        /// </summary>
-        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_builder_load_json", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern RegorusResult regorus_alias_registry_builder_load_json(RegorusAliasRegistryBuilder* builder, byte* json);
-
-        /// <summary>
-        /// Load a data-plane policy manifest into the builder.
-        /// </summary>
-        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_builder_load_manifest", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern RegorusResult regorus_alias_registry_builder_load_manifest(RegorusAliasRegistryBuilder* builder, byte* json);
-
-        /// <summary>
-        /// Freeze a builder into an immutable alias registry.
-        /// </summary>
-        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_builder_build", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        internal static extern RegorusResult regorus_alias_registry_builder_build(RegorusAliasRegistryBuilder* builder);
+        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_new", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
+        internal static extern RegorusAliasRegistry* regorus_alias_registry_new();

        /// <summary>
        /// Drop an AliasRegistry.
@@ -730,6 +684,18 @@ namespace Regorus.Internal
        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_drop", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
        internal static extern void regorus_alias_registry_drop(RegorusAliasRegistry* registry);

+        /// <summary>
+        /// Load control-plane alias data (array of ProviderAliases) into the registry.
+        /// </summary>
+        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_load_json", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
+        internal static extern RegorusResult regorus_alias_registry_load_json(RegorusAliasRegistry* registry, byte* json);
+
+        /// <summary>
+        /// Load a data-plane policy manifest into the registry.
+        /// </summary>
+        [DllImport(LibraryName, EntryPoint = "regorus_alias_registry_load_manifest", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
+        internal static extern RegorusResult regorus_alias_registry_load_manifest(RegorusAliasRegistry* registry, byte* json);
+
        /// <summary>
        /// Return the number of resource types loaded in the alias registry.
        /// </summary>
@@ -957,14 +923,6 @@ namespace Regorus.Internal
        public byte* content;
    }

-    /// <summary>
-    /// Wrapper for AliasRegistryBuilder.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    internal unsafe partial struct RegorusAliasRegistryBuilder
-    {
-    }
-
    /// <summary>
    /// Wrapper for AliasRegistry.
    /// </summary>
--- a/bindings/csharp/Regorus/Program.cs
+++ b/bindings/csharp/Regorus/Program.cs
@@ -15,7 +15,7 @@ namespace Regorus
    /// </summary>
    public unsafe sealed class Program : SafeHandleWrapper
    {
-        internal Program(RegorusProgramHandle handle)
+        private Program(RegorusProgramHandle handle)
            : base(handle, nameof(Program))
        {
        }
--- a/bindings/csharp/Regorus/ResultHelpers.cs
+++ b/bindings/csharp/Regorus/ResultHelpers.cs
@@ -69,29 +69,5 @@ namespace Regorus.Internal
                API.regorus_result_drop(result);
            }
        }
-
-
-        internal static IntPtr GetPointerResult(RegorusResult result)
-        {
-            try
-            {
-                if (result.status != RegorusStatus.Ok)
-                {
-                    var message = Utf8Marshaller.FromUtf8(result.error_message);
-                    throw result.status.CreateException(message);
-                }
-
-                if (result.data_type != RegorusDataType.Pointer || result.pointer_value == null)
-                {
-                    throw new InvalidOperationException("Expected pointer result.");
-                }
-
-                return (IntPtr)result.pointer_value;
-            }
-            finally
-            {
-                API.regorus_result_drop(result);
-            }
-        }
    }
 }
--- a/bindings/csharp/Regorus/Rvm.cs
+++ b/bindings/csharp/Regorus/Rvm.cs
@@ -106,24 +106,6 @@ namespace Regorus
            });
        }

-        /// <summary>
-        /// Set the context document for the VM.
-        /// The context provides host-supplied ambient data (e.g. resourceGroup(),
-        /// subscription()) that Azure Policy functions can access via LoadContext
-        /// instructions.
-        /// </summary>
-        public void SetContextJson(string contextJson)
-        {
-            Utf8Marshaller.WithUtf8(contextJson, contextPtr =>
-            {
-                UseHandle(vmPtr =>
-                {
-                    CheckAndDropResult(API.regorus_rvm_set_context((RegorusRvm*)vmPtr, (byte*)contextPtr));
-                    return 0;
-                });
-            });
-        }
-
        /// <summary>
        /// Set the execution mode (0 = run-to-completion, 1 = suspendable).
        /// </summary>
--- a/bindings/csharp/Regorus/SafeHandles.cs
+++ b/bindings/csharp/Regorus/SafeHandles.cs
@@ -184,48 +184,28 @@ namespace Regorus
        }
    }

-    internal sealed class RegorusAliasRegistryBuilderHandle : SafeHandleZeroOrMinusOneIsInvalid
-    {
-        private RegorusAliasRegistryBuilderHandle() : base(ownsHandle: true)
-        {
-        }
-
-        internal static RegorusAliasRegistryBuilderHandle Create()
-        {
-            unsafe
-            {
-                var raw = Internal.API.regorus_alias_registry_builder_new();
-                if (raw is null)
-                {
-                    throw new InvalidOperationException("Failed to create Regorus alias registry builder.");
-                }
-
-                var handle = new RegorusAliasRegistryBuilderHandle();
-                handle.SetHandle((IntPtr)raw);
-                return handle;
-            }
-        }
-
-        protected override bool ReleaseHandle()
-        {
-            if (!IsInvalid)
-            {
-                unsafe
-                {
-                    Internal.API.regorus_alias_registry_builder_drop((Internal.RegorusAliasRegistryBuilder*)handle);
-                }
-                SetHandle(IntPtr.Zero);
-            }
-            return true;
-        }
-    }
-
    internal sealed class RegorusAliasRegistryHandle : SafeHandleZeroOrMinusOneIsInvalid
    {
        private RegorusAliasRegistryHandle() : base(ownsHandle: true)
        {
        }

+        internal static RegorusAliasRegistryHandle Create()
+        {
+            unsafe
+            {
+                var raw = Internal.API.regorus_alias_registry_new();
+                if (raw is null)
+                {
+                    throw new InvalidOperationException("Failed to create Regorus alias registry.");
+                }
+
+                var handle = new RegorusAliasRegistryHandle();
+                handle.SetHandle((IntPtr)raw);
+                return handle;
+            }
+        }
+
        internal static RegorusAliasRegistryHandle FromPointer(IntPtr pointer)
        {
            if (pointer == IntPtr.Zero)
--- a/bindings/csharp/TargetExampleApp/Program.cs
+++ b/bindings/csharp/TargetExampleApp/Program.cs
@@ -232,9 +232,6 @@ allow if {

        Console.WriteLine("\n8. RVM host await (suspend/resume):");
        DemonstrateRvmHostAwait();
-
-        Console.WriteLine("\n9. Azure Policy JSON compilation:");
-        DemonstrateAzurePolicyJsonCompilation();
    }

    static void DemonstrateConcurrentEvaluation(Regorus.CompiledPolicy compiledPolicy)
@@ -495,80 +492,4 @@ allow if {
        var resumed = vm.Resume("{\"tier\":\"gold\"}");
        Console.WriteLine($"HostAwait resumed result: {resumed}");
    }
-
-    // Azure Policy JSON constants
-    private const string STORAGE_ALIASES_JSON = @"[{
-        ""namespace"": ""Microsoft.Storage"",
-        ""resourceTypes"": [{
-            ""resourceType"": ""storageAccounts"",
-            ""capabilities"": ""SupportsTags, SupportsLocation"",
-            ""aliases"": [
-                {
-                    ""name"": ""Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly"",
-                    ""defaultPath"": ""properties.supportsHttpsTrafficOnly"",
-                    ""paths"": []
-                }
-            ]
-        }]
-    }]";
-
-    private const string HTTPS_DENY_RULE = @"{
-        ""if"": {
-            ""allOf"": [
-                { ""field"": ""type"", ""equals"": ""Microsoft.Storage/storageAccounts"" },
-                { ""field"": ""Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly"", ""equals"": false }
-            ]
-        },
-        ""then"": { ""effect"": ""deny"" }
-    }";
-
-    static void DemonstrateAzurePolicyJsonCompilation()
-    {
-        // 1. Set up alias registry
-        using var registry = Regorus.AliasRegistry.FromJson(STORAGE_ALIASES_JSON);
-        Console.WriteLine("Loaded storage account aliases");
-
-        // 2. Compile the JSON policy rule directly (no Rego needed)
-        using var program = Regorus.AzurePolicyCompiler.CompilePolicyRule(registry, HTTPS_DENY_RULE);
-        Console.WriteLine("Compiled Azure Policy JSON rule to RVM program");
-
-        // 3. Normalize an ARM resource
-        var armResource = @"{
-            ""type"": ""Microsoft.Storage/storageAccounts"",
-            ""name"": ""insecurestorage"",
-            ""location"": ""eastus"",
-            ""properties"": { ""supportsHttpsTrafficOnly"": false }
-        }";
-        var envelope = registry.NormalizeAndWrap(armResource, apiVersion: null, contextJson: "{}", parametersJson: "{}");
-        Console.WriteLine($"Normalized ARM resource to evaluation envelope");
-
-        // 4. Execute in the RVM
-        //    Note: For policies using context functions (subscription(), resourceGroup()),
-        //    call vm.SetContextJson(contextJson) before execution. The context from
-        //    NormalizeAndWrap is in the envelope but must also be set on the VM separately.
-        using var vm = new Regorus.Rvm();
-        vm.LoadProgram(program);
-        vm.SetInputJson(envelope!);
-        // vm.SetContextJson(contextJson); // ← required for context-dependent policies
-        var result = vm.ExecuteEntryPoint("main");
-        Console.WriteLine($"Evaluation result (non-compliant): {result}");
-
-        // 5. Test with a compliant resource
-        var compliantResource = @"{
-            ""type"": ""Microsoft.Storage/storageAccounts"",
-            ""name"": ""securestorage"",
-            ""location"": ""eastus"",
-            ""properties"": { ""supportsHttpsTrafficOnly"": true }
-        }";
-        var compliantEnvelope = registry.NormalizeAndWrap(compliantResource, apiVersion: null, contextJson: "{}", parametersJson: "{}");
-        using var vm2 = new Regorus.Rvm();
-        vm2.LoadProgram(program);
-        vm2.SetInputJson(compliantEnvelope!);
-        var compliantResult = vm2.ExecuteEntryPoint("main");
-        Console.WriteLine($"Evaluation result (compliant): {compliantResult}");
-
-        // 6. Demonstrate program serialization
-        var binary = program.SerializeBinary();
-        Console.WriteLine($"Serialized program size: {binary.Length} bytes");
-    }
 }
--- a/bindings/ffi/Cargo.lock
+++ b/bindings/ffi/Cargo.lock
@@ -172,9 +172,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.62"
+version = "1.2.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -353,9 +353,9 @@ dependencies = [

 [[package]]
 name = "fancy-regex"
-version = "0.18.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"
+checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"
 dependencies = [
 "bit-set",
 "regex-automata",
@@ -508,12 +508,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.17.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
-dependencies = [
- "foldhash 0.2.0",
-]
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"

 [[package]]
 name = "heck"
@@ -687,7 +684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
- "hashbrown 0.17.1",
+ "hashbrown 0.17.0",
 "serde",
 "serde_core",
 ]
@@ -712,9 +709,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"

 [[package]]
 name = "js-sys"
-version = "0.3.98"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
 dependencies = [
 "cfg-if",
 "futures-util",
@@ -724,9 +721,9 @@ dependencies = [

 [[package]]
 name = "jsonschema"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5fe5206f06e589caf25e79fc05ccdf91fca745685fe9fe1a13bbdfb479a631"
+checksum = "257eb0e588b76827bbddc9e73945a9743693dd2adeaee9da26420f93cfedb798"
 dependencies = [
 "ahash",
 "bytecount",
@@ -796,9 +793,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "lru"
-version = "0.18.0"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"

 [[package]]
 name = "memchr"
@@ -806,12 +803,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"

-[[package]]
-name = "micromap"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a86d3146ed3995b5913c414f6664344b9617457320782e64f0bb44afd49d74"
-
 [[package]]
 name = "msvc_spectre_libs"
 version = "0.1.3"
@@ -1082,16 +1073,14 @@ dependencies = [

 [[package]]
 name = "referencing"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e4e17ef386c5383591d07623d3de49cbc601156e7582973e6db98d66a57de2"
+checksum = "e2f38748ceca8d0b0013e60f534d94a6e23dfd89fd2a88318fc5a2d04fda1010"
 dependencies = [
 "ahash",
 "fluent-uri",
 "getrandom 0.3.4",
 "hashbrown 0.16.1",
- "itoa",
- "micromap",
 "parking_lot",
 "percent-encoding",
 "serde_json",
@@ -1128,7 +1117,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

 [[package]]
 name = "regorus"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "chrono",
@@ -1136,7 +1125,7 @@ dependencies = [
 "dashmap",
 "data-encoding",
 "globset",
- "hashbrown 0.17.1",
+ "hashbrown 0.16.1",
 "icu_casemap",
 "indexmap",
 "ipnet",
@@ -1163,7 +1152,7 @@ dependencies = [

 [[package]]
 name = "regorus-ffi"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "cbindgen",
@@ -1174,7 +1163,7 @@ dependencies = [

 [[package]]
 name = "regorus-mimalloc"
-version = "2.2.7"
+version = "2.2.6"
 dependencies = [
 "regorus-mimalloc-sys",
 ]
@@ -1296,9 +1285,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "siphasher"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"

 [[package]]
 name = "slab"
@@ -1535,9 +1524,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -1548,9 +1537,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -1558,9 +1547,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
 dependencies = [
 "bumpalo",
 "proc-macro2",
@@ -1571,9 +1560,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
 dependencies = [
 "unicode-ident",
 ]
--- a/bindings/ffi/Cargo.toml
+++ b/bindings/ffi/Cargo.toml
@@ -2,7 +2,7 @@

 [package]
 name = "regorus-ffi"
-version = "0.10.1"
+version = "0.10.0"
 edition = "2021"
 license = "MIT AND Apache-2.0 AND BSD-3-Clause"

--- a/bindings/ffi/src/alias_registry.rs
+++ b/bindings/ffi/src/alias_registry.rs
@@ -5,108 +5,66 @@

 #![cfg(feature = "azure_policy")]

-use crate::common::{from_c_str, to_ref, to_shared_ref, RegorusResult, RegorusStatus};
+use crate::common::{from_c_str, to_ref, RegorusResult, RegorusStatus};
 use crate::panic_guard::with_unwind_guard;

 use alloc::boxed::Box;
 use alloc::format;
 use alloc::string::String;
-use alloc::sync::Arc;
-use anyhow::{anyhow, Result};
-use core::ffi::{c_char, c_void};
-use core::{mem, ptr};
+use anyhow::Result;
+use core::ffi::c_char;
+use core::ptr;

 use regorus::languages::azure_policy::aliases::AliasRegistry;

-/// Mutable builder for `AliasRegistry`.
-///
-/// This handle is intentionally single-threaded and must not be used
-/// concurrently. Callers should finish loading alias data and then freeze it
-/// into a `RegorusAliasRegistry` via `regorus_alias_registry_builder_build`.
-pub struct RegorusAliasRegistryBuilder {
-    registry: AliasRegistry,
-    built: bool,
-}
-
-impl RegorusAliasRegistryBuilder {
-    fn new() -> Self {
-        Self {
-            registry: AliasRegistry::new(),
-            built: false,
-        }
-    }
-
-    fn registry_mut(&mut self) -> Result<&mut AliasRegistry> {
-        if self.built {
-            return Err(anyhow!("alias registry builder has already been built"));
-        }
-        Ok(&mut self.registry)
-    }
-
-    fn build(&mut self) -> Result<RegorusAliasRegistry> {
-        if self.built {
-            return Err(anyhow!("alias registry builder has already been built"));
-        }
-
-        self.built = true;
-        Ok(RegorusAliasRegistry {
-            registry: Arc::new(mem::replace(&mut self.registry, AliasRegistry::new())),
-        })
-    }
-}
-
-/// Frozen, immutable alias registry.
+/// Opaque wrapper for `AliasRegistry`.
 pub struct RegorusAliasRegistry {
-    registry: Arc<AliasRegistry>,
-}
-
-impl RegorusAliasRegistry {
-    /// Return a shared reference to the inner registry for use by the compiler.
-    pub(crate) fn inner(&self) -> Arc<AliasRegistry> {
-        Arc::clone(&self.registry)
-    }
+    registry: AliasRegistry,
 }

 // ---------------------------------------------------------------------------
-// Builder lifecycle
+// Lifecycle
 // ---------------------------------------------------------------------------

-/// Create a new, empty `AliasRegistry` builder.
+/// Create a new, empty `AliasRegistry`.
 ///
-/// The caller must eventually call `regorus_alias_registry_builder_drop`.
+/// The caller must eventually call `regorus_alias_registry_drop` to free the handle.
 #[no_mangle]
-pub extern "C" fn regorus_alias_registry_builder_new() -> *mut RegorusAliasRegistryBuilder {
-    Box::into_raw(Box::new(RegorusAliasRegistryBuilder::new()))
+pub extern "C" fn regorus_alias_registry_new() -> *mut RegorusAliasRegistry {
+    let wrapper = RegorusAliasRegistry {
+        registry: AliasRegistry::new(),
+    };
+    Box::into_raw(Box::new(wrapper))
 }

-/// Drop a `RegorusAliasRegistryBuilder`.
+/// Drop a `RegorusAliasRegistry`.
 #[no_mangle]
-pub extern "C" fn regorus_alias_registry_builder_drop(builder: *mut RegorusAliasRegistryBuilder) {
-    if let Ok(builder) = to_ref(builder) {
+pub extern "C" fn regorus_alias_registry_drop(registry: *mut RegorusAliasRegistry) {
+    if let Ok(r) = to_ref(registry) {
        unsafe {
-            let _ = Box::from_raw(ptr::from_mut(builder));
+            let _ = Box::from_raw(ptr::from_mut(r));
        }
    }
 }

 // ---------------------------------------------------------------------------
-// Builder loading
+// Loading
 // ---------------------------------------------------------------------------

-/// Load control-plane alias data (array of `ProviderAliases`) into the builder.
+/// Load control-plane alias data (array of `ProviderAliases`) into the registry.
 ///
 /// `json` must be a valid null-terminated UTF-8 string containing the JSON
 /// array returned by `Get-AzPolicyAlias` or the static
 /// `ResourceTypesAndAliases.json` file.
 #[no_mangle]
-pub extern "C" fn regorus_alias_registry_builder_load_json(
-    builder: *mut RegorusAliasRegistryBuilder,
+pub extern "C" fn regorus_alias_registry_load_json(
+    registry: *mut RegorusAliasRegistry,
    json: *const c_char,
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<()> {
            let json_str = from_c_str(json)?;
-            to_ref(builder)?.registry_mut()?.load_from_json(&json_str)?;
+            to_ref(registry)?.registry.load_from_json(&json_str)?;
            Ok(())
        }();

@@ -120,20 +78,20 @@ pub extern "C" fn regorus_alias_registry_builder_load_json(
    })
 }

-/// Load a data-plane policy manifest into the builder.
+/// Load a data-plane policy manifest into the registry.
 ///
 /// `json` must be a valid null-terminated UTF-8 string containing a single
 /// `DataPolicyManifest` JSON object.
 #[no_mangle]
-pub extern "C" fn regorus_alias_registry_builder_load_manifest(
-    builder: *mut RegorusAliasRegistryBuilder,
+pub extern "C" fn regorus_alias_registry_load_manifest(
+    registry: *mut RegorusAliasRegistry,
    json: *const c_char,
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<()> {
            let json_str = from_c_str(json)?;
-            to_ref(builder)?
-                .registry_mut()?
+            to_ref(registry)?
+                .registry
                .load_data_policy_manifest_json(&json_str)?;
            Ok(())
        }();
@@ -148,52 +106,16 @@ pub extern "C" fn regorus_alias_registry_builder_load_manifest(
    })
 }

-/// Freeze a builder into an immutable `RegorusAliasRegistry`.
-#[no_mangle]
-pub extern "C" fn regorus_alias_registry_builder_build(
-    builder: *mut RegorusAliasRegistryBuilder,
-) -> RegorusResult {
-    with_unwind_guard(|| {
-        let output = || -> Result<*mut RegorusAliasRegistry> {
-            let registry = to_ref(builder)?.build()?;
-            Ok(Box::into_raw(Box::new(registry)))
-        }();
-
-        match output {
-            Ok(registry) => RegorusResult::ok_pointer(registry as *mut c_void),
-            Err(e) => {
-                RegorusResult::err_with_message(RegorusStatus::InvalidArgument, format!("{e}"))
-            }
-        }
-    })
-}
-
 // ---------------------------------------------------------------------------
-// Frozen registry lifecycle
-// ---------------------------------------------------------------------------
-
-/// Drop a `RegorusAliasRegistry`.
-#[no_mangle]
-pub extern "C" fn regorus_alias_registry_drop(registry: *mut RegorusAliasRegistry) {
-    if let Ok(registry) = to_ref(registry) {
-        unsafe {
-            let _ = Box::from_raw(ptr::from_mut(registry));
-        }
-    }
-}
-
-// ---------------------------------------------------------------------------
-// Frozen registry queries
+// Queries
 // ---------------------------------------------------------------------------

 /// Return the number of resource types loaded in the alias registry.
 #[no_mangle]
-pub extern "C" fn regorus_alias_registry_len(
-    registry: *const RegorusAliasRegistry,
-) -> RegorusResult {
+pub extern "C" fn regorus_alias_registry_len(registry: *mut RegorusAliasRegistry) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<i64> {
-            let len = to_shared_ref(registry)?.registry.len();
+            let len = to_ref(registry)?.registry.len();
            Ok(len as i64)
        }();

@@ -212,9 +134,15 @@ pub extern "C" fn regorus_alias_registry_len(
 ///
 /// Returns a JSON string:
 /// `{ "resource": <normalized>, "context": <context>, "parameters": <params> }`.
+///
+/// * `resource_json` – raw ARM resource JSON
+/// * `api_version` – API version string (e.g. `"2023-01-01"`), or null to use
+///   the default alias paths
+/// * `context_json` – JSON object for additional context (pass `"{}"` if none)
+/// * `parameters_json` – JSON object of policy parameter values (pass `"{}"` if none)
 #[no_mangle]
 pub extern "C" fn regorus_alias_registry_normalize_and_wrap(
-    registry: *const RegorusAliasRegistry,
+    registry: *mut RegorusAliasRegistry,
    resource_json: *const c_char,
    api_version: *const c_char,
    context_json: *const c_char,
@@ -240,7 +168,7 @@ pub extern "C" fn regorus_alias_registry_normalize_and_wrap(
            let context = regorus::Value::from_json_str(&context_str)?;
            let params = regorus::Value::from_json_str(&params_str)?;

-            let wrapped = to_shared_ref(registry)?.registry.normalize_and_wrap(
+            let wrapped = to_ref(registry)?.registry.normalize_and_wrap(
                &resource,
                api_ver.as_deref(),
                Some(context),
@@ -257,9 +185,14 @@ pub extern "C" fn regorus_alias_registry_normalize_and_wrap(
 }

 /// Denormalize a previously-normalized resource JSON back to ARM format.
+///
+/// * `normalized_json` – the normalized resource JSON
+/// * `api_version` – API version string, or null to use the default alias paths
+///
+/// Returns the denormalized ARM JSON string.
 #[no_mangle]
 pub extern "C" fn regorus_alias_registry_denormalize(
-    registry: *const RegorusAliasRegistry,
+    registry: *mut RegorusAliasRegistry,
    normalized_json: *const c_char,
    api_version: *const c_char,
 ) -> RegorusResult {
@@ -279,7 +212,7 @@ pub extern "C" fn regorus_alias_registry_denormalize(

            let normalized = regorus::Value::from_json_str(&normalized_str)?;

-            let result = to_shared_ref(registry)?
+            let result = to_ref(registry)?
                .registry
                .denormalize(&normalized, api_ver.as_deref());
            result.to_json_str()
@@ -299,10 +232,12 @@ mod tests {
    use core::ffi::CStr;
    use std::ffi::CString;

+    /// Helper: create a C string from a Rust &str.
    fn c(s: &str) -> CString {
        CString::new(s).expect("CString::new failed")
    }

+    /// Helper: assert a RegorusResult has Ok status and extract string output.
    fn assert_ok_string(r: &RegorusResult) -> String {
        assert_eq!(r.status, RegorusStatus::Ok, "expected Ok status");
        assert!(!r.output.is_null(), "expected non-null output");
@@ -313,51 +248,12 @@ mod tests {
        s
    }

+    /// Helper: assert a RegorusResult has Ok status with integer output.
    fn assert_ok_int(r: &RegorusResult) -> i64 {
        assert_eq!(r.status, RegorusStatus::Ok, "expected Ok status");
        r.int_value
    }

-    fn assert_ok_pointer(r: &RegorusResult) -> *mut c_void {
-        assert_eq!(r.status, RegorusStatus::Ok, "expected Ok status");
-        assert!(matches!(
-            r.data_type,
-            crate::common::RegorusDataType::Pointer
-        ));
-        assert!(!r.pointer_value.is_null());
-        r.pointer_value
-    }
-
-    fn build_registry_with_json(json: &str) -> *mut RegorusAliasRegistry {
-        let builder = regorus_alias_registry_builder_new();
-        let json = c(json);
-
-        let r = regorus_alias_registry_builder_load_json(builder, json.as_ptr());
-        assert_eq!(r.status, RegorusStatus::Ok);
-        regorus_result_drop(r);
-
-        let r = regorus_alias_registry_builder_build(builder);
-        let registry = assert_ok_pointer(&r) as *mut RegorusAliasRegistry;
-        regorus_result_drop(r);
-        regorus_alias_registry_builder_drop(builder);
-        registry
-    }
-
-    fn build_registry_with_manifest(json: &str) -> *mut RegorusAliasRegistry {
-        let builder = regorus_alias_registry_builder_new();
-        let json = c(json);
-
-        let r = regorus_alias_registry_builder_load_manifest(builder, json.as_ptr());
-        assert_eq!(r.status, RegorusStatus::Ok);
-        regorus_result_drop(r);
-
-        let r = regorus_alias_registry_builder_build(builder);
-        let registry = assert_ok_pointer(&r) as *mut RegorusAliasRegistry;
-        regorus_result_drop(r);
-        regorus_alias_registry_builder_drop(builder);
-        registry
-    }
-
    const ALIASES: &str = r#"[{
        "namespace": "Microsoft.Storage",
        "resourceTypes": [{
@@ -383,21 +279,20 @@ mod tests {
    }"#;

    #[test]
-    fn lifecycle_builder_build_and_drop() {
-        let builder = regorus_alias_registry_builder_new();
-        assert!(!builder.is_null());
-
-        let r = regorus_alias_registry_builder_build(builder);
-        let registry = assert_ok_pointer(&r) as *mut RegorusAliasRegistry;
-        regorus_result_drop(r);
-
-        regorus_alias_registry_builder_drop(builder);
-        regorus_alias_registry_drop(registry);
+    fn lifecycle_new_and_drop() {
+        let reg = regorus_alias_registry_new();
+        assert!(!reg.is_null());
+        regorus_alias_registry_drop(reg);
    }

    #[test]
    fn load_json_and_check_len() {
-        let reg = build_registry_with_json(ALIASES);
+        let reg = regorus_alias_registry_new();
+        let json = c(ALIASES);
+
+        let r = regorus_alias_registry_load_json(reg, json.as_ptr());
+        assert_eq!(r.status, RegorusStatus::Ok);
+        regorus_result_drop(r);

        let r = regorus_alias_registry_len(reg);
        assert_eq!(assert_ok_int(&r), 1);
@@ -408,7 +303,12 @@ mod tests {

    #[test]
    fn load_manifest_and_check_len() {
-        let reg = build_registry_with_manifest(MANIFEST);
+        let reg = regorus_alias_registry_new();
+        let json = c(MANIFEST);
+
+        let r = regorus_alias_registry_load_manifest(reg, json.as_ptr());
+        assert_eq!(r.status, RegorusStatus::Ok);
+        regorus_result_drop(r);

        let r = regorus_alias_registry_len(reg);
        assert_eq!(assert_ok_int(&r), 1);
@@ -419,39 +319,23 @@ mod tests {

    #[test]
    fn load_invalid_json_returns_error() {
-        let builder = regorus_alias_registry_builder_new();
+        let reg = regorus_alias_registry_new();
        let bad = c("not valid json");

-        let r = regorus_alias_registry_builder_load_json(builder, bad.as_ptr());
+        let r = regorus_alias_registry_load_json(reg, bad.as_ptr());
        assert_ne!(r.status, RegorusStatus::Ok);
        regorus_result_drop(r);

-        regorus_alias_registry_builder_drop(builder);
-    }
-
-    #[test]
-    fn builder_cannot_be_reused_after_build() {
-        let builder = regorus_alias_registry_builder_new();
-        let r = regorus_alias_registry_builder_build(builder);
-        let registry = assert_ok_pointer(&r) as *mut RegorusAliasRegistry;
-        regorus_result_drop(r);
-
-        let aliases = c(ALIASES);
-        let r = regorus_alias_registry_builder_load_json(builder, aliases.as_ptr());
-        assert_ne!(r.status, RegorusStatus::Ok);
-        regorus_result_drop(r);
-
-        let r = regorus_alias_registry_builder_build(builder);
-        assert_ne!(r.status, RegorusStatus::Ok);
-        regorus_result_drop(r);
-
-        regorus_alias_registry_builder_drop(builder);
-        regorus_alias_registry_drop(registry);
+        regorus_alias_registry_drop(reg);
    }

    #[test]
    fn normalize_and_wrap_round_trip() {
-        let reg = build_registry_with_json(ALIASES);
+        let reg = regorus_alias_registry_new();
+        let aliases = c(ALIASES);
+        let r = regorus_alias_registry_load_json(reg, aliases.as_ptr());
+        assert_eq!(r.status, RegorusStatus::Ok);
+        regorus_result_drop(r);

        let resource = c(r#"{
            "name": "acct1",
@@ -462,6 +346,7 @@ mod tests {
        let ctx = c(r#"{"resourceGroup": {"name": "rg1"}}"#);
        let params = c(r#"{"env": "prod"}"#);

+        // Normalize
        let r = regorus_alias_registry_normalize_and_wrap(
            reg,
            resource.as_ptr(),
@@ -472,6 +357,7 @@ mod tests {
        let envelope_json = assert_ok_string(&r);
        regorus_result_drop(r);

+        // Parse and verify structure
        let envelope: serde_json::Value =
            serde_json::from_str(&envelope_json).expect("invalid JSON output");
        assert!(
@@ -487,13 +373,16 @@ mod tests {
            "envelope missing 'context'"
        );

+        // The normalized resource should have lowercased alias fields
        let res = &envelope["resource"];
        assert_eq!(res["supportshttpstrafficonly"], true);
        assert_eq!(res["name"], "acct1");

+        // Context and parameters should be passed through
        assert_eq!(envelope["context"]["resourceGroup"]["name"], "rg1");
        assert_eq!(envelope["parameters"]["env"], "prod");

+        // Denormalize the resource portion
        let resource_json = serde_json::to_string(&res).expect("serialize resource");
        let norm_cstr = c(&resource_json);

@@ -503,6 +392,7 @@ mod tests {

        let denorm: serde_json::Value =
            serde_json::from_str(&denorm_json).expect("invalid denorm JSON");
+        // Should be back under properties with restored casing
        assert_eq!(
            denorm["properties"]["supportsHttpsTrafficOnly"], true,
            "expected restored casing under properties"
@@ -513,7 +403,11 @@ mod tests {

    #[test]
    fn denormalize_invalid_json_returns_error() {
-        let reg = build_registry_with_json(ALIASES);
+        let reg = regorus_alias_registry_new();
+        let aliases = c(ALIASES);
+        let r = regorus_alias_registry_load_json(reg, aliases.as_ptr());
+        assert_eq!(r.status, RegorusStatus::Ok);
+        regorus_result_drop(r);

        let bad = c("not json");
        let api = c("2023-01-01");
@@ -526,7 +420,11 @@ mod tests {

    #[test]
    fn normalize_data_plane_manifest() {
-        let reg = build_registry_with_manifest(MANIFEST);
+        let reg = regorus_alias_registry_new();
+        let manifest = c(MANIFEST);
+        let r = regorus_alias_registry_load_manifest(reg, manifest.as_ptr());
+        assert_eq!(r.status, RegorusStatus::Ok);
+        regorus_result_drop(r);

        let resource = c(r#"{
            "type": "Microsoft.KeyVault.Data/vaults/certificates",
@@ -555,12 +453,7 @@ mod tests {

    #[test]
    fn empty_registry_normalize() {
-        let builder = regorus_alias_registry_builder_new();
-        let r = regorus_alias_registry_builder_build(builder);
-        let reg = assert_ok_pointer(&r) as *mut RegorusAliasRegistry;
-        regorus_result_drop(r);
-        regorus_alias_registry_builder_drop(builder);
-
+        let reg = regorus_alias_registry_new();
        let resource = c(r#"{"name": "test", "type": "Unknown/type", "properties": {"foo": 1}}"#);
        let api = c("");
        let ctx = c("{}");
@@ -577,6 +470,7 @@ mod tests {
        regorus_result_drop(r);

        let envelope: serde_json::Value = serde_json::from_str(&json).expect("invalid JSON");
+        // Without aliases, properties should still be flattened
        assert_eq!(envelope["resource"]["foo"], 1);
        assert_eq!(envelope["resource"]["name"], "test");

--- a/bindings/ffi/src/common.rs
+++ b/bindings/ffi/src/common.rs
@@ -236,10 +236,6 @@ pub(crate) fn to_ref<'a, T>(t: *mut T) -> Result<&'a mut T> {
    unsafe { t.as_mut().ok_or_else(|| anyhow!("null pointer")) }
 }

-pub(crate) fn to_shared_ref<'a, T>(t: *const T) -> Result<&'a T> {
-    unsafe { t.as_ref().ok_or_else(|| anyhow!("null pointer")) }
-}
-
 pub(crate) fn to_regorus_result(r: Result<()>) -> RegorusResult {
    match r {
        Ok(()) => RegorusResult::ok_void(),
--- a/bindings/ffi/src/compile.rs
+++ b/bindings/ffi/src/compile.rs
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-use crate::common::{from_c_str, to_shared_ref, RegorusResult, RegorusStatus};
+use crate::common::{from_c_str, RegorusResult, RegorusStatus};
 use crate::compiled_policy::RegorusCompiledPolicy;
 use crate::panic_guard::with_unwind_guard;
 use alloc::boxed::Box;
@@ -208,220 +208,6 @@ fn convert_c_modules_to_rust(
    Ok(policy_modules)
 }

-// ---------------------------------------------------------------------------
-// Azure Policy JSON compilation
-// ---------------------------------------------------------------------------
-
-/// Compile an Azure Policy JSON policy rule into an RVM program.
-///
-/// Parses the JSON `policyRule` (the `{ "if": ..., "then": ... }` object),
-/// resolves aliases using the provided registry, and compiles the result
-/// into an RVM [`Program`] that can be loaded into a [`RegorusRvm`].
-///
-/// # Parameters
-/// * `registry` - Alias registry handle, or null.
-/// * `policy_rule_json` - JSON string containing the policyRule object
-///
-/// # Null registry behavior
-///
-/// When `registry` is null, compilation proceeds **without alias resolution**.
-/// Field references that correspond to Azure resource provider aliases
-/// (e.g. `Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly`) will
-/// be compiled as raw property paths rather than being resolved to their
-/// short forms.  This means:
-///
-/// - Policies that rely on aliases will **silently produce incorrect
-///   evaluation results** because the field paths won't match the
-///   normalized resource structure.
-/// - **Modify / Append** effect policies will **skip the modifiability
-///   validation** that normally rejects writes to non-modifiable aliases
-///   at compile time.
-///
-/// Pass null only when the policy is known to contain no alias references
-/// (e.g. simple `type` / `location` checks, or in unit-test scenarios).
-///
-/// # Returns
-/// Returns a `RegorusResult` containing a `RegorusProgram` pointer on success.
-///
-/// # Safety
-/// `policy_rule_json` must be a valid null-terminated UTF-8 string.
-/// If `registry` is non-null it must be a valid `RegorusAliasRegistry` pointer.
-/// The caller must eventually call `regorus_program_drop` on the returned handle.
-#[cfg(all(feature = "azure_policy", feature = "rvm"))]
-#[no_mangle]
-pub extern "C" fn regorus_compile_azure_policy_rule(
-    registry: *const crate::alias_registry::RegorusAliasRegistry,
-    policy_rule_json: *const c_char,
-) -> RegorusResult {
-    use crate::alias_registry::RegorusAliasRegistry;
-    use crate::rvm::RegorusProgram;
-    use alloc::sync::Arc;
-    use regorus::languages::azure_policy::{compiler, parser};
-    use regorus::Rc;
-    use regorus::Source;
-
-    with_unwind_guard(|| {
-        let result = || -> Result<RegorusProgram, (RegorusStatus, alloc::string::String)> {
-            let json_str = from_c_str(policy_rule_json).map_err(|e| {
-                (
-                    RegorusStatus::InvalidDataFormat,
-                    format!("Invalid policy rule JSON string: {e}"),
-                )
-            })?;
-
-            let source = Source::from_contents("policy_rule".into(), json_str).map_err(|e| {
-                (
-                    RegorusStatus::InvalidDataFormat,
-                    format!("Failed to create source: {e}"),
-                )
-            })?;
-
-            let ast = parser::parse_policy_rule(&source).map_err(|e| {
-                (
-                    RegorusStatus::InvalidPolicy,
-                    format!("Failed to parse policy rule: {e}"),
-                )
-            })?;
-
-            let program = if registry.is_null() {
-                compiler::compile_policy_rule(&ast)
-            } else {
-                let reg: &RegorusAliasRegistry = to_shared_ref(registry).map_err(|e| {
-                    (
-                        RegorusStatus::InvalidArgument,
-                        format!("Invalid alias registry: {e}"),
-                    )
-                })?;
-                compiler::compile_policy_rule_with_aliases(&ast, reg.inner())
-            };
-
-            program
-                .map(|p| RegorusProgram {
-                    program: Arc::new(Rc::try_unwrap(p).unwrap_or_else(|rc| (*rc).clone())),
-                })
-                .map_err(|e| {
-                    (
-                        RegorusStatus::CompilationFailed,
-                        format!("Failed to compile policy rule: {e}"),
-                    )
-                })
-        }();
-
-        match result {
-            Ok(program) => {
-                RegorusResult::ok_pointer(Box::into_raw(Box::new(program)) as *mut c_void)
-            }
-            Err((status, msg)) => RegorusResult::err_with_message(status, msg),
-        }
-    })
-}
-
-/// Compile a full Azure Policy definition JSON into an RVM program.
-///
-/// Parses the JSON policy definition (which includes `policyRule`, `parameters`,
-/// `displayName`, etc.), resolves aliases using the provided registry, and
-/// compiles the result into an RVM [`Program`].
-///
-/// The definition JSON may be in either wrapped or unwrapped form:
-/// - **Wrapped**: `{ "properties": { "policyRule": ..., "parameters": ... }, "id": ... }`
-/// - **Unwrapped**: `{ "policyRule": ..., "parameters": ..., "displayName": ... }`
-///
-/// # Parameters
-/// * `registry` - Alias registry handle, or null.
-/// * `policy_definition_json` - JSON string containing the full policy definition
-///
-/// # Null registry behavior
-///
-/// When `registry` is null, compilation proceeds **without alias resolution**.
-/// Field references that correspond to Azure resource provider aliases will
-/// be compiled as raw property paths rather than being resolved.  This means:
-///
-/// - Policies that rely on aliases will **silently produce incorrect
-///   evaluation results**.
-/// - **Modify / Append** effect policies will **skip the modifiability
-///   validation** that normally rejects writes to non-modifiable aliases
-///   at compile time.
-///
-/// Pass null only when the policy is known to contain no alias references
-/// (e.g. simple `type` / `location` checks, or in unit-test scenarios).
-///
-/// # Returns
-/// Returns a `RegorusResult` containing a `RegorusProgram` pointer on success.
-///
-/// # Safety
-/// `policy_definition_json` must be a valid null-terminated UTF-8 string.
-/// If `registry` is non-null it must be a valid `RegorusAliasRegistry` pointer.
-/// The caller must eventually call `regorus_program_drop` on the returned handle.
-#[cfg(all(feature = "azure_policy", feature = "rvm"))]
-#[no_mangle]
-pub extern "C" fn regorus_compile_azure_policy_definition(
-    registry: *const crate::alias_registry::RegorusAliasRegistry,
-    policy_definition_json: *const c_char,
-) -> RegorusResult {
-    use crate::alias_registry::RegorusAliasRegistry;
-    use crate::rvm::RegorusProgram;
-    use alloc::sync::Arc;
-    use regorus::languages::azure_policy::{compiler, parser};
-    use regorus::Rc;
-    use regorus::Source;
-
-    with_unwind_guard(|| {
-        let result = || -> Result<RegorusProgram, (RegorusStatus, alloc::string::String)> {
-            let json_str = from_c_str(policy_definition_json).map_err(|e| {
-                (
-                    RegorusStatus::InvalidDataFormat,
-                    format!("Invalid policy definition JSON string: {e}"),
-                )
-            })?;
-
-            let source =
-                Source::from_contents("policy_definition".into(), json_str).map_err(|e| {
-                    (
-                        RegorusStatus::InvalidDataFormat,
-                        format!("Failed to create source: {e}"),
-                    )
-                })?;
-
-            let defn = parser::parse_policy_definition(&source).map_err(|e| {
-                (
-                    RegorusStatus::InvalidPolicy,
-                    format!("Failed to parse policy definition: {e}"),
-                )
-            })?;
-
-            let program = if registry.is_null() {
-                compiler::compile_policy_definition(&defn)
-            } else {
-                let reg: &RegorusAliasRegistry = to_shared_ref(registry).map_err(|e| {
-                    (
-                        RegorusStatus::InvalidArgument,
-                        format!("Invalid alias registry: {e}"),
-                    )
-                })?;
-                compiler::compile_policy_definition_with_aliases(&defn, reg.inner())
-            };
-
-            program
-                .map(|p| RegorusProgram {
-                    program: Arc::new(Rc::try_unwrap(p).unwrap_or_else(|rc| (*rc).clone())),
-                })
-                .map_err(|e| {
-                    (
-                        RegorusStatus::CompilationFailed,
-                        format!("Failed to compile policy definition: {e}"),
-                    )
-                })
-        }();
-
-        match result {
-            Ok(program) => {
-                RegorusResult::ok_pointer(Box::into_raw(Box::new(program)) as *mut c_void)
-            }
-            Err((status, msg)) => RegorusResult::err_with_message(status, msg),
-        }
-    })
-}
-
 #[cfg(feature = "std")]
 fn report_module_error(index: usize, kind: &str, err: &anyhow::Error) {
    eprintln!("Invalid {} at index {}: {}", kind, index, err);
@@ -429,402 +215,3 @@ fn report_module_error(index: usize, kind: &str, err: &anyhow::Error) {

 #[cfg(not(feature = "std"))]
 fn report_module_error(_index: usize, _kind: &str, _err: &anyhow::Error) {}
-
-// ---------------------------------------------------------------------------
-// Tests
-// ---------------------------------------------------------------------------
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::common::regorus_result_drop;
-    use core::ffi::CStr;
-    use std::ffi::CString;
-
-    fn c(s: &str) -> CString {
-        CString::new(s).expect("CString::new failed")
-    }
-
-    fn assert_ok_pointer(r: &RegorusResult) -> *mut c_void {
-        assert_eq!(
-            r.status,
-            RegorusStatus::Ok,
-            "expected Ok, got {:?}",
-            r.status
-        );
-        assert!(!r.pointer_value.is_null(), "expected non-null pointer");
-        r.pointer_value
-    }
-
-    #[cfg(all(feature = "azure_policy", feature = "rvm"))]
-    mod azure_policy_json {
-        use super::*;
-        use crate::alias_registry::regorus_alias_registry_drop;
-        use crate::rvm::{
-            regorus_program_drop, regorus_rvm_drop, regorus_rvm_execute_entry_point_by_name,
-            regorus_rvm_load_program, regorus_rvm_new, regorus_rvm_set_context,
-            regorus_rvm_set_input, RegorusProgram,
-        };
-
-        const ALIASES: &str = r#"[{
-            "namespace": "Microsoft.Storage",
-            "resourceTypes": [{
-                "resourceType": "storageAccounts",
-                "aliases": [{
-                    "name": "Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly",
-                    "defaultPath": "properties.supportsHttpsTrafficOnly",
-                    "paths": []
-                }, {
-                    "name": "Microsoft.Storage/storageAccounts/minimumTlsVersion",
-                    "defaultPath": "properties.minimumTlsVersion",
-                    "paths": []
-                }]
-            }]
-        }]"#;
-
-        const SIMPLE_POLICY_RULE: &str = r#"{
-            "if": {
-                "field": "type",
-                "equals": "Microsoft.Storage/storageAccounts"
-            },
-            "then": { "effect": "audit" }
-        }"#;
-
-        const ALIAS_POLICY_RULE: &str = r#"{
-            "if": {
-                "allOf": [
-                    { "field": "type", "equals": "Microsoft.Storage/storageAccounts" },
-                    { "field": "Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly", "equals": false }
-                ]
-            },
-            "then": { "effect": "deny" }
-        }"#;
-
-        const POLICY_DEFINITION: &str = r#"{
-            "displayName": "Require HTTPS for storage accounts",
-            "policyType": "Custom",
-            "mode": "Indexed",
-            "parameters": {
-                "effect": {
-                    "type": "String",
-                    "defaultValue": "deny"
-                }
-            },
-            "policyRule": {
-                "if": {
-                    "allOf": [
-                        { "field": "type", "equals": "Microsoft.Storage/storageAccounts" },
-                        { "field": "Microsoft.Storage/storageAccounts/supportsHttpsTrafficOnly", "equals": false }
-                    ]
-                },
-                "then": { "effect": "[parameters('effect')]" }
-            }
-        }"#;
-
-        /// Wrap a normalized resource JSON into the input envelope expected by
-        /// the compiled Azure Policy RVM program.
-        fn wrap_input(resource_json: &str, parameters_json: &str) -> String {
-            format!(r#"{{"resource": {resource_json}, "parameters": {parameters_json}}}"#)
-        }
-
-        fn build_registry_with_json(
-            json: &str,
-        ) -> *mut crate::alias_registry::RegorusAliasRegistry {
-            let builder = crate::alias_registry::regorus_alias_registry_builder_new();
-            let json_c = c(json);
-            let r = crate::alias_registry::regorus_alias_registry_builder_load_json(
-                builder,
-                json_c.as_ptr(),
-            );
-            assert_eq!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-
-            let r = crate::alias_registry::regorus_alias_registry_builder_build(builder);
-            let registry =
-                assert_ok_pointer(&r) as *mut crate::alias_registry::RegorusAliasRegistry;
-            regorus_result_drop(r);
-            crate::alias_registry::regorus_alias_registry_builder_drop(builder);
-            registry
-        }
-
-        /// Helper: compile a policy rule, execute it with input, and return the
-        /// result string.
-        unsafe fn compile_and_eval_rule(
-            registry: *const crate::alias_registry::RegorusAliasRegistry,
-            policy_rule: &str,
-            input_json: &str,
-        ) -> String {
-            let rule_c = c(policy_rule);
-            let r = regorus_compile_azure_policy_rule(registry, rule_c.as_ptr());
-            let program_ptr = assert_ok_pointer(&r) as *mut RegorusProgram;
-            regorus_result_drop(r);
-
-            let vm = regorus_rvm_new();
-            assert!(!vm.is_null());
-
-            let r = regorus_rvm_load_program(vm, program_ptr);
-            assert_eq!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-
-            let input_c = c(input_json);
-            let r = regorus_rvm_set_input(vm, input_c.as_ptr());
-            assert_eq!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-
-            let entry = c("main");
-            let r = regorus_rvm_execute_entry_point_by_name(vm, entry.as_ptr());
-            assert_eq!(r.status, RegorusStatus::Ok, "execute failed");
-            let output = CStr::from_ptr(r.output)
-                .to_str()
-                .expect("invalid UTF-8")
-                .to_string();
-            regorus_result_drop(r);
-
-            regorus_rvm_drop(vm);
-            regorus_program_drop(program_ptr);
-            output
-        }
-
-        #[test]
-        fn compile_simple_rule_no_aliases() {
-            let rule_c = c(SIMPLE_POLICY_RULE);
-            let r = regorus_compile_azure_policy_rule(core::ptr::null_mut(), rule_c.as_ptr());
-            let ptr = assert_ok_pointer(&r);
-            regorus_result_drop(r);
-            regorus_program_drop(ptr as *mut RegorusProgram);
-        }
-
-        #[test]
-        fn compile_rule_with_aliases() {
-            let reg = build_registry_with_json(ALIASES);
-
-            let rule_c = c(ALIAS_POLICY_RULE);
-            let r = regorus_compile_azure_policy_rule(reg, rule_c.as_ptr());
-            let ptr = assert_ok_pointer(&r);
-            regorus_result_drop(r);
-
-            regorus_program_drop(ptr as *mut RegorusProgram);
-            regorus_alias_registry_drop(reg);
-        }
-
-        #[test]
-        fn compile_and_eval_simple_rule_matching() {
-            let input = wrap_input(r#"{"type":"microsoft.storage/storageaccounts"}"#, "{}");
-            let result =
-                unsafe { compile_and_eval_rule(core::ptr::null_mut(), SIMPLE_POLICY_RULE, &input) };
-            let parsed: serde_json::Value =
-                serde_json::from_str(&result).expect("result should be valid JSON");
-            assert_eq!(
-                parsed["effect"], "audit",
-                "expected audit effect, got: {result}"
-            );
-        }
-
-        #[test]
-        fn compile_and_eval_simple_rule_not_matching() {
-            let input = wrap_input(r#"{"type":"microsoft.compute/virtualmachines"}"#, "{}");
-            let result =
-                unsafe { compile_and_eval_rule(core::ptr::null_mut(), SIMPLE_POLICY_RULE, &input) };
-            // When the "if" condition doesn't match, the result should be undefined
-            assert!(
-                result.contains("undefined"),
-                "expected undefined for non-matching input, got: {result}"
-            );
-        }
-
-        #[test]
-        fn compile_and_eval_alias_rule_deny() {
-            let reg = build_registry_with_json(ALIASES);
-
-            // Non-compliant resource: HTTPS not enabled (normalized form)
-            let input = wrap_input(
-                r#"{"type": "microsoft.storage/storageaccounts", "supportshttpstrafficonly": false}"#,
-                "{}",
-            );
-            let result = unsafe { compile_and_eval_rule(reg, ALIAS_POLICY_RULE, &input) };
-            let parsed: serde_json::Value = serde_json::from_str(&result).expect("valid JSON");
-            assert_eq!(parsed["effect"], "deny", "expected deny, got: {result}");
-
-            regorus_alias_registry_drop(reg);
-        }
-
-        #[test]
-        fn compile_and_eval_alias_rule_compliant() {
-            let reg = build_registry_with_json(ALIASES);
-
-            // Compliant resource: HTTPS enabled (normalized form)
-            let input = wrap_input(
-                r#"{"type": "microsoft.storage/storageaccounts", "supportshttpstrafficonly": true}"#,
-                "{}",
-            );
-            let result = unsafe { compile_and_eval_rule(reg, ALIAS_POLICY_RULE, &input) };
-            assert!(
-                result.contains("undefined"),
-                "expected undefined for compliant resource, got: {result}"
-            );
-
-            regorus_alias_registry_drop(reg);
-        }
-
-        #[test]
-        fn compile_definition_no_aliases() {
-            let defn_c = c(POLICY_DEFINITION);
-            let r = regorus_compile_azure_policy_definition(core::ptr::null_mut(), defn_c.as_ptr());
-            let ptr = assert_ok_pointer(&r);
-            regorus_result_drop(r);
-            regorus_program_drop(ptr as *mut RegorusProgram);
-        }
-
-        #[test]
-        fn compile_definition_with_aliases_and_eval() {
-            let reg = build_registry_with_json(ALIASES);
-
-            let defn_c = c(POLICY_DEFINITION);
-            let r = regorus_compile_azure_policy_definition(reg, defn_c.as_ptr());
-            let program_ptr = assert_ok_pointer(&r) as *mut RegorusProgram;
-            regorus_result_drop(r);
-
-            // Evaluate with a non-compliant resource (normalized form, wrapped in envelope)
-            unsafe {
-                let vm = regorus_rvm_new();
-                let r = regorus_rvm_load_program(vm, program_ptr);
-                assert_eq!(r.status, RegorusStatus::Ok);
-                regorus_result_drop(r);
-
-                let input_json = wrap_input(
-                    r#"{"type": "microsoft.storage/storageaccounts", "supportshttpstrafficonly": false}"#,
-                    "{}",
-                );
-                let input = c(&input_json);
-                let r = regorus_rvm_set_input(vm, input.as_ptr());
-                assert_eq!(r.status, RegorusStatus::Ok);
-                regorus_result_drop(r);
-
-                let entry = c("main");
-                let r = regorus_rvm_execute_entry_point_by_name(vm, entry.as_ptr());
-                assert_eq!(r.status, RegorusStatus::Ok);
-                let result = CStr::from_ptr(r.output)
-                    .to_str()
-                    .expect("UTF-8")
-                    .to_string();
-                regorus_result_drop(r);
-
-                let parsed: serde_json::Value = serde_json::from_str(&result).unwrap();
-                // The default parameter value is "deny"
-                assert_eq!(parsed["effect"], "deny", "got: {result}");
-
-                regorus_rvm_drop(vm);
-                regorus_program_drop(program_ptr);
-            }
-
-            regorus_alias_registry_drop(reg);
-        }
-
-        #[test]
-        fn invalid_json_returns_error() {
-            let bad = c("not valid json");
-            let r = regorus_compile_azure_policy_rule(core::ptr::null_mut(), bad.as_ptr());
-            assert_ne!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-        }
-
-        #[test]
-        fn invalid_definition_returns_error() {
-            let bad = c(r#"{"not": "a policy definition"}"#);
-            let r = regorus_compile_azure_policy_definition(core::ptr::null_mut(), bad.as_ptr());
-            assert_ne!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-        }
-
-        /// Policy rule that uses a context function (subscription()).
-        const CONTEXT_POLICY_RULE: &str = r#"{
-            "if": {
-                "allOf": [
-                    { "field": "type", "equals": "Microsoft.Storage/storageAccounts" },
-                    { "value": "[subscription().subscriptionId]", "equals": "sub-123" }
-                ]
-            },
-            "then": { "effect": "deny" }
-        }"#;
-
-        #[test]
-        fn context_policy_evaluates_with_set_context() {
-            let rule_c = c(CONTEXT_POLICY_RULE);
-            let r = regorus_compile_azure_policy_rule(core::ptr::null_mut(), rule_c.as_ptr());
-            let program = assert_ok_pointer(&r) as *mut RegorusProgram;
-            regorus_result_drop(r);
-
-            let vm = regorus_rvm_new();
-            assert!(!vm.is_null());
-
-            let r = regorus_rvm_load_program(vm, program);
-            assert_eq!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-
-            // Set the context with subscription info
-            let context = c(r#"{"subscription": {"subscriptionId": "sub-123"}}"#);
-            let r = regorus_rvm_set_context(vm, context.as_ptr());
-            assert_eq!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-
-            // Set matching input
-            let input = c(&wrap_input(
-                r#"{"type": "microsoft.storage/storageaccounts"}"#,
-                "{}",
-            ));
-            let r = regorus_rvm_set_input(vm, input.as_ptr());
-            assert_eq!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-
-            let entry = c("main");
-            let r = regorus_rvm_execute_entry_point_by_name(vm, entry.as_ptr());
-            assert_eq!(r.status, RegorusStatus::Ok);
-            let output = unsafe { CStr::from_ptr(r.output) }.to_str().unwrap();
-            assert!(
-                output.contains("deny"),
-                "expected deny effect with matching context, got: {output}"
-            );
-            regorus_result_drop(r);
-
-            regorus_rvm_drop(vm);
-            regorus_program_drop(program);
-        }
-
-        #[test]
-        fn context_policy_undefined_without_context() {
-            let rule_c = c(CONTEXT_POLICY_RULE);
-            let r = regorus_compile_azure_policy_rule(core::ptr::null_mut(), rule_c.as_ptr());
-            let program = assert_ok_pointer(&r) as *mut RegorusProgram;
-            regorus_result_drop(r);
-
-            let vm = regorus_rvm_new();
-            assert!(!vm.is_null());
-
-            let r = regorus_rvm_load_program(vm, program);
-            assert_eq!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-
-            // No context set — subscription() will be undefined
-            let input = c(&wrap_input(
-                r#"{"type": "microsoft.storage/storageaccounts"}"#,
-                "{}",
-            ));
-            let r = regorus_rvm_set_input(vm, input.as_ptr());
-            assert_eq!(r.status, RegorusStatus::Ok);
-            regorus_result_drop(r);
-
-            let entry = c("main");
-            let r = regorus_rvm_execute_entry_point_by_name(vm, entry.as_ptr());
-            assert_eq!(r.status, RegorusStatus::Ok);
-            let output = unsafe { CStr::from_ptr(r.output) }.to_str().unwrap();
-            assert!(
-                output.contains("undefined"),
-                "expected undefined without context, got: {output}"
-            );
-            regorus_result_drop(r);
-
-            regorus_rvm_drop(vm);
-            regorus_program_drop(program);
-        }
-    }
-}
--- a/bindings/ffi/src/compiled_policy.rs
+++ b/bindings/ffi/src/compiled_policy.rs
@@ -39,7 +39,7 @@ pub extern "C" fn regorus_compiled_policy_eval_with_input(
    with_unwind_guard(|| {
        let output = || -> Result<String> {
            let input_value = regorus::Value::from_json_str(&from_c_str(input)?)?;
-            let result = to_shared_ref(compiled_policy as *const RegorusCompiledPolicy)?
+            let result = to_ref(compiled_policy)?
                .compiled_policy
                .eval_with_input(input_value)?;
            result.to_json_str()
@@ -65,9 +65,7 @@ pub extern "C" fn regorus_compiled_policy_get_policy_info(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let info = to_shared_ref(compiled_policy as *const RegorusCompiledPolicy)?
-                .compiled_policy
-                .get_policy_info()?;
+            let info = to_ref(compiled_policy)?.compiled_policy.get_policy_info()?;
            serde_json::to_string(&info)
                .map_err(|e| anyhow::anyhow!("Failed to serialize policy info: {}", e))
        }();
--- a/bindings/ffi/src/engine.rs
+++ b/bindings/ffi/src/engine.rs
@@ -2,8 +2,7 @@
 // Licensed under the MIT License.

 use crate::common::{
-    from_c_str, to_ref, to_regorus_result, to_regorus_string_result, to_shared_ref, RegorusResult,
-    RegorusStatus,
+    from_c_str, to_ref, to_regorus_result, to_regorus_string_result, RegorusResult, RegorusStatus,
 };
 use crate::compiled_policy::RegorusCompiledPolicy;
 use crate::limits::RegorusExecutionTimerConfig;
@@ -194,7 +193,7 @@ pub extern "C" fn regorus_engine_new() -> *mut RegorusEngine {
 ///
 #[no_mangle]
 pub extern "C" fn regorus_engine_clone(engine: *mut RegorusEngine) -> *mut RegorusEngine {
-    match to_shared_ref(engine as *const RegorusEngine) {
+    match to_ref(engine) {
        Ok(e) => Box::into_raw(Box::new(e.clone())),
        _ => ptr::null_mut(),
    }
@@ -224,7 +223,7 @@ pub extern "C" fn regorus_engine_add_policy(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_string_result(|| -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.add_policy(from_c_str(path)?, from_c_str(rego)?)
        }())
@@ -239,7 +238,7 @@ pub extern "C" fn regorus_engine_add_policy_from_file(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_string_result(|| -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.add_policy_from_file(from_c_str(path)?)
        }())
@@ -257,7 +256,7 @@ pub extern "C" fn regorus_engine_add_data_json(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.add_data(regorus::Value::from_json_str(&from_c_str(data)?)?)
        }())
@@ -271,7 +270,7 @@ pub extern "C" fn regorus_engine_add_data_json(
 pub extern "C" fn regorus_engine_get_packages(engine: *mut RegorusEngine) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_string_result(|| -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let guard = engine.try_read()?;
            serde_json::to_string_pretty(&guard.get_packages()?).map_err(anyhow::Error::msg)
        }())
@@ -285,7 +284,7 @@ pub extern "C" fn regorus_engine_get_packages(engine: *mut RegorusEngine) -> Reg
 pub extern "C" fn regorus_engine_get_policies(engine: *mut RegorusEngine) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_string_result(|| -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let guard = engine.try_read()?;
            guard.get_policies_as_json()
        }())
@@ -300,7 +299,7 @@ pub extern "C" fn regorus_engine_add_data_from_json_file(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.add_data(regorus::Value::from_json_file(from_c_str(path)?)?)
        }())
@@ -314,7 +313,7 @@ pub extern "C" fn regorus_engine_add_data_from_json_file(
 pub extern "C" fn regorus_engine_clear_data(engine: *mut RegorusEngine) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.clear_data();
            Ok(())
@@ -333,7 +332,7 @@ pub extern "C" fn regorus_engine_set_input_json(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.set_input(regorus::Value::from_json_str(&from_c_str(input)?)?);
            Ok(())
@@ -349,7 +348,7 @@ pub extern "C" fn regorus_engine_set_input_from_json_file(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.set_input(regorus::Value::from_json_file(from_c_str(path)?)?);
            Ok(())
@@ -368,7 +367,7 @@ pub extern "C" fn regorus_engine_eval_query(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            let results = guard.eval_query(from_c_str(query)?, false)?;
            Ok(serde_json::to_string_pretty(&results)?)
@@ -391,7 +390,7 @@ pub extern "C" fn regorus_engine_eval_rule(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.eval_rule(from_c_str(rule)?)?.to_json_str()
        }();
@@ -414,7 +413,7 @@ pub extern "C" fn regorus_engine_set_enable_coverage(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.set_enable_coverage(enable);
            Ok(())
@@ -430,7 +429,7 @@ pub extern "C" fn regorus_engine_set_enable_coverage(
 pub extern "C" fn regorus_engine_get_coverage_report(engine: *mut RegorusEngine) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let guard = engine.try_read()?;
            Ok(serde_json::to_string_pretty(&guard.get_coverage_report()?)?)
        }();
@@ -452,7 +451,7 @@ pub extern "C" fn regorus_engine_set_strict_builtin_errors(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.set_strict_builtin_errors(strict);
            Ok(())
@@ -466,20 +465,18 @@ pub extern "C" fn regorus_engine_set_execution_timer_config(
    engine: *mut RegorusEngine,
    config: *const RegorusExecutionTimerConfig,
 ) -> RegorusResult {
-    with_unwind_guard(|| {
-        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
-            let config = unsafe {
-                config
-                    .as_ref()
-                    .copied()
-                    .ok_or_else(|| anyhow!("execution timer config pointer is null"))?
-            };
-            let mut guard = engine.try_write()?;
-            guard.set_execution_timer_config(config.to_execution_timer_config()?);
-            Ok(())
-        }())
-    })
+    to_regorus_result(|| -> Result<()> {
+        let engine = to_ref(engine)?;
+        let config = unsafe {
+            config
+                .as_ref()
+                .copied()
+                .ok_or_else(|| anyhow!("execution timer config pointer is null"))?
+        };
+        let mut guard = engine.try_write()?;
+        guard.set_execution_timer_config(config.to_execution_timer_config()?);
+        Ok(())
+    }())
 }

 #[no_mangle]
@@ -487,14 +484,12 @@ pub extern "C" fn regorus_engine_set_execution_timer_config(
 pub extern "C" fn regorus_engine_clear_execution_timer_config(
    engine: *mut RegorusEngine,
 ) -> RegorusResult {
-    with_unwind_guard(|| {
-        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
-            let mut guard = engine.try_write()?;
-            guard.clear_execution_timer_config();
-            Ok(())
-        }())
-    })
+    to_regorus_result(|| -> Result<()> {
+        let engine = to_ref(engine)?;
+        let mut guard = engine.try_write()?;
+        guard.clear_execution_timer_config();
+        Ok(())
+    }())
 }

 /// Set the policy length limits used when loading policies.
@@ -505,7 +500,7 @@ pub extern "C" fn regorus_engine_set_policy_length_config(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.set_policy_length_config(config.to_policy_length_config()?);
            Ok(())
@@ -520,7 +515,7 @@ pub extern "C" fn regorus_engine_clear_policy_length_config(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.clear_policy_length_config();
            Ok(())
@@ -538,7 +533,7 @@ pub extern "C" fn regorus_engine_get_coverage_report_pretty(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let guard = engine.try_read()?;
            guard.get_coverage_report()?.to_string_pretty()
        }();
@@ -557,7 +552,7 @@ pub extern "C" fn regorus_engine_get_coverage_report_pretty(
 pub extern "C" fn regorus_engine_clear_coverage_data(engine: *mut RegorusEngine) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.clear_coverage_data();
            Ok(())
@@ -576,7 +571,7 @@ pub extern "C" fn regorus_engine_set_gather_prints(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.set_gather_prints(enable);
            Ok(())
@@ -591,7 +586,7 @@ pub extern "C" fn regorus_engine_set_gather_prints(
 pub extern "C" fn regorus_engine_take_prints(engine: *mut RegorusEngine) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            Ok(serde_json::to_string_pretty(&guard.take_prints()?)?)
        }();
@@ -610,7 +605,7 @@ pub extern "C" fn regorus_engine_take_prints(engine: *mut RegorusEngine) -> Rego
 pub extern "C" fn regorus_engine_get_ast_as_json(engine: *mut RegorusEngine) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let guard = engine.try_read()?;
            guard.get_ast_as_json()
        }();
@@ -631,7 +626,7 @@ pub extern "C" fn regorus_engine_get_policy_package_names(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let guard = engine.try_read()?;
            serde_json::to_string_pretty(&guard.get_policy_package_names()?)
                .map_err(anyhow::Error::msg)
@@ -653,7 +648,7 @@ pub extern "C" fn regorus_engine_get_policy_parameters(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let guard = engine.try_read()?;
            serde_json::to_string_pretty(&guard.get_policy_parameters()?)
                .map_err(anyhow::Error::msg)
@@ -675,7 +670,7 @@ pub extern "C" fn regorus_engine_set_rego_v0(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<()> {
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            guard.set_rego_v0(enable);
            Ok(())
@@ -697,7 +692,7 @@ pub extern "C" fn regorus_engine_set_rego_v0(
 #[cfg(feature = "azure_policy")]
 pub extern "C" fn regorus_engine_compile_for_target(engine: *mut RegorusEngine) -> RegorusResult {
    with_unwind_guard(|| {
-        let engine = match to_shared_ref(engine as *const RegorusEngine) {
+        let engine = match to_ref(engine) {
            Ok(engine) => engine,
            Err(e) => {
                return RegorusResult::err_with_message(
@@ -746,7 +741,7 @@ pub extern "C" fn regorus_engine_compile_with_entrypoint(
        let result = || -> Result<RegorusCompiledPolicy> {
            let rule_str = from_c_str(rule)?;
            let rule_rc: regorus::Rc<str> = rule_str.into();
-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            let compiled_policy = guard.compile_with_entrypoint(&rule_rc)?;
            Ok(RegorusCompiledPolicy { compiled_policy })
@@ -805,7 +800,7 @@ pub extern "C" fn regorus_engine_compile_program_with_entrypoints(
                .ok_or_else(|| anyhow!("entry_points must contain at least one entry"))?;
            let rule_rc: regorus::Rc<str> = (*rule).into();

-            let engine = to_shared_ref(engine as *const RegorusEngine)?;
+            let engine = to_ref(engine)?;
            let mut guard = engine.try_write()?;
            let compiled_policy = guard.compile_with_entrypoint(&rule_rc)?;

--- a/bindings/ffi/src/rvm.rs
+++ b/bindings/ffi/src/rvm.rs
@@ -2,8 +2,7 @@
 // Licensed under the MIT License.

 use crate::common::{
-    from_c_str, to_ref, to_regorus_result, to_shared_ref, RegorusBuffer, RegorusResult,
-    RegorusStatus,
+    from_c_str, to_ref, to_regorus_result, RegorusBuffer, RegorusResult, RegorusStatus,
 };
 use crate::compile::RegorusPolicyModule;
 use crate::compiled_policy::RegorusCompiledPolicy;
@@ -107,8 +106,7 @@ pub extern "C" fn regorus_program_compile_from_policy(

            let entry_points_ref: Vec<&str> = entry_points_vec.iter().map(|s| s.as_str()).collect();

-            let compiled_policy =
-                &to_shared_ref(compiled_policy as *const RegorusCompiledPolicy)?.compiled_policy;
+            let compiled_policy = &to_ref(compiled_policy)?.compiled_policy;
            let program = Compiler::compile_from_policy(compiled_policy, &entry_points_ref)?;
            Ok(Box::into_raw(Box::new(RegorusProgram { program })))
        }();
@@ -189,7 +187,7 @@ pub extern "C" fn regorus_program_new() -> *mut RegorusProgram {
 pub extern "C" fn regorus_program_serialize_binary(program: *mut RegorusProgram) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<*mut RegorusBuffer> {
-            let program = &to_shared_ref(program as *const RegorusProgram)?.program;
+            let program = &to_ref(program)?.program;
            let bytes = program.serialize_binary().map_err(|e| anyhow!(e))?;
            Ok(RegorusBuffer::from_vec(bytes))
        }();
@@ -213,10 +211,7 @@ pub extern "C" fn regorus_program_deserialize_binary(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<(*mut RegorusProgram, bool)> {
-            if data.is_null() {
-                if len > 0 {
-                    return Err(anyhow!("null data pointer with non-zero length"));
-                }
+            if data.is_null() && len > 0 {
                return Err(anyhow!("null data pointer"));
            }
            let data = unsafe { core::slice::from_raw_parts(data, len) };
@@ -254,7 +249,7 @@ pub extern "C" fn regorus_program_deserialize_binary(
 pub extern "C" fn regorus_program_generate_listing(program: *mut RegorusProgram) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let program = &to_shared_ref(program as *const RegorusProgram)?.program;
+            let program = &to_ref(program)?.program;
            Ok(generate_assembly_listing(
                program,
                &AssemblyListingConfig::default(),
@@ -275,7 +270,7 @@ pub extern "C" fn regorus_program_generate_tabular_listing(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let program = &to_shared_ref(program as *const RegorusProgram)?.program;
+            let program = &to_ref(program)?.program;
            Ok(generate_tabular_assembly_listing(
                program,
                &AssemblyListingConfig::default(),
@@ -302,9 +297,7 @@ pub extern "C" fn regorus_rvm_new_with_policy(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<*mut RegorusRvm> {
-            let policy = to_shared_ref(compiled_policy as *const RegorusCompiledPolicy)?
-                .compiled_policy
-                .clone();
+            let policy = to_ref(compiled_policy)?.compiled_policy.clone();
            Ok(Box::into_raw(Box::new(RegorusRvm::new(
                RegoVM::new_with_policy(policy),
            ))))
@@ -325,11 +318,9 @@ pub extern "C" fn regorus_rvm_load_program(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
-            let program = to_shared_ref(program as *const RegorusProgram)?
-                .program
-                .clone();
+            let program = to_ref(program)?.program.clone();
            guard.load_program(program);
            Ok(())
        }())
@@ -341,7 +332,7 @@ pub extern "C" fn regorus_rvm_load_program(
 pub extern "C" fn regorus_rvm_set_data(vm: *mut RegorusRvm, data: *const c_char) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            let data_value = Value::from_json_str(&from_c_str(data)?)?;
            guard.set_data(data_value)?;
@@ -358,7 +349,7 @@ pub extern "C" fn regorus_rvm_set_input(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            let input_value = Value::from_json_str(&from_c_str(input)?)?;
            guard.set_input(input_value);
@@ -367,33 +358,6 @@ pub extern "C" fn regorus_rvm_set_input(
    })
 }

-/// Set the VM context document from JSON.
-///
-/// The context provides host-supplied ambient data (e.g. `resourceGroup()`,
-/// `subscription()`) that Azure Policy functions can access via `LoadContext`
-/// instructions. This must be called before `regorus_rvm_execute` when
-/// evaluating policies that reference context functions.
-///
-/// # Safety
-/// - `vm` must be a valid pointer to a `RegorusRvm` created by `regorus_rvm_new`.
-/// - `context_json` must be a valid null-terminated UTF-8 string.
-#[cfg(feature = "azure_policy")]
-#[no_mangle]
-pub extern "C" fn regorus_rvm_set_context(
-    vm: *mut RegorusRvm,
-    context_json: *const c_char,
-) -> RegorusResult {
-    with_unwind_guard(|| {
-        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
-            let mut guard = vm.try_write()?;
-            let context_value = Value::from_json_str(&from_c_str(context_json)?)?;
-            guard.set_context(context_value);
-            Ok(())
-        }())
-    })
-}
-
 /// Set the maximum number of instructions that can execute.
 #[no_mangle]
 pub extern "C" fn regorus_rvm_set_max_instructions(
@@ -402,7 +366,7 @@ pub extern "C" fn regorus_rvm_set_max_instructions(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            guard.set_max_instructions(max_instructions);
            Ok(())
@@ -418,7 +382,7 @@ pub extern "C" fn regorus_rvm_set_strict_builtin_errors(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            guard.set_strict_builtin_errors(strict);
            Ok(())
@@ -431,7 +395,7 @@ pub extern "C" fn regorus_rvm_set_strict_builtin_errors(
 pub extern "C" fn regorus_rvm_set_execution_mode(vm: *mut RegorusRvm, mode: u8) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            let mode = match mode {
                0 => ExecutionMode::RunToCompletion,
@@ -449,7 +413,7 @@ pub extern "C" fn regorus_rvm_set_execution_mode(vm: *mut RegorusRvm, mode: u8)
 pub extern "C" fn regorus_rvm_set_step_mode(vm: *mut RegorusRvm, enabled: bool) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            guard.set_step_mode(enabled);
            Ok(())
@@ -466,7 +430,7 @@ pub extern "C" fn regorus_rvm_set_execution_timer_config(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        to_regorus_result(|| -> Result<()> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            if has_config {
                guard.set_execution_timer_config(Some(config.to_execution_timer_config()?));
@@ -483,7 +447,7 @@ pub extern "C" fn regorus_rvm_set_execution_timer_config(
 pub extern "C" fn regorus_rvm_execute(vm: *mut RegorusRvm) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            let result = guard.execute()?;
            result.to_json_str()
@@ -504,7 +468,7 @@ pub extern "C" fn regorus_rvm_execute_entry_point_by_name(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            let name = from_c_str(entry_point)?;
            let result = guard.execute_entry_point_by_name(&name)?;
@@ -526,7 +490,7 @@ pub extern "C" fn regorus_rvm_execute_entry_point_by_index(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            let result = guard.execute_entry_point_by_index(index)?;
            result.to_json_str()
@@ -548,7 +512,7 @@ pub extern "C" fn regorus_rvm_resume(
 ) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let mut guard = vm.try_write()?;
            let value = if has_value {
                Some(Value::from_json_str(&from_c_str(resume_value_json)?)?)
@@ -571,7 +535,7 @@ pub extern "C" fn regorus_rvm_resume(
 pub extern "C" fn regorus_rvm_get_execution_state(vm: *mut RegorusRvm) -> RegorusResult {
    with_unwind_guard(|| {
        let output = || -> Result<String> {
-            let vm = to_shared_ref(vm as *const RegorusRvm)?;
+            let vm = to_ref(vm)?;
            let guard = vm.try_read()?;
            let state: ExecutionState = guard.execution_state().clone();
            Ok(format!("{:?}", state))
--- a/bindings/java/Cargo.lock
+++ b/bindings/java/Cargo.lock
@@ -109,9 +109,9 @@ checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"

 [[package]]
 name = "cc"
-version = "1.2.62"
+version = "1.2.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -237,9 +237,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

 [[package]]
 name = "fancy-regex"
-version = "0.18.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"
+checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"
 dependencies = [
 "bit-set",
 "regex-automata",
@@ -380,9 +380,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.17.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"

 [[package]]
 name = "heck"
@@ -530,7 +530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
- "hashbrown 0.17.1",
+ "hashbrown 0.17.0",
 "serde",
 "serde_core",
 ]
@@ -598,9 +598,9 @@ dependencies = [

 [[package]]
 name = "js-sys"
-version = "0.3.98"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
 dependencies = [
 "cfg-if",
 "futures-util",
@@ -610,9 +610,9 @@ dependencies = [

 [[package]]
 name = "jsonschema"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5fe5206f06e589caf25e79fc05ccdf91fca745685fe9fe1a13bbdfb479a631"
+checksum = "257eb0e588b76827bbddc9e73945a9743693dd2adeaee9da26420f93cfedb798"
 dependencies = [
 "ahash",
 "bytecount",
@@ -676,9 +676,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "lru"
-version = "0.18.0"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"

 [[package]]
 name = "memchr"
@@ -686,12 +686,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"

-[[package]]
-name = "micromap"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a86d3146ed3995b5913c414f6664344b9617457320782e64f0bb44afd49d74"
-
 [[package]]
 name = "msvc_spectre_libs"
 version = "0.1.3"
@@ -954,16 +948,14 @@ dependencies = [

 [[package]]
 name = "referencing"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e4e17ef386c5383591d07623d3de49cbc601156e7582973e6db98d66a57de2"
+checksum = "e2f38748ceca8d0b0013e60f534d94a6e23dfd89fd2a88318fc5a2d04fda1010"
 dependencies = [
 "ahash",
 "fluent-uri",
 "getrandom 0.3.4",
 "hashbrown 0.16.1",
- "itoa",
- "micromap",
 "parking_lot",
 "percent-encoding",
 "serde_json",
@@ -1000,7 +992,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

 [[package]]
 name = "regorus"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "chrono",
@@ -1032,7 +1024,7 @@ dependencies = [

 [[package]]
 name = "regorus-java"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "jni",
@@ -1042,7 +1034,7 @@ dependencies = [

 [[package]]
 name = "regorus-mimalloc"
-version = "2.2.7"
+version = "2.2.6"
 dependencies = [
 "regorus-mimalloc-sys",
 ]
@@ -1176,9 +1168,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"

 [[package]]
 name = "siphasher"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"

 [[package]]
 name = "slab"
@@ -1360,9 +1352,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -1373,9 +1365,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -1383,9 +1375,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
 dependencies = [
 "bumpalo",
 "proc-macro2",
@@ -1396,9 +1388,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
 dependencies = [
 "unicode-ident",
 ]
@@ -1659,9 +1651,9 @@ dependencies = [

 [[package]]
 name = "zerofrom"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
 dependencies = [
 "zerofrom-derive",
 ]
--- a/bindings/java/Cargo.toml
+++ b/bindings/java/Cargo.toml
@@ -2,7 +2,7 @@

 [package]
 name = "regorus-java"
-version = "0.10.1"
+version = "0.10.0"
 edition = "2021"
 repository = "https://github.com/microsoft/regorus/bindings/java"
 description = "Java bindings for Regorus - a fast, lightweight Rego interpreter written in Rust"
--- a/bindings/java/pom.xml
+++ b/bindings/java/pom.xml
@@ -9,7 +9,7 @@

  <groupId>com.microsoft.regorus</groupId>
  <artifactId>regorus-java</artifactId>
-  <version>0.10.1</version>
+  <version>0.10.0</version>

  <name>Regorus Java</name>
  <description>Java bindings for Regorus - a fast, lightweight Rego interpreter written in Rust</description>
--- a/bindings/java/src/lib.rs
+++ b/bindings/java/src/lib.rs
@@ -462,7 +462,7 @@ pub extern "system" fn Java_com_microsoft_regorus_Program_nativeCompileFromModul
        }

        let mut modules = Vec::with_capacity(ids.len());
-        for (id, content) in ids.into_iter().zip(contents) {
+        for (id, content) in ids.into_iter().zip(contents.into_iter()) {
            modules.push(PolicyModule {
                id: Rc::from(id.as_str()),
                content: Rc::from(content.as_str()),
--- a/bindings/python/Cargo.lock
+++ b/bindings/python/Cargo.lock
@@ -103,9 +103,9 @@ checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"

 [[package]]
 name = "cc"
-version = "1.2.62"
+version = "1.2.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -221,9 +221,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

 [[package]]
 name = "fancy-regex"
-version = "0.18.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"
+checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"
 dependencies = [
 "bit-set",
 "regex-automata",
@@ -364,9 +364,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.17.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"

 [[package]]
 name = "heck"
@@ -514,7 +514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
- "hashbrown 0.17.1",
+ "hashbrown 0.17.0",
 "serde",
 "serde_core",
 ]
@@ -533,9 +533,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"

 [[package]]
 name = "js-sys"
-version = "0.3.98"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
 dependencies = [
 "cfg-if",
 "futures-util",
@@ -545,9 +545,9 @@ dependencies = [

 [[package]]
 name = "jsonschema"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5fe5206f06e589caf25e79fc05ccdf91fca745685fe9fe1a13bbdfb479a631"
+checksum = "257eb0e588b76827bbddc9e73945a9743693dd2adeaee9da26420f93cfedb798"
 dependencies = [
 "ahash",
 "bytecount",
@@ -611,9 +611,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "lru"
-version = "0.18.0"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"

 [[package]]
 name = "memchr"
@@ -621,12 +621,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"

-[[package]]
-name = "micromap"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a86d3146ed3995b5913c414f6664344b9617457320782e64f0bb44afd49d74"
-
 [[package]]
 name = "msvc_spectre_libs"
 version = "0.1.3"
@@ -963,16 +957,14 @@ dependencies = [

 [[package]]
 name = "referencing"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e4e17ef386c5383591d07623d3de49cbc601156e7582973e6db98d66a57de2"
+checksum = "e2f38748ceca8d0b0013e60f534d94a6e23dfd89fd2a88318fc5a2d04fda1010"
 dependencies = [
 "ahash",
 "fluent-uri",
 "getrandom 0.3.4",
 "hashbrown 0.16.1",
- "itoa",
- "micromap",
 "parking_lot",
 "percent-encoding",
 "serde_json",
@@ -1009,7 +1001,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

 [[package]]
 name = "regorus"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "chrono",
@@ -1041,7 +1033,7 @@ dependencies = [

 [[package]]
 name = "regorus-mimalloc"
-version = "2.2.7"
+version = "2.2.6"
 dependencies = [
 "regorus-mimalloc-sys",
 ]
@@ -1055,7 +1047,7 @@ dependencies = [

 [[package]]
 name = "regoruspy"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "ordered-float",
@@ -1152,9 +1144,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "siphasher"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"

 [[package]]
 name = "slab"
@@ -1332,9 +1324,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -1345,9 +1337,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -1355,9 +1347,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
 dependencies = [
 "bumpalo",
 "proc-macro2",
@@ -1368,9 +1360,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
 dependencies = [
 "unicode-ident",
 ]
@@ -1613,9 +1605,9 @@ dependencies = [

 [[package]]
 name = "zerofrom"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
 dependencies = [
 "zerofrom-derive",
 ]
--- a/bindings/python/Cargo.toml
+++ b/bindings/python/Cargo.toml
@@ -2,7 +2,7 @@

 [package]
 name = "regoruspy"
-version = "0.10.1"
+version = "0.10.0"
 edition = "2021"
 repository = "https://github.com/microsoft/regorus/bindings/python"
 description = "Python bindings for Regorus - a fast, lightweight Rego interpreter written in Rust"
--- a/bindings/ruby/Cargo.lock
+++ b/bindings/ruby/Cargo.lock
@@ -121,9 +121,9 @@ checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"

 [[package]]
 name = "cc"
-version = "1.2.62"
+version = "1.2.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -244,9 +244,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

 [[package]]
 name = "fancy-regex"
-version = "0.18.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"
+checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"
 dependencies = [
 "bit-set",
 "regex-automata",
@@ -393,9 +393,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.17.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"

 [[package]]
 name = "heck"
@@ -543,7 +543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
- "hashbrown 0.17.1",
+ "hashbrown 0.17.0",
 "serde",
 "serde_core",
 ]
@@ -571,9 +571,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"

 [[package]]
 name = "js-sys"
-version = "0.3.98"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
 dependencies = [
 "cfg-if",
 "futures-util",
@@ -583,9 +583,9 @@ dependencies = [

 [[package]]
 name = "jsonschema"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5fe5206f06e589caf25e79fc05ccdf91fca745685fe9fe1a13bbdfb479a631"
+checksum = "257eb0e588b76827bbddc9e73945a9743693dd2adeaee9da26420f93cfedb798"
 dependencies = [
 "ahash",
 "bytecount",
@@ -659,9 +659,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "lru"
-version = "0.18.0"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"

 [[package]]
 name = "magnus"
@@ -692,12 +692,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"

-[[package]]
-name = "micromap"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a86d3146ed3995b5913c414f6664344b9617457320782e64f0bb44afd49d74"
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -935,18 +929,18 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"

 [[package]]
 name = "rb-sys"
-version = "0.9.128"
+version = "0.9.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca28513560e56cfb79a62b1fce363c73af170a182024ce880c77ee9429920a"
+checksum = "d7d7c9560fe42dcffa576941394075f18a17dce89fcf718a2fa90b7dc2134d12"
 dependencies = [
 "rb-sys-build",
 ]

 [[package]]
 name = "rb-sys-build"
-version = "0.9.128"
+version = "0.9.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce04b2c55eff3a21aaa623fcc655d94373238e72cac6b3e1a3641ff31649f99a"
+checksum = "f1688e8f32967ba48c89e4dfa283b57f901075f542fc7ee9c3d7c5f9091ca1d9"
 dependencies = [
 "bindgen",
 "lazy_static",
@@ -994,16 +988,14 @@ dependencies = [

 [[package]]
 name = "referencing"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e4e17ef386c5383591d07623d3de49cbc601156e7582973e6db98d66a57de2"
+checksum = "e2f38748ceca8d0b0013e60f534d94a6e23dfd89fd2a88318fc5a2d04fda1010"
 dependencies = [
 "ahash",
 "fluent-uri",
 "getrandom 0.3.4",
 "hashbrown 0.16.1",
- "itoa",
- "micromap",
 "parking_lot",
 "percent-encoding",
 "serde_json",
@@ -1040,7 +1032,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

 [[package]]
 name = "regorus"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "chrono",
@@ -1071,7 +1063,7 @@ dependencies = [

 [[package]]
 name = "regorus-mimalloc"
-version = "2.2.7"
+version = "2.2.6"
 dependencies = [
 "regorus-mimalloc-sys",
 ]
@@ -1085,7 +1077,7 @@ dependencies = [

 [[package]]
 name = "regorusrb"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "magnus",
 "regorus",
@@ -1211,9 +1203,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "siphasher"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"

 [[package]]
 name = "slab"
@@ -1391,9 +1383,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -1404,9 +1396,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -1414,9 +1406,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
 dependencies = [
 "bumpalo",
 "proc-macro2",
@@ -1427,9 +1419,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
 dependencies = [
 "unicode-ident",
 ]
@@ -1672,9 +1664,9 @@ dependencies = [

 [[package]]
 name = "zerofrom"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
 dependencies = [
 "zerofrom-derive",
 ]
--- a/bindings/ruby/ext/regorusrb/Cargo.toml
+++ b/bindings/ruby/ext/regorusrb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "regorusrb"
-version = "0.10.1"
+version = "0.10.0"
 edition = "2024"
 description = "Ruby bindings for Regorus - a fast, lightweight Rego interpreter written in Rust"
 license = "MIT AND Apache-2.0 AND BSD-3-Clause"
--- a/bindings/ruby/lib/regorus/version.rb
+++ b/bindings/ruby/lib/regorus/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true

 module Regorus
-  VERSION = "0.10.1"
+  VERSION = "0.10.0"
 end
--- a/bindings/wasm/Cargo.lock
+++ b/bindings/wasm/Cargo.lock
@@ -120,9 +120,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.2.62"
+version = "1.2.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -238,9 +238,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

 [[package]]
 name = "fancy-regex"
-version = "0.18.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e1dacd0d2082dfcf1351c4bdd566bbe89a2b263235a2b50058f1e130a47277"
+checksum = "72cf461f865c862bb7dc573f643dd6a2b6842f7c30b07882b56bd148cc2761b8"
 dependencies = [
 "bit-set",
 "regex-automata",
@@ -396,9 +396,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.17.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"

 [[package]]
 name = "heck"
@@ -546,7 +546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
- "hashbrown 0.17.1",
+ "hashbrown 0.17.0",
 "serde",
 "serde_core",
 ]
@@ -565,9 +565,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"

 [[package]]
 name = "js-sys"
-version = "0.3.98"
+version = "0.3.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
+checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
 dependencies = [
 "cfg-if",
 "futures-util",
@@ -577,9 +577,9 @@ dependencies = [

 [[package]]
 name = "jsonschema"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5fe5206f06e589caf25e79fc05ccdf91fca745685fe9fe1a13bbdfb479a631"
+checksum = "257eb0e588b76827bbddc9e73945a9743693dd2adeaee9da26420f93cfedb798"
 dependencies = [
 "ahash",
 "bytecount",
@@ -649,9 +649,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"

 [[package]]
 name = "lru"
-version = "0.18.0"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"

 [[package]]
 name = "memchr"
@@ -659,12 +659,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"

-[[package]]
-name = "micromap"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a86d3146ed3995b5913c414f6664344b9617457320782e64f0bb44afd49d74"
-
 [[package]]
 name = "minicov"
 version = "0.3.8"
@@ -953,16 +947,14 @@ dependencies = [

 [[package]]
 name = "referencing"
-version = "0.46.5"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e4e17ef386c5383591d07623d3de49cbc601156e7582973e6db98d66a57de2"
+checksum = "e2f38748ceca8d0b0013e60f534d94a6e23dfd89fd2a88318fc5a2d04fda1010"
 dependencies = [
 "ahash",
 "fluent-uri",
 "getrandom 0.3.4",
 "hashbrown 0.16.1",
- "itoa",
- "micromap",
 "parking_lot",
 "percent-encoding",
 "serde_json",
@@ -999,7 +991,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

 [[package]]
 name = "regorus"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "anyhow",
 "chrono",
@@ -1030,7 +1022,7 @@ dependencies = [

 [[package]]
 name = "regorusjs"
-version = "0.10.1"
+version = "0.10.0"
 dependencies = [
 "getrandom 0.2.17",
 "getrandom 0.3.4",
@@ -1152,9 +1144,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "siphasher"
-version = "1.0.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"

 [[package]]
 name = "slab"
@@ -1344,9 +1336,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
+checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -1357,9 +1349,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.71"
+version = "0.4.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8"
+checksum = "af934872acec734c2d80e6617bbb5ff4f12b052dd8e6332b0817bce889516084"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -1367,9 +1359,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
+checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -1377,9 +1369,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
+checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
 dependencies = [
 "bumpalo",
 "proc-macro2",
@@ -1390,18 +1382,18 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
+checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.71"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af5ec93229ad9ccd0a545a516dec76dc276613f278f6a91aa6b463d5b33d42d0"
+checksum = "29826f9d9ecaa314c480d376b276d1c790e6cb6a4681fab8532da69cbabf977d"
 dependencies = [
 "async-trait",
 "cast",
@@ -1421,9 +1413,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.71"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c81b9fef827e575e0e54431736d1baa0d700315d8c62cfef1f61fa3aad0cbeb"
+checksum = "c610311887f9e6599a546d278d12d69dfd3a3e92639b2129e4b11ad6cf1961d6"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1432,9 +1424,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-test-shared"
-version = "0.2.121"
+version = "0.2.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4d8ae7ad5440360e9799dfd42857d126454a88441ddf72d288ef83fa47f527"
+checksum = "60238e5b4b1b295701d6f9a66d2a126fe19990348f5fb9dae3b623a370119d94"

 [[package]]
 name = "wasm-encoder"
@@ -1692,9 +1684,9 @@ dependencies = [

 [[package]]
 name = "zerofrom"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
 dependencies = [
 "zerofrom-derive",
 ]
--- a/bindings/wasm/Cargo.toml
+++ b/bindings/wasm/Cargo.toml
@@ -2,7 +2,7 @@

 [package]
 name = "regorusjs"
-version = "0.10.1"
+version = "0.10.0"
 edition = "2021"
 repository = "https://github.com/microsoft/regorus/bindings/wasm"
 description = "WASM bindings for Regorus - a fast, lightweight Rego interpreter written in Rust"
@@ -55,7 +55,7 @@ getrandom03 = { package = "getrandom", version = "0.3.1", features = ["std", "wa
 getrandom = { version = "0.4.2", features = ["wasm_js"] }

 [dev-dependencies]
-wasm-bindgen-test = "0.3.71"
+wasm-bindgen-test = "0.3.67"

 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(wasm_bindgen_unstable_test_coverage)'] }
--- a/examples/regorus/azure_policy.rs
+++ b/examples/regorus/azure_policy.rs
@@ -23,7 +23,8 @@ use regorus::languages::azure_policy::aliases::AliasRegistry;
 use regorus::languages::azure_policy::compiler;
 use regorus::languages::azure_policy::parser;
 use regorus::rvm::RegoVM;
-use regorus::{Rc, Source, Value};
+use regorus::Source;
+use regorus::Value;

 /// Evaluate an Azure Policy definition against a resource.
 ///
@@ -59,8 +60,11 @@ pub fn azure_policy_eval(
    println!("Parsed policy definition from {policy_definition}");

    // 3. Compile to RVM bytecode.
-    let registry = Rc::new(registry);
-    let program = compiler::compile_policy_definition_with_aliases(&defn, Rc::clone(&registry))?;
+    let program = compiler::compile_policy_definition_with_aliases(
+        &defn,
+        registry.alias_map(),
+        registry.alias_modifiable_map(),
+    )?;
    println!("Compiled policy to RVM bytecode");

    // 4. Build normalized input.
@@ -134,7 +138,7 @@ pub fn azure_policy_aliases(aliases: String, resource_type: Option<String>) -> R
    if let Some(ref rt) = resource_type {
        let rt_lower = rt.to_lowercase();
        let mut found = false;
-        for alias_name in registry.alias_map().keys() {
+        for (alias_name, _) in registry.alias_map() {
            if alias_name.to_lowercase().starts_with(&rt_lower) {
                println!("  {alias_name}");
                found = true;
@@ -144,7 +148,7 @@ pub fn azure_policy_aliases(aliases: String, resource_type: Option<String>) -> R
            bail!("no aliases found for resource type '{rt}'");
        }
    } else {
-        for alias_name in registry.alias_map().keys() {
+        for (alias_name, _) in registry.alias_map() {
            println!("  {alias_name}");
        }
    }
--- a/mimalloc/Cargo.toml
+++ b/mimalloc/Cargo.toml
@@ -2,7 +2,7 @@
 name = "regorus-mimalloc"
 description = "Vendored mimalloc allocator for regorus"
 edition = "2021"
-version = "2.2.7"
+version = "2.2.6"
 license = "MIT"
 repository = "https://github.com/microsoft/regorus"

--- a/src/compiler/destructuring_planner/assignment.rs
+++ b/src/compiler/destructuring_planner/assignment.rs
@@ -314,7 +314,7 @@ fn order_element_pairs<T: VariableBindingContext>(

            if ready {
                let (value_expr, plan, _deps, binds) = remaining.remove(idx);
-                scheduled.extend(binds);
+                scheduled.extend(binds.into_iter());
                ordered.push((value_expr, plan));
                progress = true;
                break;
--- a/src/interpreter.rs
+++ b/src/interpreter.rs
@@ -4,9 +4,9 @@

 use crate::ast::*;
 use crate::builtins::{self, BuiltinFcn};
-use crate::compiled_policy::CompiledPolicyData;
 #[cfg(feature = "azure_policy")]
 use crate::compiled_policy::TargetInfo;
+use crate::compiled_policy::{CompiledPolicyData, DefaultRuleInfo};
 use crate::compiler::destructuring_planner::{
    AssignmentPlan, BindingPlan, DestructuringPlan, WildcardSide,
 };
@@ -1724,6 +1724,9 @@ impl Interpreter {
    // For now, we restrict constant refs to those that contain only simple literals.
    fn is_constant_ref(mut expr: &Ref<Expr>) -> Result<bool> {
        loop {
+            if Self::is_simple_literal(expr)? {
+                return Ok(true);
+            }
            match expr.as_ref() {
                Expr::Var { .. } => break,
                Expr::RefDot { refr, .. } => expr = refr,
@@ -1747,6 +1750,30 @@ impl Interpreter {
        ))
    }

+    fn is_constant_key_expr(&self, expr: &Ref<Expr>) -> Result<bool> {
+        if Self::is_simple_literal(expr)? {
+            return Ok(true);
+        }
+
+        match expr.as_ref() {
+            Expr::Var { span, .. } => {
+                // A variable that is not currently bound in any active local scope behaves like
+                // a stable global/package reference for this evaluation.
+                let is_bound = self
+                    .scopes
+                    .iter()
+                    .rev()
+                    .any(|scope| scope.contains_key(&span.source_str()));
+                Ok(!is_bound)
+            }
+            Expr::RefDot { refr, .. } => self.is_constant_key_expr(refr),
+            Expr::RefBrack { refr, index, .. } => {
+                Ok(self.is_constant_key_expr(refr)? && self.is_constant_key_expr(index)?)
+            }
+            _ => Ok(false),
+        }
+    }
+
    // A rule's output expression is constant if it does not contain local variables.
    // For now, we restrict output expressions to those that contain only simple literals.
    fn is_constant_output(key_expr: &Option<Ref<Expr>>, output_expr: &Ref<Expr>) -> Result<bool> {
@@ -1782,7 +1809,6 @@ impl Interpreter {

                let mut comps = self.eval_rule_ref(&rule_ref)?;
                if let Some(ke) = &key_expr {
-                    is_const_rule = is_const_rule && Self::is_simple_literal(ke)?;
                    comps.push(self.eval_expr(ke)?);
                }
                let output = if let Some(oe) = &output_expr {
@@ -1798,7 +1824,12 @@ impl Interpreter {
                    comps.pop();
                    output
                } else {
-                    // Rule's constness is determined only by its ref.
+                    // Implicit-true partial object rules can vary with each successful key binding.
+                    if let Some(ke) = &key_expr {
+                        if !is_old_style_set && !self.is_constant_key_expr(ke)? {
+                            is_const_rule = false;
+                        }
+                    }
                    Value::Bool(true)
                };

@@ -2943,6 +2974,41 @@ impl Interpreter {
        Ok(())
    }

+    fn default_rules_for_path(&self, path: &str) -> Option<Vec<DefaultRuleInfo>> {
+        if let Some(rules) = self.compiled_policy.default_rules.get(path) {
+            return Some(rules.clone());
+        }
+
+        let (parent_path, index) = path.rsplit_once('.')?;
+        let rules = self.compiled_policy.default_rules.get(parent_path)?;
+        let matches = rules
+            .iter()
+            .filter(|(_, rule_index)| Self::default_rule_index_matches(rule_index, index))
+            .cloned()
+            .collect::<Vec<_>>();
+
+        if matches.is_empty() {
+            None
+        } else {
+            Some(matches)
+        }
+    }
+
+    fn has_default_rules_for_path(&self, path: &str) -> bool {
+        self.default_rules_for_path(path).is_some()
+    }
+
+    fn default_rule_index_matches(index: &Option<String>, path_component: &str) -> bool {
+        match index.as_deref() {
+            Some(index) if index == path_component => true,
+            Some(index) => index
+                .strip_prefix('"')
+                .and_then(|index| index.strip_suffix('"'))
+                .is_some_and(|index| index == path_component),
+            None => false,
+        }
+    }
+
    fn ensure_rule_evaluated(&mut self, path: String) -> Result<()> {
        self.check_execution_time()?;
        let mut matched = false;
@@ -2957,9 +3023,9 @@ impl Interpreter {
        }

        // Evaluate the associated default rules after non-default rules
-        if let Some(rules) = self.compiled_policy.default_rules.get(&path) {
+        if let Some(rules) = self.default_rules_for_path(&path) {
            matched = true;
-            for (r, _) in rules.clone() {
+            for (r, _) in rules {
                if !self.processed.contains(&r) {
                    let module = self.get_rule_module(&r)?;
                    let prev_module = self.set_current_module(Some(module))?;
@@ -3050,10 +3116,7 @@ impl Interpreter {
                let prefix = fields.iter().take(i).copied().collect::<Vec<_>>();
                let prefix_path = format!("data.{}", prefix.join("."));
                if self.compiled_policy.rules.contains_key(&prefix_path)
-                    || self
-                        .compiled_policy
-                        .default_rules
-                        .contains_key(&prefix_path)
+                    || self.has_default_rules_for_path(&prefix_path)
                {
                    self.ensure_rule_evaluated(prefix_path)?;
                    break;
@@ -3077,7 +3140,7 @@ impl Interpreter {

            if !no_error
                && !self.compiled_policy.rules.contains_key(&rule_path)
-                && !self.compiled_policy.default_rules.contains_key(&rule_path)
+                && !self.has_default_rules_for_path(&rule_path)
                && !self.compiled_policy.imports.contains_key(&rule_path)
            {
                bail!(span.error(&format!(
@@ -3100,7 +3163,7 @@ impl Interpreter {
                };

                if self.compiled_policy.rules.contains_key(&path)
-                    || self.compiled_policy.default_rules.contains_key(&path)
+                    || self.has_default_rules_for_path(&path)
                {
                    self.ensure_rule_evaluated(path)?;
                    found = true;
@@ -3647,7 +3710,7 @@ impl Interpreter {
        self.data = Value::Undefined;
        self.ensure_loop_var_values_capacity();

-        let default_rules = self.compiled_policy.default_rules.get(rule_path).cloned();
+        let default_rules = self.default_rules_for_path(rule_path);

        if let Some(rules) = default_rules {
            for (rule, _) in rules {
--- a/src/languages/azure_policy/aliases/mod.rs
+++ b/src/languages/azure_policy/aliases/mod.rs
@@ -172,31 +172,11 @@ impl AliasRegistry {
        let prefix = alloc::format!("{}/", fq_type);

        for alias in aliases {
-            // Skip aliases without a default_path — the normalizer's
-            // resolve_resource_type also skips these, so inserting them into
-            // compiler maps would cause a divergence where the compiler
-            // resolves the alias but normalized input never contains the field.
-            if alias.default_path.is_none() {
-                continue;
-            }
-
            // Derive the short name by stripping the resource type prefix.
            let raw_short = if alias.name.len() > prefix.len()
-                && alias
-                    .name
-                    .get(..prefix.len())
-                    .is_some_and(|s| s.eq_ignore_ascii_case(&prefix))
+                && alias.name[..prefix.len()].eq_ignore_ascii_case(&prefix)
            {
-                // Both slice boundaries are valid: prefix is ASCII
-                // (resource type + '/'), so if `..prefix.len()` succeeded
-                // above, `prefix.len()..` is guaranteed to be on a char
-                // boundary too.  The `unwrap_or` is a defensive fallback
-                // that can never trigger for well-formed Azure alias names.
-                alias
-                    .name
-                    .get(prefix.len()..)
-                    .unwrap_or(&alias.name)
-                    .to_string()
+                alias.name[prefix.len()..].to_string()
            } else if let Some(rest) = alias
                .name
                .rfind('/')
@@ -280,19 +260,20 @@ impl AliasRegistry {
            .map(String::as_str)
    }

-    /// Return a reference to the alias-to-short-name map.
+    /// Return a clone of the alias-to-short-name map for use by the compiler.
    ///
-    /// Keys are lowercase fully-qualified alias names; values are short names.
-    pub const fn alias_map(&self) -> &BTreeMap<String, String> {
-        &self.alias_to_short
+    /// The compiler stores this map internally so it can resolve fully-qualified
+    /// alias names without holding a reference to the registry.
+    pub fn alias_map(&self) -> BTreeMap<String, String> {
+        self.alias_to_short.clone()
    }

-    /// Return a reference to the alias-to-modifiable map.
+    /// Return a clone of the alias-to-modifiable map for use by the compiler.
    ///
-    /// Keys are lowercase fully-qualified alias names; values are `true` when
-    /// the alias has `defaultMetadata.attributes = "Modifiable"`.
-    pub const fn alias_modifiable_map(&self) -> &BTreeMap<String, bool> {
-        &self.alias_modifiable
+    /// Maps lowercase fully-qualified alias names to `true` when the alias
+    /// has `defaultMetadata.attributes = "Modifiable"`.
+    pub fn alias_modifiable_map(&self) -> BTreeMap<String, bool> {
+        self.alias_modifiable.clone()
    }

    /// Normalize a raw ARM resource and wrap it in the input envelope.
--- a/src/languages/azure_policy/aliases/normalizer/alias_resolution.rs
+++ b/src/languages/azure_policy/aliases/normalizer/alias_resolution.rs
@@ -4,13 +4,14 @@
 //! Per-alias path resolution: reads values from versioned ARM paths and places
 //! them at alias short name paths in the normalized output.

-use crate::Rc;
+use alloc::string::String;
+
 use crate::Value;

 use super::super::obj_map::remove_element_field;
 use super::super::obj_map::{
-    collision_safe_key, is_root_field_collision, obj_contains, obj_insert, obj_insert_rc,
-    obj_remove, set_nested_lowercased, ObjMap,
+    collision_safe_key, is_root_field_collision, obj_contains, obj_insert, obj_remove,
+    set_nested_lowercased, ObjMap,
 };
 use super::super::types::ResolvedAliases;
 use super::element_remap::apply_element_remap_precomputed;
@@ -47,14 +48,12 @@ pub fn apply_alias_entries(
        if let Some(value) = value {
            let value = normalize_value(&value, &entry.short_name, None);

-            if is_root_field_collision(&entry.short_name, &entry.default_path) {
-                let target = collision_safe_key(&entry.short_name);
-                set_nested_lowercased(result, &target, value);
-            } else if entry.short_name.contains('.') {
-                set_nested_lowercased(result, &entry.short_name, value);
+            let target = if is_root_field_collision(&entry.short_name, &entry.default_path) {
+                collision_safe_key(&entry.short_name)
            } else {
-                obj_insert_rc(result, Rc::clone(&entry.short_name_lc), value);
-            }
+                entry.short_name.clone()
+            };
+            set_nested_lowercased(result, &target, value);
        }
    }

@@ -85,13 +84,13 @@ pub fn apply_alias_entries(
 }

 /// Navigate an ARM path using precomputed segments (avoids per-call split).
-fn navigate_arm_path_segments(value: &Value, segments: &[Rc<str>]) -> Option<Value> {
+fn navigate_arm_path_segments(value: &Value, segments: &[String]) -> Option<Value> {
    let mut current = value;
    for segment in segments {
        current = current
            .as_object()
            .ok()?
-            .get(&Value::String(Rc::clone(segment)))?;
+            .get(&Value::from(segment.as_str()))?;
    }
    Some(current.clone())
 }
--- a/src/languages/azure_policy/aliases/obj_map.rs
+++ b/src/languages/azure_policy/aliases/obj_map.rs
@@ -7,7 +7,7 @@
 //! then converts to `Value::Object` (a `BTreeMap<Value, Value>`) only at
 //! the output boundary via [`make_value`].

-use alloc::string::String;
+use alloc::string::{String, ToString as _};
 use alloc::vec::Vec;

 use hashbrown::HashMap;
@@ -41,33 +41,6 @@ pub fn obj_insert(map: &mut ObjMap, key: &str, val: Value) {
    map.insert(Rc::from(key), val);
 }

-/// Insert a key-value pair using a pre-allocated `Rc<str>` key.
-///
-/// Avoids the `Rc::from(key)` heap allocation that [`obj_insert`] performs.
-pub fn obj_insert_rc(map: &mut ObjMap, key: Rc<str>, val: Value) {
-    map.insert(key, val);
-}
-
-/// Lowercase a string, returning an `Rc<str>`.
-///
-/// Both paths allocate an `Rc<str>` (header + string bytes).  The fast-path
-/// avoids creating an intermediate lowercased `String` when the input is
-/// already all-lowercase ASCII.
-pub fn rc_lowercase(s: &str) -> Rc<str> {
-    if s.bytes().all(|b| !b.is_ascii_uppercase()) {
-        Rc::from(s)
-    } else {
-        Rc::from(s.to_ascii_lowercase())
-    }
-}
-
-/// Insert a key-value pair with the key lowercased, using [`rc_lowercase`]
-/// for the allocation fast-path.
-pub fn obj_insert_lc(map: &mut ObjMap, key: &str, val: Value) {
-    let lc = rc_lowercase(key);
-    map.insert(lc, val);
-}
-
 /// Check whether a key exists.
 pub fn obj_contains(map: &ObjMap, key: &str) -> bool {
    map.contains_key(key)
@@ -139,7 +112,7 @@ pub fn set_nested_lowercased(result: &mut ObjMap, path: &str, value: Value) {
    }
    if segments.len() == 1 {
        if let Some(&seg) = segments.first() {
-            obj_insert_lc(result, seg, value);
+            obj_insert(result, &seg.to_ascii_lowercase(), value);
        }
        return;
    }
@@ -171,28 +144,28 @@ fn set_nested_inner(obj: &mut ObjMap, segments: &[&str], value: Value, lowercase
    };

    if segments.len() == 1 {
-        let key: Rc<str> = if lowercase {
-            rc_lowercase(first)
+        let key = if lowercase {
+            first.to_ascii_lowercase()
        } else {
-            Rc::from(first)
+            first.to_string()
        };
-        obj_insert_rc(obj, key, value);
+        obj_insert(obj, &key, value);
        return;
    }

-    let seg: Rc<str> = if lowercase {
-        rc_lowercase(first)
+    let seg = if lowercase {
+        first.to_ascii_lowercase()
    } else {
-        Rc::from(first)
+        first.to_string()
    };

    // Ensure an intermediate object exists at `seg`.
-    if !obj.contains_key(&*seg) {
-        obj_insert_rc(obj, Rc::clone(&seg), make_value(new_map()));
+    if !obj_contains(obj, &seg) {
+        obj_insert(obj, &seg, make_value(new_map()));
    }

    // Descend directly into the BTreeMap, avoiding ObjMap round-trip.
-    if let Some(Value::Object(inner_rc)) = obj.get_mut(&*seg) {
+    if let Some(Value::Object(inner_rc)) = obj_get_mut(obj, &seg) {
        let inner_btree = Rc::make_mut(inner_rc);
        set_nested_in_btree(
            inner_btree,
@@ -218,12 +191,12 @@ pub fn set_nested_in_btree(
        return;
    };

-    let key_rc: Rc<str> = if lowercase {
-        rc_lowercase(first)
+    let key_str: String = if lowercase {
+        first.to_ascii_lowercase()
    } else {
-        Rc::from(first)
+        first.to_string()
    };
-    let key_val = Value::String(Rc::clone(&key_rc));
+    let key_val = Value::String(Rc::from(key_str.as_str()));

    if segments.len() == 1 {
        btree.insert(key_val, value);
@@ -270,24 +243,13 @@ pub const ROOT_FIELDS: &[&str] = &[
    "extendedLocation",
 ];

-const PROPERTIES_DOT: &[u8] = b"properties.";
-
 /// Check whether an alias short name collides with a reserved ARM root field
 /// and needs a collision-safe key.
 pub fn is_root_field_collision(short_name: &str, default_path: &str) -> bool {
    ROOT_FIELDS
        .iter()
        .any(|f| f.eq_ignore_ascii_case(short_name))
-        && default_path.len() > PROPERTIES_DOT.len()
-        && default_path
-            .as_bytes()
-            .get(..PROPERTIES_DOT.len())
-            .is_some_and(|prefix| {
-                prefix
-                    .iter()
-                    .zip(PROPERTIES_DOT)
-                    .all(|(a, b)| a.to_ascii_lowercase() == *b)
-            })
+        && default_path.to_ascii_lowercase().starts_with("properties.")
 }

 /// Return a collision-safe key for an alias whose short name collides with a
--- a/src/languages/azure_policy/aliases/types.rs
+++ b/src/languages/azure_policy/aliases/types.rs
@@ -18,22 +18,6 @@ use alloc::vec::Vec;

 use serde::{Deserialize, Deserializer};

-use crate::Rc;
-
-// ---------------------------------------------------------------------------
-// Deserialization helpers
-// ---------------------------------------------------------------------------
-
-/// Deserialize a `Vec<T>` that tolerates JSON `null` by mapping it to an
-/// empty vector.
-fn deserialize_null_as_empty_vec<'de, T, D>(deserializer: D) -> Result<Vec<T>, D::Error>
-where
-    T: Deserialize<'de>,
-    D: Deserializer<'de>,
-{
-    Ok(Option::<Vec<T>>::deserialize(deserializer)?.unwrap_or_default())
-}
-
 // ─── Top-level response wrappers ────────────────────────────────────────────

 /// ARM API response envelope: `{ "value": [...] }`
@@ -114,10 +98,7 @@ pub struct AliasEntry {

    /// Versioned path entries.  Empty for the vast majority of aliases that
    /// have only a `defaultPath`.
-    ///
-    /// In real Azure catalog data (~97% of aliases), `az provider list` emits
-    /// `"paths": null` rather than an empty array.
-    #[serde(default, deserialize_with = "deserialize_null_as_empty_vec")]
+    #[serde(default)]
    pub paths: Vec<AliasPath>,
 }

@@ -423,13 +404,11 @@ pub struct ResolvedEntry {
    // ── Precomputed fields (derived at registry-load time) ──────────────
    /// Whether `short_name` contains `[*]` (i.e., this is a wildcard/array alias).
    pub is_wildcard: bool,
-    /// Pre-lowercased short name as `Rc<str>` for allocation-free common-case inserts.
-    pub(crate) short_name_lc: Rc<str>,
    /// Precomputed `default_path.split('.').collect()` for fast ARM path navigation.
-    pub(crate) default_path_segments: Vec<Rc<str>>,
+    pub default_path_segments: Vec<String>,
    /// Precomputed path segments for each versioned path, in the same order
    /// as `versioned_paths`.
-    pub(crate) versioned_path_segments: Vec<Vec<Rc<str>>>,
+    pub versioned_path_segments: Vec<Vec<String>>,
 }

 impl ResolvedEntry {
@@ -441,15 +420,10 @@ impl ResolvedEntry {
        metadata: Option<AliasPathMetadata>,
    ) -> Self {
        let is_wildcard = short_name.contains("[*]");
-        let short_name_lc = if short_name.bytes().all(|b| !b.is_ascii_uppercase()) {
-            Rc::from(short_name.as_str())
-        } else {
-            Rc::from(short_name.to_ascii_lowercase())
-        };
-        let default_path_segments = default_path.split('.').map(Rc::from).collect();
+        let default_path_segments = default_path.split('.').map(String::from).collect();
        let versioned_path_segments = versioned_paths
            .iter()
-            .map(|(_, p)| p.split('.').map(Rc::from).collect())
+            .map(|(_, p)| p.split('.').map(String::from).collect())
            .collect();
        Self {
            short_name,
@@ -457,7 +431,6 @@ impl ResolvedEntry {
            versioned_paths,
            metadata,
            is_wildcard,
-            short_name_lc,
            default_path_segments,
            versioned_path_segments,
        }
@@ -483,7 +456,7 @@ impl ResolvedEntry {
    /// Returns the versioned segments if `api_version` matches, otherwise
    /// the default segments.  This avoids per-call `split('.')` for both
    /// default and versioned scalar alias navigation.
-    pub(crate) fn select_path_segments(&self, api_version: Option<&str>) -> &[Rc<str>] {
+    pub fn select_path_segments(&self, api_version: Option<&str>) -> &[String] {
        if let Some(ver) = api_version {
            for (i, (v, _)) in self.versioned_paths.iter().enumerate() {
                if v.eq_ignore_ascii_case(ver) {
--- a/src/languages/azure_policy/compiler/core.rs
+++ b/src/languages/azure_policy/compiler/core.rs
@@ -18,7 +18,6 @@ use crate::rvm::program::{Program, SpanInfo};
 use crate::rvm::Instruction;
 use crate::{Rc, Value};

-use crate::languages::azure_policy::aliases::AliasRegistry;
 use crate::languages::azure_policy::ast::PolicyRule;

 // ---------------------------------------------------------------------------
@@ -45,9 +44,10 @@ pub(super) struct Compiler {
    pub(super) cached_input_reg: Option<u8>,
    /// Cached register for `LoadContext` — allocated once on first use.
    pub(super) cached_context_reg: Option<u8>,
-    /// Alias registry for resolving fully-qualified alias names.
-    /// Shared via `Rc` to avoid cloning the 73K-entry alias maps.
-    pub(super) alias_registry: Option<Rc<AliasRegistry>>,
+    /// Map from lowercase fully-qualified alias name → short name.
+    pub(super) alias_map: BTreeMap<String, String>,
+    /// Map from lowercase fully-qualified alias name → modifiable flag.
+    pub(super) alias_modifiable: BTreeMap<String, bool>,
    /// Default values for policy parameters.
    pub(super) parameter_defaults: Option<Value>,
    /// Cached literal-table index for `parameter_defaults` (or an empty object
@@ -338,13 +338,8 @@ impl Compiler {
        path: &str,
        span: &crate::lexer::Span,
    ) -> Result<String> {
-        let alias_map = match &self.alias_registry {
-            Some(reg) => reg.alias_map(),
-            None => return Ok(path.to_string()),
-        };
-
        let lc = path.to_ascii_lowercase();
-        if let Some(short) = alias_map.get(&lc) {
+        if let Some(short) = self.alias_map.get(&lc) {
            let resolved = short.clone();
            let result = Self::strip_fq_prefix(&resolved).to_ascii_lowercase();
            return Ok(result);
@@ -353,7 +348,7 @@ impl Compiler {
        // Fallback: derive array path from a corresponding `[*]` alias.
        if !lc.contains("[*]") {
            let wildcard_key = alloc::format!("{}[*]", lc);
-            if let Some(short) = alias_map.get(&wildcard_key) {
+            if let Some(short) = self.alias_map.get(&wildcard_key) {
                let resolved = Self::strip_fq_prefix(short).to_ascii_lowercase();
                if let Some(base) = resolved.strip_suffix("[*]") {
                    return Ok(base.to_string());
@@ -361,14 +356,14 @@ impl Compiler {
            }
        }

-        if !alias_map.is_empty() && !self.alias_fallback_to_raw {
+        if !self.alias_map.is_empty() && !self.alias_fallback_to_raw {
            bail!(span.error(&alloc::format!(
                "unknown alias '{}': field references must use fully-qualified alias names when an alias catalog is loaded",
                path
            )));
        }

-        if alias_map.is_empty() {
+        if self.alias_map.is_empty() {
            Ok(path.to_string())
        } else {
            let result = Self::strip_fq_prefix(path).to_ascii_lowercase();
--- a/src/languages/azure_policy/compiler/count.rs
+++ b/src/languages/azure_policy/compiler/count.rs
@@ -998,13 +998,7 @@ impl Compiler {
                    return Ok(result);
                }
            }
-            Err(e)
-                if self
-                    .alias_registry
-                    .as_ref()
-                    .is_some_and(|r| !r.alias_map().is_empty())
-                    && !self.alias_fallback_to_raw =>
-            {
+            Err(e) if !self.alias_map.is_empty() && !self.alias_fallback_to_raw => {
                return Err(e);
            }
            _ => {}
--- a/src/languages/azure_policy/compiler/effects.rs
+++ b/src/languages/azure_policy/compiler/effects.rs
@@ -692,18 +692,13 @@ impl Compiler {
        field_path: &str,
        span: &crate::lexer::Span,
    ) -> Result<()> {
-        let modifiable_map = match &self.alias_registry {
-            Some(reg) => reg.alias_modifiable_map(),
-            None => return Ok(()),
-        };
-
-        if modifiable_map.is_empty() {
+        if self.alias_modifiable.is_empty() {
            return Ok(());
        }

        let lc = field_path.to_lowercase();

-        if let Some(&modifiable) = modifiable_map.get(&lc) {
+        if let Some(&modifiable) = self.alias_modifiable.get(&lc) {
            if !modifiable {
                bail!(span.error(&format!(
                    "alias '{}' is not modifiable (defaultMetadata.attributes != 'Modifiable')",
@@ -808,6 +803,7 @@ fn unescape_arm_literal(s: &str) -> alloc::string::String {
 /// 1. Build a template `BTreeMap` with `Value::Undefined` placeholders.
 /// 2. Sort keys by their literal value (BTreeMap order).
 /// 3. Emit `ObjectCreate`.
+#[allow(clippy::indexing_slicing)]
 pub(super) fn build_object_from_keys(
    compiler: &mut Compiler,
    mut keys: Vec<(u16, u8)>,
@@ -816,33 +812,17 @@ pub(super) fn build_object_from_keys(
    // Build template: object with all keys set to Undefined.
    let mut template = BTreeMap::new();
    for &(key_idx, _) in &keys {
-        // key_idx was returned by `add_literal_u16` in the calling code,
-        // so it is always in bounds.  We use `.get()` + `?` instead of
-        // direct indexing to satisfy the crate-wide `deny(indexing_slicing)`.
-        let key_val = compiler
-            .program
-            .literals
-            .get(usize::from(key_idx))
-            .ok_or_else(|| {
-                anyhow!(
-                    "internal error in build_object_from_keys: \
-                     literal index {} out of bounds (literals len = {})",
-                    key_idx,
-                    compiler.program.literals.len()
-                )
-            })?
-            .clone();
+        // SAFETY: key_idx was just returned by `add_literal_u16`, so the
+        // index is guaranteed to be in bounds.
+        let key_val = compiler.program.literals[usize::from(key_idx)].clone();
        template.insert(key_val, Value::Undefined);
    }
    let template_idx = compiler.add_literal_u16(Value::Object(crate::Rc::new(template)))?;

-    // Sort keys by literal value (BTreeMap order).  All indices were
-    // validated in the loop above (which returns Err for out-of-bounds),
-    // so `.get()` always returns `Some` here — `None` is unreachable.
+    // Sort keys by literal value (BTreeMap order).
    keys.sort_by(|a, b| {
-        let a_val = compiler.program.literals.get(usize::from(a.0));
-        let b_val = compiler.program.literals.get(usize::from(b.0));
-        a_val.cmp(&b_val)
+        compiler.program.literals[usize::from(a.0)]
+            .cmp(&compiler.program.literals[usize::from(b.0)])
    });

    let dest = compiler.alloc_register()?;
--- a/src/languages/azure_policy/compiler/mod.rs
+++ b/src/languages/azure_policy/compiler/mod.rs
@@ -30,11 +30,11 @@ mod metadata;
 mod template_dispatch;
 mod utils;

-use alloc::string::ToString as _;
+use alloc::collections::BTreeMap;
+use alloc::string::{String, ToString as _};

 use anyhow::Result;

-use crate::languages::azure_policy::aliases::AliasRegistry;
 use crate::languages::azure_policy::ast::{PolicyDefinition, PolicyRule};
 use crate::rvm::program::Program;
 use crate::{Rc, Value};
@@ -69,14 +69,17 @@ pub fn compile_policy_rule(rule: &PolicyRule) -> Result<Rc<Program>> {

 /// Compile a parsed Azure Policy rule with alias resolution.
 ///
-/// The registry provides alias-to-short-name resolution and modifiability
-/// data.  Pass it as an `Rc` to avoid cloning the internal alias maps.
+/// The `alias_map` maps lowercase fully-qualified alias names to their short
+/// names.  Obtain it from
+/// [`AliasRegistry::alias_map()`](crate::languages::azure_policy::aliases::AliasRegistry::alias_map).
 pub fn compile_policy_rule_with_aliases(
    rule: &PolicyRule,
-    registry: Rc<AliasRegistry>,
+    alias_map: BTreeMap<String, String>,
+    alias_modifiable: BTreeMap<String, bool>,
 ) -> Result<Rc<Program>> {
    let mut compiler = Compiler::new();
-    compiler.alias_registry = Some(registry);
+    compiler.alias_map = alias_map;
+    compiler.alias_modifiable = alias_modifiable;
    init_effect_annotation(&mut compiler, rule);
    compiler.compile(rule)
 }
@@ -97,10 +100,12 @@ pub fn compile_policy_definition(defn: &PolicyDefinition) -> Result<Rc<Program>>
 /// Compile a parsed Azure Policy definition with alias resolution.
 pub fn compile_policy_definition_with_aliases(
    defn: &PolicyDefinition,
-    registry: Rc<AliasRegistry>,
+    alias_map: BTreeMap<String, String>,
+    alias_modifiable: BTreeMap<String, bool>,
 ) -> Result<Rc<Program>> {
    let mut compiler = Compiler::new();
-    compiler.alias_registry = Some(registry);
+    compiler.alias_map = alias_map;
+    compiler.alias_modifiable = alias_modifiable;
    compiler.parameter_defaults = Some(build_parameter_defaults(&defn.parameters)?);
    compiler.populate_definition_metadata(defn);
    init_effect_annotation(&mut compiler, &defn.policy_rule);
@@ -114,11 +119,13 @@ pub fn compile_policy_definition_with_aliases(
 /// a known alias are silently treated as raw property paths.
 pub fn compile_policy_definition_with_aliases_opts(
    defn: &PolicyDefinition,
-    registry: Rc<AliasRegistry>,
+    alias_map: BTreeMap<String, String>,
+    alias_modifiable: BTreeMap<String, bool>,
    alias_fallback_to_raw: bool,
 ) -> Result<Rc<Program>> {
    let mut compiler = Compiler::new();
-    compiler.alias_registry = Some(registry);
+    compiler.alias_map = alias_map;
+    compiler.alias_modifiable = alias_modifiable;
    compiler.alias_fallback_to_raw = alias_fallback_to_raw;
    compiler.parameter_defaults = Some(build_parameter_defaults(&defn.parameters)?);
    compiler.populate_definition_metadata(defn);
--- a/src/languages/azure_policy/parser/policy_definition.rs
+++ b/src/languages/azure_policy/parser/policy_definition.rs
@@ -264,17 +264,18 @@ impl<'source> Parser<'source> {
            "metadata" => {
                *metadata = Some(self.parse_json_value()?);
            }
-            "parameters" if self.token_text() == "{" => {
-                // Parameters must be a JSON object; if not, push to extra.
-                *parameters = self.parse_parameter_definitions()?;
-            }
            "parameters" => {
-                let value = self.parse_json_value()?;
-                extra.push(ObjectEntry {
-                    key_span,
-                    key: key.into(),
-                    value,
-                });
+                // Parameters must be a JSON object; if not, push to extra.
+                if self.token_text() == "{" {
+                    *parameters = self.parse_parameter_definitions()?;
+                } else {
+                    let value = self.parse_json_value()?;
+                    extra.push(ObjectEntry {
+                        key_span,
+                        key: key.into(),
+                        value,
+                    });
+                }
            }
            "policyrule" => {
                // Parse the policyRule directly from the token stream!
--- a/src/languages/rego/compiler/error.rs
+++ b/src/languages/rego/compiler/error.rs
@@ -63,14 +63,6 @@ pub enum CompilerError {
    #[error("Invalid function expression with package")]
    InvalidFunctionExpressionWithPackage,

-    #[error("partial object rules with constant keys are not yet supported by the RVM compiler")]
-    PartialObjectConstantKeyUnsupported,
-
-    #[error(
-        "partial object rules with nested bracket keys are not yet supported by the RVM compiler"
-    )]
-    PartialObjectNestedKeyUnsupported,
-
    #[error("Compilation error: {message}")]
    General { message: String },
 }
--- a/src/languages/rego/compiler/program.rs
+++ b/src/languages/rego/compiler/program.rs
@@ -181,7 +181,7 @@ impl<'a> Compiler<'a> {
    }

    fn evaluate_default_rule(&mut self, rule_path: &str) -> Option<u16> {
-        if !self.policy.inner.default_rules.contains_key(rule_path) {
+        if !self.may_have_default_rule(rule_path) {
            return None;
        }

@@ -200,6 +200,33 @@ impl<'a> Compiler<'a> {
        None
    }

+    fn may_have_default_rule(&self, rule_path: &str) -> bool {
+        if self.policy.inner.default_rules.contains_key(rule_path) {
+            return true;
+        }
+
+        let Some((parent_path, index)) = rule_path.rsplit_once('.') else {
+            return false;
+        };
+
+        self.policy
+            .inner
+            .default_rules
+            .get(parent_path)
+            .is_some_and(|rules| {
+                rules
+                    .iter()
+                    .any(|(_, rule_index)| match rule_index.as_deref() {
+                        Some(rule_index) if rule_index == index => true,
+                        Some(rule_index) => rule_index
+                            .strip_prefix('"')
+                            .and_then(|rule_index| rule_index.strip_suffix('"'))
+                            .is_some_and(|rule_index| rule_index == index),
+                        None => false,
+                    })
+            })
+    }
+
    fn extract_destructuring_blocks(&self, rule_index: u16) -> Vec<Option<u32>> {
        self.rule_definition_destructuring_patterns[rule_index as usize].clone()
    }
--- a/src/languages/rego/compiler/rules.rs
+++ b/src/languages/rego/compiler/rules.rs
@@ -11,7 +11,7 @@
 )]

 use super::{CompilationContext, Compiler, CompilerError, ContextType, Result, WorklistEntry};
-use crate::ast::{Expr, ExprRef, Rule, RuleHead};
+use crate::ast::{AssignOp, Expr, ExprRef, Rule, RuleHead};
 use crate::compiler::destructuring_planner::plans::BindingPlan;
 use crate::lexer::Span;
 use crate::rvm::program::{Program, RuleType};
@@ -52,14 +52,29 @@ impl<'a> Compiler<'a> {
        let rule_types: BTreeSet<RuleType> = definitions
            .iter()
            .map(|def| {
-                if let Rule::Spec { head, .. } = def.as_ref() {
+                if let Rule::Spec { head, bodies, .. } = def.as_ref() {
                    match head {
                        RuleHead::Set { .. } => RuleType::PartialSet,
                        RuleHead::Compr { refr, assign, .. } => match refr.as_ref() {
-                            crate::ast::Expr::RefBrack { .. } if assign.is_some() => {
+                            // Variable-key bracket heads emit one object entry per successful
+                            // binding, so they must compile as partial objects.
+                            crate::ast::Expr::RefBrack { index, .. }
+                                if super::expressions::try_eval_const(index.as_ref()).is_none() =>
+                            {
                                RuleType::PartialObject
                            }
-                            crate::ast::Expr::RefBrack { .. } => RuleType::PartialObject,
+                            crate::ast::Expr::RefBrack { .. }
+                                if matches!(
+                                    assign.as_ref().map(|assign| &assign.op),
+                                    Some(AssignOp::Eq)
+                                ) =>
+                            {
+                                RuleType::PartialObject
+                            }
+                            crate::ast::Expr::RefBrack { .. } if bodies.is_empty() => {
+                                RuleType::PartialObject
+                            }
+                            crate::ast::Expr::RefBrack { .. } => RuleType::Complete,
                            _ => RuleType::Complete,
                        },
                        _ => RuleType::Complete,
@@ -88,54 +103,6 @@ impl<'a> Compiler<'a> {
        })
    }

-    fn validate_partial_object_shape(&self, refr: &ExprRef) -> Result<()> {
-        let Expr::RefBrack {
-            refr: prefix,
-            index,
-            ..
-        } = refr.as_ref()
-        else {
-            return Ok(());
-        };
-
-        if Self::has_unsupported_bracket_prefix(prefix) {
-            return Err(CompilerError::PartialObjectNestedKeyUnsupported.at(refr.span()));
-        }
-
-        if Self::is_simple_literal(index) {
-            return Err(CompilerError::PartialObjectConstantKeyUnsupported.at(index.span()));
-        }
-
-        Ok(())
-    }
-
-    fn has_unsupported_bracket_prefix(expr: &ExprRef) -> bool {
-        match expr.as_ref() {
-            Expr::RefBrack { refr, index, .. } => {
-                !Self::is_string_literal(index) || Self::has_unsupported_bracket_prefix(refr)
-            }
-            Expr::RefDot { refr, .. } => Self::has_unsupported_bracket_prefix(refr),
-            _ => false,
-        }
-    }
-
-    fn is_string_literal(expr: &ExprRef) -> bool {
-        matches!(expr.as_ref(), Expr::String { .. } | Expr::RawString { .. })
-    }
-
-    fn is_simple_literal(expr: &ExprRef) -> bool {
-        match expr.as_ref() {
-            Expr::String { .. }
-            | Expr::RawString { .. }
-            | Expr::Number { .. }
-            | Expr::Bool { .. }
-            | Expr::Null { .. } => true,
-            // Unary expressions like `-1` are constant literals too.
-            Expr::UnaryExpr { expr, .. } => Self::is_simple_literal(expr),
-            _ => false,
-        }
-    }
-
    pub(super) fn get_or_assign_rule_index(&mut self, rule_path: &str) -> Result<u16> {
        if let Some(&index) = self.rule_index_map.get(rule_path) {
            return Ok(index);
@@ -393,10 +360,6 @@ impl<'a> Compiler<'a> {

                    let (key_expr, value_expr) = match head {
                        RuleHead::Compr { refr, assign, .. } => {
-                            if rule_type == RuleType::PartialObject {
-                                self.validate_partial_object_shape(refr)?;
-                            }
-
                            self.rule_definition_function_params[rule_index as usize].push(None);
                            self.rule_definition_destructuring_patterns[rule_index as usize]
                                .push(None);
--- a/src/rvm/vm/dispatch.rs
+++ b/src/rvm/vm/dispatch.rs
@@ -454,7 +454,19 @@ impl RegoVM {
                let mut obj_value = self.take_register(obj)?;

                if let Ok(obj_mut) = obj_value.as_object_mut() {
-                    obj_mut.insert(key_value, value_value);
+                    match obj_mut.get(&key_value) {
+                        Some(existing_value) if existing_value != &value_value => {
+                            self.set_register(obj, obj_value)?;
+                            return Err(VmError::RuleMultipleOutputs { pc: self.pc });
+                        }
+                        Some(_) => {
+                            self.set_register(obj, obj_value)?;
+                            return Ok(InstructionOutcome::Continue);
+                        }
+                        None => {
+                            obj_mut.insert(key_value, value_value);
+                        }
+                    }
                    self.set_register(obj, obj_value)?;
                } else {
                    let offending = obj_value.clone();
--- a/src/rvm/vm/errors.rs
+++ b/src/rvm/vm/errors.rs
@@ -209,6 +209,9 @@ pub enum VmError {
    #[error("Rule-data conflict: {message} (pc={pc})")]
    RuleDataConflict { message: String, pc: usize },

+    #[error("rules must not produce multiple outputs (pc={pc})")]
+    RuleMultipleOutputs { pc: usize },
+
    #[error("Arithmetic error: {message} (pc={pc})")]
    ArithmeticError { message: String, pc: usize },

--- a/src/rvm/vm/rules.rs
+++ b/src/rvm/vm/rules.rs
@@ -17,8 +17,9 @@ use super::execution_model::{
 use super::machine::RegoVM;

 impl RegoVM {
-    /// Returns true if the error represents a resource-limit violation that
-    /// must never be silently absorbed by rule evaluation.
+    /// Returns true if the error must never be silently absorbed by rule
+    /// evaluation backtracking, including resource-limit failures and semantic
+    /// rule consistency errors.
    pub(super) const fn is_fatal_vm_error(err: &VmError) -> bool {
        matches!(
            err,
@@ -26,6 +27,7 @@ impl RegoVM {
                | VmError::MemoryLimitExceeded { .. }
                | VmError::RegexSizeLimitExceeded { .. }
                | VmError::InstructionLimitExceeded { .. }
+                | VmError::RuleMultipleOutputs { .. }
        )
    }

--- a/src/tests/scheduler/analyzer/mod.rs
+++ b/src/tests/scheduler/analyzer/mod.rs
@@ -88,7 +88,7 @@ fn analyze_file(regos: &[String], expected_scopes: &[Scope]) -> Result<()> {
        }
    }

-    scopes.sort_by_key(|a| a.0.span.line);
+    scopes.sort_by(|a, b| a.0.span.line.cmp(&b.0.span.line));
    for (idx, (_, scope)) in scopes.iter().enumerate() {
        if idx > expected_scopes.len() {
            bail!("extra scope generated.")
--- a/tests/azure_policy/mod.rs
+++ b/tests/azure_policy/mod.rs
@@ -23,7 +23,8 @@ use regorus::languages::azure_policy::aliases::AliasRegistry;
 use regorus::languages::azure_policy::compiler;
 use regorus::languages::azure_policy::parser;
 use regorus::rvm::RegoVM;
-use regorus::{Rc, Source, Value};
+use regorus::Source;
+use regorus::Value;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::fs;
@@ -193,7 +194,7 @@ fn yaml_test_impl(file: &str) -> Result<()> {
    let test: YamlTest = serde_yaml::from_str(&yaml_str)?;

    // Load alias registry if an aliases file is specified.
-    let alias_registry: Option<Rc<AliasRegistry>> = if let Some(ref aliases_file) = test.aliases {
+    let alias_registry = if let Some(ref aliases_file) = test.aliases {
        let aliases_dir = Path::new(file)
            .parent()
            .unwrap_or_else(|| Path::new("."))
@@ -208,7 +209,7 @@ fn yaml_test_impl(file: &str) -> Result<()> {
        })?;
        let mut registry = AliasRegistry::new();
        registry.load_from_json(&aliases_json)?;
-        Some(Rc::new(registry))
+        Some(registry)
    } else {
        None
    };
@@ -280,7 +281,11 @@ fn yaml_test_impl(file: &str) -> Result<()> {
                        );
                    }
                    if let Some(ref registry) = alias_registry {
-                        compiler::compile_policy_definition_with_aliases(&defn, Rc::clone(registry))
+                        compiler::compile_policy_definition_with_aliases(
+                            &defn,
+                            registry.alias_map(),
+                            registry.alias_modifiable_map(),
+                        )
                    } else {
                        compiler::compile_policy_definition(&defn)
                    }
@@ -303,7 +308,11 @@ fn yaml_test_impl(file: &str) -> Result<()> {
                        );
                    }
                    if let Some(ref registry) = alias_registry {
-                        compiler::compile_policy_rule_with_aliases(&ast, Rc::clone(registry))
+                        compiler::compile_policy_rule_with_aliases(
+                            &ast,
+                            registry.alias_map(),
+                            registry.alias_modifiable_map(),
+                        )
                    } else {
                        compiler::compile_policy_rule(&ast)
                    }
@@ -357,7 +366,7 @@ fn yaml_test_impl(file: &str) -> Result<()> {

        let mut vm = RegoVM::new();
        vm.load_program(program);
-        vm.set_input(make_input(case, alias_registry.as_deref())?);
+        vm.set_input(make_input(case, alias_registry.as_ref())?);
        vm.set_context(make_context(case)?);

        // Load host-await responses (for auditIfNotExists / deployIfNotExists policies).
@@ -382,11 +391,7 @@ fn yaml_test_impl(file: &str) -> Result<()> {
                        if let Some(rt) = effective_type {
                            inject_type_field(&mut raw, rt);
                        }
-                        normalizer::normalize(
-                            &raw,
-                            Some(registry.as_ref()),
-                            case.api_version.as_deref(),
-                        )
+                        normalizer::normalize(&raw, Some(registry), case.api_version.as_deref())
                    } else {
                        raw
                    }
--- a/tests/interpreter/cases/default/basic.yaml
+++ b/tests/interpreter/cases/default/basic.yaml
@@ -341,6 +341,35 @@ cases:
      result: false
      reasons: []

+  - note: default_rule_with_object_key
+    data: {}
+    input: {}
+    modules:
+      - |
+        package test
+        import rego.v1
+        default config["timeout"] := 30
+        config["timeout"] := val if {
+          val := input.val
+        }
+    query: data.test.config.timeout
+    want_result: 30
+
+  - note: default_rule_with_object_key_override
+    data: {}
+    input:
+      val: 60
+    modules:
+      - |
+        package test
+        import rego.v1
+        default config["timeout"] := 30
+        config["timeout"] := val if {
+          val := input.val
+        }
+    query: data.test.config.timeout
+    want_result: 60
+
  - note: default_only_rule_with_package_query
    data: {}
    modules:
--- a/tests/interpreter/cases/rule/partial_object_iteration.yaml
+++ b/tests/interpreter/cases/rule/partial_object_iteration.yaml
@@ -0,0 +1,242 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+cases:
+  - note: partial_object_iteration_some_in_object_v1
+    data: {}
+    input:
+      x:
+        FOO: 1
+        BAR: 2
+        BAZ: 3
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        violations[k] if {
+          some k, _ in input.x
+        }
+    query: data.test
+    want_result:
+      violations:
+        BAR: true
+        BAZ: true
+        FOO: true
+
+  - note: partial_object_iteration_some_in_array_v1
+    data: {}
+    input:
+      arr: ["FOO", "BAR", "BAZ"]
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        violations[v] if {
+          some _, v in input.arr
+        }
+    query: data.test
+    want_result:
+      violations:
+        BAR: true
+        BAZ: true
+        FOO: true
+
+  - note: partial_object_iteration_with_filter_v1
+    data: {}
+    input:
+      x:
+        FOO: 1
+        BAR: 2
+        BAZ: 3
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        violations[k] if {
+          some k, _ in input.x
+          k != "BAR"
+        }
+    query: data.test
+    want_result:
+      violations:
+        BAZ: true
+        FOO: true
+
+  - note: partial_object_iteration_input_lookup_future_keywords
+    data: {}
+    input:
+      x:
+        FOO: 1
+        BAR: 2
+        BAZ: 3
+    modules:
+      - |
+        package test
+        import future.keywords.if
+
+        violations[k] if {
+          input.x[k]
+        }
+    query: data.test
+    want_result:
+      violations:
+        BAR: true
+        BAZ: true
+        FOO: true
+
+  - note: partial_object_multiple_bodies_collect_all_keys_v1
+    data: {}
+    input:
+      primary:
+        FOO: 1
+        BAR: 2
+      secondary:
+        BAZ: 3
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        violations[k] if {
+          some k, _ in input.primary
+        }
+
+        violations[k] if {
+          some k, _ in input.secondary
+        }
+    query: data.test
+    want_result:
+      violations:
+        BAR: true
+        BAZ: true
+        FOO: true
+
+  - note: constant_key_implicit_true_rule_is_complete_v1
+    data: {}
+    input:
+      enabled: true
+      other: false
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        p["x"] if {
+          input.enabled
+        }
+
+        p["x"] if {
+          input.other
+        }
+    query: data.test.p.x
+    want_result: true
+
+  - note: partial_object_duplicate_keys_same_value_are_ok_v1
+    data: {}
+    input:
+      arr: ["FOO", "FOO", "BAR"]
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        violations[v] if {
+          some _, v in input.arr
+        }
+    query: data.test
+    want_result:
+      violations:
+        BAR: true
+        FOO: true
+
+  - note: partial_object_duplicate_keys_different_values_error_v1
+    data: {}
+    input:
+      entries:
+        - k: "FOO"
+          v: 1
+        - k: "FOO"
+          v: 2
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        violations[k] := v if {
+          some entry in input.entries
+          k := entry.k
+          v := entry.v
+        }
+    query: data.test.violations
+    error: "rules must not produce multiple outputs"
+
+  - note: partial_object_and_partial_set_iteration_coexist_v1
+    data: {}
+    input:
+      x:
+        FOO: 1
+        BAR: 2
+        BAZ: 3
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        violations[k] if {
+          some k, _ in input.x
+        }
+
+        seen contains k if {
+          some k, _ in input.x
+        }
+    query: data.test
+    want_result:
+      seen:
+        set!: ["BAR", "BAZ", "FOO"]
+      violations:
+        BAR: true
+        BAZ: true
+        FOO: true
+
+  - note: partial_object_key_bound_in_outer_scope_v1
+    data: {}
+    input:
+      outer:
+        FOO: [1, 2]
+        BAR: [3]
+        BAZ: []
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        violations[k] if {
+          some k, arr in input.outer
+          some _ in arr
+        }
+    query: data.test.violations
+    want_result:
+      BAR: true
+      FOO: true
+
+  - note: complete_rule_same_value_definitions_still_work_v1
+    data: {}
+    input:
+      role: "superuser"
+    modules:
+      - |
+        package test
+        import rego.v1
+
+        allowed if {
+          input.role == "admin"
+        }
+
+        allowed if {
+          input.role == "superuser"
+        }
+    query: data.test.allowed
+    want_result: true
--- a/tests/interpreter/cases/rule/partial_object_v1.yaml
+++ b/tests/interpreter/cases/rule/partial_object_v1.yaml
@@ -1,150 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-cases:
-  - note: constant_key_partial_object_v1
-    data: {}
-    input:
-      enabled: true
-    modules:
-      - |
-        package test
-        import rego.v1
-
-        p["fixed"] if {
-          input.enabled
-        }
-    query: data.test
-    want_result:
-      p:
-        fixed: true
-
-  - note: multilevel_partial_object_v1
-    data: {}
-    input:
-      nested:
-        app:
-          read: 1
-          write: 2
-        ops:
-          deploy: 3
-    modules:
-      - |
-        package test
-        import rego.v1
-
-        p[a][b] if {
-          some a, obj in input.nested
-          some b, _ in obj
-        }
-    query: data.test
-    want_result:
-      p:
-        app:
-          read: true
-          write: true
-        ops:
-          deploy: true
-
-  - note: constant_key_partial_object_explicit_value_v1
-    data: {}
-    input:
-      enabled: true
-    modules:
-      - |
-        package test
-        import rego.v1
-
-        p["fixed"] := 7 if {
-          input.enabled
-        }
-    query: data.test
-    want_result:
-      p:
-        fixed: 7
-
-  - note: multilevel_partial_object_explicit_value_v1
-    data: {}
-    input:
-      nested:
-        app:
-          read: 1
-          write: 2
-        ops:
-          deploy: 3
-    modules:
-      - |
-        package test
-        import rego.v1
-
-        p[a][b] := v if {
-          some a, obj in input.nested
-          some b, v in obj
-        }
-    query: data.test
-    want_result:
-      p:
-        app:
-          read: 1
-          write: 2
-        ops:
-          deploy: 3
-
-  - note: issue_712_reproducer_v0_partial_set
-    data: {}
-    input:
-      servers:
-        FOO: 1
-        BAR: 2
-        BAZ: 3
-    modules:
-      - |
-        package test
-        import future.keywords.in
-
-        violations[k] {
-          some k, _ in input.servers
-        }
-    query: data.test.violations
-    want_result:
-      set!: ["BAR", "BAZ", "FOO"]
-
-  - note: issue_712_reproducer_v1_partial_object
-    data: {}
-    input:
-      servers:
-        FOO: 1
-        BAR: 2
-        BAZ: 3
-    modules:
-      - |
-        package test
-        import rego.v1
-
-        violations[k] if {
-          some k, _ in input.servers
-        }
-    query: data.test.violations
-    want_result:
-      BAR: true
-      BAZ: true
-      FOO: true
-
-  - note: issue_712_reproducer_v1_contains_partial_set
-    data: {}
-    input:
-      servers:
-        FOO: 1
-        BAR: 2
-        BAZ: 3
-    modules:
-      - |
-        package test
-        import rego.v1
-
-        violations contains k if {
-          some k, _ in input.servers
-        }
-    query: data.test.violations
-    want_result:
-      set!: ["BAR", "BAZ", "FOO"]
--- a/tests/opa.rs
+++ b/tests/opa.rs
@@ -275,14 +275,6 @@ fn is_with_keyword_unsupported_error(err: &anyhow::Error) -> bool {
    })
 }

-fn is_partial_object_unsupported_error(err: &anyhow::Error) -> bool {
-    err.chain().any(|cause| {
-        let msg = cause.to_string();
-        msg.contains("partial object rules with constant keys are not yet supported")
-            || msg.contains("partial object rules with nested bracket keys are not yet supported")
-    })
-}
-
 fn maybe_verify_rvm_case(case: &TestCase, is_rego_v0_test: bool, actual: &Value) -> Result<()> {
    if case.note == "defaultkeyword/function with var arg, ref head query" {
        println!(
@@ -316,14 +308,6 @@ fn maybe_verify_rvm_case(case: &TestCase, is_rego_v0_test: bool, actual: &Value)
                return Ok(());
            }

-            if is_partial_object_unsupported_error(&err) {
-                println!(
-                    "    skipping RVM check for '{}' (partial object pattern unsupported)",
-                    case.note
-                );
-                return Ok(());
-            }
-
            return Err(err);
        }
    };
--- a/tests/rvm/rego/cases/default_rules.yaml
+++ b/tests/rvm/rego/cases/default_rules.yaml
@@ -48,18 +48,34 @@ cases:
    want_result: true

  - note: default_rule_with_object_key
-    skip: true  # TODO: Fix rule type classification for config["timeout"] - should be Complete, not PartialObject
    data: {}
+    input: {}
    modules:
      - |
        package test
+        import rego.v1
        default config["timeout"] := 30
-        config["timeout"] := 60 if {
-          false  # This will fail
+        config["timeout"] := val if {
+          val := input.val
        }
    query: data.test.config.timeout
    want_result: 30

+  - note: default_rule_with_object_key_override
+    data: {}
+    input:
+      val: 60
+    modules:
+      - |
+        package test
+        import rego.v1
+        default config["timeout"] := 30
+        config["timeout"] := val if {
+          val := input.val
+        }
+    query: data.test.config.timeout
+    want_result: 60
+
  - note: default_rule_complex_value
    data: {}
    modules:
--- a/tests/rvm/rego/cases/partial_object_rules.yaml
+++ b/tests/rvm/rego/cases/partial_object_rules.yaml
--- a/tests/rvm/vm/suites/object_operations.yaml
+++ b/tests/rvm/vm/suites/object_operations.yaml
@@ -6,9 +6,9 @@
 # Covers dynamic keys, collisions, non-string keys, and template validation

 cases:
-  - note: object_key_collision_overwrite
-    description: Setting same key twice should overwrite the value
-    example_rego: "{\"key\": 1, \"key\": 2}"
+  - note: object_key_collision_conflict
+    description: Setting same key twice with different values should raise a rule output conflict
+    example_rego: "p[\"key\"] = value { value := [1, 2][_] }"
    literals:
      - {}
      - "key"
@@ -26,9 +26,31 @@ cases:
      - "Load { dest: 2, literal_idx: 2 }"  # value 1
      - "ObjectSet { obj: 0, key: 1, value: 2 }"
      - "Load { dest: 3, literal_idx: 3 }"  # value 2
-      - "ObjectSet { obj: 0, key: 1, value: 3 }"  # Overwrite
+      - "ObjectSet { obj: 0, key: 1, value: 3 }"  # Conflict
      - "Return { value: 0 }"
-    want_result: {"key": 2}
+    want_error: "multiple outputs"
+
+  - note: object_key_duplicate_same_value
+    description: Setting same key twice with the same value should succeed
+    example_rego: "p[\"key\"] := 1 if { some _ in [0, 1] }"
+    literals:
+      - {}
+      - "key"
+      - 1
+    instruction_params:
+      object_create_params:
+        - dest: 0
+          template_literal_idx: 0
+          literal_key_fields: []
+          fields: []
+    instructions:
+      - "ObjectCreate { params_index: 0 }"
+      - "Load { dest: 1, literal_idx: 1 }"  # key
+      - "Load { dest: 2, literal_idx: 2 }"  # value
+      - "ObjectSet { obj: 0, key: 1, value: 2 }"
+      - "ObjectSet { obj: 0, key: 1, value: 2 }"
+      - "Return { value: 0 }"
+    want_result: {"key": 1}

  - note: object_dynamic_key_generation
    description: Generate object keys dynamically from loop iteration
Author	SHA1	Message	Date
copilot-swe-agent[bot]	eb6e156e8a	fix: cover outer-scope bracket key handling Agent-Logs-Url: https://github.com/microsoft/regorus/sessions/992f5462-7cc4-4e4f-bd7f-799308063765 Co-authored-by: anakrish <35780660+anakrish@users.noreply.github.com>	2026-05-07 03:08:59 +00:00
copilot-swe-agent[bot]	5ae1d8abf2	chore: clarify bracket-head rule semantics Agent-Logs-Url: https://github.com/microsoft/regorus/sessions/272a971a-ae52-45ae-8cb3-714e747599c4 Co-authored-by: anakrish <35780660+anakrish@users.noreply.github.com>	2026-05-06 22:31:09 +00:00
copilot-swe-agent[bot]	03c4275855	fix: classify constant-key bracket rules precisely Agent-Logs-Url: https://github.com/microsoft/regorus/sessions/272a971a-ae52-45ae-8cb3-714e747599c4 Co-authored-by: anakrish <35780660+anakrish@users.noreply.github.com>	2026-05-06 22:27:07 +00:00
copilot-swe-agent[bot]	78f226f957	fix: refine constant-key bracket rule handling Agent-Logs-Url: https://github.com/microsoft/regorus/sessions/272a971a-ae52-45ae-8cb3-714e747599c4 Co-authored-by: anakrish <35780660+anakrish@users.noreply.github.com>	2026-05-06 22:19:56 +00:00
copilot-swe-agent[bot]	bec159a580	test: align VM ObjectSet collision expectations Agent-Logs-Url: https://github.com/microsoft/regorus/sessions/34a4e1b3-d364-46c4-9998-b00780f5d339 Co-authored-by: anakrish <35780660+anakrish@users.noreply.github.com>	2026-05-06 19:38:42 +00:00
copilot-swe-agent[bot]	117671d959	fix: preserve all bindings for partial object iteration Agent-Logs-Url: https://github.com/microsoft/regorus/sessions/34a4e1b3-d364-46c4-9998-b00780f5d339 Co-authored-by: anakrish <35780660+anakrish@users.noreply.github.com>	2026-05-06 19:34:41 +00:00
copilot-swe-agent[bot]	8617c79da5	Initial plan	2026-05-06 19:25:36 +00:00