diff --git a/analyzer/ras-data/data/ras-data-p10-10.json b/analyzer/ras-data/data/ras-data-p10-10.json
index 0c50bb8..100f9f2 100644
--- a/analyzer/ras-data/data/ras-data-p10-10.json
+++ b/analyzer/ras-data/data/ras-data-p10-10.json
@@ -75,6 +75,8 @@
        "mcc6" : "pib/perv15/mc3/mcc0",
        "mcc7" : "pib/perv15/mc3/mcc1",
 
+       "nx0" : "pib/nx0",
+
        "omi0"  : "pib/perv12/mc0/mi0/mcc0/omi0",
        "omi1"  : "pib/perv12/mc0/mi0/mcc0/omi1",
        "omi2"  : "pib/perv12/mc0/mi0/mcc1/omi0",
@@ -917,6 +919,10 @@
         "pau6": [ { "type": "callout_unit", "name": "pau6", "priority": "MED", "guard": true } ],
         "pau7": [ { "type": "callout_unit", "name": "pau7", "priority": "MED", "guard": true } ],
 
+        "nx0": [
+            { "type": "callout_unit", "name": "nx0", "priority": "MED", "guard": true }
+        ],
+
         "rcs_osc_error_0": [
             { "type": "callout_clock", "name": "OSC_REF_CLOCK_0", "priority": "HIGH", "guard": true },
             { "type": "action", "name": "self_L" }
@@ -958,6 +964,7 @@
         "tod_error"      : [ { "type": "action", "name": "level2" } ],
         "sbe_vital_attn" : [ { "type": "action", "name": "level2" } ],
         "neighbor_core"  : [ { "type": "action", "name": "level2" } ],
+        "occ_interrupt"  : [ { "type": "action", "name": "level2" } ],
         "pig_interrupt"  : [ { "type": "action", "name": "level2" } ],
         "qme_interrupt"  : [ { "type": "action", "name": "level2" } ]
    },
@@ -1481,24 +1488,24 @@
          "27" : { "00" : "masked" }
       },
       "0cd3" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
+         "02" : { "00" : "self" },
          "03" : { "00" : "masked" },
          "04" : { "00" : "masked" },
          "05" : { "00" : "masked" },
          "06" : { "00" : "masked" },
          "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
+         "08" : { "00" : "self" },
          "09" : { "00" : "masked" },
          "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
+         "0b" : { "00" : "self" },
          "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
+         "0d" : { "00" : "self" },
          "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
+         "0f" : { "00" : "self" },
+         "10" : { "00" : "self" },
+         "11" : { "00" : "self" },
          "12" : { "00" : "masked" },
          "13" : { "00" : "masked" }
       },
@@ -2934,57 +2941,57 @@
          }
       },
       "31b3" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
+         "02" : { "00" : "self" },
+         "03" : { "00" : "self" },
+         "04" : { "00" : "self" },
+         "05" : { "00" : "self" },
+         "06" : { "00" : "self_M_level2_L" },
+         "07" : { "00" : "self_M_level2_L" },
+         "08" : { "00" : "self" },
+         "09" : { "00" : "self" },
          "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "0b" : { "00" : "self" },
+         "0c" : { "00" : "self" },
+         "0d" : { "00" : "self" },
+         "0e" : { "00" : "self" },
          "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
-         "16" : { "00" : "masked" },
+         "10" : { "00" : "self" },
+         "11" : { "00" : "self" },
+         "12" : { "00" : "self" },
+         "13" : { "00" : "self" },
+         "14" : { "00" : "self" },
+         "15" : { "00" : "self" },
+         "16" : { "00" : "self" },
          "17" : { "00" : "masked" },
-         "18" : { "00" : "masked" },
-         "19" : { "00" : "masked" },
-         "1a" : { "00" : "masked" },
-         "1b" : { "00" : "masked" },
-         "1c" : { "00" : "masked" },
+         "18" : { "00" : "self" },
+         "19" : { "00" : "self" },
+         "1a" : { "00" : "self" },
+         "1b" : { "00" : "self" },
+         "1c" : { "00" : "self" },
          "1d" : { "00" : "masked" },
          "1e" : { "00" : "masked" },
          "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
