diff --git a/examples/output-demo-pharma-mx/bom-spec.yaml b/examples/output-demo-pharma-mx/bom-spec.yaml
index d1dbb71..91fbc20 100644
--- a/examples/output-demo-pharma-mx/bom-spec.yaml
+++ b/examples/output-demo-pharma-mx/bom-spec.yaml
@@ -1,5 +1,6 @@
-# Prompt 13: BOM generator
-# ExaCS X11M Half Rack + ADB-S + networking + security
+# OCI Deal Accelerator — BOM Spec
+# Demo: PharmaCorp Mexico — ExaCS X11M + networking + security
+# SKUs verified against kb/pricing/oci-sku-catalog.yaml
 
 metadata:
   customer: "PharmaCorp Mexico"
@@ -8,64 +9,134 @@ metadata:
   currency: "USD"
   contract_months: 12
   discount_pct: 0.45
-  notes: "ExaCS BYOL — customer has existing Oracle DB EE licenses"
+  notes: "ExaCS BYOL — customer has existing Oracle DB EE licenses with active support"
 
 line_items:
-  # ExaCS Production — Queretaro
-  - category: "Exadata Cloud Service"
-    product: "ExaCS X11M Half Rack — DB Server"
-    sku: "B92459"
-    qty: 4
-    unit: "OCPU per hour"
+  # ExaCS X11M — DB Servers (Queretaro Production)
+  - category: "Exadata Cloud Infrastructure"
+    product: "ExaCS X11M DB Server"
+    sku: "B110627"
+    qty: 2
+    unit: "Hosted Environment Per Hour"
     hours_units: 744
     months: 12
-    notes: "4 DB servers, 128 ECPUs each, BYOL"
+    notes: "2 DB servers for Quarter Rack — Queretaro (Prod)"
 
-  - category: "Exadata Cloud Service"
-    product: "ExaCS X11M Half Rack — Storage Server"
-    sku: "B92460"
-    qty: 6
-    unit: "per hour"
+  # ExaCS X11M — Storage Servers (Queretaro Production)
+  - category: "Exadata Cloud Infrastructure"
+    product: "ExaCS X11M Storage Server"
+    sku: "B110629"
+    qty: 3
+    unit: "Hosted Environment Per Hour"
     hours_units: 744
     months: 12
-    notes: "6 storage servers"
+    notes: "3 storage servers — Quarter Rack minimum"
 
-  # ADB-S
+  # ExaCS X11M — ECPU BYOL (Queretaro)
+  - category: "Exadata Cloud Infrastructure"
+    product: "ExaCS X11M ECPU BYOL"
+    sku: "B110632"
+    qty: 128
+    unit: "ECPU Per Hour"
+    hours_units: 744
+    months: 12
+    notes: "128 ECPUs BYOL — EBS + SAP + DW"
+
+  # ExaCS X11M — DB Servers (Sao Paulo DR Standby)
+  - category: "Exadata Cloud Infrastructure"
+    product: "ExaCS X11M DB Server (DR)"
+    sku: "B110627"
+    qty: 2
+    unit: "Hosted Environment Per Hour"
+    hours_units: 744
+    months: 12
+    notes: "2 DB servers — Sao Paulo (DR Standby)"
+
+  # ExaCS X11M — Storage Servers (Sao Paulo DR)
+  - category: "Exadata Cloud Infrastructure"
+    product: "ExaCS X11M Storage Server (DR)"
+    sku: "B110629"
+    qty: 3
+    unit: "Hosted Environment Per Hour"
+    hours_units: 744
+    months: 12
+    notes: "3 storage servers — DR Standby"
+
+  # ExaCS X11M — ECPU BYOL (Sao Paulo DR)
+  - category: "Exadata Cloud Infrastructure"
+    product: "ExaCS X11M ECPU BYOL (DR)"
+    sku: "B110632"
+    qty: 128
+    unit: "ECPU Per Hour"
+    hours_units: 744
+    months: 12
+    notes: "128 ECPUs BYOL — Data Guard standby"
+
+  # ADB-S for DW migration (Phase 2)
   - category: "Autonomous Database"
-    product: "ADB-S Serverless ECPU"
-    sku: "B97472"
-    qty: 32
-    unit: "ECPU per hour"
+    product: "ADB-S ECPU BYOL"
+    sku: "B95703"
+    qty: 16
+    unit: "ECPU Per Hour"
     hours_units: 744
     months: 12
-    notes: "32 ECPU for DW migration (Phase 2)"
+    notes: "16 ECPU for DW migration to ADB-S (optional Phase 2)"
 
