diff --git a/xml/explorer/node_ocmb_lfir.xml b/xml/explorer/node_ocmb_lfir.xml
index 4c8c1a1..639cc0e 100644
--- a/xml/explorer/node_ocmb_lfir.xml
+++ b/xml/explorer/node_ocmb_lfir.xml
@@ -7,6 +7,52 @@
         <action attn_type="RE"  config="01" />
     </local_fir>
 
+    <!--
+        These registers are on the MicroChip side of Explorer and are not in
+        the SCOM def.
+    -->
+
+    <register name="ADSP_PCBI">
+        <instance reg_inst="0" addr="0x00200860" />
+        <instance reg_inst="1" addr="0x00201860" />
+        <instance reg_inst="2" addr="0x00202860" />
+        <instance reg_inst="3" addr="0x00203860" />
+        <instance reg_inst="4" addr="0x00204860" />
+        <instance reg_inst="5" addr="0x00205860" />
+        <instance reg_inst="6" addr="0x00206860" />
+        <instance reg_inst="7" addr="0x00207860" />
+    </register>
+
+    <register name="CSU_PCBI">
+        <instance reg_inst="0" addr="0x002000B0" />
+        <instance reg_inst="1" addr="0x002010B0" />
+        <instance reg_inst="2" addr="0x002020B0" />
+        <instance reg_inst="3" addr="0x002030B0" />
+        <instance reg_inst="4" addr="0x002040B0" />
+        <instance reg_inst="5" addr="0x002050B0" />
+        <instance reg_inst="6" addr="0x002060B0" />
+        <instance reg_inst="7" addr="0x002070B0" />
+    </register>
+
+    <capture_group node_inst="0">
+        <capture_register reg_name="ADSP_PCBI" reg_inst="0" />
+        <capture_register reg_name="ADSP_PCBI" reg_inst="1" />
+        <capture_register reg_name="ADSP_PCBI" reg_inst="2" />
+        <capture_register reg_name="ADSP_PCBI" reg_inst="3" />
+        <capture_register reg_name="ADSP_PCBI" reg_inst="4" />
+        <capture_register reg_name="ADSP_PCBI" reg_inst="5" />
+        <capture_register reg_name="ADSP_PCBI" reg_inst="6" />
+        <capture_register reg_name="ADSP_PCBI" reg_inst="7" />
+        <capture_register reg_name="CSU_PCBI"  reg_inst="0" />
+        <capture_register reg_name="CSU_PCBI"  reg_inst="1" />
+        <capture_register reg_name="CSU_PCBI"  reg_inst="2" />
+        <capture_register reg_name="CSU_PCBI"  reg_inst="3" />
+        <capture_register reg_name="CSU_PCBI"  reg_inst="4" />
+        <capture_register reg_name="CSU_PCBI"  reg_inst="5" />
+        <capture_register reg_name="CSU_PCBI"  reg_inst="6" />
+        <capture_register reg_name="CSU_PCBI"  reg_inst="7" />
+    </capture_group>
+
     <bit pos= "0"   >CFIR access PCB error</bit>
     <bit pos= "1"   >CFIR internal parity error</bit>
     <bit pos= "2"   >LFIR internal parity error</bit>
@@ -26,19 +72,23 @@
     <bit pos="24"   >early power off warning</bit>
     <bit pos="25"   >TOP fatal interrupts</bit>
     <bit pos="26"   >TOP non fatal interrupts</bit>
-    <bit pos="27:34">Interrupt from OPSe to OCMB</bit>
+    <bit pos="27:30">Interrupt from OPSe to OCMB</bit>
+    <bit pos="31"   >SerDes continuous calibration failure</bit>
+    <bit pos="32"   >Firmware Assert or CPU Exception</bit>
+    <bit pos="33"   >Extended error information ready</bit>
+    <bit pos="34"   >Interrupt from OPSe to OCMB</bit>
     <bit pos="35"   >DDR thermal event</bit>
     <bit pos="36"   >DDR4 PHY fatal</bit>
     <bit pos="37"   >DDR4 PHY non fatal</bit>
     <bit pos="38"   >DDR4 PHY interrupt</bit>