+         "20" : { "00" : "self" },
          "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
+         "22" : { "00" : "self" },
          "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
+         "24" : { "00" : "self" },
          "25" : { "00" : "masked" },
          "26" : { "00" : "masked" },
          "27" : { "00" : "masked" },
          "28" : { "00" : "masked" },
          "29" : { "00" : "masked" },
-         "2a" : { "00" : "masked" },
+         "2a" : { "00" : "self" },
          "2b" : { "00" : "masked" },
          "2c" : { "00" : "masked" },
          "2d" : { "00" : "masked" },
-         "2e" : { "00" : "masked" },
+         "2e" : { "00" : "self" },
          "2f" : { "00" : "masked" },
-         "30" : { "00" : "masked" },
+         "30" : { "00" : "self" },
          "31" : { "00" : "masked" },
-         "32" : { "00" : "masked" },
+         "32" : { "00" : "self" },
          "33" : { "00" : "masked" }
       },
       "32b1" : {
@@ -8693,46 +8700,46 @@
          }
       },
       "520c" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
+         "00" : { "00" : "nx0" },
+         "01" : { "00" : "nx0" },
          "02" : { "00" : "masked" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
+         "04" : { "00" : "nx0" },
+         "05" : { "00" : "nx0" },
+         "06" : { "00" : "nx0" },
+         "07" : { "00" : "nx0" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
+         "09" : { "00" : "nx0" },
+         "0a" : { "00" : "nx0" },
+         "0b" : { "00" : "nx0" },
+         "0c" : { "00" : "nx0" },
+         "0d" : { "00" : "nx0" },
          "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
+         "0f" : { "00" : "nx0" },
+         "10" : { "00" : "nx0" },
+         "11" : { "00" : "nx0" },
+         "12" : { "00" : "nx0" },
          "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
-         "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
-         "18" : { "00" : "masked" },
+         "14" : { "00" : "nx0" },
+         "15" : { "00" : "nx0" },
+         "16" : { "00" : "nx0" },
+         "17" : { "00" : "nx0" },
+         "18" : { "00" : "nx0" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
          "1b" : { "00" : "masked" },
          "1c" : { "00" : "masked" },
          "1d" : { "00" : "masked" },
          "1e" : { "00" : "masked" },
-         "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
+         "1f" : { "00" : "nx0" },
+         "20" : { "00" : "nx0" },
          "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
-         "25" : { "00" : "masked" },
-         "26" : { "00" : "masked" },
-         "27" : { "00" : "masked" },
+         "22" : { "00" : "nx0" },
+         "23" : { "00" : "nx0" },
+         "24" : { "00" : "nx0" },
+         "25" : { "00" : "nx0" },
+         "26" : { "00" : "nx0" },
+         "27" : { "00" : "nx0" },
          "28" : { "00" : "masked" },
          "29" : { "00" : "masked" },
          "2a" : { "00" : "masked" },
@@ -17073,67 +17080,67 @@
          }
       },
       "91d3" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
+         "02" : { "00" : "self" },
+         "03" : { "00" : "self" },
+         "04" : { "00" : "self" },
+         "05" : { "00" : "self" },
+         "06" : { "00" : "self" },
+         "07" : { "00" : "self" },
+         "08" : { "00" : "self" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "self" },
+         "0b" : { "00" : "self" },
+         "0c" : { "00" : "self" },
+         "0d" : { "00" : "self" },
+         "0e" : { "00" : "self" },
+         "0f" : { "00" : "self" },
+         "10" : { "00" : "self" },
+         "11" : { "00" : "self" },
+         "12" : { "00" : "self" },
+         "13" : { "00" : "self" },
+         "14" : { "00" : "self" },
+         "15" : { "00" : "self" },
          "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
-         "18" : { "00" : "masked" },
-         "19" : { "00" : "masked" },
-         "1a" : { "00" : "masked" },
+         "17" : { "00" : "self" },
+         "18" : { "00" : "self" },
+         "19" : { "00" : "self" },
+         "1a" : { "00" : "self_M_level2_L" },
          "1b" : { "00" : "masked" },
          "1c" : { "00" : "masked" },
          "1d" : { "00" : "masked" },
          "1e" : { "00" : "masked" },
          "1f" : { "00" : "masked" },
          "20" : { "00" : "masked" },
-         "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
-         "25" : { "00" : "masked" },
-         "26" : { "00" : "masked" },
-         "27" : { "00" : "masked" },
-         "28" : { "00" : "masked" },
+         "21" : { "00" : "self_M_level2_L" },
+         "22" : { "00" : "self_M_level2_L" },
+         "23" : { "00" : "self" },
+         "24" : { "00" : "self" },
+         "25" : { "00" : "self_M_level2_L" },
+         "26" : { "00" : "self" },
+         "27" : { "00" : "self" },
+         "28" : { "00" : "self" },
          "29" : { "00" : "masked" },
-         "2a" : { "00" : "masked" },
-         "2b" : { "00" : "masked" },
-         "2c" : { "00" : "masked" },
-         "2d" : { "00" : "masked" },
-         "2e" : { "00" : "masked" },
-         "2f" : { "00" : "masked" },
-         "30" : { "00" : "masked" },
-         "31" : { "00" : "masked" },
-         "32" : { "00" : "masked" },
+         "2a" : { "00" : "self" },
+         "2b" : { "00" : "self" },
+         "2c" : { "00" : "self" },
+         "2d" : { "00" : "self" },
+         "2e" : { "00" : "self" },
+         "2f" : { "00" : "self" },
+         "30" : { "00" : "self" },
+         "31" : { "00" : "self" },
+         "32" : { "00" : "self" },
          "33" : { "00" : "masked" },
          "34" : { "00" : "masked" },
          "35" : { "00" : "masked" },
          "36" : { "00" : "masked" },
-         "37" : { "00" : "masked" },
-         "38" : { "00" : "masked" },
-         "39" : { "00" : "masked" },
-         "3a" : { "00" : "masked" },
-         "3b" : { "00" : "masked" },
-         "3c" : { "00" : "masked" },
+         "37" : { "00" : "self" },
+         "38" : { "00" : "self" },
+         "39" : { "00" : "self" },
+         "3a" : { "00" : "level2_M_self_L" },
+         "3b" : { "00" : "level2_M_self_L" },
+         "3c" : { "00" : "level2_M_self_L" },
          "3d" : { "00" : "masked" },
          "3e" : { "00" : "masked" },
          "3f" : { "00" : "masked" }
@@ -21107,48 +21114,48 @@
          }
       },
       "d773" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "nx0" },