-  # Storage
-  - category: "Block Storage"
-    product: "Block Volume Performance Units"
-    sku: "B91628"
-    qty: 50000
-    unit: "GB per month"
+  # ADB-S Storage
+  - category: "Autonomous Database"
+    product: "ADB-S Storage (ATP)"
+    sku: "B95706"
+    qty: 2000
+    unit: "Gigabyte Storage Capacity Per Month"
     hours_units: 1
     months: 12
-    notes: "50TB block storage"
+    notes: "2TB storage for DW"
 
-  # Networking
+  # FastConnect 10Gbps Dual
   - category: "Networking"
-    product: "FastConnect 10Gbps"
-    sku: "B91960"
-    qty: 2
-    unit: "port per hour"
+    product: "FastConnect 10 Gbps (Primary)"
+    sku: "B88326"
+    qty: 1
+    unit: "Port Hour"
     hours_units: 744
     months: 12
-    notes: "Dual 10Gbps circuits"
+    notes: "Primary circuit — Mexico City to Queretaro"
 
-  # Security
+  - category: "Networking"
+    product: "FastConnect 10 Gbps (Redundant)"
+    sku: "B88326"
+    qty: 1
+    unit: "Port Hour"
+    hours_units: 744
+    months: 12
+    notes: "Redundant circuit — Mexico City to Queretaro"
+
+  # Object Storage for RMAN backups
+  - category: "Storage"
+    product: "Object Storage"
+    sku: "B91628"
+    qty: 50000
+    unit: "Gigabyte Storage Capacity Per Month"
+    hours_units: 1
+    months: 12
+    notes: "50TB for RMAN backups (DW + EBS)"
+
+  # Block Volume
+  - category: "Storage"
+    product: "Block Volume Storage"
+    sku: "B91961"
+    qty: 10000
+    unit: "Gigabyte Storage Capacity Per Month"
+    hours_units: 1
+    months: 12
+    notes: "10TB additional block storage"
+
+  # OCI Vault
   - category: "Security"
-    product: "OCI Vault — Key Management"
-    sku: "B92098"
+    product: "OCI Vault Key Versions"
+    sku: "B92092"
     qty: 10
-    unit: "key version per month"
+    unit: "Key Version Per Month"
     hours_units: 1
     months: 12
     notes: "TDE keys for 3 databases + DR + backups"
diff --git a/examples/output-demo-pharma-mx/business-case-spec.yaml b/examples/output-demo-pharma-mx/business-case-spec.yaml
index 753d1a3..eb68377 100644
--- a/examples/output-demo-pharma-mx/business-case-spec.yaml
+++ b/examples/output-demo-pharma-mx/business-case-spec.yaml
@@ -1,5 +1,6 @@
 # OCI Deal Accelerator — Business Case
 # Demo: PharmaCorp Mexico — ExaCS migration from on-prem Exadata X6
+# Follows exact schema expected by oci_bizcase_gen.py
 
 business_case:
   customer_name: "PharmaCorp Mexico"
@@ -12,118 +13,125 @@ business_case:
     company into 5 more years of on-prem operations with no DR capability. Migration
     to OCI ExaCS X11M reduces annual infrastructure costs by 61% ($1.75M over 3 years),
     adds cross-region DR (RPO<15min, RTO<1h), and resolves the pending SOX audit
-    finding on automated patching — all while eliminating data center costs.
+    finding on automated patching.
 
   drivers:
     primary: "hardware_refresh_avoidance"
     urgency: "HW refresh due in 6 months — must decide now or commit $1.8M"
     cost_of_inaction:
-      financial: "$1.8M HW refresh + $300K/yr support + $80K/yr DC costs = $2.88M over 3yr"
-      risk: "No DR today — single site, single point of failure for EBS production"
-      compliance: "SOX audit finding: manual quarterly patching is non-compliant"
+      financial: "$2.88M over 3yr: $1.8M HW refresh + $300K/yr support + $80K/yr DC costs"
+      operational: "No DR today — single site, single point of failure for EBS production"
+      strategic: "SOX audit finding pending: manual quarterly patching is non-compliant"
 
-  tco_comparison:
+  tco:
+    horizon_years: 3
     current_state:
-      description: "On-premises Exadata X6 with hardware refresh"
-      line_items:
-        - item: "Hardware Refresh (Exadata X8M)"
-          year_1: 1800000
-          year_2: 0
-          year_3: 0
-          notes: "One-time CapEx"
-        - item: "Annual Support & Maintenance"
-          year_1: 220000
-          year_2: 220000
-          year_3: 220000
-        - item: "Data Center (power, cooling, space)"
-          year_1: 80000
-          year_2: 80000
-          year_3: 80000
-        - item: "DBA Operations (patching)"
-          year_1: 60000
-          year_2: 60000
-          year_3: 60000
-        - item: "DR Infrastructure"
-          year_1: 0
-          year_2: 0
-          year_3: 0
-          notes: "No DR — risk accepted"
-      total_3yr: 2880000
+      annual_infrastructure: 600000
+      annual_licensing: 220000
+      annual_operations: 60000
+      annual_downtime_cost: 50000
+      annual_compliance_cost: 30000
+      breakdown:
+        - item: "Exadata X6 depreciation + refresh amortization"
+          annual: 600000
+        - item: "Oracle DB EE Support & Maintenance"
+          annual: 220000
+        - item: "DBA patching + infra management (part-time)"
+          annual: 60000
+        - item: "Data center (power, cooling, space)"
+          annual: 80000
 
     proposed_oci:
-      description: "OCI ExaCS X11M with Data Guard DR"
-      line_items:
+      migration_one_time: 50000
+      annual_cloud_consumption: 278400
+      annual_licensing: 0
+      annual_operations: 20000
+      annual_downtime_cost: 0
+      annual_compliance_cost: 0
+      breakdown:
         - item: "ExaCS X11M Queretaro (Prod, BYOL)"
-          year_1: 98400
-          year_2: 98400
-          year_3: 98400
-          notes: "$8,200/mo"
-        - item: "ExaCS X11M Sao Paulo (DR, BYOL)"
-          year_1: 98400
-          year_2: 98400
-          year_3: 98400
-          notes: "$8,200/mo — Data Guard standby"
+          annual: 98400
+        - item: "ExaCS X11M Sao Paulo (DR Standby, BYOL)"
+          annual: 98400
         - item: "FastConnect 10Gbps Dual"
-          year_1: 36720
-          year_2: 36720
-          year_3: 36720
-          notes: "$3,060/mo"
+          annual: 36720
         - item: "OCI Vault + Monitoring + Storage"
-          year_1: 30000
-          year_2: 30000
-          year_3: 30000
-          notes: "$2,500/mo"
-        - item: "Migration (one-time)"
-          year_1: 50000
-          year_2: 0
-          year_3: 0
-          notes: "ZDM + Data Guard setup + testing"
-      total_3yr: 1130400
+          annual: 30000
+        - item: "Reduced DBA operations (automated patching)"
+          annual: 20000
+        - item: "Migration project (one-time, amortized Y1)"
+          annual: 50000
 
-    savings_3yr: 1749600
-    savings_pct: 61
+    savings:
+      annual: 661600
+      three_year: 1749600
+      pct: 61
 
   roi:
-    investment: 50000
-    annual_savings: 583200
+    three_year_roi_pct: 3400
     payback_months: 1
-    three_year_roi: "3,400%"
+    total_investment: 50000
+    annual_net_benefit: 661600
+    notes: >
+      ROI based on 3-year TCO comparison. 1-month payback driven by immediate
+      elimination of HW refresh commitment ($1.8M avoided). Conservative — does
+      not include productivity gains from automated patching or DR risk reduction.
 
   value_drivers:
-    - driver: "Cost Avoidance"
-      impact: "$1.75M saved over 3 years vs HW refresh"
-      evidence: "BYOL pricing + elimination of DC costs + automated patching"
-    - driver: "Risk Reduction"
-      impact: "Cross-region DR where none exists today"
-      evidence: "RPO<15min, RTO<1h with Data Guard + FSDR"
-    - driver: "Compliance"
-      impact: "SOX audit finding resolved"
-      evidence: "ExaCS automated patching + OCI Audit + Vault for key management"
-    - driver: "Operational Agility"
-      impact: "DBA freed from patching + infrastructure management"
-      evidence: "Oracle-managed ExaCS infrastructure, automated backups"
+    - category: "Cost Avoidance"
+      driver: "Avoid $1.8M hardware refresh + eliminate DC costs"
+      quantification: "$1.75M saved over 3 years (61% reduction)"
+
+    - category: "Risk Reduction"
+      driver: "Cross-region DR where none exists today"
+      quantification: "RPO<15min, RTO<1h with Data Guard + FSDR"
+
+    - category: "Compliance"
+      driver: "SOX audit finding resolved with automated patching"
+      quantification: "ExaCS auto-patching + OCI Audit + Vault key management"
+
+    - category: "Operational Efficiency"
+      driver: "DBA freed from manual patching + infrastructure management"
+      quantification: "60% reduction in DBA time allocated to patching"
 
   risks:
     migration_risks:
-      - risk: "EBS customizations require testing"
-        mitigation: "Pre-Prod testing in Phase 2 before cutover"
+      - risk: "EBS R12 customizations may require OS-level changes post-migration"
+        probability: "Medium"
+        impact: "Medium"
+        mitigation: "Inventory all customizations pre-migration; test in Pre-Prod"
+
       - risk: "FastConnect provisioning delay (partner-dependent)"