-    <bit pos="39" child_node="OCMB_LFIR_FFDC_FOXHOUND" node_inst="7">foxhound fatal lane 7</bit>
-    <bit pos="40" child_node="OCMB_LFIR_FFDC_FOXHOUND" node_inst="6">foxhound fatal lane 6</bit>
-    <bit pos="41" child_node="OCMB_LFIR_FFDC_FOXHOUND" node_inst="5">foxhound fatal lane 5</bit>
-    <bit pos="42" child_node="OCMB_LFIR_FFDC_FOXHOUND" node_inst="4">foxhound fatal lane 4</bit>
-    <bit pos="43" child_node="OCMB_LFIR_FFDC_FOXHOUND" node_inst="3">foxhound fatal lane 3</bit>
-    <bit pos="44" child_node="OCMB_LFIR_FFDC_FOXHOUND" node_inst="2">foxhound fatal lane 2</bit>
-    <bit pos="45" child_node="OCMB_LFIR_FFDC_FOXHOUND" node_inst="1">foxhound fatal lane 1</bit>
-    <bit pos="46" child_node="OCMB_LFIR_FFDC_FOXHOUND" node_inst="0">foxhound fatal lane 0</bit>
+    <bit pos="39"   >foxhound fatal lane 7</bit>
+    <bit pos="40"   >foxhound fatal lane 6</bit>
+    <bit pos="41"   >foxhound fatal lane 5</bit>
+    <bit pos="42"   >foxhound fatal lane 4</bit>
+    <bit pos="43"   >foxhound fatal lane 3</bit>
+    <bit pos="44"   >foxhound fatal lane 2</bit>
+    <bit pos="45"   >foxhound fatal lane 1</bit>
+    <bit pos="46"   >foxhound fatal lane 0</bit>
     <bit pos="47:54">foxhound non fatal</bit>
     <bit pos="55:62">foxhound serdes interrupt</bit>
     <bit pos="63"   >GIF2PCB parity error on FSM or Registers</bit>