+         "01" : { "00" : "nx0" },
+         "02" : { "00" : "nx0" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
+         "04" : { "00" : "nx0" },
+         "05" : { "00" : "nx0" },
+         "06" : { "00" : "level2" },
+         "07" : { "00" : "nx0" },
+         "08" : { "00" : "nx0" },
+         "09" : { "00" : "nx0" },
+         "0a" : { "00" : "nx0" },
          "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
+         "0c" : { "00" : "nx0" },
          "0d" : { "00" : "masked" },
          "0e" : { "00" : "masked" },
          "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
-         "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
-         "18" : { "00" : "masked" },
+         "10" : { "00" : "nx0" },
+         "11" : { "00" : "nx0" },
+         "12" : { "00" : "nx0" },
+         "13" : { "00" : "nx0" },
+         "14" : { "00" : "nx0" },
+         "15" : { "00" : "level2" },
+         "16" : { "00" : "nx0" },
+         "17" : { "00" : "nx0" },
+         "18" : { "00" : "nx0" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
-         "1b" : { "00" : "masked" },
-         "1c" : { "00" : "masked" },
-         "1d" : { "00" : "masked" },
+         "1b" : { "00" : "nx0" },
+         "1c" : { "00" : "nx0" },
+         "1d" : { "00" : "nx0" },
          "1e" : { "00" : "masked" },
          "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
-         "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
-         "25" : { "00" : "masked" },
+         "20" : { "00" : "nx0" },
+         "21" : { "00" : "nx0" },
+         "22" : { "00" : "nx0" },
+         "23" : { "00" : "nx0" },
+         "24" : { "00" : "nx0" },
+         "25" : { "00" : "nx0" },
          "26" : { "00" : "masked" },
-         "27" : { "00" : "masked" },
+         "27" : { "00" : "nx0" },
          "28" : { "00" : "masked" },
-         "29" : { "00" : "masked" }
+         "29" : { "00" : "nx0" }
       },
       "d9ef" : {
          "00" : { "00" : "masked" },
@@ -21251,21 +21258,21 @@
          "06" : { "00" : "masked" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "self" },
          "0b" : { "00" : "masked" },
          "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
+         "0d" : { "00" : "occ_interrupt" },
+         "0e" : { "00" : "occ_interrupt" },
+         "0f" : { "00" : "self" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
          "12" : { "00" : "masked" },
          "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
-         "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
+         "14" : { "00" : "self" },
+         "15" : { "00" : "self" },
+         "16" : { "00" : "self" },
+         "17" : { "00" : "self" },
          "18" : { "00" : "masked" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
@@ -21274,32 +21281,32 @@
          "1d" : { "00" : "masked" },
          "1e" : { "00" : "masked" },
          "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
-         "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
+         "20" : { "00" : "self" },
+         "21" : { "00" : "self" },
+         "22" : { "00" : "self" },
+         "23" : { "00" : "occ_interrupt" },
+         "24" : { "00" : "self" },
          "25" : { "00" : "masked" },
          "26" : { "00" : "masked" },
          "27" : { "00" : "masked" },
          "28" : { "00" : "masked" },
          "29" : { "00" : "masked" },
-         "2a" : { "00" : "masked" },
-         "2b" : { "00" : "masked" },
-         "2c" : { "00" : "masked" },
-         "2d" : { "00" : "masked" },
-         "2e" : { "00" : "masked" },
-         "2f" : { "00" : "masked" },
-         "30" : { "00" : "masked" },
+         "2a" : { "00" : "self" },
+         "2b" : { "00" : "self" },
+         "2c" : { "00" : "occ_interrupt" },
+         "2d" : { "00" : "self" },
+         "2e" : { "00" : "self" },
+         "2f" : { "00" : "self" },
+         "30" : { "00" : "self" },
          "31" : { "00" : "masked" },
          "32" : { "00" : "masked" },
-         "33" : { "00" : "masked" },
-         "34" : { "00" : "masked" },
-         "35" : { "00" : "masked" },
-         "36" : { "00" : "masked" },
+         "33" : { "00" : "self" },
+         "34" : { "00" : "self" },
+         "35" : { "00" : "self" },
+         "36" : { "00" : "self" },
          "37" : { "00" : "masked" },
          "38" : { "00" : "masked" },
-         "39" : { "00" : "masked" },
+         "39" : { "00" : "self" },
          "3a" : { "00" : "masked" },
          "3b" : { "00" : "masked" },
          "3c" : { "00" : "masked" },
diff --git a/analyzer/ras-data/data/ras-data-p10-20.json b/analyzer/ras-data/data/ras-data-p10-20.json
index c760473..4102494 100644
--- a/analyzer/ras-data/data/ras-data-p10-20.json
+++ b/analyzer/ras-data/data/ras-data-p10-20.json
@@ -75,6 +75,8 @@
        "mcc6" : "pib/perv15/mc3/mcc0",
        "mcc7" : "pib/perv15/mc3/mcc1",
 
+       "nx0" : "pib/nx0",
+
        "omi0"  : "pib/perv12/mc0/mi0/mcc0/omi0",
        "omi1"  : "pib/perv12/mc0/mi0/mcc0/omi1",
        "omi2"  : "pib/perv12/mc0/mi0/mcc1/omi0",
@@ -917,6 +919,10 @@
         "pau6": [ { "type": "callout_unit", "name": "pau6", "priority": "MED", "guard": true } ],
         "pau7": [ { "type": "callout_unit", "name": "pau7", "priority": "MED", "guard": true } ],
 
+        "nx0": [
+            { "type": "callout_unit", "name": "nx0", "priority": "MED", "guard": true }
+        ],
+
         "rcs_osc_error_0": [
             { "type": "callout_clock", "name": "OSC_REF_CLOCK_0", "priority": "HIGH", "guard": true },
             { "type": "action", "name": "self_L" }
@@ -958,6 +964,7 @@
         "tod_error"      : [ { "type": "action", "name": "level2" } ],
         "sbe_vital_attn" : [ { "type": "action", "name": "level2" } ],
         "neighbor_core"  : [ { "type": "action", "name": "level2" } ],
+        "occ_interrupt"  : [ { "type": "action", "name": "level2" } ],
         "pig_interrupt"  : [ { "type": "action", "name": "level2" } ],
         "qme_interrupt"  : [ { "type": "action", "name": "level2" } ]
    },
@@ -1481,24 +1488,24 @@
          "27" : { "00" : "masked" }
       },
       "0cd3" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
+         "02" : { "00" : "self" },
          "03" : { "00" : "masked" },
          "04" : { "00" : "masked" },
          "05" : { "00" : "masked" },
          "06" : { "00" : "masked" },
          "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
+         "08" : { "00" : "self" },
          "09" : { "00" : "masked" },
          "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
+         "0b" : { "00" : "self" },
          "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
+         "0d" : { "00" : "self" },
          "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
+         "0f" : { "00" : "self" },
+         "10" : { "00" : "self" },
+         "11" : { "00" : "self" },
          "12" : { "00" : "masked" },
          "13" : { "00" : "masked" }
       },
@@ -2922,57 +2929,57 @@
          }
       },
       "31b3" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