-        mitigation: "Start in week 1; IPSec VPN as interim backup"
+        probability: "Medium"
+        impact: "Low"
+        mitigation: "Start in Phase 1 week 1; IPSec VPN as interim backup"
+
       - risk: "HW refresh deadline pressure (6 months)"
-        mitigation: "16-week migration plan fits within window"
+        probability: "High"
+        impact: "High"
+        mitigation: "16-week migration plan fits within window with margin"
+
     do_nothing_risks:
-      - risk: "No DR — single site, single point of failure for EBS"
-        mitigation: "Cannot be mitigated without investment"
+      - risk: "No DR — single site, single point of failure for EBS production"
+        probability: "High"
+        impact: "Critical"
+        mitigation: "Cannot be mitigated without infrastructure investment"
+
       - risk: "SOX audit finding remains unresolved (manual patching)"
+        probability: "High"
+        impact: "High"
         mitigation: "Remediation requires automated patching — on-prem can't deliver"
-      - risk: "$1.8M HW refresh locks in 5 more years of on-prem"
-        mitigation: "Sunk cost — no cloud migration ROI for 5+ years"
+
+      - risk: "$1.8M HW refresh locks in 5 more years of on-prem with no cloud ROI"
+        probability: "High"
+        impact: "High"
+        mitigation: "Sunk cost — delays any cloud migration benefit for 5+ years"
 
   recommendation:
     summary: >
       Proceed with OCI ExaCS migration. 61% cost reduction over 3 years ($1.75M saved),
       cross-region DR capability, and SOX compliance resolution. The alternative
-      (HW refresh) costs $1.75M more and leaves DR + compliance gaps unresolved.
+      (HW refresh at $1.8M) costs more and leaves DR + compliance gaps unresolved.
     next_steps:
       - "Board approval with TCO presentation — May 2026"
       - "Provision OCI tenancy + ExaCS in Queretaro — June 2026"
@@ -134,18 +142,27 @@ business_case:
   roadmap:
     total_duration: "16 weeks (May — September 2026)"
     phases:
-      - phase: "Board Approval"
-        timeline: "May 2026"
-        key_action: "Present TCO + risk analysis to board"
-      - phase: "Foundation (networking + ExaCS)"
-        timeline: "June 2026 (4 weeks)"
-        key_action: "Provision OCI tenancy, ExaCS, FastConnect"
-      - phase: "EBS Migration"
-        timeline: "July 2026 (6 weeks)"
-        key_action: "Migrate EBS R12 with ZDM, configure Data Guard"
-      - phase: "SAP + DW Migration"
-        timeline: "August 2026 (4 weeks)"
-        key_action: "Migrate remaining databases"
-      - phase: "Cutover + Decommission"
-        timeline: "September 2026 (2 weeks)"
-        key_action: "Production cutover, decommission Exadata X6"
+      - name: "Board Approval"
+        duration: "2 weeks"
+        investment: 0
+        description: "Present TCO + risk analysis to board"
+
+      - name: "Foundation (networking + ExaCS)"
+        duration: "4 weeks"
+        investment: 15000
+        description: "Provision OCI tenancy, ExaCS, FastConnect"
+
+      - name: "EBS Migration + Data Guard"
+        duration: "6 weeks"
+        investment: 25000
+        description: "Migrate EBS R12 with ZDM, configure Data Guard to Sao Paulo"
+
+      - name: "SAP + DW Migration"
+        duration: "4 weeks"
+        investment: 10000
+        description: "Migrate remaining databases, RMAN backup for DW"
+
+      - name: "Cutover + Decommission"
+        duration: "2 weeks"
+        investment: 0
+        description: "Production cutover, decommission Exadata X6"
diff --git a/examples/output-demo-pharma-mx/opt01-architecture-proposal.pptx b/examples/output-demo-pharma-mx/opt01-architecture-proposal.pptx
index 8929e3c..bbc796f 100644
Binary files a/examples/output-demo-pharma-mx/opt01-architecture-proposal.pptx and b/examples/output-demo-pharma-mx/opt01-architecture-proposal.pptx differ
diff --git a/examples/output-demo-pharma-mx/opt08-business-case.pptx b/examples/output-demo-pharma-mx/opt08-business-case.pptx
index c1f1178..4a736c6 100644
Binary files a/examples/output-demo-pharma-mx/opt08-business-case.pptx and b/examples/output-demo-pharma-mx/opt08-business-case.pptx differ
diff --git a/examples/output-demo-pharma-mx/opt14-bom-appca.xlsx b/examples/output-demo-pharma-mx/opt14-bom-appca.xlsx
index 5f71733..97ee370 100644
Binary files a/examples/output-demo-pharma-mx/opt14-bom-appca.xlsx and b/examples/output-demo-pharma-mx/opt14-bom-appca.xlsx differ