diff --git a/xml/explorer/node_ocmb_lfir_ffdc_foxhound.xml b/xml/explorer/node_ocmb_lfir_ffdc_foxhound.xml
deleted file mode 100644
index 531c9ff..0000000
--- a/xml/explorer/node_ocmb_lfir_ffdc_foxhound.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node name="OCMB_LFIR_FFDC_FOXHOUND" model_ec="EXPLORER_11,EXPLORER_20" reg_type="SCOM">
-
-    <!--
-        These registers are on the MicroChip side of Explorer and are not in
-        the SCOM def.
-    -->
-
-    <register name="ADSP_PCBI">
-        <instance reg_inst="0" addr="0x00200860" />
-        <instance reg_inst="1" addr="0x00201860" />
-        <instance reg_inst="2" addr="0x00202860" />
-        <instance reg_inst="3" addr="0x00203860" />
-        <instance reg_inst="4" addr="0x00204860" />
-        <instance reg_inst="5" addr="0x00205860" />
-        <instance reg_inst="6" addr="0x00206860" />
-        <instance reg_inst="7" addr="0x00207860" />
-    </register>
-
-    <register name="CSU_PCBI">
-        <instance reg_inst="0" addr="0x002000B0" />
-        <instance reg_inst="1" addr="0x002010B0" />
-        <instance reg_inst="2" addr="0x002020B0" />
-        <instance reg_inst="3" addr="0x002030B0" />
-        <instance reg_inst="4" addr="0x002040B0" />
-        <instance reg_inst="5" addr="0x002050B0" />
-        <instance reg_inst="6" addr="0x002060B0" />
-        <instance reg_inst="7" addr="0x002070B0" />
-    </register>
-
-    <capture_group node_inst="0:7">
-        <capture_register reg_name="ADSP_PCBI" reg_inst="0:7" />
-        <capture_register reg_name="CSU_PCBI"  reg_inst="0:7" />
-    </capture_group>
-
-</attn_node>
-
diff --git a/xml/explorer/node_omi_dl.xml b/xml/explorer/node_omi_dl.xml
deleted file mode 100644
index 71fbe47..0000000
--- a/xml/explorer/node_omi_dl.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<attn_node model_ec="EXPLORER_11,EXPLORER_20" name="OMI_DL" reg_type="SCOM">
-
-    <register name="OMI_DL_CONFIG0">
-        <instance reg_inst="0" addr="0x08012810" />
-    </register>
-
-    <register name="OMI_DL_CONFIG1">
-        <instance reg_inst="0" addr="0x08012811" />
-    </register>
-
-    <register name="OMI_DL_ERR_MASK">
-        <instance reg_inst="0" addr="0x08012812" />
-    </register>
-
-    <register name="OMI_DL_ERR_RPT">
-        <instance reg_inst="0" addr="0x08012813" />
-    </register>
-
-    <register name="OMI_DL_ERR_CAPTURE">
-        <instance reg_inst="0" addr="0x08012814" />
-    </register>
-
-    <register name="OMI_DL_EDPL_MAX_COUNT">
-        <instance reg_inst="0" addr="0x08012815" />
-    </register>
-
-    <register name="OMI_DL_STATUS">
-        <instance reg_inst="0" addr="0x08012816" />
-    </register>
-
-    <register name="OMI_DL_TRAINING_STATUS">
-        <instance reg_inst="0" addr="0x08012817" />
-    </register>
-
-    <register name="OMI_DL_DLX_CONFIG">
-        <instance reg_inst="0" addr="0x08012818" />
-    </register>
-
-    <register name="OMI_DL_DLX_INFO">
-        <instance reg_inst="0" addr="0x08012819" />
-    </register>
-
-    <register name="OMI_DL_ERR_ACTION">
-        <instance reg_inst="0" addr="0x0801281D" />
-    </register>
-
-    <register name="OMI_DL_DEBUG_AID">
-        <instance reg_inst="0" addr="0x0801281E" />
-    </register>
-
-    <register name="OMI_DL_CYA_BITS">
-        <instance reg_inst="0" addr="0x0801281F" />
-    </register>
-
-    <capture_group node_inst="0">
-        <capture_register reg_name="OMI_DL_CONFIG0"         reg_inst="0" />
-        <capture_register reg_name="OMI_DL_CONFIG1"         reg_inst="0" />
-        <capture_register reg_name="OMI_DL_ERR_MASK"        reg_inst="0" />
-        <capture_register reg_name="OMI_DL_ERR_RPT"         reg_inst="0" />
-        <capture_register reg_name="OMI_DL_ERR_CAPTURE"     reg_inst="0" />
-        <capture_register reg_name="OMI_DL_EDPL_MAX_COUNT"  reg_inst="0" />
-        <capture_register reg_name="OMI_DL_STATUS"          reg_inst="0" />
-        <capture_register reg_name="OMI_DL_TRAINING_STATUS" reg_inst="0" />
-        <capture_register reg_name="OMI_DL_DLX_CONFIG"      reg_inst="0" />
-        <capture_register reg_name="OMI_DL_DLX_INFO"        reg_inst="0" />
-        <capture_register reg_name="OMI_DL_ERR_ACTION"      reg_inst="0" />
-        <capture_register reg_name="OMI_DL_DEBUG_AID"       reg_inst="0" />
-        <capture_register reg_name="OMI_DL_CYA_BITS"        reg_inst="0" />
-    </capture_group>
-
-    <rule attn_type="UCS" node_inst="0">
-        <!-- FIR & ~MASK & ~ACT0 & ~ACT1 & 0xfffff00000000000-->
-        <expr type="and">
-            <expr type="reg" value1="OMI_DL_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="OMI_DL_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="OMI_DL_FIR_ACT0"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="OMI_DL_FIR_ACT1"/>
-            </expr>
-            <expr type="int" value1="0xfffff00000000000" />
-        </expr>
-    </rule>
-
-    <rule attn_type="RE" node_inst="0">
-        <!-- FIR & ~MASK & ~ACT0 & ACT1 & 0xfffff00000000000-->
-        <expr type="and">
-            <expr type="reg" value1="OMI_DL_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="OMI_DL_FIR_MASK"/>
-            </expr>
-            <expr type="not">
-                <expr type="reg" value1="OMI_DL_FIR_ACT0"/>
-            </expr>
-            <expr type="reg" value1="OMI_DL_FIR_ACT1"/>
-            <expr type="int" value1="0xfffff00000000000" />
-        </expr>
-    </rule>
-
-    <rule attn_type="HA" node_inst="0">
-        <!-- FIR & ~MASK & ACT0 & ~ACT1 & 0xfffff00000000000-->
-        <expr type="and">
-            <expr type="reg" value1="OMI_DL_FIR"/>
-            <expr type="not">
-                <expr type="reg" value1="OMI_DL_FIR_MASK"/>
-            </expr>
-            <expr type="reg" value1="OMI_DL_FIR_ACT0"/>
-            <expr type="not">
-                <expr type="reg" value1="OMI_DL_FIR_ACT1"/>
-            </expr>
-            <expr type="int" value1="0xfffff00000000000" />
-        </expr>
-    </rule>
-
-    <bit pos= "0" child_node="OMI_DL_ERR_RPT" node_inst="0">OMI-DL fatal error</bit>
-    <bit pos= "1">OMI-DL UE on data flit</bit>
-    <bit pos= "2">OMI-DL CE on TL flit</bit>
-    <bit pos= "3">OMI-DL detected a CRC error</bit>
-    <bit pos= "4">OMI-DL received a nack</bit>
-    <bit pos= "5">OMI-DL running in degraded mode</bit>
-    <bit pos= "6">OMI-DL parity error detection on a lane</bit>
-    <bit pos= "7">OMI-DL retrained due to no forward progress</bit>
-    <bit pos= "8">OMI-DL remote side initiated a retrain</bit>
-    <bit pos= "9">OMI-DL retrain due to internal error or software</bit>
-    <bit pos="10">OMI-DL threshold reached</bit>
-    <bit pos="11">OMI-DL trained</bit>
-    <bit pos="12">OMI-DL endpoint error bit 0</bit>
-    <bit pos="13">OMI-DL endpoint error bit 1</bit>
-    <bit pos="14">OMI-DL endpoint error bit 2</bit>
-    <bit pos="15">OMI-DL endpoint error bit 3</bit>
-    <bit pos="16">OMI-DL endpoint error bit 4</bit>
-    <bit pos="17">OMI-DL endpoint error bit 5</bit>
-    <bit pos="18">OMI-DL endpoint error bit 6</bit>
-    <bit pos="19">OMI-DL endpoint error bit 7</bit>
-
-</attn_node>
diff --git a/xml/explorer/node_omi_dl_fir.xml b/xml/explorer/node_omi_dl_fir.xml
index 54ed5f0..ebbeba9 100644
--- a/xml/explorer/node_omi_dl_fir.xml
+++ b/xml/explorer/node_omi_dl_fir.xml
@@ -16,12 +16,96 @@
         <instance reg_inst="0" addr="0x0801280F" />
     </register>
 