+         "02" : { "00" : "self" },
+         "03" : { "00" : "self" },
+         "04" : { "00" : "self" },
+         "05" : { "00" : "self" },
+         "06" : { "00" : "self_M_level2_L" },
+         "07" : { "00" : "self_M_level2_L" },
+         "08" : { "00" : "self" },
+         "09" : { "00" : "self" },
          "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
+         "0b" : { "00" : "self" },
+         "0c" : { "00" : "self" },
+         "0d" : { "00" : "self" },
+         "0e" : { "00" : "self" },
          "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
-         "16" : { "00" : "masked" },
+         "10" : { "00" : "self" },
+         "11" : { "00" : "self" },
+         "12" : { "00" : "self" },
+         "13" : { "00" : "self" },
+         "14" : { "00" : "self" },
+         "15" : { "00" : "self" },
+         "16" : { "00" : "self" },
          "17" : { "00" : "masked" },
-         "18" : { "00" : "masked" },
-         "19" : { "00" : "masked" },
-         "1a" : { "00" : "masked" },
-         "1b" : { "00" : "masked" },
-         "1c" : { "00" : "masked" },
+         "18" : { "00" : "self" },
+         "19" : { "00" : "self" },
+         "1a" : { "00" : "self" },
+         "1b" : { "00" : "self" },
+         "1c" : { "00" : "self" },
          "1d" : { "00" : "masked" },
          "1e" : { "00" : "masked" },
          "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