+    <register name="OMI_DL_CONFIG0">
+        <instance reg_inst="0" addr="0x08012810" />
+    </register>
+
+    <register name="OMI_DL_CONFIG1">
+        <instance reg_inst="0" addr="0x08012811" />
+    </register>
+
+    <register name="OMI_DL_ERR_MASK">
+        <instance reg_inst="0" addr="0x08012812" />
+    </register>
+
+    <register name="OMI_DL_ERR_RPT">
+        <instance reg_inst="0" addr="0x08012813" />
+    </register>
+
+    <register name="OMI_DL_ERR_CAPTURE">
+        <instance reg_inst="0" addr="0x08012814" />
+    </register>
+
+    <register name="OMI_DL_EDPL_MAX_COUNT">
+        <instance reg_inst="0" addr="0x08012815" />
+    </register>
+
+    <register name="OMI_DL_STATUS">
+        <instance reg_inst="0" addr="0x08012816" />
+    </register>
+
+    <register name="OMI_DL_TRAINING_STATUS">
+        <instance reg_inst="0" addr="0x08012817" />
+    </register>
+
+    <register name="OMI_DL_DLX_CONFIG">
+        <instance reg_inst="0" addr="0x08012818" />
+    </register>
+
+    <register name="OMI_DL_DLX_INFO">
+        <instance reg_inst="0" addr="0x08012819" />
+    </register>
+
+    <register name="OMI_DL_ERR_ACTION">
+        <instance reg_inst="0" addr="0x0801281D" />
+    </register>
+
+    <register name="OMI_DL_DEBUG_AID">
+        <instance reg_inst="0" addr="0x0801281E" />
+    </register>
+
+    <register name="OMI_DL_CYA_BITS">
+        <instance reg_inst="0" addr="0x0801281F" />
+    </register>
+
     <capture_group node_inst="0">