+         "20" : { "00" : "self" },
          "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
+         "22" : { "00" : "self" },
          "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
+         "24" : { "00" : "self" },
          "25" : { "00" : "masked" },
          "26" : { "00" : "masked" },
          "27" : { "00" : "masked" },
          "28" : { "00" : "masked" },
          "29" : { "00" : "masked" },
-         "2a" : { "00" : "masked" },
+         "2a" : { "00" : "self" },
          "2b" : { "00" : "masked" },
          "2c" : { "00" : "masked" },
          "2d" : { "00" : "masked" },
-         "2e" : { "00" : "masked" },
+         "2e" : { "00" : "self" },
          "2f" : { "00" : "masked" },
-         "30" : { "00" : "masked" },
+         "30" : { "00" : "self" },
          "31" : { "00" : "masked" },
-         "32" : { "00" : "masked" },
+         "32" : { "00" : "self" },
          "33" : { "00" : "masked" }
       },
       "32b1" : {
@@ -8669,46 +8676,46 @@
          }
       },
       "520c" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
+         "00" : { "00" : "nx0" },
+         "01" : { "00" : "nx0" },
          "02" : { "00" : "masked" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
+         "04" : { "00" : "nx0" },
+         "05" : { "00" : "nx0" },
+         "06" : { "00" : "nx0" },
+         "07" : { "00" : "nx0" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
+         "09" : { "00" : "nx0" },
+         "0a" : { "00" : "nx0" },
+         "0b" : { "00" : "nx0" },
+         "0c" : { "00" : "nx0" },
+         "0d" : { "00" : "nx0" },
          "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
+         "0f" : { "00" : "nx0" },
+         "10" : { "00" : "nx0" },
+         "11" : { "00" : "nx0" },
+         "12" : { "00" : "nx0" },
          "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
-         "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
-         "18" : { "00" : "masked" },
+         "14" : { "00" : "nx0" },
+         "15" : { "00" : "nx0" },
+         "16" : { "00" : "nx0" },
+         "17" : { "00" : "nx0" },
+         "18" : { "00" : "nx0" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
          "1b" : { "00" : "masked" },
          "1c" : { "00" : "masked" },
          "1d" : { "00" : "masked" },
          "1e" : { "00" : "masked" },
-         "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
+         "1f" : { "00" : "nx0" },
+         "20" : { "00" : "nx0" },
          "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
-         "25" : { "00" : "masked" },
-         "26" : { "00" : "masked" },
-         "27" : { "00" : "masked" },
+         "22" : { "00" : "nx0" },
+         "23" : { "00" : "nx0" },
+         "24" : { "00" : "nx0" },
+         "25" : { "00" : "nx0" },
+         "26" : { "00" : "nx0" },
+         "27" : { "00" : "nx0" },
          "28" : { "00" : "masked" },
          "29" : { "00" : "masked" },
          "2a" : { "00" : "masked" },
@@ -17041,67 +17048,67 @@
          }
       },
       "91d3" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
-         "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
-         "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
+         "00" : { "00" : "self" },
+         "01" : { "00" : "self" },
+         "02" : { "00" : "self" },
+         "03" : { "00" : "self" },
+         "04" : { "00" : "self" },
+         "05" : { "00" : "self" },
+         "06" : { "00" : "self" },
+         "07" : { "00" : "self" },
+         "08" : { "00" : "self" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "self" },
+         "0b" : { "00" : "self" },
+         "0c" : { "00" : "self" },
+         "0d" : { "00" : "self" },
+         "0e" : { "00" : "self" },
+         "0f" : { "00" : "self" },
+         "10" : { "00" : "self" },
+         "11" : { "00" : "self" },
+         "12" : { "00" : "self" },
+         "13" : { "00" : "self" },
+         "14" : { "00" : "self" },
+         "15" : { "00" : "self" },
          "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
-         "18" : { "00" : "masked" },
-         "19" : { "00" : "masked" },
-         "1a" : { "00" : "masked" },
+         "17" : { "00" : "self" },
+         "18" : { "00" : "self" },
+         "19" : { "00" : "self" },
+         "1a" : { "00" : "self_M_level2_L" },
          "1b" : { "00" : "masked" },
          "1c" : { "00" : "masked" },
          "1d" : { "00" : "masked" },
          "1e" : { "00" : "masked" },
          "1f" : { "00" : "masked" },
          "20" : { "00" : "masked" },
-         "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
-         "25" : { "00" : "masked" },
-         "26" : { "00" : "masked" },
-         "27" : { "00" : "masked" },
-         "28" : { "00" : "masked" },
+         "21" : { "00" : "self_M_level2_L" },
+         "22" : { "00" : "self_M_level2_L" },
+         "23" : { "00" : "self" },
+         "24" : { "00" : "self" },
+         "25" : { "00" : "self_M_level2_L" },
+         "26" : { "00" : "self" },
+         "27" : { "00" : "self" },
+         "28" : { "00" : "self" },
          "29" : { "00" : "masked" },
-         "2a" : { "00" : "masked" },
-         "2b" : { "00" : "masked" },
-         "2c" : { "00" : "masked" },
-         "2d" : { "00" : "masked" },
-         "2e" : { "00" : "masked" },
-         "2f" : { "00" : "masked" },
-         "30" : { "00" : "masked" },
-         "31" : { "00" : "masked" },
-         "32" : { "00" : "masked" },
+         "2a" : { "00" : "self" },
+         "2b" : { "00" : "self" },
+         "2c" : { "00" : "self" },
+         "2d" : { "00" : "self" },
+         "2e" : { "00" : "self" },
+         "2f" : { "00" : "self" },
+         "30" : { "00" : "self" },
+         "31" : { "00" : "self" },
+         "32" : { "00" : "self" },
          "33" : { "00" : "masked" },
          "34" : { "00" : "masked" },
          "35" : { "00" : "masked" },
          "36" : { "00" : "masked" },
-         "37" : { "00" : "masked" },
-         "38" : { "00" : "masked" },
-         "39" : { "00" : "masked" },
-         "3a" : { "00" : "masked" },
-         "3b" : { "00" : "masked" },
-         "3c" : { "00" : "masked" },
+         "37" : { "00" : "self" },
+         "38" : { "00" : "self" },
+         "39" : { "00" : "self" },
+         "3a" : { "00" : "level2_M_self_L" },
+         "3b" : { "00" : "level2_M_self_L" },
+         "3c" : { "00" : "level2_M_self_L" },
          "3d" : { "00" : "masked" },
          "3e" : { "00" : "masked" },
          "3f" : { "00" : "masked" }
@@ -20943,48 +20950,48 @@
          }
       },
       "d773" : {
-         "00" : { "00" : "masked" },
-         "01" : { "00" : "masked" },
-         "02" : { "00" : "masked" },
+         "00" : { "00" : "nx0" },
+         "01" : { "00" : "nx0" },
+         "02" : { "00" : "nx0" },
          "03" : { "00" : "masked" },
-         "04" : { "00" : "masked" },
-         "05" : { "00" : "masked" },
-         "06" : { "00" : "masked" },
-         "07" : { "00" : "masked" },
-         "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
+         "04" : { "00" : "nx0" },
+         "05" : { "00" : "nx0" },
+         "06" : { "00" : "level2" },
+         "07" : { "00" : "nx0" },
+         "08" : { "00" : "nx0" },
+         "09" : { "00" : "nx0" },
+         "0a" : { "00" : "nx0" },
          "0b" : { "00" : "masked" },
-         "0c" : { "00" : "masked" },
+         "0c" : { "00" : "nx0" },
          "0d" : { "00" : "masked" },
          "0e" : { "00" : "masked" },
          "0f" : { "00" : "masked" },
-         "10" : { "00" : "masked" },
-         "11" : { "00" : "masked" },
-         "12" : { "00" : "masked" },
-         "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
-         "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
-         "18" : { "00" : "masked" },
+         "10" : { "00" : "nx0" },
+         "11" : { "00" : "nx0" },
+         "12" : { "00" : "nx0" },
+         "13" : { "00" : "nx0" },
+         "14" : { "00" : "nx0" },
+         "15" : { "00" : "level2" },
+         "16" : { "00" : "nx0" },
+         "17" : { "00" : "nx0" },
+         "18" : { "00" : "nx0" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
-         "1b" : { "00" : "masked" },
-         "1c" : { "00" : "masked" },
-         "1d" : { "00" : "masked" },
+         "1b" : { "00" : "nx0" },
+         "1c" : { "00" : "nx0" },
+         "1d" : { "00" : "nx0" },
          "1e" : { "00" : "masked" },
          "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
-         "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
-         "25" : { "00" : "masked" },
+         "20" : { "00" : "nx0" },
+         "21" : { "00" : "nx0" },
+         "22" : { "00" : "nx0" },
+         "23" : { "00" : "nx0" },
+         "24" : { "00" : "nx0" },
+         "25" : { "00" : "nx0" },
          "26" : { "00" : "masked" },
-         "27" : { "00" : "masked" },
+         "27" : { "00" : "nx0" },
          "28" : { "00" : "masked" },
-         "29" : { "00" : "masked" }
+         "29" : { "00" : "nx0" }
       },
       "d9ef" : {
          "00" : { "00" : "masked" },
@@ -21087,21 +21094,21 @@
          "06" : { "00" : "masked" },
          "07" : { "00" : "masked" },
          "08" : { "00" : "masked" },
-         "09" : { "00" : "masked" },
-         "0a" : { "00" : "masked" },
+         "09" : { "00" : "self" },
+         "0a" : { "00" : "self" },
          "0b" : { "00" : "masked" },
          "0c" : { "00" : "masked" },
-         "0d" : { "00" : "masked" },
-         "0e" : { "00" : "masked" },
-         "0f" : { "00" : "masked" },
+         "0d" : { "00" : "occ_interrupt" },
+         "0e" : { "00" : "occ_interrupt" },
+         "0f" : { "00" : "self" },
          "10" : { "00" : "masked" },
          "11" : { "00" : "masked" },
          "12" : { "00" : "masked" },
          "13" : { "00" : "masked" },
-         "14" : { "00" : "masked" },
-         "15" : { "00" : "masked" },
-         "16" : { "00" : "masked" },
-         "17" : { "00" : "masked" },
+         "14" : { "00" : "self" },
+         "15" : { "00" : "self" },
+         "16" : { "00" : "self" },
+         "17" : { "00" : "self" },
          "18" : { "00" : "masked" },
          "19" : { "00" : "masked" },
          "1a" : { "00" : "masked" },
@@ -21110,32 +21117,32 @@
          "1d" : { "00" : "masked" },
          "1e" : { "00" : "masked" },
          "1f" : { "00" : "masked" },
-         "20" : { "00" : "masked" },
-         "21" : { "00" : "masked" },
-         "22" : { "00" : "masked" },
-         "23" : { "00" : "masked" },
-         "24" : { "00" : "masked" },
+         "20" : { "00" : "self" },
+         "21" : { "00" : "self" },
+         "22" : { "00" : "self" },
+         "23" : { "00" : "occ_interrupt" },
+         "24" : { "00" : "self" },
          "25" : { "00" : "masked" },
          "26" : { "00" : "masked" },
          "27" : { "00" : "masked" },
          "28" : { "00" : "masked" },
          "29" : { "00" : "masked" },
-         "2a" : { "00" : "masked" },
-         "2b" : { "00" : "masked" },
-         "2c" : { "00" : "masked" },
-         "2d" : { "00" : "masked" },
-         "2e" : { "00" : "masked" },
-         "2f" : { "00" : "masked" },
-         "30" : { "00" : "masked" },
+         "2a" : { "00" : "self" },
+         "2b" : { "00" : "self" },
+         "2c" : { "00" : "occ_interrupt" },
+         "2d" : { "00" : "self" },
+         "2e" : { "00" : "self" },
+         "2f" : { "00" : "self" },
+         "30" : { "00" : "self" },
          "31" : { "00" : "masked" },
          "32" : { "00" : "masked" },
-         "33" : { "00" : "masked" },
-         "34" : { "00" : "masked" },
-         "35" : { "00" : "masked" },
-         "36" : { "00" : "masked" },
+         "33" : { "00" : "self" },
+         "34" : { "00" : "self" },
+         "35" : { "00" : "self" },
+         "36" : { "00" : "self" },
          "37" : { "00" : "masked" },
          "38" : { "00" : "masked" },
-         "39" : { "00" : "masked" },
+         "39" : { "00" : "self" },
          "3a" : { "00" : "masked" },
          "3b" : { "00" : "masked" },
          "3c" : { "00" : "masked" },