-        <capture_register reg_name="CMN_CONFIG" reg_inst="0" />
-        <capture_register reg_name="PMU_CNTR"   reg_inst="0" />
+        <capture_register reg_name="CMN_CONFIG"             reg_inst="0" />
+        <capture_register reg_name="PMU_CNTR"               reg_inst="0" />
+        <capture_register reg_name="OMI_DL_CONFIG0"         reg_inst="0" />
+        <capture_register reg_name="OMI_DL_CONFIG1"         reg_inst="0" />
+        <capture_register reg_name="OMI_DL_ERR_MASK"        reg_inst="0" />
+        <capture_register reg_name="OMI_DL_ERR_RPT"         reg_inst="0" />
+        <capture_register reg_name="OMI_DL_ERR_CAPTURE"     reg_inst="0" />
+        <capture_register reg_name="OMI_DL_EDPL_MAX_COUNT"  reg_inst="0" />
+        <capture_register reg_name="OMI_DL_STATUS"          reg_inst="0" />
+        <capture_register reg_name="OMI_DL_TRAINING_STATUS" reg_inst="0" />
+        <capture_register reg_name="OMI_DL_DLX_CONFIG"      reg_inst="0" />
+        <capture_register reg_name="OMI_DL_DLX_INFO"        reg_inst="0" />
+        <capture_register reg_name="OMI_DL_ERR_ACTION"      reg_inst="0" />
+        <capture_register reg_name="OMI_DL_DEBUG_AID"       reg_inst="0" />
+        <capture_register reg_name="OMI_DL_CYA_BITS"        reg_inst="0" />
     </capture_group>
 
-    <bit pos="0:19" child_node="OMI_DL" node_inst="0">OMI-DL0</bit>
+    <bit pos= "0" child_node="OMI_DL_ERR_RPT" node_inst="0">OMI-DL0 fatal error</bit>
+    <bit pos= "1">OMI-DL0 UE on data flit</bit>
+    <bit pos= "2">OMI-DL0 CE on TL flit</bit>
+    <bit pos= "3">OMI-DL0 detected a CRC error</bit>
+    <bit pos= "4">OMI-DL0 received a nack</bit>
+    <bit pos= "5">OMI-DL0 running in degraded mode</bit>
+    <bit pos= "6">OMI-DL0 parity error detection on a lane</bit>
+    <bit pos= "7">OMI-DL0 retrained due to no forward progress</bit>
+    <bit pos= "8">OMI-DL0 remote side initiated a retrain</bit>
+    <bit pos= "9">OMI-DL0 retrain due to internal error or software</bit>
+    <bit pos="10">OMI-DL0 threshold reached</bit>
+    <bit pos="11">OMI-DL0 trained</bit>
+    <bit pos="12">OMI-DL0 endpoint error bit 0</bit>
+    <bit pos="13">OMI-DL0 endpoint error bit 1</bit>
+    <bit pos="14">OMI-DL0 endpoint error bit 2</bit>
+    <bit pos="15">OMI-DL0 endpoint error bit 3</bit>
+    <bit pos="16">OMI-DL0 endpoint error bit 4</bit>
+    <bit pos="17">OMI-DL0 endpoint error bit 5</bit>
+    <bit pos="18">OMI-DL0 endpoint error bit 6</bit>
+    <bit pos="19">OMI-DL0 endpoint error bit 7</bit>
     <bit pos="20:39">OMI-DL1</bit>
     <bit pos="40:59">OMI-DL2</bit>
     <bit pos="60">Performance monitor wrapped</bit>