diff --git a/analyzer/ras-data/data/ras-data-p10-10.json b/analyzer/ras-data/data/ras-data-p10-10.json
index 6cbd88f..f2dadb0 100644
--- a/analyzer/ras-data/data/ras-data-p10-10.json
+++ b/analyzer/ras-data/data/ras-data-p10-10.json
@@ -259,7 +259,7 @@
         }
     },
     "actions": {
-        "self": [
+        "self_M": [
             {
                 "type": "callout_self",
                 "priority": "MED",
@@ -280,7 +280,47 @@
                 "guard": false
             }
         ],
-        "level2": [
+        "self_M_th_1": [
+            {
+                "type": "action",
+                "name": "self_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "self_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "self_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "self_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "self_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "self_M_info_only": [
+            {
+                "type": "action",
+                "name": "self_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "level2_M": [
             {
                 "type": "callout_procedure",
                 "name": "LEVEL2",
@@ -290,7 +330,31 @@
         "level2_M_th1": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_th32perDay": [
+            {
+                "type": "action",
+                "name": "level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "level2_M_info_only": [
+            {
+                "type": "action",
+                "name": "level2_M_th32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
             }
         ],
         "level2_L": [
@@ -303,31 +367,65 @@
         "self_M_level2_L": [
             {
                 "type": "action",
-                "name": "self"
+                "name": "self_M"
             },
             {
                 "type": "action",
                 "name": "level2_L"
             }
         ],
+        "self_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "self_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
         "level2_M_self_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "action",
                 "name": "self_L"
             }
         ],
+        "level2_M_self_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_self_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_self_L_th_32perDay": [
+            {
+                "type": "action",
+                "name": "level2_M_self_L"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
         "sue_seen_H": [
             {
                 "type": "callout_procedure",
                 "name": "SUE_SEEN",
                 "priority": "HIGH"
+            },
+            {
+                "type": "flag",
+                "name": "sue_seen"
             }
         ],
-        "self_sue": [
+        "self_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -336,9 +434,13 @@
                 "type": "callout_self",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core0": [
+        "core0_M": [
             {
                 "type": "callout_unit",
                 "name": "core0",
@@ -346,7 +448,7 @@
                 "guard": true
             }
         ],
-        "core1": [
+        "core1_M": [
             {
                 "type": "callout_unit",
                 "name": "core1",
@@ -354,7 +456,7 @@
                 "guard": true
             }
         ],
-        "core2": [
+        "core2_M": [
             {
                 "type": "callout_unit",
                 "name": "core2",
@@ -362,7 +464,7 @@
                 "guard": true
             }
         ],
-        "core3": [
+        "core3_M": [
             {
                 "type": "callout_unit",
                 "name": "core3",
@@ -370,7 +472,7 @@
                 "guard": true
             }
         ],
-        "core4": [
+        "core4_M": [
             {
                 "type": "callout_unit",
                 "name": "core4",
@@ -378,7 +480,7 @@
                 "guard": true
             }
         ],
-        "core5": [
+        "core5_M": [
             {
                 "type": "callout_unit",
                 "name": "core5",
@@ -386,7 +488,7 @@
                 "guard": true
             }
         ],
-        "core6": [
+        "core6_M": [
             {
                 "type": "callout_unit",
                 "name": "core6",
@@ -394,7 +496,7 @@
                 "guard": true
             }
         ],
-        "core7": [
+        "core7_M": [
             {
                 "type": "callout_unit",
                 "name": "core7",
@@ -402,7 +504,7 @@
                 "guard": true
             }
         ],
-        "core8": [
+        "core8_M": [
             {
                 "type": "callout_unit",
                 "name": "core8",
@@ -410,7 +512,7 @@
                 "guard": true
             }
         ],
-        "core9": [
+        "core9_M": [
             {
                 "type": "callout_unit",
                 "name": "core9",
@@ -418,7 +520,7 @@
                 "guard": true
             }
         ],
-        "core10": [
+        "core10_M": [
             {
                 "type": "callout_unit",
                 "name": "core10",
@@ -426,7 +528,7 @@
                 "guard": true
             }
         ],
-        "core11": [
+        "core11_M": [
             {
                 "type": "callout_unit",
                 "name": "core11",
@@ -434,7 +536,7 @@
                 "guard": true
             }
         ],
-        "core12": [
+        "core12_M": [
             {
                 "type": "callout_unit",
                 "name": "core12",
@@ -442,7 +544,7 @@
                 "guard": true
             }
         ],
-        "core13": [
+        "core13_M": [
             {
                 "type": "callout_unit",
                 "name": "core13",
@@ -450,7 +552,7 @@
                 "guard": true
             }
         ],
-        "core14": [
+        "core14_M": [
             {
                 "type": "callout_unit",
                 "name": "core14",
@@ -458,7 +560,7 @@
                 "guard": true
             }
         ],
-        "core15": [
+        "core15_M": [
             {
                 "type": "callout_unit",
                 "name": "core15",
@@ -466,7 +568,7 @@
                 "guard": true
             }
         ],
-        "core16": [
+        "core16_M": [
             {
                 "type": "callout_unit",
                 "name": "core16",
@@ -474,7 +576,7 @@
                 "guard": true
             }
         ],
-        "core17": [
+        "core17_M": [
             {
                 "type": "callout_unit",
                 "name": "core17",
@@ -482,7 +584,7 @@
                 "guard": true
             }
         ],
-        "core18": [
+        "core18_M": [
             {
                 "type": "callout_unit",
                 "name": "core18",
@@ -490,7 +592,7 @@
                 "guard": true
             }
         ],
-        "core19": [
+        "core19_M": [
             {
                 "type": "callout_unit",
                 "name": "core19",
@@ -498,7 +600,7 @@
                 "guard": true
             }
         ],
-        "core20": [
+        "core20_M": [
             {
                 "type": "callout_unit",
                 "name": "core20",
@@ -506,7 +608,7 @@
                 "guard": true
             }
         ],
-        "core21": [
+        "core21_M": [
             {
                 "type": "callout_unit",
                 "name": "core21",
@@ -514,7 +616,7 @@
                 "guard": true
             }
         ],
-        "core22": [
+        "core22_M": [
             {
                 "type": "callout_unit",
                 "name": "core22",
@@ -522,7 +624,7 @@
                 "guard": true
             }
         ],
-        "core23": [
+        "core23_M": [
             {
                 "type": "callout_unit",
                 "name": "core23",
@@ -530,7 +632,7 @@
                 "guard": true
             }
         ],
-        "core24": [
+        "core24_M": [
             {
                 "type": "callout_unit",
                 "name": "core24",
@@ -538,7 +640,7 @@
                 "guard": true
             }
         ],
-        "core25": [
+        "core25_M": [
             {
                 "type": "callout_unit",
                 "name": "core25",
@@ -546,7 +648,7 @@
                 "guard": true
             }
         ],
-        "core26": [
+        "core26_M": [
             {
                 "type": "callout_unit",
                 "name": "core26",
@@ -554,7 +656,7 @@
                 "guard": true
             }
         ],
-        "core27": [
+        "core27_M": [
             {
                 "type": "callout_unit",
                 "name": "core27",
@@ -562,7 +664,7 @@
                 "guard": true
             }
         ],
-        "core28": [
+        "core28_M": [
             {
                 "type": "callout_unit",
                 "name": "core28",
@@ -570,7 +672,7 @@
                 "guard": true
             }
         ],
-        "core29": [
+        "core29_M": [
             {
                 "type": "callout_unit",
                 "name": "core29",
@@ -578,7 +680,7 @@
                 "guard": true
             }
         ],
-        "core30": [
+        "core30_M": [
             {
                 "type": "callout_unit",
                 "name": "core30",
@@ -586,7 +688,7 @@
                 "guard": true
             }
         ],
-        "core31": [
+        "core31_M": [
             {
                 "type": "callout_unit",
                 "name": "core31",
@@ -594,7 +696,1607 @@
                 "guard": true
             }
         ],
-        "core0_sue": [
+        "core0_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core1_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core3_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core4_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core5_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core6_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core7_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core8_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core9_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core10_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core11_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core12_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core13_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core14_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core15_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core16_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core16_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core17_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core17_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core18_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core18_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core19_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core19_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core20_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core20_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core21_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core21_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core22_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core22_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core23_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core23_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core24_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core24_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core25_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core25_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core26_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core26_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core27_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core27_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core28_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core28_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core29_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core29_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core30_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core30_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core31_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core31_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core0_M_th_1": [
+            {
+                "type": "action",
+                "name": "core0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core1_M_th_1": [
+            {
+                "type": "action",
+                "name": "core1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core2_M_th_1": [
+            {
+                "type": "action",
+                "name": "core2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core3_M_th_1": [
+            {
+                "type": "action",
+                "name": "core3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core4_M_th_1": [
+            {
+                "type": "action",
+                "name": "core4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core5_M_th_1": [
+            {
+                "type": "action",
+                "name": "core5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core6_M_th_1": [
+            {
+                "type": "action",
+                "name": "core6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core7_M_th_1": [
+            {
+                "type": "action",
+                "name": "core7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core8_M_th_1": [
+            {
+                "type": "action",
+                "name": "core8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core9_M_th_1": [
+            {
+                "type": "action",
+                "name": "core9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core10_M_th_1": [
+            {
+                "type": "action",
+                "name": "core10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core11_M_th_1": [
+            {
+                "type": "action",
+                "name": "core11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core12_M_th_1": [
+            {
+                "type": "action",
+                "name": "core12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core13_M_th_1": [
+            {
+                "type": "action",
+                "name": "core13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core14_M_th_1": [
+            {
+                "type": "action",
+                "name": "core14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core15_M_th_1": [
+            {
+                "type": "action",
+                "name": "core15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core16_M_th_1": [
+            {
+                "type": "action",
+                "name": "core16_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core17_M_th_1": [
+            {
+                "type": "action",
+                "name": "core17_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core18_M_th_1": [
+            {
+                "type": "action",
+                "name": "core18_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core19_M_th_1": [
+            {
+                "type": "action",
+                "name": "core19_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core20_M_th_1": [
+            {
+                "type": "action",
+                "name": "core20_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core21_M_th_1": [
+            {
+                "type": "action",
+                "name": "core21_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core22_M_th_1": [
+            {
+                "type": "action",
+                "name": "core22_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core23_M_th_1": [
+            {
+                "type": "action",
+                "name": "core23_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core24_M_th_1": [
+            {
+                "type": "action",
+                "name": "core24_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core25_M_th_1": [
+            {
+                "type": "action",
+                "name": "core25_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core26_M_th_1": [
+            {
+                "type": "action",
+                "name": "core26_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core27_M_th_1": [
+            {
+                "type": "action",
+                "name": "core27_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core28_M_th_1": [
+            {
+                "type": "action",
+                "name": "core28_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core29_M_th_1": [
+            {
+                "type": "action",
+                "name": "core29_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core30_M_th_1": [
+            {
+                "type": "action",
+                "name": "core30_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core31_M_th_1": [
+            {
+                "type": "action",
+                "name": "core31_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core2_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core4_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core5_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core6_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core7_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core8_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core9_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core10_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core11_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core12_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core13_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core14_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core15_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core16_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core16_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core17_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core17_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core18_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core18_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core19_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core19_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core20_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core20_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core21_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core21_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core22_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core22_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core23_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core23_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core24_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core24_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core25_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core25_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core26_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core26_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core27_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core27_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core28_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core28_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core29_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core29_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core30_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core30_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core31_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "core31_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "core0_M_info_only": [
+            {
+                "type": "action",
+                "name": "core0_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core1_M_info_only": [
+            {
+                "type": "action",
+                "name": "core1_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core2_M_info_only": [
+            {
+                "type": "action",
+                "name": "core2_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core3_M_info_only": [
+            {
+                "type": "action",
+                "name": "core3_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core4_M_info_only": [
+            {
+                "type": "action",
+                "name": "core4_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core5_M_info_only": [
+            {
+                "type": "action",
+                "name": "core5_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core6_M_info_only": [
+            {
+                "type": "action",
+                "name": "core6_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core7_M_info_only": [
+            {
+                "type": "action",
+                "name": "core7_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core8_M_info_only": [
+            {
+                "type": "action",
+                "name": "core8_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core9_M_info_only": [
+            {
+                "type": "action",
+                "name": "core9_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core10_M_info_only": [
+            {
+                "type": "action",
+                "name": "core10_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core11_M_info_only": [
+            {
+                "type": "action",
+                "name": "core11_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core12_M_info_only": [
+            {
+                "type": "action",
+                "name": "core12_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core13_M_info_only": [
+            {
+                "type": "action",
+                "name": "core13_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core14_M_info_only": [
+            {
+                "type": "action",
+                "name": "core14_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core15_M_info_only": [
+            {
+                "type": "action",
+                "name": "core15_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core16_M_info_only": [
+            {
+                "type": "action",
+                "name": "core16_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core17_M_info_only": [
+            {
+                "type": "action",
+                "name": "core17_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core18_M_info_only": [
+            {
+                "type": "action",
+                "name": "core18_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core19_M_info_only": [
+            {
+                "type": "action",
+                "name": "core19_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core20_M_info_only": [
+            {
+                "type": "action",
+                "name": "core20_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core21_M_info_only": [
+            {
+                "type": "action",
+                "name": "core21_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core22_M_info_only": [
+            {
+                "type": "action",
+                "name": "core22_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core23_M_info_only": [
+            {
+                "type": "action",
+                "name": "core23_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core24_M_info_only": [
+            {
+                "type": "action",
+                "name": "core24_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core25_M_info_only": [
+            {
+                "type": "action",
+                "name": "core25_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core26_M_info_only": [
+            {
+                "type": "action",
+                "name": "core26_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core27_M_info_only": [
+            {
+                "type": "action",
+                "name": "core27_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core28_M_info_only": [
+            {
+                "type": "action",
+                "name": "core28_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core29_M_info_only": [
+            {
+                "type": "action",
+                "name": "core29_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core30_M_info_only": [
+            {
+                "type": "action",
+                "name": "core30_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core31_M_info_only": [
+            {
+                "type": "action",
+                "name": "core31_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "core0_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core1_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core2_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core3_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core4_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core5_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core6_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core7_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core8_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core9_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core10_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core11_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core12_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core13_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core14_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core15_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core16_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core16_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core17_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core17_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core18_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core18_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core19_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core19_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core20_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core20_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core21_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core21_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core22_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core22_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core23_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core23_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core24_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core24_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core25_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core25_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core26_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core26_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core27_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core27_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core28_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core28_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core29_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core29_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core30_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core30_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core31_M_th_128perDay": [
+            {
+                "type": "action",
+                "name": "core31_M"
+            },
+            {
+                "type": "action",
+                "name": "th_128perDay"
+            }
+        ],
+        "core0_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -604,9 +2306,13 @@
                 "name": "core0",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core1_sue": [
+        "core1_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -616,9 +2322,13 @@
                 "name": "core1",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core2_sue": [
+        "core2_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -628,9 +2338,13 @@
                 "name": "core2",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core3_sue": [
+        "core3_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -640,9 +2354,13 @@
                 "name": "core3",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core4_sue": [
+        "core4_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -652,9 +2370,13 @@
                 "name": "core4",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core5_sue": [
+        "core5_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -664,9 +2386,13 @@
                 "name": "core5",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core6_sue": [
+        "core6_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -676,9 +2402,13 @@
                 "name": "core6",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core7_sue": [
+        "core7_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -688,9 +2418,13 @@
                 "name": "core7",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core8_sue": [
+        "core8_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -700,9 +2434,13 @@
                 "name": "core8",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core9_sue": [
+        "core9_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -712,9 +2450,13 @@
                 "name": "core9",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core10_sue": [
+        "core10_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -724,9 +2466,13 @@
                 "name": "core10",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core11_sue": [
+        "core11_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -736,9 +2482,13 @@
                 "name": "core11",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core12_sue": [
+        "core12_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -748,9 +2498,13 @@
                 "name": "core12",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core13_sue": [
+        "core13_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -760,9 +2514,13 @@
                 "name": "core13",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core14_sue": [
+        "core14_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -772,9 +2530,13 @@
                 "name": "core14",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core15_sue": [
+        "core15_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -784,9 +2546,13 @@
                 "name": "core15",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core16_sue": [
+        "core16_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -796,9 +2562,13 @@
                 "name": "core16",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core17_sue": [
+        "core17_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -808,9 +2578,13 @@
                 "name": "core17",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core18_sue": [
+        "core18_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -820,9 +2594,13 @@
                 "name": "core18",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core19_sue": [
+        "core19_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -832,9 +2610,13 @@
                 "name": "core19",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core20_sue": [
+        "core20_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -844,9 +2626,13 @@
                 "name": "core20",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core21_sue": [
+        "core21_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -856,9 +2642,13 @@
                 "name": "core21",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core22_sue": [
+        "core22_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -868,9 +2658,13 @@
                 "name": "core22",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core23_sue": [
+        "core23_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -880,9 +2674,13 @@
                 "name": "core23",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core24_sue": [
+        "core24_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -892,9 +2690,13 @@
                 "name": "core24",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core25_sue": [
+        "core25_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -904,9 +2706,13 @@
                 "name": "core25",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core26_sue": [
+        "core26_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -916,9 +2722,13 @@
                 "name": "core26",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core27_sue": [
+        "core27_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -928,9 +2738,13 @@
                 "name": "core27",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core28_sue": [
+        "core28_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -940,9 +2754,13 @@
                 "name": "core28",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core29_sue": [
+        "core29_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -952,9 +2770,13 @@
                 "name": "core29",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core30_sue": [
+        "core30_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -964,9 +2786,13 @@
                 "name": "core30",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "core31_sue": [
+        "core31_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -976,332 +2802,656 @@
                 "name": "core31",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
         "core0_M_level2_M": [
             {
                 "type": "action",
-                "name": "core0"
+                "name": "core0_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core1_M_level2_M": [
             {
                 "type": "action",
-                "name": "core1"
+                "name": "core1_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core2_M_level2_M": [
             {
                 "type": "action",
-                "name": "core2"
+                "name": "core2_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core3_M_level2_M": [
             {
                 "type": "action",
-                "name": "core3"
+                "name": "core3_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core4_M_level2_M": [
             {
                 "type": "action",
-                "name": "core4"
+                "name": "core4_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core5_M_level2_M": [
             {
                 "type": "action",
-                "name": "core5"
+                "name": "core5_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core6_M_level2_M": [
             {
                 "type": "action",
-                "name": "core6"
+                "name": "core6_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core7_M_level2_M": [
             {
                 "type": "action",
-                "name": "core7"
+                "name": "core7_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core8_M_level2_M": [
             {
                 "type": "action",
-                "name": "core8"
+                "name": "core8_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core9_M_level2_M": [
             {
                 "type": "action",
-                "name": "core9"
+                "name": "core9_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core10_M_level2_M": [
             {
                 "type": "action",
-                "name": "core10"
+                "name": "core10_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core11_M_level2_M": [
             {
                 "type": "action",
-                "name": "core11"
+                "name": "core11_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core12_M_level2_M": [
             {
                 "type": "action",
-                "name": "core12"
+                "name": "core12_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core13_M_level2_M": [
             {
                 "type": "action",
-                "name": "core13"
+                "name": "core13_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core14_M_level2_M": [
             {
                 "type": "action",
-                "name": "core14"
+                "name": "core14_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core15_M_level2_M": [
             {
                 "type": "action",
-                "name": "core15"
+                "name": "core15_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core16_M_level2_M": [
             {
                 "type": "action",
-                "name": "core16"
+                "name": "core16_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core17_M_level2_M": [
             {
                 "type": "action",
-                "name": "core17"
+                "name": "core17_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core18_M_level2_M": [
             {
                 "type": "action",
-                "name": "core18"
+                "name": "core18_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core19_M_level2_M": [
             {
                 "type": "action",
-                "name": "core19"
+                "name": "core19_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core20_M_level2_M": [
             {
                 "type": "action",
-                "name": "core20"
+                "name": "core20_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core21_M_level2_M": [
             {
                 "type": "action",
-                "name": "core21"
+                "name": "core21_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core22_M_level2_M": [
             {
                 "type": "action",
-                "name": "core22"
+                "name": "core22_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core23_M_level2_M": [
             {
                 "type": "action",
-                "name": "core23"
+                "name": "core23_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core24_M_level2_M": [
             {
                 "type": "action",
-                "name": "core24"
+                "name": "core24_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core25_M_level2_M": [
             {
                 "type": "action",
-                "name": "core25"
+                "name": "core25_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core26_M_level2_M": [
             {
                 "type": "action",
-                "name": "core26"
+                "name": "core26_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core27_M_level2_M": [
             {
                 "type": "action",
-                "name": "core27"
+                "name": "core27_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core28_M_level2_M": [
             {
                 "type": "action",
-                "name": "core28"
+                "name": "core28_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core29_M_level2_M": [
             {
                 "type": "action",
-                "name": "core29"
+                "name": "core29_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core30_M_level2_M": [
             {
                 "type": "action",
-                "name": "core30"
+                "name": "core30_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             }
         ],
         "core31_M_level2_M": [
             {
                 "type": "action",
-                "name": "core31"
+                "name": "core31_M"
             },
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
+            }
+        ],
+        "core0_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core0_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core1_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core1_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core2_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core2_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core3_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core3_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core4_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core4_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core5_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core5_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core6_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core6_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core7_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core7_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core8_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core8_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core9_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core9_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core10_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core10_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core11_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core11_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core12_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core12_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core13_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core13_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core14_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core14_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core15_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core15_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core16_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core16_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core17_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core17_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core18_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core18_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core19_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core19_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core20_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core20_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core21_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core21_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core22_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core22_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core23_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core23_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core24_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core24_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core25_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core25_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core26_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core26_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core27_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core27_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core28_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core28_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core29_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core29_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core30_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core30_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
+            }
+        ],
+        "core31_M_level2_M_th_5perHour": [
+            {
+                "type": "action",
+                "name": "core31_M_level2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_5perHour"
             }
         ],
         "core0_M_level2_L": [
             {
                 "type": "action",
-                "name": "core0"
+                "name": "core0_M"
             },
             {
                 "type": "action",
@@ -1311,7 +3461,7 @@
         "core1_M_level2_L": [
             {
                 "type": "action",
-                "name": "core1"
+                "name": "core1_M"
             },
             {
                 "type": "action",
@@ -1321,7 +3471,7 @@
         "core2_M_level2_L": [
             {
                 "type": "action",
-                "name": "core2"
+                "name": "core2_M"
             },
             {
                 "type": "action",
@@ -1331,7 +3481,7 @@
         "core3_M_level2_L": [
             {
                 "type": "action",
-                "name": "core3"
+                "name": "core3_M"
             },
             {
                 "type": "action",
@@ -1341,7 +3491,7 @@
         "core4_M_level2_L": [
             {
                 "type": "action",
-                "name": "core4"
+                "name": "core4_M"
             },
             {
                 "type": "action",
@@ -1351,7 +3501,7 @@
         "core5_M_level2_L": [
             {
                 "type": "action",
-                "name": "core5"
+                "name": "core5_M"
             },
             {
                 "type": "action",
@@ -1361,7 +3511,7 @@
         "core6_M_level2_L": [
             {
                 "type": "action",
-                "name": "core6"
+                "name": "core6_M"
             },
             {
                 "type": "action",
@@ -1371,7 +3521,7 @@
         "core7_M_level2_L": [
             {
                 "type": "action",
-                "name": "core7"
+                "name": "core7_M"
             },
             {
                 "type": "action",
@@ -1381,7 +3531,7 @@
         "core8_M_level2_L": [
             {
                 "type": "action",
-                "name": "core8"
+                "name": "core8_M"
             },
             {
                 "type": "action",
@@ -1391,7 +3541,7 @@
         "core9_M_level2_L": [
             {
                 "type": "action",
-                "name": "core9"
+                "name": "core9_M"
             },
             {
                 "type": "action",
@@ -1401,7 +3551,7 @@
         "core10_M_level2_L": [
             {
                 "type": "action",
-                "name": "core10"
+                "name": "core10_M"
             },
             {
                 "type": "action",
@@ -1411,7 +3561,7 @@
         "core11_M_level2_L": [
             {
                 "type": "action",
-                "name": "core11"
+                "name": "core11_M"
             },
             {
                 "type": "action",
@@ -1421,7 +3571,7 @@
         "core12_M_level2_L": [
             {
                 "type": "action",
-                "name": "core12"
+                "name": "core12_M"
             },
             {
                 "type": "action",
@@ -1431,7 +3581,7 @@
         "core13_M_level2_L": [
             {
                 "type": "action",
-                "name": "core13"
+                "name": "core13_M"
             },
             {
                 "type": "action",
@@ -1441,7 +3591,7 @@
         "core14_M_level2_L": [
             {
                 "type": "action",
-                "name": "core14"
+                "name": "core14_M"
             },
             {
                 "type": "action",
@@ -1451,7 +3601,7 @@
         "core15_M_level2_L": [
             {
                 "type": "action",
-                "name": "core15"
+                "name": "core15_M"
             },
             {
                 "type": "action",
@@ -1461,7 +3611,7 @@
         "core16_M_level2_L": [
             {
                 "type": "action",
-                "name": "core16"
+                "name": "core16_M"
             },
             {
                 "type": "action",
@@ -1471,7 +3621,7 @@
         "core17_M_level2_L": [
             {
                 "type": "action",
-                "name": "core17"
+                "name": "core17_M"
             },
             {
                 "type": "action",
@@ -1481,7 +3631,7 @@
         "core18_M_level2_L": [
             {
                 "type": "action",
-                "name": "core18"
+                "name": "core18_M"
             },
             {
                 "type": "action",
@@ -1491,7 +3641,7 @@
         "core19_M_level2_L": [
             {
                 "type": "action",
-                "name": "core19"
+                "name": "core19_M"
             },
             {
                 "type": "action",
@@ -1501,7 +3651,7 @@
         "core20_M_level2_L": [
             {
                 "type": "action",
-                "name": "core20"
+                "name": "core20_M"
             },
             {
                 "type": "action",
@@ -1511,7 +3661,7 @@
         "core21_M_level2_L": [
             {
                 "type": "action",
-                "name": "core21"
+                "name": "core21_M"
             },
             {
                 "type": "action",
@@ -1521,7 +3671,7 @@
         "core22_M_level2_L": [
             {
                 "type": "action",
-                "name": "core22"
+                "name": "core22_M"
             },
             {
                 "type": "action",
@@ -1531,7 +3681,7 @@
         "core23_M_level2_L": [
             {
                 "type": "action",
-                "name": "core23"
+                "name": "core23_M"
             },
             {
                 "type": "action",
@@ -1541,7 +3691,7 @@
         "core24_M_level2_L": [
             {
                 "type": "action",
-                "name": "core24"
+                "name": "core24_M"
             },
             {
                 "type": "action",
@@ -1551,7 +3701,7 @@
         "core25_M_level2_L": [
             {
                 "type": "action",
-                "name": "core25"
+                "name": "core25_M"
             },
             {
                 "type": "action",
@@ -1561,7 +3711,7 @@
         "core26_M_level2_L": [
             {
                 "type": "action",
-                "name": "core26"
+                "name": "core26_M"
             },
             {
                 "type": "action",
@@ -1571,7 +3721,7 @@
         "core27_M_level2_L": [
             {
                 "type": "action",
-                "name": "core27"
+                "name": "core27_M"
             },
             {
                 "type": "action",
@@ -1581,7 +3731,7 @@
         "core28_M_level2_L": [
             {
                 "type": "action",
-                "name": "core28"
+                "name": "core28_M"
             },
             {
                 "type": "action",
@@ -1591,7 +3741,7 @@
         "core29_M_level2_L": [
             {
                 "type": "action",
-                "name": "core29"
+                "name": "core29_M"
             },
             {
                 "type": "action",
@@ -1601,7 +3751,7 @@
         "core30_M_level2_L": [
             {
                 "type": "action",
-                "name": "core30"
+                "name": "core30_M"
             },
             {
                 "type": "action",
@@ -1611,17 +3761,337 @@
         "core31_M_level2_L": [
             {
                 "type": "action",
-                "name": "core31"
+                "name": "core31_M"
             },
             {
                 "type": "action",
                 "name": "level2_L"
             }
         ],
+        "core0_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core0_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core1_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core1_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core2_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core2_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core3_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core3_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core4_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core4_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core5_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core5_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core6_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core6_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core7_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core7_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core8_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core8_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core9_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core9_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core10_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core10_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core11_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core11_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core12_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core12_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core13_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core13_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core14_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core14_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core15_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core15_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core16_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core16_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core17_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core17_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core18_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core18_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core19_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core19_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core20_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core20_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core21_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core21_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core22_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core22_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core23_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core23_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core24_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core24_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core25_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core25_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core26_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core26_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core27_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core27_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core28_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core28_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core29_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core29_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core30_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core30_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "core31_M_level2_L_th_1": [
+            {
+                "type": "action",
+                "name": "core31_M_level2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
         "level2_M_core0_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1633,7 +4103,7 @@
         "level2_M_core1_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1645,7 +4115,7 @@
         "level2_M_core2_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1657,7 +4127,7 @@
         "level2_M_core3_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1669,7 +4139,7 @@
         "level2_M_core4_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1681,7 +4151,7 @@
         "level2_M_core5_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1693,7 +4163,7 @@
         "level2_M_core6_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1705,7 +4175,7 @@
         "level2_M_core7_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1717,7 +4187,7 @@
         "level2_M_core8_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1729,7 +4199,7 @@
         "level2_M_core9_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1741,7 +4211,7 @@
         "level2_M_core10_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1753,7 +4223,7 @@
         "level2_M_core11_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1765,7 +4235,7 @@
         "level2_M_core12_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1777,7 +4247,7 @@
         "level2_M_core13_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1789,7 +4259,7 @@
         "level2_M_core14_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1801,7 +4271,7 @@
         "level2_M_core15_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1813,7 +4283,7 @@
         "level2_M_core16_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1825,7 +4295,7 @@
         "level2_M_core17_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1837,7 +4307,7 @@
         "level2_M_core18_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1849,7 +4319,7 @@
         "level2_M_core19_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1861,7 +4331,7 @@
         "level2_M_core20_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1873,7 +4343,7 @@
         "level2_M_core21_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1885,7 +4355,7 @@
         "level2_M_core22_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1897,7 +4367,7 @@
         "level2_M_core23_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1909,7 +4379,7 @@
         "level2_M_core24_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1921,7 +4391,7 @@
         "level2_M_core25_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1933,7 +4403,7 @@
         "level2_M_core26_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1945,7 +4415,7 @@
         "level2_M_core27_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1957,7 +4427,7 @@
         "level2_M_core28_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1969,7 +4439,7 @@
         "level2_M_core29_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1981,7 +4451,7 @@
         "level2_M_core30_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -1993,7 +4463,7 @@
         "level2_M_core31_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -2002,7 +4472,327 @@
                 "guard": false
             }
         ],
-        "iohs0": [
+        "level2_M_core0_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core0_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core1_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core1_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core2_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core3_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core3_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core4_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core4_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core5_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core5_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core6_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core6_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core7_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core7_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core8_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core8_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core9_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core9_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core10_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core10_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core11_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core11_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core12_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core12_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core13_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core13_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core14_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core14_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core15_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core15_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core16_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core16_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core17_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core17_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core18_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core18_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core19_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core19_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core20_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core20_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core21_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core21_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core22_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core22_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core23_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core23_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core24_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core24_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core25_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core25_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core26_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core26_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core27_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core27_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core28_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core28_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core29_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core29_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core30_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core30_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_core31_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_core31_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs0_M": [
             {
                 "type": "callout_unit",
                 "name": "iohs0",
@@ -2010,7 +4800,7 @@
                 "guard": true
             }
         ],
-        "iohs1": [
+        "iohs1_M": [
             {
                 "type": "callout_unit",
                 "name": "iohs1",
@@ -2018,7 +4808,7 @@
                 "guard": true
             }
         ],
-        "iohs2": [
+        "iohs2_M": [
             {
                 "type": "callout_unit",
                 "name": "iohs2",
@@ -2026,7 +4816,7 @@
                 "guard": true
             }
         ],
-        "iohs3": [
+        "iohs3_M": [
             {
                 "type": "callout_unit",
                 "name": "iohs3",
@@ -2034,7 +4824,7 @@
                 "guard": true
             }
         ],
-        "iohs4": [
+        "iohs4_M": [
             {
                 "type": "callout_unit",
                 "name": "iohs4",
@@ -2042,7 +4832,7 @@
                 "guard": true
             }
         ],
-        "iohs5": [
+        "iohs5_M": [
             {
                 "type": "callout_unit",
                 "name": "iohs5",
@@ -2050,7 +4840,7 @@
                 "guard": true
             }
         ],
-        "iohs6": [
+        "iohs6_M": [
             {
                 "type": "callout_unit",
                 "name": "iohs6",
@@ -2058,7 +4848,7 @@
                 "guard": true
             }
         ],
-        "iohs7": [
+        "iohs7_M": [
             {
                 "type": "callout_unit",
                 "name": "iohs7",
@@ -2066,7 +4856,247 @@
                 "guard": true
             }
         ],
-        "iolink0": [
+        "iohs0_M_th_1": [
+            {
+                "type": "action",
+                "name": "iohs0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs1_M_th_1": [
+            {
+                "type": "action",
+                "name": "iohs1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs2_M_th_1": [
+            {
+                "type": "action",
+                "name": "iohs2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs3_M_th_1": [
+            {
+                "type": "action",
+                "name": "iohs3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs4_M_th_1": [
+            {
+                "type": "action",
+                "name": "iohs4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs5_M_th_1": [
+            {
+                "type": "action",
+                "name": "iohs5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs6_M_th_1": [
+            {
+                "type": "action",
+                "name": "iohs6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs7_M_th_1": [
+            {
+                "type": "action",
+                "name": "iohs7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iohs0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iohs0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iohs1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iohs1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iohs2_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iohs2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iohs3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iohs3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iohs4_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iohs4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iohs5_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iohs5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iohs6_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iohs6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iohs7_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iohs7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iohs0_M_info_only": [
+            {
+                "type": "action",
+                "name": "iohs0_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iohs1_M_info_only": [
+            {
+                "type": "action",
+                "name": "iohs1_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iohs2_M_info_only": [
+            {
+                "type": "action",
+                "name": "iohs2_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iohs3_M_info_only": [
+            {
+                "type": "action",
+                "name": "iohs3_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iohs4_M_info_only": [
+            {
+                "type": "action",
+                "name": "iohs4_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iohs5_M_info_only": [
+            {
+                "type": "action",
+                "name": "iohs5_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iohs6_M_info_only": [
+            {
+                "type": "action",
+                "name": "iohs6_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iohs7_M_info_only": [
+            {
+                "type": "action",
+                "name": "iohs7_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink0_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink0",
@@ -2074,7 +5104,7 @@
                 "guard": true
             }
         ],
-        "iolink1": [
+        "iolink1_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink1",
@@ -2082,7 +5112,7 @@
                 "guard": true
             }
         ],
-        "iolink2": [
+        "iolink2_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink2",
@@ -2090,7 +5120,7 @@
                 "guard": true
             }
         ],
-        "iolink3": [
+        "iolink3_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink3",
@@ -2098,7 +5128,7 @@
                 "guard": true
             }
         ],
-        "iolink4": [
+        "iolink4_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink4",
@@ -2106,7 +5136,7 @@
                 "guard": true
             }
         ],
-        "iolink5": [
+        "iolink5_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink5",
@@ -2114,7 +5144,7 @@
                 "guard": true
             }
         ],
-        "iolink6": [
+        "iolink6_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink6",
@@ -2122,7 +5152,7 @@
                 "guard": true
             }
         ],
-        "iolink7": [
+        "iolink7_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink7",
@@ -2130,7 +5160,7 @@
                 "guard": true
             }
         ],
-        "iolink8": [
+        "iolink8_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink8",
@@ -2138,7 +5168,7 @@
                 "guard": true
             }
         ],
-        "iolink9": [
+        "iolink9_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink9",
@@ -2146,7 +5176,7 @@
                 "guard": true
             }
         ],
-        "iolink10": [
+        "iolink10_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink10",
@@ -2154,7 +5184,7 @@
                 "guard": true
             }
         ],
-        "iolink11": [
+        "iolink11_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink11",
@@ -2162,7 +5192,7 @@
                 "guard": true
             }
         ],
-        "iolink12": [
+        "iolink12_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink12",
@@ -2170,7 +5200,7 @@
                 "guard": true
             }
         ],
-        "iolink13": [
+        "iolink13_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink13",
@@ -2178,7 +5208,7 @@
                 "guard": true
             }
         ],
-        "iolink14": [
+        "iolink14_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink14",
@@ -2186,7 +5216,7 @@
                 "guard": true
             }
         ],
-        "iolink15": [
+        "iolink15_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink15",
@@ -2194,6 +5224,486 @@
                 "guard": true
             }
         ],
+        "iolink0_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink1_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink2_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink3_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink4_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink5_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink6_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink7_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink8_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink9_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink10_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink11_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink12_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink13_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink14_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink15_M_th_1": [
+            {
+                "type": "action",
+                "name": "iolink15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "iolink0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink2_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink4_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink5_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink6_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink7_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink8_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink9_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink10_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink11_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink12_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink13_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink14_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink15_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "iolink15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "iolink0_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink0_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink1_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink1_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink2_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink2_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink3_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink3_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink4_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink4_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink5_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink5_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink6_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink6_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink7_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink7_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink8_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink8_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink9_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink9_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink10_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink10_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink11_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink11_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink12_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink12_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink13_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink13_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink14_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink14_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "iolink15_M_info_only": [
+            {
+                "type": "action",
+                "name": "iolink15_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
         "bus_endpoints_iohs0": [
             {
                 "type": "callout_unit",
@@ -2306,6 +5816,86 @@
                 "guard": true
             }
         ],
+        "bus_endpoints_iohs0_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iohs0"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iohs1_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iohs1"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iohs2_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iohs2"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iohs3_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iohs3"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iohs4_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iohs4"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iohs5_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iohs5"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iohs6_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iohs6"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iohs7_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iohs7"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
         "bus_endpoints_iolink0": [
             {
                 "type": "callout_unit",
@@ -2530,6 +6120,166 @@
                 "guard": true
             }
         ],
+        "bus_endpoints_iolink0_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink0"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink1_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink1"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink2_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink2"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink3_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink3"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink4_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink4"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink5_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink5"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink6_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink6"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink7_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink7"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink8_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink8"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink9_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink9"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink10_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink10"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink11_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink11"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink12_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink12"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink13_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink13"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink14_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink14"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "bus_endpoints_iolink15_th_1": [
+            {
+                "type": "action",
+                "name": "bus_endpoints_iolink15"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
         "smp_bus_iolink0": [
             {
                 "type": "action",
@@ -2722,7 +6472,487 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink0": [
+        "smp_bus_iolink0_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink0"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink1_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink1"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink2_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink2"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink3_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink3"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink4_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink4"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink5_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink5"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink6_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink6"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink7_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink7"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink8_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink8"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink9_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink9"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink10_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink10"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink11_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink11"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink12_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink12"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink13_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink13"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink14_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink14"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink15_th_1": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink15"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "smp_bus_iolink0_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink0"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink1_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink1"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink2_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink2"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink3_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink3"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink4_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink4"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink5_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink5"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink6_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink6"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink7_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink7"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink8_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink8"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink9_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink9"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink10_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink10"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink11_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink11"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink12_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink12"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink13_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink13"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink14_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink14"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink15_th_32perDay": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink15"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "smp_bus_iolink0_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink0_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink1_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink1_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink2_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink2_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink3_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink3_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink4_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink4_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink5_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink5_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink6_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink6_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink7_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink7_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink8_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink8_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink9_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink9_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink10_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink10_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink11_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink11_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink12_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink12_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink13_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink13_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink14_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink14_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "smp_bus_iolink15_info_only": [
+            {
+                "type": "action",
+                "name": "smp_bus_iolink15_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "opencapi_iolink0_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink0",
@@ -2730,7 +6960,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink1": [
+        "opencapi_iolink1_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink1",
@@ -2738,7 +6968,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink2": [
+        "opencapi_iolink2_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink2",
@@ -2746,7 +6976,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink3": [
+        "opencapi_iolink3_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink3",
@@ -2754,7 +6984,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink4": [
+        "opencapi_iolink4_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink4",
@@ -2762,7 +6992,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink5": [
+        "opencapi_iolink5_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink5",
@@ -2770,7 +7000,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink6": [
+        "opencapi_iolink6_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink6",
@@ -2778,7 +7008,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink7": [
+        "opencapi_iolink7_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink7",
@@ -2786,7 +7016,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink8": [
+        "opencapi_iolink8_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink8",
@@ -2794,7 +7024,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink9": [
+        "opencapi_iolink9_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink9",
@@ -2802,7 +7032,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink10": [
+        "opencapi_iolink10_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink10",
@@ -2810,7 +7040,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink11": [
+        "opencapi_iolink11_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink11",
@@ -2818,7 +7048,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink12": [
+        "opencapi_iolink12_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink12",
@@ -2826,7 +7056,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink13": [
+        "opencapi_iolink13_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink13",
@@ -2834,7 +7064,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink14": [
+        "opencapi_iolink14_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink14",
@@ -2842,7 +7072,7 @@
                 "guard": false
             }
         ],
-        "opencapi_iolink15": [
+        "opencapi_iolink15_M": [
             {
                 "type": "callout_unit",
                 "name": "iolink15",
@@ -2850,135 +7080,519 @@
                 "guard": false
             }
         ],
-        "framer_error_iolink0": [
+        "opencapi_iolink0_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink1_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink2_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink3_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink4_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink5_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink6_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink7_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink8_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink9_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink10_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink11_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink12_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink13_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink14_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink15_M_th_1": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "opencapi_iolink0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink2_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink4_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink5_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink6_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink7_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink8_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink9_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink10_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink11_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink12_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink13_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink14_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "opencapi_iolink15_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "opencapi_iolink15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "framer_error_iolink0_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink0",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink1": [
+        "framer_error_iolink1_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink1",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink2": [
+        "framer_error_iolink2_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink2",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink3": [
+        "framer_error_iolink3_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink3",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink4": [
+        "framer_error_iolink4_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink4",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink5": [
+        "framer_error_iolink5_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink5",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink6": [
+        "framer_error_iolink6_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink6",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink7": [
+        "framer_error_iolink7_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink7",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink8": [
+        "framer_error_iolink8_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink8",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink9": [
+        "framer_error_iolink9_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink9",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink10": [
+        "framer_error_iolink10_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink10",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink11": [
+        "framer_error_iolink11_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink11",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink12": [
+        "framer_error_iolink12_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink12",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink13": [
+        "framer_error_iolink13_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink13",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink14": [
+        "framer_error_iolink14_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink14",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "framer_error_iolink15": [
+        "framer_error_iolink15_th_1": [
             {
                 "type": "callout_connected",
                 "name": "iolink15",
                 "priority": "MED_A",
                 "guard": true
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "mc0": [
+        "mc0_M": [
             {
                 "type": "callout_unit",
                 "name": "mc0",
@@ -2986,7 +7600,7 @@
                 "guard": true
             }
         ],
-        "mc1": [
+        "mc1_M": [
             {
                 "type": "callout_unit",
                 "name": "mc1",
@@ -2994,7 +7608,7 @@
                 "guard": true
             }
         ],
-        "mc2": [
+        "mc2_M": [
             {
                 "type": "callout_unit",
                 "name": "mc2",
@@ -3002,7 +7616,7 @@
                 "guard": true
             }
         ],
-        "mc3": [
+        "mc3_M": [
             {
                 "type": "callout_unit",
                 "name": "mc3",
@@ -3010,7 +7624,127 @@
                 "guard": true
             }
         ],
-        "mcc0": [
+        "mc0_M_th_1": [
+            {
+                "type": "action",
+                "name": "mc0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mc1_M_th_1": [
+            {
+                "type": "action",
+                "name": "mc1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mc2_M_th_1": [
+            {
+                "type": "action",
+                "name": "mc2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mc3_M_th_1": [
+            {
+                "type": "action",
+                "name": "mc3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mc0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mc0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mc1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mc1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mc2_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mc2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mc3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mc3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mc0_M_info_only": [
+            {
+                "type": "action",
+                "name": "mc0_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "mc1_M_info_only": [
+            {
+                "type": "action",
+                "name": "mc1_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "mc2_M_info_only": [
+            {
+                "type": "action",
+                "name": "mc2_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "mc3_M_info_only": [
+            {
+                "type": "action",
+                "name": "mc3_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "mcc0_M": [
             {
                 "type": "callout_unit",
                 "name": "mcc0",
@@ -3018,7 +7752,7 @@
                 "guard": true
             }
         ],
-        "mcc1": [
+        "mcc1_M": [
             {
                 "type": "callout_unit",
                 "name": "mcc1",
@@ -3026,7 +7760,7 @@
                 "guard": true
             }
         ],
-        "mcc2": [
+        "mcc2_M": [
             {
                 "type": "callout_unit",
                 "name": "mcc2",
@@ -3034,7 +7768,7 @@
                 "guard": true
             }
         ],
-        "mcc3": [
+        "mcc3_M": [
             {
                 "type": "callout_unit",
                 "name": "mcc3",
@@ -3042,7 +7776,7 @@
                 "guard": true
             }
         ],
-        "mcc4": [
+        "mcc4_M": [
             {
                 "type": "callout_unit",
                 "name": "mcc4",
@@ -3050,7 +7784,7 @@
                 "guard": true
             }
         ],
-        "mcc5": [
+        "mcc5_M": [
             {
                 "type": "callout_unit",
                 "name": "mcc5",
@@ -3058,7 +7792,7 @@
                 "guard": true
             }
         ],
-        "mcc6": [
+        "mcc6_M": [
             {
                 "type": "callout_unit",
                 "name": "mcc6",
@@ -3066,7 +7800,7 @@
                 "guard": true
             }
         ],
-        "mcc7": [
+        "mcc7_M": [
             {
                 "type": "callout_unit",
                 "name": "mcc7",
@@ -3074,10 +7808,170 @@
                 "guard": true
             }
         ],
+        "mcc0_M_th_1": [
+            {
+                "type": "action",
+                "name": "mcc0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mcc1_M_th_1": [
+            {
+                "type": "action",
+                "name": "mcc1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mcc2_M_th_1": [
+            {
+                "type": "action",
+                "name": "mcc2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mcc3_M_th_1": [
+            {
+                "type": "action",
+                "name": "mcc3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mcc4_M_th_1": [
+            {
+                "type": "action",
+                "name": "mcc4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mcc5_M_th_1": [
+            {
+                "type": "action",
+                "name": "mcc5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mcc6_M_th_1": [
+            {
+                "type": "action",
+                "name": "mcc6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mcc7_M_th_1": [
+            {
+                "type": "action",
+                "name": "mcc7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "mcc0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mcc0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mcc1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mcc1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mcc2_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mcc2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mcc3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mcc3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mcc4_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mcc4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mcc5_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mcc5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mcc6_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mcc6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "mcc7_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "mcc7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
         "level2_M_mc0_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -3089,7 +7983,7 @@
         "level2_M_mc1_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -3101,7 +7995,7 @@
         "level2_M_mc2_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -3113,7 +8007,7 @@
         "level2_M_mc3_L": [
             {
                 "type": "action",
-                "name": "level2"
+                "name": "level2_M"
             },
             {
                 "type": "callout_unit",
@@ -3122,7 +8016,47 @@
                 "guard": false
             }
         ],
-        "omi0": [
+        "level2_M_mc0_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_mc0_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_mc1_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_mc1_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_mc2_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_mc2_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "level2_M_mc3_L_th_1": [
+            {
+                "type": "action",
+                "name": "level2_M_mc3_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi0_M": [
             {
                 "type": "callout_unit",
                 "name": "omi0",
@@ -3130,7 +8064,7 @@
                 "guard": true
             }
         ],
-        "omi1": [
+        "omi1_M": [
             {
                 "type": "callout_unit",
                 "name": "omi1",
@@ -3138,7 +8072,7 @@
                 "guard": true
             }
         ],
-        "omi2": [
+        "omi2_M": [
             {
                 "type": "callout_unit",
                 "name": "omi2",
@@ -3146,7 +8080,7 @@
                 "guard": true
             }
         ],
-        "omi3": [
+        "omi3_M": [
             {
                 "type": "callout_unit",
                 "name": "omi3",
@@ -3154,7 +8088,7 @@
                 "guard": true
             }
         ],
-        "omi4": [
+        "omi4_M": [
             {
                 "type": "callout_unit",
                 "name": "omi4",
@@ -3162,7 +8096,7 @@
                 "guard": true
             }
         ],
-        "omi5": [
+        "omi5_M": [
             {
                 "type": "callout_unit",
                 "name": "omi5",
@@ -3170,7 +8104,7 @@
                 "guard": true
             }
         ],
-        "omi6": [
+        "omi6_M": [
             {
                 "type": "callout_unit",
                 "name": "omi6",
@@ -3178,7 +8112,7 @@
                 "guard": true
             }
         ],
-        "omi7": [
+        "omi7_M": [
             {
                 "type": "callout_unit",
                 "name": "omi7",
@@ -3186,7 +8120,7 @@
                 "guard": true
             }
         ],
-        "omi8": [
+        "omi8_M": [
             {
                 "type": "callout_unit",
                 "name": "omi8",
@@ -3194,7 +8128,7 @@
                 "guard": true
             }
         ],
-        "omi9": [
+        "omi9_M": [
             {
                 "type": "callout_unit",
                 "name": "omi9",
@@ -3202,7 +8136,7 @@
                 "guard": true
             }
         ],
-        "omi10": [
+        "omi10_M": [
             {
                 "type": "callout_unit",
                 "name": "omi10",
@@ -3210,7 +8144,7 @@
                 "guard": true
             }
         ],
-        "omi11": [
+        "omi11_M": [
             {
                 "type": "callout_unit",
                 "name": "omi11",
@@ -3218,7 +8152,7 @@
                 "guard": true
             }
         ],
-        "omi12": [
+        "omi12_M": [
             {
                 "type": "callout_unit",
                 "name": "omi12",
@@ -3226,7 +8160,7 @@
                 "guard": true
             }
         ],
-        "omi13": [
+        "omi13_M": [
             {
                 "type": "callout_unit",
                 "name": "omi13",
@@ -3234,7 +8168,7 @@
                 "guard": true
             }
         ],
-        "omi14": [
+        "omi14_M": [
             {
                 "type": "callout_unit",
                 "name": "omi14",
@@ -3242,7 +8176,7 @@
                 "guard": true
             }
         ],
-        "omi15": [
+        "omi15_M": [
             {
                 "type": "callout_unit",
                 "name": "omi15",
@@ -3250,7 +8184,327 @@
                 "guard": true
             }
         ],
-        "connected_ocmb0": [
+        "omi0_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi1_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi2_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi3_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi4_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi5_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi6_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi7_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi8_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi9_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi10_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi11_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi12_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi13_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi14_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi15_M_th_1": [
+            {
+                "type": "action",
+                "name": "omi15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi2_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi4_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi5_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi6_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi7_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi8_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi9_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi10_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi11_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi12_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi13_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi14_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi15_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb0_M": [
             {
                 "type": "callout_connected",
                 "name": "omi0",
@@ -3258,7 +8512,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb1": [
+        "connected_ocmb1_M": [
             {
                 "type": "callout_connected",
                 "name": "omi1",
@@ -3266,7 +8520,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb2": [
+        "connected_ocmb2_M": [
             {
                 "type": "callout_connected",
                 "name": "omi2",
@@ -3274,7 +8528,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb3": [
+        "connected_ocmb3_M": [
             {
                 "type": "callout_connected",
                 "name": "omi3",
@@ -3282,7 +8536,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb4": [
+        "connected_ocmb4_M": [
             {
                 "type": "callout_connected",
                 "name": "omi4",
@@ -3290,7 +8544,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb5": [
+        "connected_ocmb5_M": [
             {
                 "type": "callout_connected",
                 "name": "omi5",
@@ -3298,7 +8552,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb6": [
+        "connected_ocmb6_M": [
             {
                 "type": "callout_connected",
                 "name": "omi6",
@@ -3306,7 +8560,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb7": [
+        "connected_ocmb7_M": [
             {
                 "type": "callout_connected",
                 "name": "omi7",
@@ -3314,7 +8568,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb8": [
+        "connected_ocmb8_M": [
             {
                 "type": "callout_connected",
                 "name": "omi8",
@@ -3322,7 +8576,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb9": [
+        "connected_ocmb9_M": [
             {
                 "type": "callout_connected",
                 "name": "omi9",
@@ -3330,7 +8584,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb10": [
+        "connected_ocmb10_M": [
             {
                 "type": "callout_connected",
                 "name": "omi10",
@@ -3338,7 +8592,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb11": [
+        "connected_ocmb11_M": [
             {
                 "type": "callout_connected",
                 "name": "omi11",
@@ -3346,7 +8600,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb12": [
+        "connected_ocmb12_M": [
             {
                 "type": "callout_connected",
                 "name": "omi12",
@@ -3354,7 +8608,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb13": [
+        "connected_ocmb13_M": [
             {
                 "type": "callout_connected",
                 "name": "omi13",
@@ -3362,7 +8616,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb14": [
+        "connected_ocmb14_M": [
             {
                 "type": "callout_connected",
                 "name": "omi14",
@@ -3370,7 +8624,7 @@
                 "guard": true
             }
         ],
-        "connected_ocmb15": [
+        "connected_ocmb15_M": [
             {
                 "type": "callout_connected",
                 "name": "omi15",
@@ -3378,6 +8632,646 @@
                 "guard": true
             }
         ],
+        "connected_ocmb0_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb1_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb2_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb3_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb4_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb5_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb6_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb7_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb8_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb9_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb10_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb11_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb12_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb13_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb14_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb15_M_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "connected_ocmb0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb2_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb4_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb5_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb6_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb7_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb8_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb8_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb9_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb9_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb10_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb10_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb11_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb11_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb12_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb12_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb13_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb13_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb14_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb14_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb15_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "connected_ocmb15_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "connected_ocmb0_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb0_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb1_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb1_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb2_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb2_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb3_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb3_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb4_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb4_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb5_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb5_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb6_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb6_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb7_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb7_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb8_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb8_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb9_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb9_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb10_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb10_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb11_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb11_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb12_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb12_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb13_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb13_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb14_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb14_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb15_M_info_only": [
+            {
+                "type": "action",
+                "name": "connected_ocmb15_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb0_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb0_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb1_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb1_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb2_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb2_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb3_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb3_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb4_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb4_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb5_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb5_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb6_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb6_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb7_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb7_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb8_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb8_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb9_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb9_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb10_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb10_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb11_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb11_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb12_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb12_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb13_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb13_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb14_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb14_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "connected_ocmb15_M_info_only_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb15_M_th_1"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
         "omi_bus0": [
             {
                 "type": "callout_unit",
@@ -3698,6 +9592,486 @@
                 "guard": false
             }
         ],
+        "omi_bus0_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus0"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus1_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus1"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus2_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus2"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus3_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus3"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus4_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus4"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus5_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus5"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus6_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus6"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus7_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus7"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus8_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus8"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus9_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus9"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus10_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus10"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus11_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus11"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus12_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus12"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus13_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus13"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus14_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus14"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus15_th_1": [
+            {
+                "type": "action",
+                "name": "omi_bus15"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "omi_bus0_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus0"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus1_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus1"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus2_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus2"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus3_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus3"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus4_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus4"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus5_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus5"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus6_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus6"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus7_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus7"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus8_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus8"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus9_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus9"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus10_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus10"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus11_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus11"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus12_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus12"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus13_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus13"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus14_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus14"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus15_th_32perDay": [
+            {
+                "type": "action",
+                "name": "omi_bus15"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "omi_bus0_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus0_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus1_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus1_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus2_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus2_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus3_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus3_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus4_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus4_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus5_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus5_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus6_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus6_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus7_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus7_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus8_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus8_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus9_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus9_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus10_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus10_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus11_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus11_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus12_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus12_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus13_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus13_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus14_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus14_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "omi_bus15_info_only": [
+            {
+                "type": "action",
+                "name": "omi_bus15_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
         "channel_timeout_omi0": [
             {
                 "type": "callout_connected",
@@ -3922,116 +10296,468 @@
                 "guard": false
             }
         ],
-        "all_ocmb_and_mcc0": [
+        "channel_timeout_omi0_th_1": [
             {
                 "type": "action",
-                "name": "connected_ocmb0"
+                "name": "channel_timeout_omi0"
             },
             {
                 "type": "action",
-                "name": "connected_ocmb1"
-            },
-            {
-                "type": "action",
-                "name": "mcc0"
+                "name": "th_1"
             }
         ],
-        "all_ocmb_and_mcc1": [
+        "channel_timeout_omi1_th_1": [
             {
                 "type": "action",
-                "name": "connected_ocmb2"
+                "name": "channel_timeout_omi1"
             },
             {
                 "type": "action",
-                "name": "connected_ocmb3"
-            },
-            {
-                "type": "action",
-                "name": "mcc1"
+                "name": "th_1"
             }
         ],
-        "all_ocmb_and_mcc2": [
+        "channel_timeout_omi2_th_1": [
             {
                 "type": "action",
-                "name": "connected_ocmb4"
+                "name": "channel_timeout_omi2"
             },
             {
                 "type": "action",
-                "name": "connected_ocmb5"
-            },
-            {
-                "type": "action",
-                "name": "mcc2"
+                "name": "th_1"
             }
         ],
-        "all_ocmb_and_mcc3": [
+        "channel_timeout_omi3_th_1": [
             {
                 "type": "action",
-                "name": "connected_ocmb6"
+                "name": "channel_timeout_omi3"
             },
             {
                 "type": "action",
-                "name": "connected_ocmb7"
-            },
-            {
-                "type": "action",
-                "name": "mcc3"
+                "name": "th_1"
             }
         ],
-        "all_ocmb_and_mcc4": [
+        "channel_timeout_omi4_th_1": [
             {
                 "type": "action",
-                "name": "connected_ocmb8"
+                "name": "channel_timeout_omi4"
             },
             {
                 "type": "action",
-                "name": "connected_ocmb9"
-            },
-            {
-                "type": "action",
-                "name": "mcc4"
+                "name": "th_1"
             }
         ],
-        "all_ocmb_and_mcc5": [
+        "channel_timeout_omi5_th_1": [
             {
                 "type": "action",
-                "name": "connected_ocmb10"
+                "name": "channel_timeout_omi5"
             },
             {
                 "type": "action",
-                "name": "connected_ocmb11"
-            },
-            {
-                "type": "action",
-                "name": "mcc5"
+                "name": "th_1"
             }
         ],
-        "all_ocmb_and_mcc6": [
+        "channel_timeout_omi6_th_1": [
             {
                 "type": "action",
-                "name": "connected_ocmb12"
+                "name": "channel_timeout_omi6"
             },
             {
                 "type": "action",
-                "name": "connected_ocmb13"
-            },
-            {
-                "type": "action",
-                "name": "mcc6"
+                "name": "th_1"
             }
         ],
-        "all_ocmb_and_mcc7": [
+        "channel_timeout_omi7_th_1": [
             {
                 "type": "action",
-                "name": "connected_ocmb14"
+                "name": "channel_timeout_omi7"
             },
             {
                 "type": "action",
-                "name": "connected_ocmb15"
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi8_th_1": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi8"
             },
             {
                 "type": "action",
-                "name": "mcc7"
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi9_th_1": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi9"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi10_th_1": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi10"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi11_th_1": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi11"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi12_th_1": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi12"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi13_th_1": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi13"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi14_th_1": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi14"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi15_th_1": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi15"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "channel_timeout_omi0_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi0"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi1_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi1"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi2_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi2"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi3_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi3"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi4_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi4"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi5_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi5"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi6_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi6"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi7_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi7"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi8_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi8"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi9_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi9"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi10_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi10"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi11_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi11"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi12_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi12"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi13_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi13"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi14_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi14"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "channel_timeout_omi15_th_32perDay": [
+            {
+                "type": "action",
+                "name": "channel_timeout_omi15"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "all_ocmb_and_mcc0_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb0_M"
+            },
+            {
+                "type": "action",
+                "name": "connected_ocmb1_M"
+            },
+            {
+                "type": "action",
+                "name": "mcc0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "all_ocmb_and_mcc1_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb2_M"
+            },
+            {
+                "type": "action",
+                "name": "connected_ocmb3_M"
+            },
+            {
+                "type": "action",
+                "name": "mcc1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "all_ocmb_and_mcc2_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb4_M"
+            },
+            {
+                "type": "action",
+                "name": "connected_ocmb5_M"
+            },
+            {
+                "type": "action",
+                "name": "mcc2_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "all_ocmb_and_mcc3_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb6_M"
+            },
+            {
+                "type": "action",
+                "name": "connected_ocmb7_M"
+            },
+            {
+                "type": "action",
+                "name": "mcc3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "all_ocmb_and_mcc4_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb8_M"
+            },
+            {
+                "type": "action",
+                "name": "connected_ocmb9_M"
+            },
+            {
+                "type": "action",
+                "name": "mcc4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "all_ocmb_and_mcc5_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb10_M"
+            },
+            {
+                "type": "action",
+                "name": "connected_ocmb11_M"
+            },
+            {
+                "type": "action",
+                "name": "mcc5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "all_ocmb_and_mcc6_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb12_M"
+            },
+            {
+                "type": "action",
+                "name": "connected_ocmb13_M"
+            },
+            {
+                "type": "action",
+                "name": "mcc6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "all_ocmb_and_mcc7_th_1": [
+            {
+                "type": "action",
+                "name": "connected_ocmb14_M"
+            },
+            {
+                "type": "action",
+                "name": "connected_ocmb15_M"
+            },
+            {
+                "type": "action",
+                "name": "mcc7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
         "ocmb_H_omi_L_0": [
@@ -4258,7 +10984,327 @@
                 "guard": false
             }
         ],
-        "pec0": [
+        "ocmb_H_omi_L_0_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_0"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_1_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_1"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_2_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_2"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_3_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_3"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_4_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_4"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_5_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_5"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_6_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_6"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_7_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_7"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_8_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_8"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_9_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_9"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_10_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_10"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_11_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_11"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_12_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_12"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_13_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_13"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_14_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_14"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_15_th_1": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_15"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "ocmb_H_omi_L_0_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_0"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_1_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_1"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_2_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_2"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_3_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_3"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_4_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_4"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_5_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_5"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_6_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_6"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_7_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_7"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_8_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_8"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_9_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_9"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_10_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_10"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_11_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_11"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_12_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_12"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_13_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_13"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_14_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_14"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "ocmb_H_omi_L_15_th_32perDay": [
+            {
+                "type": "action",
+                "name": "ocmb_H_omi_L_15"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pec0_M": [
             {
                 "type": "callout_unit",
                 "name": "pec0",
@@ -4266,7 +11312,7 @@
                 "guard": true
             }
         ],
-        "pec1": [
+        "pec1_M": [
             {
                 "type": "callout_unit",
                 "name": "pec1",
@@ -4274,7 +11320,67 @@
                 "guard": true
             }
         ],
-        "pau0": [
+        "pec0_M_th_1": [
+            {
+                "type": "action",
+                "name": "pec0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "pec1_M_th_1": [
+            {
+                "type": "action",
+                "name": "pec1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "pec0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "pec0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pec1_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "pec1_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pec0_M_info_only": [
+            {
+                "type": "action",
+                "name": "pec0_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "pec1_M_info_only": [
+            {
+                "type": "action",
+                "name": "pec1_M_th_32perDay"
+            },
+            {
+                "type": "flag",
+                "name": "informational_only"
+            }
+        ],
+        "pau0_M": [
             {
                 "type": "callout_unit",
                 "name": "pau0",
@@ -4282,7 +11388,7 @@
                 "guard": true
             }
         ],
-        "pau3": [
+        "pau3_M": [
             {
                 "type": "callout_unit",
                 "name": "pau3",
@@ -4290,7 +11396,7 @@
                 "guard": true
             }
         ],
-        "pau4": [
+        "pau4_M": [
             {
                 "type": "callout_unit",
                 "name": "pau4",
@@ -4298,7 +11404,7 @@
                 "guard": true
             }
         ],
-        "pau5": [
+        "pau5_M": [
             {
                 "type": "callout_unit",
                 "name": "pau5",
@@ -4306,7 +11412,7 @@
                 "guard": true
             }
         ],
-        "pau6": [
+        "pau6_M": [
             {
                 "type": "callout_unit",
                 "name": "pau6",
@@ -4314,7 +11420,7 @@
                 "guard": true
             }
         ],
-        "pau7": [
+        "pau7_M": [
             {
                 "type": "callout_unit",
                 "name": "pau7",
@@ -4322,7 +11428,127 @@
                 "guard": true
             }
         ],
-        "pau0_sue": [
+        "pau0_M_th_1": [
+            {
+                "type": "action",
+                "name": "pau0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "pau3_M_th_1": [
+            {
+                "type": "action",
+                "name": "pau3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "pau4_M_th_1": [
+            {
+                "type": "action",
+                "name": "pau4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "pau5_M_th_1": [
+            {
+                "type": "action",
+                "name": "pau5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "pau6_M_th_1": [
+            {
+                "type": "action",
+                "name": "pau6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "pau7_M_th_1": [
+            {
+                "type": "action",
+                "name": "pau7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "pau0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "pau0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pau3_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "pau3_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pau4_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "pau4_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pau5_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "pau5_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pau6_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "pau6_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pau7_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "pau7_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "pau0_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -4332,9 +11558,13 @@
                 "name": "pau0",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "pau3_sue": [
+        "pau3_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -4344,9 +11574,13 @@
                 "name": "pau3",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "pau4_sue": [
+        "pau4_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -4356,9 +11590,13 @@
                 "name": "pau4",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "pau5_sue": [
+        "pau5_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -4368,9 +11606,13 @@
                 "name": "pau5",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "pau6_sue": [
+        "pau6_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -4380,9 +11622,13 @@
                 "name": "pau6",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "pau7_sue": [
+        "pau7_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -4392,9 +11638,13 @@
                 "name": "pau7",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
-        "nx0": [
+        "nx0_M": [
             {
                 "type": "callout_unit",
                 "name": "nx0",
@@ -4402,7 +11652,27 @@
                 "guard": true
             }
         ],
-        "nx0_sue": [
+        "nx0_M_th_1": [
+            {
+                "type": "action",
+                "name": "nx0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
+            }
+        ],
+        "nx0_M_th_32perDay": [
+            {
+                "type": "action",
+                "name": "nx0_M"
+            },
+            {
+                "type": "action",
+                "name": "th_32perDay"
+            }
+        ],
+        "nx0_M_th_1_sue": [
             {
                 "type": "action",
                 "name": "sue_seen_H"
@@ -4412,6 +11682,10 @@
                 "name": "nx0",
                 "priority": "MED",
                 "guard": false
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
         "rcs_osc_error_0": [
@@ -4424,6 +11698,10 @@
             {
                 "type": "action",
                 "name": "self_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
         "rcs_osc_error_1": [
@@ -4436,6 +11714,10 @@
             {
                 "type": "action",
                 "name": "self_L"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
         "pll_unlock_0": [
@@ -4456,6 +11738,10 @@
             {
                 "type": "action",
                 "name": "self_H"
+            },
+            {
+                "type": "action",
+                "name": "th_1"
             }
         ],
         "ncu_timeout": [
@@ -4491,16 +11777,14 @@
                 "instance": 0
             }
         ],
-        "c_err_rpt": [
-            {
-                "type": "action",
-                "name": "level2_M_th1"
-            }
-        ],
         "downstream_attn": [
             {
                 "type": "action",
                 "name": "level2_M_th1"
+            },
+            {
+                "type": "flag",
+                "name": "recovered_error"
             }
         ],
         "sbe_vital_attn": [
@@ -4513,46 +11797,69 @@
             {
                 "type": "action",
                 "name": "level2_M_th1"
+            },
+            {
+                "type": "flag",
+                "name": "recovered_error"
+            }
+        ],
+        "th_1": [],
+        "th_32perDay": [
+            {
+                "type": "flag",
+                "name": "recovered_error"
+            }
+        ],
+        "th_5perHour": [
+            {
+                "type": "flag",
+                "name": "recovered_error"
+            }
+        ],
+        "th_128perDay": [
+            {
+                "type": "flag",
+                "name": "recovered_error"
             }
         ]
     },
     "signatures": {
         "ba70": {
             "00": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "02": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "03": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "04": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "05": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "06": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "07": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "08": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0a": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0b": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1"
@@ -4579,10 +11886,10 @@
                 "00": "level2_M_th1"
             },
             "14": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "15": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "16": {
                 "00": "level2_M_th1"
@@ -4687,10 +11994,10 @@
                 "00": "level2_M_th1"
             },
             "38": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "39": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "3a": {
                 "00": "deadman_timer"
@@ -4713,76 +12020,76 @@
         },
         "803f": {
             "00": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "01": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "02": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "03": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "04": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "05": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "06": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only"
             },
             "07": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only"
             },
             "08": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only"
             },
             "09": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only"
             },
             "0a": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only"
             },
             "0b": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1",
@@ -4833,16 +12140,16 @@
                 "03": "level2_M_th1"
             },
             "14": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "15": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "16": {
                 "00": "level2_M_th1",
@@ -5099,40 +12406,40 @@
         },
         "0cb8": {
             "00": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "02": {
                 "00": "level2_M_th1"
             },
             "03": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "04": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "05": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "06": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "07": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "08": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0a": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0b": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1"
@@ -5156,13 +12463,13 @@
                 "00": "level2_M_th1"
             },
             "13": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "14": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "15": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "16": {
                 "00": "level2_M_th1"
@@ -5183,31 +12490,31 @@
                 "00": "level2_M_th1"
             },
             "1c": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "1d": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "1e": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "1f": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "20": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "21": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "22": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "23": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "24": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "25": {
                 "00": "level2_M_th1"
@@ -5221,25 +12528,25 @@
         },
         "0bb6": {
             "00": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1"
@@ -5248,22 +12555,22 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
@@ -5307,98 +12614,98 @@
                 "0f": "level2_M_th1"
             },
             "35": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15",
+                "00": "omi0_M_th_1",
+                "01": "omi1_M_th_1",
+                "02": "omi2_M_th_1",
+                "03": "omi3_M_th_1",
+                "04": "omi4_M_th_1",
+                "05": "omi5_M_th_1",
+                "06": "omi6_M_th_1",
+                "07": "omi7_M_th_1",
+                "08": "omi8_M_th_1",
+                "09": "omi9_M_th_1",
+                "0a": "omi10_M_th_1",
+                "0b": "omi11_M_th_1",
+                "0c": "omi12_M_th_1",
+                "0d": "omi13_M_th_1",
+                "0e": "omi14_M_th_1",
+                "0f": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "36": {
-                "00": "omi_bus0",
-                "01": "omi_bus1",
-                "02": "omi_bus2",
-                "03": "omi_bus3",
-                "04": "omi_bus4",
-                "05": "omi_bus5",
-                "06": "omi_bus6",
-                "07": "omi_bus7",
-                "08": "omi_bus8",
-                "09": "omi_bus9",
-                "0a": "omi_bus10",
-                "0b": "omi_bus11",
-                "0c": "omi_bus12",
-                "0d": "omi_bus13",
-                "0e": "omi_bus14",
-                "0f": "omi_bus15",
+                "00": "omi_bus0_th_1",
+                "01": "omi_bus1_th_1",
+                "02": "omi_bus2_th_1",
+                "03": "omi_bus3_th_1",
+                "04": "omi_bus4_th_1",
+                "05": "omi_bus5_th_1",
+                "06": "omi_bus6_th_1",
+                "07": "omi_bus7_th_1",
+                "08": "omi_bus8_th_1",
+                "09": "omi_bus9_th_1",
+                "0a": "omi_bus10_th_1",
+                "0b": "omi_bus11_th_1",
+                "0c": "omi_bus12_th_1",
+                "0d": "omi_bus13_th_1",
+                "0e": "omi_bus14_th_1",
+                "0f": "omi_bus15_th_1",
                 "flags": ["sue_source"]
             },
             "37": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15",
+                "00": "omi0_M_th_1",
+                "01": "omi1_M_th_1",
+                "02": "omi2_M_th_1",
+                "03": "omi3_M_th_1",
+                "04": "omi4_M_th_1",
+                "05": "omi5_M_th_1",
+                "06": "omi6_M_th_1",
+                "07": "omi7_M_th_1",
+                "08": "omi8_M_th_1",
+                "09": "omi9_M_th_1",
+                "0a": "omi10_M_th_1",
+                "0b": "omi11_M_th_1",
+                "0c": "omi12_M_th_1",
+                "0d": "omi13_M_th_1",
+                "0e": "omi14_M_th_1",
+                "0f": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "38": {
-                "00": "omi_bus0",
-                "01": "omi_bus1",
-                "02": "omi_bus2",
-                "03": "omi_bus3",
-                "04": "omi_bus4",
-                "05": "omi_bus5",
-                "06": "omi_bus6",
-                "07": "omi_bus7",
-                "08": "omi_bus8",
-                "09": "omi_bus9",
-                "0a": "omi_bus10",
-                "0b": "omi_bus11",
-                "0c": "omi_bus12",
-                "0d": "omi_bus13",
-                "0e": "omi_bus14",
-                "0f": "omi_bus15",
+                "00": "omi_bus0_th_1",
+                "01": "omi_bus1_th_1",
+                "02": "omi_bus2_th_1",
+                "03": "omi_bus3_th_1",
+                "04": "omi_bus4_th_1",
+                "05": "omi_bus5_th_1",
+                "06": "omi_bus6_th_1",
+                "07": "omi_bus7_th_1",
+                "08": "omi_bus8_th_1",
+                "09": "omi_bus9_th_1",
+                "0a": "omi_bus10_th_1",
+                "0b": "omi_bus11_th_1",
+                "0c": "omi_bus12_th_1",
+                "0d": "omi_bus13_th_1",
+                "0e": "omi_bus14_th_1",
+                "0f": "omi_bus15_th_1",
                 "flags": ["sue_source"]
             },
             "39": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15",
+                "00": "omi0_M_th_1",
+                "01": "omi1_M_th_1",
+                "02": "omi2_M_th_1",
+                "03": "omi3_M_th_1",
+                "04": "omi4_M_th_1",
+                "05": "omi5_M_th_1",
+                "06": "omi6_M_th_1",
+                "07": "omi7_M_th_1",
+                "08": "omi8_M_th_1",
+                "09": "omi9_M_th_1",
+                "0a": "omi10_M_th_1",
+                "0b": "omi11_M_th_1",
+                "0c": "omi12_M_th_1",
+                "0d": "omi13_M_th_1",
+                "0e": "omi14_M_th_1",
+                "0f": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "3a": {
@@ -5420,135 +12727,135 @@
                 "0f": "level2_M_th1"
             },
             "3b": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15",
+                "00": "omi0_M_th_1",
+                "01": "omi1_M_th_1",
+                "02": "omi2_M_th_1",
+                "03": "omi3_M_th_1",
+                "04": "omi4_M_th_1",
+                "05": "omi5_M_th_1",
+                "06": "omi6_M_th_1",
+                "07": "omi7_M_th_1",
+                "08": "omi8_M_th_1",
+                "09": "omi9_M_th_1",
+                "0a": "omi10_M_th_1",
+                "0b": "omi11_M_th_1",
+                "0c": "omi12_M_th_1",
+                "0d": "omi13_M_th_1",
+                "0e": "omi14_M_th_1",
+                "0f": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "3c": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15",
+                "00": "omi0_M_th_1",
+                "01": "omi1_M_th_1",
+                "02": "omi2_M_th_1",
+                "03": "omi3_M_th_1",
+                "04": "omi4_M_th_1",
+                "05": "omi5_M_th_1",
+                "06": "omi6_M_th_1",
+                "07": "omi7_M_th_1",
+                "08": "omi8_M_th_1",
+                "09": "omi9_M_th_1",
+                "0a": "omi10_M_th_1",
+                "0b": "omi11_M_th_1",
+                "0c": "omi12_M_th_1",
+                "0d": "omi13_M_th_1",
+                "0e": "omi14_M_th_1",
+                "0f": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "3d": {
-                "00": "omi_bus0",
-                "01": "omi_bus1",
-                "02": "omi_bus2",
-                "03": "omi_bus3",
-                "04": "omi_bus4",
-                "05": "omi_bus5",
-                "06": "omi_bus6",
-                "07": "omi_bus7",
-                "08": "omi_bus8",
-                "09": "omi_bus9",
-                "0a": "omi_bus10",
-                "0b": "omi_bus11",
-                "0c": "omi_bus12",
-                "0d": "omi_bus13",
-                "0e": "omi_bus14",
-                "0f": "omi_bus15",
+                "00": "omi_bus0_th_1",
+                "01": "omi_bus1_th_1",
+                "02": "omi_bus2_th_1",
+                "03": "omi_bus3_th_1",
+                "04": "omi_bus4_th_1",
+                "05": "omi_bus5_th_1",
+                "06": "omi_bus6_th_1",
+                "07": "omi_bus7_th_1",
+                "08": "omi_bus8_th_1",
+                "09": "omi_bus9_th_1",
+                "0a": "omi_bus10_th_1",
+                "0b": "omi_bus11_th_1",
+                "0c": "omi_bus12_th_1",
+                "0d": "omi_bus13_th_1",
+                "0e": "omi_bus14_th_1",
+                "0f": "omi_bus15_th_1",
                 "flags": ["sue_source"]
             },
             "3e": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15",
+                "00": "omi0_M_th_1",
+                "01": "omi1_M_th_1",
+                "02": "omi2_M_th_1",
+                "03": "omi3_M_th_1",
+                "04": "omi4_M_th_1",
+                "05": "omi5_M_th_1",
+                "06": "omi6_M_th_1",
+                "07": "omi7_M_th_1",
+                "08": "omi8_M_th_1",
+                "09": "omi9_M_th_1",
+                "0a": "omi10_M_th_1",
+                "0b": "omi11_M_th_1",
+                "0c": "omi12_M_th_1",
+                "0d": "omi13_M_th_1",
+                "0e": "omi14_M_th_1",
+                "0f": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "3f": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15",
+                "00": "omi0_M_th_1",
+                "01": "omi1_M_th_1",
+                "02": "omi2_M_th_1",
+                "03": "omi3_M_th_1",
+                "04": "omi4_M_th_1",
+                "05": "omi5_M_th_1",
+                "06": "omi6_M_th_1",
+                "07": "omi7_M_th_1",
+                "08": "omi8_M_th_1",
+                "09": "omi9_M_th_1",
+                "0a": "omi10_M_th_1",
+                "0b": "omi11_M_th_1",
+                "0c": "omi12_M_th_1",
+                "0d": "omi13_M_th_1",
+                "0e": "omi14_M_th_1",
+                "0f": "omi15_M_th_1",
                 "flags": ["sue_source"]
             }
         },
         "5074": {
             "00": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "01": {
                 "00": "level2_M_th1",
@@ -5585,141 +12892,141 @@
                 "1f": "level2_M_th1"
             },
             "02": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "03": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_info_only",
+                "01": "core1_M_info_only",
+                "02": "core2_M_info_only",
+                "03": "core3_M_info_only",
+                "04": "core4_M_info_only",
+                "05": "core5_M_info_only",
+                "06": "core6_M_info_only",
+                "07": "core7_M_info_only",
+                "08": "core8_M_info_only",
+                "09": "core9_M_info_only",
+                "0a": "core10_M_info_only",
+                "0b": "core11_M_info_only",
+                "0c": "core12_M_info_only",
+                "0d": "core13_M_info_only",
+                "0e": "core14_M_info_only",
+                "0f": "core15_M_info_only",
+                "10": "core16_M_info_only",
+                "11": "core17_M_info_only",
+                "12": "core18_M_info_only",
+                "13": "core19_M_info_only",
+                "14": "core20_M_info_only",
+                "15": "core21_M_info_only",
+                "16": "core22_M_info_only",
+                "17": "core23_M_info_only",
+                "18": "core24_M_info_only",
+                "19": "core25_M_info_only",
+                "1a": "core26_M_info_only",
+                "1b": "core27_M_info_only",
+                "1c": "core28_M_info_only",
+                "1d": "core29_M_info_only",
+                "1e": "core30_M_info_only",
+                "1f": "core31_M_info_only"
             },
             "04": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_128perDay",
+                "01": "core1_M_th_128perDay",
+                "02": "core2_M_th_128perDay",
+                "03": "core3_M_th_128perDay",
+                "04": "core4_M_th_128perDay",
+                "05": "core5_M_th_128perDay",
+                "06": "core6_M_th_128perDay",
+                "07": "core7_M_th_128perDay",
+                "08": "core8_M_th_128perDay",
+                "09": "core9_M_th_128perDay",
+                "0a": "core10_M_th_128perDay",
+                "0b": "core11_M_th_128perDay",
+                "0c": "core12_M_th_128perDay",
+                "0d": "core13_M_th_128perDay",
+                "0e": "core14_M_th_128perDay",
+                "0f": "core15_M_th_128perDay",
+                "10": "core16_M_th_128perDay",
+                "11": "core17_M_th_128perDay",
+                "12": "core18_M_th_128perDay",
+                "13": "core19_M_th_128perDay",
+                "14": "core20_M_th_128perDay",
+                "15": "core21_M_th_128perDay",
+                "16": "core22_M_th_128perDay",
+                "17": "core23_M_th_128perDay",
+                "18": "core24_M_th_128perDay",
+                "19": "core25_M_th_128perDay",
+                "1a": "core26_M_th_128perDay",
+                "1b": "core27_M_th_128perDay",
+                "1c": "core28_M_th_128perDay",
+                "1d": "core29_M_th_128perDay",
+                "1e": "core30_M_th_128perDay",
+                "1f": "core31_M_th_128perDay"
             },
             "05": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "06": {
@@ -5757,72 +13064,72 @@
                 "1f": "level2_M_th1"
             },
             "07": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_32perDay",
+                "01": "core1_M_th_32perDay",
+                "02": "core2_M_th_32perDay",
+                "03": "core3_M_th_32perDay",
+                "04": "core4_M_th_32perDay",
+                "05": "core5_M_th_32perDay",
+                "06": "core6_M_th_32perDay",
+                "07": "core7_M_th_32perDay",
+                "08": "core8_M_th_32perDay",
+                "09": "core9_M_th_32perDay",
+                "0a": "core10_M_th_32perDay",
+                "0b": "core11_M_th_32perDay",
+                "0c": "core12_M_th_32perDay",
+                "0d": "core13_M_th_32perDay",
+                "0e": "core14_M_th_32perDay",
+                "0f": "core15_M_th_32perDay",
+                "10": "core16_M_th_32perDay",
+                "11": "core17_M_th_32perDay",
+                "12": "core18_M_th_32perDay",
+                "13": "core19_M_th_32perDay",
+                "14": "core20_M_th_32perDay",
+                "15": "core21_M_th_32perDay",
+                "16": "core22_M_th_32perDay",
+                "17": "core23_M_th_32perDay",
+                "18": "core24_M_th_32perDay",
+                "19": "core25_M_th_32perDay",
+                "1a": "core26_M_th_32perDay",
+                "1b": "core27_M_th_32perDay",
+                "1c": "core28_M_th_32perDay",
+                "1d": "core29_M_th_32perDay",
+                "1e": "core30_M_th_32perDay",
+                "1f": "core31_M_th_32perDay"
             },
             "08": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "09": {
@@ -5860,72 +13167,72 @@
                 "1f": "level2_M_th1"
             },
             "0a": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_32perDay",
+                "01": "core1_M_th_32perDay",
+                "02": "core2_M_th_32perDay",
+                "03": "core3_M_th_32perDay",
+                "04": "core4_M_th_32perDay",
+                "05": "core5_M_th_32perDay",
+                "06": "core6_M_th_32perDay",
+                "07": "core7_M_th_32perDay",
+                "08": "core8_M_th_32perDay",
+                "09": "core9_M_th_32perDay",
+                "0a": "core10_M_th_32perDay",
+                "0b": "core11_M_th_32perDay",
+                "0c": "core12_M_th_32perDay",
+                "0d": "core13_M_th_32perDay",
+                "0e": "core14_M_th_32perDay",
+                "0f": "core15_M_th_32perDay",
+                "10": "core16_M_th_32perDay",
+                "11": "core17_M_th_32perDay",
+                "12": "core18_M_th_32perDay",
+                "13": "core19_M_th_32perDay",
+                "14": "core20_M_th_32perDay",
+                "15": "core21_M_th_32perDay",
+                "16": "core22_M_th_32perDay",
+                "17": "core23_M_th_32perDay",
+                "18": "core24_M_th_32perDay",
+                "19": "core25_M_th_32perDay",
+                "1a": "core26_M_th_32perDay",
+                "1b": "core27_M_th_32perDay",
+                "1c": "core28_M_th_32perDay",
+                "1d": "core29_M_th_32perDay",
+                "1e": "core30_M_th_32perDay",
+                "1f": "core31_M_th_32perDay"
             },
             "0b": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0c": {
@@ -5963,72 +13270,72 @@
                 "1f": "level2_M_th1"
             },
             "0d": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_32perDay",
+                "01": "core1_M_th_32perDay",
+                "02": "core2_M_th_32perDay",
+                "03": "core3_M_th_32perDay",
+                "04": "core4_M_th_32perDay",
+                "05": "core5_M_th_32perDay",
+                "06": "core6_M_th_32perDay",
+                "07": "core7_M_th_32perDay",
+                "08": "core8_M_th_32perDay",
+                "09": "core9_M_th_32perDay",
+                "0a": "core10_M_th_32perDay",
+                "0b": "core11_M_th_32perDay",
+                "0c": "core12_M_th_32perDay",
+                "0d": "core13_M_th_32perDay",
+                "0e": "core14_M_th_32perDay",
+                "0f": "core15_M_th_32perDay",
+                "10": "core16_M_th_32perDay",
+                "11": "core17_M_th_32perDay",
+                "12": "core18_M_th_32perDay",
+                "13": "core19_M_th_32perDay",
+                "14": "core20_M_th_32perDay",
+                "15": "core21_M_th_32perDay",
+                "16": "core22_M_th_32perDay",
+                "17": "core23_M_th_32perDay",
+                "18": "core24_M_th_32perDay",
+                "19": "core25_M_th_32perDay",
+                "1a": "core26_M_th_32perDay",
+                "1b": "core27_M_th_32perDay",
+                "1c": "core28_M_th_32perDay",
+                "1d": "core29_M_th_32perDay",
+                "1e": "core30_M_th_32perDay",
+                "1f": "core31_M_th_32perDay"
             },
             "0e": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "0f": {
                 "00": "level2_M_th1",
@@ -6065,72 +13372,72 @@
                 "1f": "level2_M_th1"
             },
             "10": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L"
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1"
             },
             "11": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "12": {
@@ -6304,106 +13611,106 @@
                 "1f": "level2_M_th1"
             },
             "17": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L"
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1"
             },
             "18": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "19": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L"
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1"
             },
             "1a": {
                 "00": "level2_M_th1",
@@ -6440,38 +13747,38 @@
                 "1f": "level2_M_th1"
             },
             "1b": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L"
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1"
             },
             "1c": {
                 "00": "level2_M_th1",
@@ -6508,72 +13815,72 @@
                 "1f": "level2_M_th1"
             },
             "1d": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "1e": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "1f": {
                 "00": "level2_M_th1",
@@ -6670,17 +13977,17 @@
                 "03": "level2_M_th1"
             },
             "04": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
                 "flags": ["cs_possible"]
             },
             "05": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "06": {
                 "00": "level2_M_th1",
@@ -6689,23 +13996,23 @@
                 "03": "level2_M_th1"
             },
             "07": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "08": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
                 "flags": ["cs_possible"]
             },
             "09": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1",
@@ -6714,106 +14021,106 @@
                 "03": "level2_M_th1"
             },
             "0b": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "0c": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "0d": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "0e": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "0f": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "10": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "11": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "12": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "13": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "14": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "15": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "16": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink4",
-                "02": "smp_bus_iolink8",
-                "03": "smp_bus_iolink12"
+                "00": "smp_bus_iolink0_th_1",
+                "01": "smp_bus_iolink4_th_1",
+                "02": "smp_bus_iolink8_th_1",
+                "03": "smp_bus_iolink12_th_1"
             },
             "17": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink5",
-                "02": "smp_bus_iolink9",
-                "03": "smp_bus_iolink13"
+                "00": "smp_bus_iolink1_th_1",
+                "01": "smp_bus_iolink5_th_1",
+                "02": "smp_bus_iolink9_th_1",
+                "03": "smp_bus_iolink13_th_1"
             },
             "18": {
-                "00": "smp_bus_iolink2",
-                "01": "smp_bus_iolink6",
-                "02": "smp_bus_iolink10",
-                "03": "smp_bus_iolink14"
+                "00": "smp_bus_iolink2_th_1",
+                "01": "smp_bus_iolink6_th_1",
+                "02": "smp_bus_iolink10_th_1",
+                "03": "smp_bus_iolink14_th_1"
             },
             "19": {
-                "00": "smp_bus_iolink3",
-                "01": "smp_bus_iolink7",
-                "02": "smp_bus_iolink11",
-                "03": "smp_bus_iolink15"
+                "00": "smp_bus_iolink3_th_1",
+                "01": "smp_bus_iolink7_th_1",
+                "02": "smp_bus_iolink11_th_1",
+                "03": "smp_bus_iolink15_th_1"
             },
             "1a": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "1b": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn"
             },
             "1c": {
                 "00": "level2_M_th1",
@@ -6890,13 +14197,13 @@
         },
         "0cd3": {
             "00": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "02": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "03": {
                 "00": "level2_M_th1"
@@ -6914,7 +14221,7 @@
                 "00": "level2_M_th1"
             },
             "08": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "09": {
                 "00": "level2_M_th1"
@@ -6923,25 +14230,25 @@
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1"
             },
             "0d": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0e": {
                 "00": "level2_M_th1"
             },
             "0f": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "10": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "11": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "12": {
                 "00": "level2_M_th1"
@@ -6952,25 +14259,25 @@
         },
         "06b8": {
             "00": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1"
@@ -6979,22 +14286,22 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
@@ -7020,146 +14327,146 @@
         },
         "4558": {
             "00": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec0_M_th_32perDay",
+                "02": "pec1_M_th_32perDay",
+                "03": "pec1_M_th_32perDay"
             },
             "01": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_1",
+                "01": "pec0_M_th_1",
+                "02": "pec1_M_th_1",
+                "03": "pec1_M_th_1"
             },
             "02": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec0_M_th_32perDay",
+                "02": "pec1_M_th_32perDay",
+                "03": "pec1_M_th_32perDay"
             },
             "03": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_1",
+                "01": "pec0_M_th_1",
+                "02": "pec1_M_th_1",
+                "03": "pec1_M_th_1"
             },
             "04": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec0_M_th_32perDay",
+                "02": "pec1_M_th_32perDay",
+                "03": "pec1_M_th_32perDay"
             },
             "05": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_1",
+                "01": "pec0_M_th_1",
+                "02": "pec1_M_th_1",
+                "03": "pec1_M_th_1"
             },
             "06": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec0_M_th_32perDay",
+                "02": "pec1_M_th_32perDay",
+                "03": "pec1_M_th_32perDay"
             },
             "07": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec0_M_th_32perDay",
+                "02": "pec1_M_th_32perDay",
+                "03": "pec1_M_th_32perDay"
             },
             "08": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec0_M_th_32perDay",
+                "02": "pec1_M_th_32perDay",
+                "03": "pec1_M_th_32perDay"
             },
             "09": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_1",
+                "01": "pec0_M_th_1",
+                "02": "pec1_M_th_1",
+                "03": "pec1_M_th_1"
             },
             "0a": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec0_M_th_32perDay",
+                "02": "pec1_M_th_32perDay",
+                "03": "pec1_M_th_32perDay"
             },
             "0b": {
-                "00": "pec0",
-                "01": "pec0",
-                "02": "pec1",
-                "03": "pec1"
+                "00": "pec0_M_th_1",
+                "01": "pec0_M_th_1",
+                "02": "pec1_M_th_1",
+                "03": "pec1_M_th_1"
             }
         },
         "4d74": {
             "00": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_128perDay",
+                "01": "core1_M_th_128perDay",
+                "02": "core2_M_th_128perDay",
+                "03": "core3_M_th_128perDay",
+                "04": "core4_M_th_128perDay",
+                "05": "core5_M_th_128perDay",
+                "06": "core6_M_th_128perDay",
+                "07": "core7_M_th_128perDay",
+                "08": "core8_M_th_128perDay",
+                "09": "core9_M_th_128perDay",
+                "0a": "core10_M_th_128perDay",
+                "0b": "core11_M_th_128perDay",
+                "0c": "core12_M_th_128perDay",
+                "0d": "core13_M_th_128perDay",
+                "0e": "core14_M_th_128perDay",
+                "0f": "core15_M_th_128perDay",
+                "10": "core16_M_th_128perDay",
+                "11": "core17_M_th_128perDay",
+                "12": "core18_M_th_128perDay",
+                "13": "core19_M_th_128perDay",
+                "14": "core20_M_th_128perDay",
+                "15": "core21_M_th_128perDay",
+                "16": "core22_M_th_128perDay",
+                "17": "core23_M_th_128perDay",
+                "18": "core24_M_th_128perDay",
+                "19": "core25_M_th_128perDay",
+                "1a": "core26_M_th_128perDay",
+                "1b": "core27_M_th_128perDay",
+                "1c": "core28_M_th_128perDay",
+                "1d": "core29_M_th_128perDay",
+                "1e": "core30_M_th_128perDay",
+                "1f": "core31_M_th_128perDay"
             },
             "01": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "02": {
@@ -7299,140 +14606,140 @@
                 "1f": "level2_M_th1"
             },
             "06": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_32perDay",
+                "01": "core1_M_th_32perDay",
+                "02": "core2_M_th_32perDay",
+                "03": "core3_M_th_32perDay",
+                "04": "core4_M_th_32perDay",
+                "05": "core5_M_th_32perDay",
+                "06": "core6_M_th_32perDay",
+                "07": "core7_M_th_32perDay",
+                "08": "core8_M_th_32perDay",
+                "09": "core9_M_th_32perDay",
+                "0a": "core10_M_th_32perDay",
+                "0b": "core11_M_th_32perDay",
+                "0c": "core12_M_th_32perDay",
+                "0d": "core13_M_th_32perDay",
+                "0e": "core14_M_th_32perDay",
+                "0f": "core15_M_th_32perDay",
+                "10": "core16_M_th_32perDay",
+                "11": "core17_M_th_32perDay",
+                "12": "core18_M_th_32perDay",
+                "13": "core19_M_th_32perDay",
+                "14": "core20_M_th_32perDay",
+                "15": "core21_M_th_32perDay",
+                "16": "core22_M_th_32perDay",
+                "17": "core23_M_th_32perDay",
+                "18": "core24_M_th_32perDay",
+                "19": "core25_M_th_32perDay",
+                "1a": "core26_M_th_32perDay",
+                "1b": "core27_M_th_32perDay",
+                "1c": "core28_M_th_32perDay",
+                "1d": "core29_M_th_32perDay",
+                "1e": "core30_M_th_32perDay",
+                "1f": "core31_M_th_32perDay"
             },
             "07": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "08": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "09": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "0a": {
                 "00": "level2_M_th1",
@@ -7469,38 +14776,38 @@
                 "1f": "level2_M_th1"
             },
             "0b": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_32perDay",
+                "01": "core1_M_th_32perDay",
+                "02": "core2_M_th_32perDay",
+                "03": "core3_M_th_32perDay",
+                "04": "core4_M_th_32perDay",
+                "05": "core5_M_th_32perDay",
+                "06": "core6_M_th_32perDay",
+                "07": "core7_M_th_32perDay",
+                "08": "core8_M_th_32perDay",
+                "09": "core9_M_th_32perDay",
+                "0a": "core10_M_th_32perDay",
+                "0b": "core11_M_th_32perDay",
+                "0c": "core12_M_th_32perDay",
+                "0d": "core13_M_th_32perDay",
+                "0e": "core14_M_th_32perDay",
+                "0f": "core15_M_th_32perDay",
+                "10": "core16_M_th_32perDay",
+                "11": "core17_M_th_32perDay",
+                "12": "core18_M_th_32perDay",
+                "13": "core19_M_th_32perDay",
+                "14": "core20_M_th_32perDay",
+                "15": "core21_M_th_32perDay",
+                "16": "core22_M_th_32perDay",
+                "17": "core23_M_th_32perDay",
+                "18": "core24_M_th_32perDay",
+                "19": "core25_M_th_32perDay",
+                "1a": "core26_M_th_32perDay",
+                "1b": "core27_M_th_32perDay",
+                "1c": "core28_M_th_32perDay",
+                "1d": "core29_M_th_32perDay",
+                "1e": "core30_M_th_32perDay",
+                "1f": "core31_M_th_32perDay"
             },
             "0c": {
                 "00": "level2_M_th1",
@@ -7573,244 +14880,244 @@
                 "flags": ["cs_possible"]
             },
             "0e": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L",
-                "08": "level2_M_self_L",
-                "09": "level2_M_self_L",
-                "0a": "level2_M_self_L",
-                "0b": "level2_M_self_L",
-                "0c": "level2_M_self_L",
-                "0d": "level2_M_self_L",
-                "0e": "level2_M_self_L",
-                "0f": "level2_M_self_L",
-                "10": "level2_M_self_L",
-                "11": "level2_M_self_L",
-                "12": "level2_M_self_L",
-                "13": "level2_M_self_L",
-                "14": "level2_M_self_L",
-                "15": "level2_M_self_L",
-                "16": "level2_M_self_L",
-                "17": "level2_M_self_L",
-                "18": "level2_M_self_L",
-                "19": "level2_M_self_L",
-                "1a": "level2_M_self_L",
-                "1b": "level2_M_self_L",
-                "1c": "level2_M_self_L",
-                "1d": "level2_M_self_L",
-                "1e": "level2_M_self_L",
-                "1f": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1",
+                "08": "level2_M_self_L_th_1",
+                "09": "level2_M_self_L_th_1",
+                "0a": "level2_M_self_L_th_1",
+                "0b": "level2_M_self_L_th_1",
+                "0c": "level2_M_self_L_th_1",
+                "0d": "level2_M_self_L_th_1",
+                "0e": "level2_M_self_L_th_1",
+                "0f": "level2_M_self_L_th_1",
+                "10": "level2_M_self_L_th_1",
+                "11": "level2_M_self_L_th_1",
+                "12": "level2_M_self_L_th_1",
+                "13": "level2_M_self_L_th_1",
+                "14": "level2_M_self_L_th_1",
+                "15": "level2_M_self_L_th_1",
+                "16": "level2_M_self_L_th_1",
+                "17": "level2_M_self_L_th_1",
+                "18": "level2_M_self_L_th_1",
+                "19": "level2_M_self_L_th_1",
+                "1a": "level2_M_self_L_th_1",
+                "1b": "level2_M_self_L_th_1",
+                "1c": "level2_M_self_L_th_1",
+                "1d": "level2_M_self_L_th_1",
+                "1e": "level2_M_self_L_th_1",
+                "1f": "level2_M_self_L_th_1"
             },
             "0f": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "10": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "11": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "12": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "13": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self",
-                "08": "self",
-                "09": "self",
-                "0a": "self",
-                "0b": "self",
-                "0c": "self",
-                "0d": "self",
-                "0e": "self",
-                "0f": "self",
-                "10": "self",
-                "11": "self",
-                "12": "self",
-                "13": "self",
-                "14": "self",
-                "15": "self",
-                "16": "self",
-                "17": "self",
-                "18": "self",
-                "19": "self",
-                "1a": "self",
-                "1b": "self",
-                "1c": "self",
-                "1d": "self",
-                "1e": "self",
-                "1f": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay",
+                "08": "self_M_th_32perDay",
+                "09": "self_M_th_32perDay",
+                "0a": "self_M_th_32perDay",
+                "0b": "self_M_th_32perDay",
+                "0c": "self_M_th_32perDay",
+                "0d": "self_M_th_32perDay",
+                "0e": "self_M_th_32perDay",
+                "0f": "self_M_th_32perDay",
+                "10": "self_M_th_32perDay",
+                "11": "self_M_th_32perDay",
+                "12": "self_M_th_32perDay",
+                "13": "self_M_th_32perDay",
+                "14": "self_M_th_32perDay",
+                "15": "self_M_th_32perDay",
+                "16": "self_M_th_32perDay",
+                "17": "self_M_th_32perDay",
+                "18": "self_M_th_32perDay",
+                "19": "self_M_th_32perDay",
+                "1a": "self_M_th_32perDay",
+                "1b": "self_M_th_32perDay",
+                "1c": "self_M_th_32perDay",
+                "1d": "self_M_th_32perDay",
+                "1e": "self_M_th_32perDay",
+                "1f": "self_M_th_32perDay"
             },
             "14": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self",
-                "08": "self",
-                "09": "self",
-                "0a": "self",
-                "0b": "self",
-                "0c": "self",
-                "0d": "self",
-                "0e": "self",
-                "0f": "self",
-                "10": "self",
-                "11": "self",
-                "12": "self",
-                "13": "self",
-                "14": "self",
-                "15": "self",
-                "16": "self",
-                "17": "self",
-                "18": "self",
-                "19": "self",
-                "1a": "self",
-                "1b": "self",
-                "1c": "self",
-                "1d": "self",
-                "1e": "self",
-                "1f": "self",
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1",
+                "06": "self_M_th_1",
+                "07": "self_M_th_1",
+                "08": "self_M_th_1",
+                "09": "self_M_th_1",
+                "0a": "self_M_th_1",
+                "0b": "self_M_th_1",
+                "0c": "self_M_th_1",
+                "0d": "self_M_th_1",
+                "0e": "self_M_th_1",
+                "0f": "self_M_th_1",
+                "10": "self_M_th_1",
+                "11": "self_M_th_1",
+                "12": "self_M_th_1",
+                "13": "self_M_th_1",
+                "14": "self_M_th_1",
+                "15": "self_M_th_1",
+                "16": "self_M_th_1",
+                "17": "self_M_th_1",
+                "18": "self_M_th_1",
+                "19": "self_M_th_1",
+                "1a": "self_M_th_1",
+                "1b": "self_M_th_1",
+                "1c": "self_M_th_1",
+                "1d": "self_M_th_1",
+                "1e": "self_M_th_1",
+                "1f": "self_M_th_1",
                 "flags": ["cs_possible"]
             },
             "15": {
@@ -7848,38 +15155,38 @@
                 "1f": "level2_M_th1"
             },
             "16": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "17": {
                 "00": "level2_M_th1",
@@ -7916,175 +15223,175 @@
                 "1f": "level2_M_th1"
             },
             "18": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "19": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L"
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1"
             },
             "1a": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_32perDay",
+                "01": "core1_M_th_32perDay",
+                "02": "core2_M_th_32perDay",
+                "03": "core3_M_th_32perDay",
+                "04": "core4_M_th_32perDay",
+                "05": "core5_M_th_32perDay",
+                "06": "core6_M_th_32perDay",
+                "07": "core7_M_th_32perDay",
+                "08": "core8_M_th_32perDay",
+                "09": "core9_M_th_32perDay",
+                "0a": "core10_M_th_32perDay",
+                "0b": "core11_M_th_32perDay",
+                "0c": "core12_M_th_32perDay",
+                "0d": "core13_M_th_32perDay",
+                "0e": "core14_M_th_32perDay",
+                "0f": "core15_M_th_32perDay",
+                "10": "core16_M_th_32perDay",
+                "11": "core17_M_th_32perDay",
+                "12": "core18_M_th_32perDay",
+                "13": "core19_M_th_32perDay",
+                "14": "core20_M_th_32perDay",
+                "15": "core21_M_th_32perDay",
+                "16": "core22_M_th_32perDay",
+                "17": "core23_M_th_32perDay",
+                "18": "core24_M_th_32perDay",
+                "19": "core25_M_th_32perDay",
+                "1a": "core26_M_th_32perDay",
+                "1b": "core27_M_th_32perDay",
+                "1c": "core28_M_th_32perDay",
+                "1d": "core29_M_th_32perDay",
+                "1e": "core30_M_th_32perDay",
+                "1f": "core31_M_th_32perDay"
             },
             "1b": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "1c": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "1d": {
                 "00": "level2_M_th1",
@@ -8325,38 +15632,38 @@
                 "1f": "level2_M_th1"
             },
             "24": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_info_only",
+                "01": "core1_M_info_only",
+                "02": "core2_M_info_only",
+                "03": "core3_M_info_only",
+                "04": "core4_M_info_only",
+                "05": "core5_M_info_only",
+                "06": "core6_M_info_only",
+                "07": "core7_M_info_only",
+                "08": "core8_M_info_only",
+                "09": "core9_M_info_only",
+                "0a": "core10_M_info_only",
+                "0b": "core11_M_info_only",
+                "0c": "core12_M_info_only",
+                "0d": "core13_M_info_only",
+                "0e": "core14_M_info_only",
+                "0f": "core15_M_info_only",
+                "10": "core16_M_info_only",
+                "11": "core17_M_info_only",
+                "12": "core18_M_info_only",
+                "13": "core19_M_info_only",
+                "14": "core20_M_info_only",
+                "15": "core21_M_info_only",
+                "16": "core22_M_info_only",
+                "17": "core23_M_info_only",
+                "18": "core24_M_info_only",
+                "19": "core25_M_info_only",
+                "1a": "core26_M_info_only",
+                "1b": "core27_M_info_only",
+                "1c": "core28_M_info_only",
+                "1d": "core29_M_info_only",
+                "1e": "core30_M_info_only",
+                "1f": "core31_M_info_only"
             },
             "25": {
                 "00": "level2_M_th1",
@@ -9243,330 +16550,330 @@
         },
         "32b1": {
             "00": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "01": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "02": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "03": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "04": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "05": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "06": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "07": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "08": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "09": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "0a": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "0b": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "0c": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "0d": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "0e": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "0f": {
-                "00": "bus_endpoints_iohs0",
-                "01": "bus_endpoints_iohs2",
-                "02": "bus_endpoints_iohs4",
-                "03": "bus_endpoints_iohs6"
+                "00": "bus_endpoints_iohs0_th_1",
+                "01": "bus_endpoints_iohs2_th_1",
+                "02": "bus_endpoints_iohs4_th_1",
+                "03": "bus_endpoints_iohs6_th_1"
             },
             "10": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "11": {
-                "00": "bus_endpoints_iohs0",
-                "01": "bus_endpoints_iohs2",
-                "02": "bus_endpoints_iohs4",
-                "03": "bus_endpoints_iohs6"
+                "00": "bus_endpoints_iohs0_th_1",
+                "01": "bus_endpoints_iohs2_th_1",
+                "02": "bus_endpoints_iohs4_th_1",
+                "03": "bus_endpoints_iohs6_th_1"
             },
             "12": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "13": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "14": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "15": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "16": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "17": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "18": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "19": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "1a": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "1b": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "1c": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "1d": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "1e": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "1f": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "20": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "21": {
-                "00": "bus_endpoints_iohs0",
-                "01": "bus_endpoints_iohs2",
-                "02": "bus_endpoints_iohs4",
-                "03": "bus_endpoints_iohs6"
+                "00": "bus_endpoints_iohs0_th_1",
+                "01": "bus_endpoints_iohs2_th_1",
+                "02": "bus_endpoints_iohs4_th_1",
+                "03": "bus_endpoints_iohs6_th_1"
             },
             "22": {
-                "00": "bus_endpoints_iohs0",
-                "01": "bus_endpoints_iohs2",
-                "02": "bus_endpoints_iohs4",
-                "03": "bus_endpoints_iohs6"
+                "00": "bus_endpoints_iohs0_th_1",
+                "01": "bus_endpoints_iohs2_th_1",
+                "02": "bus_endpoints_iohs4_th_1",
+                "03": "bus_endpoints_iohs6_th_1"
             },
             "23": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "24": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "25": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "26": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "27": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "28": {
-                "00": "bus_endpoints_iohs0",
-                "01": "bus_endpoints_iohs2",
-                "02": "bus_endpoints_iohs4",
-                "03": "bus_endpoints_iohs6"
+                "00": "bus_endpoints_iohs0_th_1",
+                "01": "bus_endpoints_iohs2_th_1",
+                "02": "bus_endpoints_iohs4_th_1",
+                "03": "bus_endpoints_iohs6_th_1"
             },
             "29": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "2a": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "2b": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "2c": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "2d": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "2e": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "2f": {
-                "00": "iohs0",
-                "01": "iohs2",
-                "02": "iohs4",
-                "03": "iohs6"
+                "00": "iohs0_M_th_1",
+                "01": "iohs2_M_th_1",
+                "02": "iohs4_M_th_1",
+                "03": "iohs6_M_th_1"
             },
             "30": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "31": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "32": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "33": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             }
         },
         "efa7": {
             "00": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_th_1",
+                "01": "mc1_M_th_1",
+                "02": "mc2_M_th_1",
+                "03": "mc3_M_th_1"
             },
             "01": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_th_1",
+                "01": "mc1_M_th_1",
+                "02": "mc2_M_th_1",
+                "03": "mc3_M_th_1"
             },
             "02": {
                 "00": "level2_M_th1",
@@ -9575,16 +16882,16 @@
                 "03": "level2_M_th1"
             },
             "03": {
-                "00": "level2_M_mc0_L",
-                "01": "level2_M_mc1_L",
-                "02": "level2_M_mc2_L",
-                "03": "level2_M_mc3_L"
+                "00": "level2_M_mc0_L_th_1",
+                "01": "level2_M_mc1_L_th_1",
+                "02": "level2_M_mc2_L_th_1",
+                "03": "level2_M_mc3_L_th_1"
             },
             "04": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_th_1",
+                "01": "mc1_M_th_1",
+                "02": "mc2_M_th_1",
+                "03": "mc3_M_th_1"
             },
             "05": {
                 "00": "level2_M_th1",
@@ -9605,10 +16912,10 @@
                 "03": "level2_M_th1"
             },
             "08": {
-                "00": "level2_M_th1",
-                "01": "level2_M_th1",
-                "02": "level2_M_th1",
-                "03": "level2_M_th1"
+                "00": "level2_M_info_only",
+                "01": "level2_M_info_only",
+                "02": "level2_M_info_only",
+                "03": "level2_M_info_only"
             },
             "09": {
                 "00": "level2_M_th1",
@@ -9647,16 +16954,16 @@
                 "03": "level2_M_th1"
             },
             "0f": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "10": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "11": {
                 "00": "level2_M_th1",
@@ -9677,10 +16984,10 @@
                 "03": "level2_M_th1"
             },
             "14": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_th_1",
+                "01": "mc1_M_th_1",
+                "02": "mc2_M_th_1",
+                "03": "mc3_M_th_1"
             },
             "15": {
                 "00": "level2_M_th1",
@@ -9695,66 +17002,66 @@
                 "03": "level2_M_th1"
             },
             "17": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_th_1",
+                "01": "mc1_M_th_1",
+                "02": "mc2_M_th_1",
+                "03": "mc3_M_th_1"
             }
         },
         "f1ee": {
             "00": {
-                "00": "c_err_rpt",
-                "01": "c_err_rpt",
-                "02": "c_err_rpt",
-                "03": "c_err_rpt",
-                "04": "c_err_rpt",
-                "05": "c_err_rpt",
-                "06": "c_err_rpt",
-                "07": "c_err_rpt",
-                "08": "c_err_rpt",
-                "09": "c_err_rpt",
-                "0a": "c_err_rpt",
-                "0b": "c_err_rpt",
-                "0c": "c_err_rpt",
-                "0d": "c_err_rpt",
-                "0e": "c_err_rpt",
-                "0f": "c_err_rpt"
+                "00": "downstream_attn",
+                "01": "downstream_attn",
+                "02": "downstream_attn",
+                "03": "downstream_attn",
+                "04": "downstream_attn",
+                "05": "downstream_attn",
+                "06": "downstream_attn",
+                "07": "downstream_attn",
+                "08": "downstream_attn",
+                "09": "downstream_attn",
+                "0a": "downstream_attn",
+                "0b": "downstream_attn",
+                "0c": "downstream_attn",
+                "0d": "downstream_attn",
+                "0e": "downstream_attn",
+                "0f": "downstream_attn"
             },
             "01": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15"
+                "00": "omi0_M_th_1",
+                "01": "omi1_M_th_1",
+                "02": "omi2_M_th_1",
+                "03": "omi3_M_th_1",
+                "04": "omi4_M_th_1",
+                "05": "omi5_M_th_1",
+                "06": "omi6_M_th_1",
+                "07": "omi7_M_th_1",
+                "08": "omi8_M_th_1",
+                "09": "omi9_M_th_1",
+                "0a": "omi10_M_th_1",
+                "0b": "omi11_M_th_1",
+                "0c": "omi12_M_th_1",
+                "0d": "omi13_M_th_1",
+                "0e": "omi14_M_th_1",
+                "0f": "omi15_M_th_1"
             },
             "02": {
-                "00": "omi0",
-                "01": "omi1",
-                "02": "omi2",
-                "03": "omi3",
-                "04": "omi4",
-                "05": "omi5",
-                "06": "omi6",
-                "07": "omi7",
-                "08": "omi8",
-                "09": "omi9",
-                "0a": "omi10",
-                "0b": "omi11",
-                "0c": "omi12",
-                "0d": "omi13",
-                "0e": "omi14",
-                "0f": "omi15"
+                "00": "omi0_M_th_32perDay",
+                "01": "omi1_M_th_32perDay",
+                "02": "omi2_M_th_32perDay",
+                "03": "omi3_M_th_32perDay",
+                "04": "omi4_M_th_32perDay",
+                "05": "omi5_M_th_32perDay",
+                "06": "omi6_M_th_32perDay",
+                "07": "omi7_M_th_32perDay",
+                "08": "omi8_M_th_32perDay",
+                "09": "omi9_M_th_32perDay",
+                "0a": "omi10_M_th_32perDay",
+                "0b": "omi11_M_th_32perDay",
+                "0c": "omi12_M_th_32perDay",
+                "0d": "omi13_M_th_32perDay",
+                "0e": "omi14_M_th_32perDay",
+                "0f": "omi15_M_th_32perDay"
             },
             "03": {
                 "00": "level2_M_th1",
@@ -9793,22 +17100,22 @@
                 "0f": "level2_M_th1"
             },
             "05": {
-                "00": "omi_bus0",
-                "01": "omi_bus1",
-                "02": "omi_bus2",
-                "03": "omi_bus3",
-                "04": "omi_bus4",
-                "05": "omi_bus5",
-                "06": "omi_bus6",
-                "07": "omi_bus7",
-                "08": "omi_bus8",
-                "09": "omi_bus9",
-                "0a": "omi_bus10",
-                "0b": "omi_bus11",
-                "0c": "omi_bus12",
-                "0d": "omi_bus13",
-                "0e": "omi_bus14",
-                "0f": "omi_bus15"
+                "00": "omi_bus0_th_1",
+                "01": "omi_bus1_th_1",
+                "02": "omi_bus2_th_1",
+                "03": "omi_bus3_th_1",
+                "04": "omi_bus4_th_1",
+                "05": "omi_bus5_th_1",
+                "06": "omi_bus6_th_1",
+                "07": "omi_bus7_th_1",
+                "08": "omi_bus8_th_1",
+                "09": "omi_bus9_th_1",
+                "0a": "omi_bus10_th_1",
+                "0b": "omi_bus11_th_1",
+                "0c": "omi_bus12_th_1",
+                "0d": "omi_bus13_th_1",
+                "0e": "omi_bus14_th_1",
+                "0f": "omi_bus15_th_1"
             },
             "06": {
                 "00": "level2_M_th1",
@@ -9829,22 +17136,22 @@
                 "0f": "level2_M_th1"
             },
             "07": {
-                "00": "omi_bus0",
-                "01": "omi_bus1",
-                "02": "omi_bus2",
-                "03": "omi_bus3",
-                "04": "omi_bus4",
-                "05": "omi_bus5",
-                "06": "omi_bus6",
-                "07": "omi_bus7",
-                "08": "omi_bus8",
-                "09": "omi_bus9",
-                "0a": "omi_bus10",
-                "0b": "omi_bus11",
-                "0c": "omi_bus12",
-                "0d": "omi_bus13",
-                "0e": "omi_bus14",
-                "0f": "omi_bus15"
+                "00": "omi_bus0_th_32perDay",
+                "01": "omi_bus1_th_32perDay",
+                "02": "omi_bus2_th_32perDay",
+                "03": "omi_bus3_th_32perDay",
+                "04": "omi_bus4_th_32perDay",
+                "05": "omi_bus5_th_32perDay",
+                "06": "omi_bus6_th_32perDay",
+                "07": "omi_bus7_th_32perDay",
+                "08": "omi_bus8_th_32perDay",
+                "09": "omi_bus9_th_32perDay",
+                "0a": "omi_bus10_th_32perDay",
+                "0b": "omi_bus11_th_32perDay",
+                "0c": "omi_bus12_th_32perDay",
+                "0d": "omi_bus13_th_32perDay",
+                "0e": "omi_bus14_th_32perDay",
+                "0f": "omi_bus15_th_32perDay"
             },
             "08": {
                 "00": "level2_M_th1",
@@ -9865,40 +17172,40 @@
                 "0f": "level2_M_th1"
             },
             "09": {
-                "00": "omi_bus0",
-                "01": "omi_bus1",
-                "02": "omi_bus2",
-                "03": "omi_bus3",
-                "04": "omi_bus4",
-                "05": "omi_bus5",
-                "06": "omi_bus6",
-                "07": "omi_bus7",
-                "08": "omi_bus8",
-                "09": "omi_bus9",
-                "0a": "omi_bus10",
-                "0b": "omi_bus11",
-                "0c": "omi_bus12",
-                "0d": "omi_bus13",
-                "0e": "omi_bus14",
-                "0f": "omi_bus15"
+                "00": "omi_bus0_th_32perDay",
+                "01": "omi_bus1_th_32perDay",
+                "02": "omi_bus2_th_32perDay",
+                "03": "omi_bus3_th_32perDay",
+                "04": "omi_bus4_th_32perDay",
+                "05": "omi_bus5_th_32perDay",
+                "06": "omi_bus6_th_32perDay",
+                "07": "omi_bus7_th_32perDay",
+                "08": "omi_bus8_th_32perDay",
+                "09": "omi_bus9_th_32perDay",
+                "0a": "omi_bus10_th_32perDay",
+                "0b": "omi_bus11_th_32perDay",
+                "0c": "omi_bus12_th_32perDay",
+                "0d": "omi_bus13_th_32perDay",
+                "0e": "omi_bus14_th_32perDay",
+                "0f": "omi_bus15_th_32perDay"
             },
             "0a": {
-                "00": "omi_bus0",
-                "01": "omi_bus1",
-                "02": "omi_bus2",
-                "03": "omi_bus3",
-                "04": "omi_bus4",
-                "05": "omi_bus5",
-                "06": "omi_bus6",
-                "07": "omi_bus7",
-                "08": "omi_bus8",
-                "09": "omi_bus9",
-                "0a": "omi_bus10",
-                "0b": "omi_bus11",
-                "0c": "omi_bus12",
-                "0d": "omi_bus13",
-                "0e": "omi_bus14",
-                "0f": "omi_bus15"
+                "00": "omi_bus0_th_32perDay",
+                "01": "omi_bus1_th_32perDay",
+                "02": "omi_bus2_th_32perDay",
+                "03": "omi_bus3_th_32perDay",
+                "04": "omi_bus4_th_32perDay",
+                "05": "omi_bus5_th_32perDay",
+                "06": "omi_bus6_th_32perDay",
+                "07": "omi_bus7_th_32perDay",
+                "08": "omi_bus8_th_32perDay",
+                "09": "omi_bus9_th_32perDay",
+                "0a": "omi_bus10_th_32perDay",
+                "0b": "omi_bus11_th_32perDay",
+                "0c": "omi_bus12_th_32perDay",
+                "0d": "omi_bus13_th_32perDay",
+                "0e": "omi_bus14_th_32perDay",
+                "0f": "omi_bus15_th_32perDay"
             },
             "0b": {
                 "00": "level2_M_th1",
@@ -10081,270 +17388,270 @@
                 "07": "level2_M_th1"
             },
             "02": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1"
             },
             "03": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1"
             },
             "04": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "05": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "06": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "07": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "08": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "09": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0a": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0b": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0c": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0d": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0e": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0f": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "10": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "11": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "12": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "13": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_32perDay",
+                "03": "pau3_M_th_32perDay",
+                "04": "pau4_M_th_32perDay",
+                "05": "pau5_M_th_32perDay",
+                "06": "pau6_M_th_32perDay",
+                "07": "pau7_M_th_32perDay"
             },
             "14": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "15": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "16": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "17": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "18": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "19": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1a": {
-                "00": "pau0_sue",
-                "03": "pau3_sue",
-                "04": "pau4_sue",
-                "05": "pau5_sue",
-                "06": "pau6_sue",
-                "07": "pau7_sue",
+                "00": "pau0_M_th_1_sue",
+                "03": "pau3_M_th_1_sue",
+                "04": "pau4_M_th_1_sue",
+                "05": "pau5_M_th_1_sue",
+                "06": "pau6_M_th_1_sue",
+                "07": "pau7_M_th_1_sue",
                 "flags": ["cs_possible"]
             },
             "1b": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1c": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1d": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1e": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1f": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "20": {
@@ -10380,66 +17687,66 @@
                 "07": "level2_M_th1"
             },
             "24": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "25": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "26": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "27": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "28": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "29": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "2a": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_1_sue",
+                "03": "pau3_M_th_1_sue",
+                "04": "pau4_M_th_1_sue",
+                "05": "pau5_M_th_1_sue",
+                "06": "pau6_M_th_1_sue",
+                "07": "pau7_M_th_1_sue"
             },
             "2b": {
                 "00": "level2_M_th1",
@@ -10458,73 +17765,73 @@
                 "07": "level2_M_th1"
             },
             "2d": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "2e": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_32perDay",
+                "03": "pau3_M_th_32perDay",
+                "04": "pau4_M_th_32perDay",
+                "05": "pau5_M_th_32perDay",
+                "06": "pau6_M_th_32perDay",
+                "07": "pau7_M_th_32perDay"
             },
             "2f": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "30": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "31": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_32perDay",
+                "03": "pau3_M_th_32perDay",
+                "04": "pau4_M_th_32perDay",
+                "05": "pau5_M_th_32perDay",
+                "06": "pau6_M_th_32perDay",
+                "07": "pau7_M_th_32perDay"
             },
             "32": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "33": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "34": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "35": {
@@ -10618,34 +17925,34 @@
         },
         "0985": {
             "00": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1",
@@ -10658,14 +17965,14 @@
                 "07": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1",
@@ -10678,14 +17985,14 @@
                 "07": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1",
@@ -10708,14 +18015,14 @@
                 "07": "level2_M_th1"
             },
             "09": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1",
@@ -10728,44 +18035,44 @@
                 "07": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L",
-                "06": "level2_M_self_L",
-                "07": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1",
+                "06": "level2_M_self_L_th_1",
+                "07": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1",
@@ -11386,40 +18693,40 @@
         },
         "ba6a": {
             "00": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "02": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "03": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "04": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "05": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "06": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "07": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "08": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0a": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0b": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1"
@@ -11446,10 +18753,10 @@
                 "00": "level2_M_th1"
             },
             "14": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "15": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "16": {
                 "00": "level2_M_th1"
@@ -11580,316 +18887,316 @@
         },
         "4ccb": {
             "00": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "01": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "02": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "03": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "04": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "05": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "06": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "07": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "08": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "09": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "0a": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "0b": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "0c": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "0d": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "0e": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "0f": {
-                "00": "bus_endpoints_iohs1",
-                "01": "bus_endpoints_iohs3",
-                "02": "bus_endpoints_iohs5",
-                "03": "bus_endpoints_iohs7"
+                "00": "bus_endpoints_iohs1_th_1",
+                "01": "bus_endpoints_iohs3_th_1",
+                "02": "bus_endpoints_iohs5_th_1",
+                "03": "bus_endpoints_iohs7_th_1"
             },
             "10": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "11": {
-                "00": "bus_endpoints_iohs1",
-                "01": "bus_endpoints_iohs3",
-                "02": "bus_endpoints_iohs5",
-                "03": "bus_endpoints_iohs7"
+                "00": "bus_endpoints_iohs1_th_1",
+                "01": "bus_endpoints_iohs3_th_1",
+                "02": "bus_endpoints_iohs5_th_1",
+                "03": "bus_endpoints_iohs7_th_1"
             },
             "12": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "13": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "14": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "15": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "16": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "17": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "18": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "19": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "1a": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "1b": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "1c": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "1d": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "1e": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "1f": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "20": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "21": {
-                "00": "bus_endpoints_iohs1",
-                "01": "bus_endpoints_iohs3",
-                "02": "bus_endpoints_iohs5",
-                "03": "bus_endpoints_iohs7"
+                "00": "bus_endpoints_iohs1_th_1",
+                "01": "bus_endpoints_iohs3_th_1",
+                "02": "bus_endpoints_iohs5_th_1",
+                "03": "bus_endpoints_iohs7_th_1"
             },
             "22": {
-                "00": "bus_endpoints_iohs1",
-                "01": "bus_endpoints_iohs3",
-                "02": "bus_endpoints_iohs5",
-                "03": "bus_endpoints_iohs7"
+                "00": "bus_endpoints_iohs1_th_1",
+                "01": "bus_endpoints_iohs3_th_1",
+                "02": "bus_endpoints_iohs5_th_1",
+                "03": "bus_endpoints_iohs7_th_1"
             },
             "23": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "24": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "25": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "26": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "27": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "28": {
-                "00": "bus_endpoints_iohs1",
-                "01": "bus_endpoints_iohs3",
-                "02": "bus_endpoints_iohs5",
-                "03": "bus_endpoints_iohs7"
+                "00": "bus_endpoints_iohs1_th_1",
+                "01": "bus_endpoints_iohs3_th_1",
+                "02": "bus_endpoints_iohs5_th_1",
+                "03": "bus_endpoints_iohs7_th_1"
             },
             "29": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "2a": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "2b": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "2c": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "2d": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "2e": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "2f": {
-                "00": "iohs1",
-                "01": "iohs3",
-                "02": "iohs5",
-                "03": "iohs7"
+                "00": "iohs1_M_th_1",
+                "01": "iohs3_M_th_1",
+                "02": "iohs5_M_th_1",
+                "03": "iohs7_M_th_1"
             },
             "30": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "31": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "32": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "33": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             }
         },
         "e5bb": {
@@ -11921,10 +19228,10 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0a": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0b": {
                 "00": "level2_M_th1"
@@ -11939,7 +19246,7 @@
                 "00": "level2_M_th1"
             },
             "0f": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "10": {
                 "00": "level2_M_th1"
@@ -11954,16 +19261,16 @@
                 "00": "level2_M_th1"
             },
             "14": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "15": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "16": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "17": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "18": {
                 "00": "level2_M_th1"
@@ -11990,19 +19297,19 @@
                 "00": "level2_M_th1"
             },
             "20": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "21": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "22": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "23": {
                 "00": "level2_M_th1"
             },
             "24": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "25": {
                 "00": "level2_M_th1"
@@ -12020,25 +19327,25 @@
                 "00": "level2_M_th1"
             },
             "2a": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "2b": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "2c": {
                 "00": "level2_M_th1"
             },
             "2d": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "2e": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "2f": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "30": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "31": {
                 "00": "level2_M_th1"
@@ -12047,16 +19354,16 @@
                 "00": "level2_M_th1"
             },
             "33": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "34": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "35": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "36": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "37": {
                 "00": "level2_M_th1"
@@ -12065,7 +19372,7 @@
                 "00": "level2_M_th1"
             },
             "39": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "3a": {
                 "00": "level2_M_th1"
@@ -12082,11 +19389,11 @@
         },
         "520c": {
             "00": {
-                "00": "nx0",
+                "00": "nx0_M_th_1",
                 "flags": ["cs_possible"]
             },
             "01": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "02": {
                 "00": "level2_M_th1"
@@ -12095,67 +19402,67 @@
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "05": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "06": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "07": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "08": {
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "0a": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "0b": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "0c": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "0d": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "0e": {
                 "00": "level2_M_th1"
             },
             "0f": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "10": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "11": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "12": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "13": {
                 "00": "level2_M_th1"
             },
             "14": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "15": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "16": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "17": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "18": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "19": {
                 "00": "level2_M_th1"
@@ -12176,31 +19483,31 @@
                 "00": "level2_M_th1"
             },
             "1f": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "20": {
-                "00": "nx0_sue"
+                "00": "nx0_M_th_1_sue"
             },
             "21": {
                 "00": "level2_M_th1"
             },
             "22": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "23": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "24": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "25": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "26": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "27": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "28": {
                 "00": "level2_M_th1"
@@ -12333,12 +19640,12 @@
                 "07": "level2_M_th1"
             },
             "0d": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_32perDay",
+                "03": "pau3_M_th_32perDay",
+                "04": "pau4_M_th_32perDay",
+                "05": "pau5_M_th_32perDay",
+                "06": "pau6_M_th_32perDay",
+                "07": "pau7_M_th_32perDay"
             },
             "0e": {
                 "00": "level2_M_th1",
@@ -12349,12 +19656,12 @@
                 "07": "level2_M_th1"
             },
             "0f": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "10": {
@@ -12374,21 +19681,21 @@
                 "07": "level2_M_th1"
             },
             "12": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "13": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "14": {
@@ -12400,53 +19707,53 @@
                 "07": "level2_M_th1"
             },
             "15": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1"
             },
             "16": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1"
             },
             "17": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1"
             },
             "18": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1"
             },
             "19": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1a": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1b": {
@@ -12466,21 +19773,21 @@
                 "07": "level2_M_th1"
             },
             "1d": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1e": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_32perDay",
+                "03": "pau3_M_th_32perDay",
+                "04": "pau4_M_th_32perDay",
+                "05": "pau5_M_th_32perDay",
+                "06": "pau6_M_th_32perDay",
+                "07": "pau7_M_th_32perDay"
             },
             "1f": {
                 "00": "level2_M_th1",
@@ -12499,30 +19806,30 @@
                 "07": "level2_M_th1"
             },
             "21": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "22": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "23": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "24": {
@@ -12558,29 +19865,29 @@
                 "07": "level2_M_th1"
             },
             "28": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "29": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7"
+                "00": "pau0_M_th_32perDay",
+                "03": "pau3_M_th_32perDay",
+                "04": "pau4_M_th_32perDay",
+                "05": "pau5_M_th_32perDay",
+                "06": "pau6_M_th_32perDay",
+                "07": "pau7_M_th_32perDay"
             },
             "2a": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "2b": {
@@ -12592,21 +19899,21 @@
                 "07": "level2_M_th1"
             },
             "2c": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "2d": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "2e": {
@@ -12756,25 +20063,25 @@
         },
         "0bb8": {
             "00": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1"
@@ -12783,22 +20090,22 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
@@ -12824,25 +20131,25 @@
         },
         "0bb7": {
             "00": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1"
@@ -12851,22 +20158,22 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
@@ -12892,72 +20199,72 @@
         },
         "a832": {
             "00": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "01": {
                 "00": "level2_M_th1",
                 "01": "level2_M_th1"
             },
             "02": {
-                "00": "self_M_level2_L",
-                "01": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1",
+                "01": "self_M_level2_L_th_1"
             },
             "03": {
-                "00": "self_M_level2_L",
-                "01": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1",
+                "01": "self_M_level2_L_th_1"
             },
             "04": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "05": {
                 "00": "level2_M_th1",
                 "01": "level2_M_th1"
             },
             "06": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "07": {
-                "00": "self_sue",
-                "01": "self_sue"
+                "00": "self_M_th_1_sue",
+                "01": "self_M_th_1_sue"
             },
             "08": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay"
             },
             "09": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "0a": {
                 "00": "level2_M_th1",
                 "01": "level2_M_th1"
             },
             "0b": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay"
             },
             "0c": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "0d": {
                 "00": "level2_M_th1",
                 "01": "level2_M_th1"
             },
             "0e": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay"
             },
             "0f": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "10": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "11": {
                 "00": "level2_M_th1",
@@ -12982,91 +20289,91 @@
         },
         "31b3": {
             "00": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "02": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "03": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "04": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "05": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "06": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "07": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "08": {
-                "00": "self"
+                "00": "self_M_th_5perHour"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_5perHour"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "self"
+                "00": "self_M_th_5perHour"
             },
             "0c": {
-                "00": "self"
+                "00": "self_M_th_5perHour"
             },
             "0d": {
-                "00": "self"
+                "00": "self_M_th_5perHour"
             },
             "0e": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
             },
             "10": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "16": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "17": {
                 "00": "level2_M_th1"
             },
             "18": {
-                "00": "self_sue"
+                "00": "self_M_th_1_sue"
             },
             "19": {
-                "00": "self_sue"
+                "00": "self_M_th_1_sue"
             },
             "1a": {
-                "00": "self_sue"
+                "00": "self_M_th_1_sue"
             },
             "1b": {
-                "00": "self_sue"
+                "00": "self_M_th_1_sue"
             },
             "1c": {
-                "00": "self_sue"
+                "00": "self_M_th_1_sue"
             },
             "1d": {
                 "00": "level2_M_th1"
@@ -13078,19 +20385,19 @@
                 "00": "level2_M_th1"
             },
             "20": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "21": {
                 "00": "level2_M_th1"
             },
             "22": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "23": {
                 "00": "level2_M_th1"
             },
             "24": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "25": {
                 "00": "level2_M_th1"
@@ -13108,7 +20415,7 @@
                 "00": "level2_M_th1"
             },
             "2a": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "2b": {
                 "00": "level2_M_th1"
@@ -13120,19 +20427,19 @@
                 "00": "level2_M_th1"
             },
             "2e": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "2f": {
                 "00": "level2_M_th1"
             },
             "30": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "31": {
                 "00": "level2_M_th1"
             },
             "32": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "33": {
                 "00": "level2_M_th1"
@@ -13244,30 +20551,30 @@
                 "07": "level2_M_th1"
             },
             "0d": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0e": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0f": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "10": {
@@ -13439,12 +20746,12 @@
                 "07": "level2_M_th1"
             },
             "25": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "26": {
@@ -13456,12 +20763,12 @@
                 "07": "level2_M_th1"
             },
             "27": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "28": {
@@ -13473,21 +20780,21 @@
                 "07": "level2_M_th1"
             },
             "29": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "2a": {
-                "00": "pau0",
-                "03": "pau3",
-                "04": "pau4",
-                "05": "pau5",
-                "06": "pau6",
-                "07": "pau7",
+                "00": "pau0_M_th_1",
+                "03": "pau3_M_th_1",
+                "04": "pau4_M_th_1",
+                "05": "pau5_M_th_1",
+                "06": "pau6_M_th_1",
+                "07": "pau7_M_th_1",
                 "flags": ["cs_possible"]
             },
             "2b": {
@@ -13661,47 +20968,47 @@
         },
         "bd3a": {
             "00": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "01": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "02": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "03": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "04": {
@@ -13725,24 +21032,24 @@
                 "07": "level2_M_th1"
             },
             "06": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_32perDay",
+                "01": "mcc1_M_th_32perDay",
+                "02": "mcc2_M_th_32perDay",
+                "03": "mcc3_M_th_32perDay",
+                "04": "mcc4_M_th_32perDay",
+                "05": "mcc5_M_th_32perDay",
+                "06": "mcc6_M_th_32perDay",
+                "07": "mcc7_M_th_32perDay"
             },
             "07": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "08": {
                 "00": "level2_M_th1",
@@ -13755,64 +21062,64 @@
                 "07": "level2_M_th1"
             },
             "09": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "0a": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "0b": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "0c": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "0d": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "0e": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "0f": {
                 "00": "level2_M_th1",
@@ -13825,14 +21132,14 @@
                 "07": "level2_M_th1"
             },
             "10": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "11": {
                 "00": "level2_M_th1",
@@ -13855,34 +21162,34 @@
                 "07": "level2_M_th1"
             },
             "13": {
-                "00": "all_ocmb_and_mcc0",
-                "01": "all_ocmb_and_mcc1",
-                "02": "all_ocmb_and_mcc2",
-                "03": "all_ocmb_and_mcc3",
-                "04": "all_ocmb_and_mcc4",
-                "05": "all_ocmb_and_mcc5",
-                "06": "all_ocmb_and_mcc6",
-                "07": "all_ocmb_and_mcc7"
+                "00": "all_ocmb_and_mcc0_th_1",
+                "01": "all_ocmb_and_mcc1_th_1",
+                "02": "all_ocmb_and_mcc2_th_1",
+                "03": "all_ocmb_and_mcc3_th_1",
+                "04": "all_ocmb_and_mcc4_th_1",
+                "05": "all_ocmb_and_mcc5_th_1",
+                "06": "all_ocmb_and_mcc6_th_1",
+                "07": "all_ocmb_and_mcc7_th_1"
             },
             "14": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "15": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1",
+                "06": "self_M_th_1",
+                "07": "self_M_th_1"
             },
             "16": {
                 "00": "level2_M_th1",
@@ -13895,24 +21202,24 @@
                 "07": "level2_M_th1"
             },
             "17": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "18": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "19": {
                 "00": "level2_M_th1",
@@ -13925,56 +21232,56 @@
                 "07": "level2_M_th1"
             },
             "1a": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "1b": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "1c": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "1d": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14"
+                "00": "connected_ocmb0_M_info_only_th_1",
+                "01": "connected_ocmb2_M_info_only_th_1",
+                "02": "connected_ocmb4_M_info_only_th_1",
+                "03": "connected_ocmb6_M_info_only_th_1",
+                "04": "connected_ocmb8_M_info_only_th_1",
+                "05": "connected_ocmb10_M_info_only_th_1",
+                "06": "connected_ocmb12_M_info_only_th_1",
+                "07": "connected_ocmb14_M_info_only_th_1"
             },
             "1e": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15"
+                "00": "connected_ocmb1_M_info_only_th_1",
+                "01": "connected_ocmb3_M_info_only_th_1",
+                "02": "connected_ocmb5_M_info_only_th_1",
+                "03": "connected_ocmb7_M_info_only_th_1",
+                "04": "connected_ocmb9_M_info_only_th_1",
+                "05": "connected_ocmb11_M_info_only_th_1",
+                "06": "connected_ocmb13_M_info_only_th_1",
+                "07": "connected_ocmb15_M_info_only_th_1"
             },
             "1f": {
                 "00": "level2_M_th1",
@@ -13997,154 +21304,154 @@
                 "07": "level2_M_th1"
             },
             "21": {
-                "00": "ocmb_H_omi_L_0",
-                "01": "ocmb_H_omi_L_2",
-                "02": "ocmb_H_omi_L_4",
-                "03": "ocmb_H_omi_L_6",
-                "04": "ocmb_H_omi_L_8",
-                "05": "ocmb_H_omi_L_10",
-                "06": "ocmb_H_omi_L_12",
-                "07": "ocmb_H_omi_L_14"
+                "00": "ocmb_H_omi_L_0_th_32perDay",
+                "01": "ocmb_H_omi_L_2_th_32perDay",
+                "02": "ocmb_H_omi_L_4_th_32perDay",
+                "03": "ocmb_H_omi_L_6_th_32perDay",
+                "04": "ocmb_H_omi_L_8_th_32perDay",
+                "05": "ocmb_H_omi_L_10_th_32perDay",
+                "06": "ocmb_H_omi_L_12_th_32perDay",
+                "07": "ocmb_H_omi_L_14_th_32perDay"
             },
             "22": {
-                "00": "ocmb_H_omi_L_1",
-                "01": "ocmb_H_omi_L_3",
-                "02": "ocmb_H_omi_L_5",
-                "03": "ocmb_H_omi_L_7",
-                "04": "ocmb_H_omi_L_9",
-                "05": "ocmb_H_omi_L_11",
-                "06": "ocmb_H_omi_L_13",
-                "07": "ocmb_H_omi_L_15"
+                "00": "ocmb_H_omi_L_1_th_32perDay",
+                "01": "ocmb_H_omi_L_3_th_32perDay",
+                "02": "ocmb_H_omi_L_5_th_32perDay",
+                "03": "ocmb_H_omi_L_7_th_32perDay",
+                "04": "ocmb_H_omi_L_9_th_32perDay",
+                "05": "ocmb_H_omi_L_11_th_32perDay",
+                "06": "ocmb_H_omi_L_13_th_32perDay",
+                "07": "ocmb_H_omi_L_15_th_32perDay"
             },
             "23": {
-                "00": "omi0",
-                "01": "omi2",
-                "02": "omi4",
-                "03": "omi6",
-                "04": "omi8",
-                "05": "omi10",
-                "06": "omi12",
-                "07": "omi14",
+                "00": "omi0_M_th_1",
+                "01": "omi2_M_th_1",
+                "02": "omi4_M_th_1",
+                "03": "omi6_M_th_1",
+                "04": "omi8_M_th_1",
+                "05": "omi10_M_th_1",
+                "06": "omi12_M_th_1",
+                "07": "omi14_M_th_1",
                 "flags": ["sue_source"]
             },
             "24": {
-                "00": "omi1",
-                "01": "omi3",
-                "02": "omi5",
-                "03": "omi7",
-                "04": "omi9",
-                "05": "omi11",
-                "06": "omi13",
-                "07": "omi15",
+                "00": "omi1_M_th_1",
+                "01": "omi3_M_th_1",
+                "02": "omi5_M_th_1",
+                "03": "omi7_M_th_1",
+                "04": "omi9_M_th_1",
+                "05": "omi11_M_th_1",
+                "06": "omi13_M_th_1",
+                "07": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "25": {
-                "00": "omi0",
-                "01": "omi2",
-                "02": "omi4",
-                "03": "omi6",
-                "04": "omi8",
-                "05": "omi10",
-                "06": "omi12",
-                "07": "omi14",
+                "00": "omi0_M_th_1",
+                "01": "omi2_M_th_1",
+                "02": "omi4_M_th_1",
+                "03": "omi6_M_th_1",
+                "04": "omi8_M_th_1",
+                "05": "omi10_M_th_1",
+                "06": "omi12_M_th_1",
+                "07": "omi14_M_th_1",
                 "flags": ["sue_source"]
             },
             "26": {
-                "00": "omi1",
-                "01": "omi3",
-                "02": "omi5",
-                "03": "omi7",
-                "04": "omi9",
-                "05": "omi11",
-                "06": "omi13",
-                "07": "omi15",
+                "00": "omi1_M_th_1",
+                "01": "omi3_M_th_1",
+                "02": "omi5_M_th_1",
+                "03": "omi7_M_th_1",
+                "04": "omi9_M_th_1",
+                "05": "omi11_M_th_1",
+                "06": "omi13_M_th_1",
+                "07": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "27": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "28": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "29": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "2a": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "2b": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "2c": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "2d": {
-                "00": "omi0",
-                "01": "omi2",
-                "02": "omi4",
-                "03": "omi6",
-                "04": "omi8",
-                "05": "omi10",
-                "06": "omi12",
-                "07": "omi14"
+                "00": "omi0_M_th_1",
+                "01": "omi2_M_th_1",
+                "02": "omi4_M_th_1",
+                "03": "omi6_M_th_1",
+                "04": "omi8_M_th_1",
+                "05": "omi10_M_th_1",
+                "06": "omi12_M_th_1",
+                "07": "omi14_M_th_1"
             },
             "2e": {
-                "00": "omi1",
-                "01": "omi3",
-                "02": "omi5",
-                "03": "omi7",
-                "04": "omi9",
-                "05": "omi11",
-                "06": "omi13",
-                "07": "omi15"
+                "00": "omi1_M_th_1",
+                "01": "omi3_M_th_1",
+                "02": "omi5_M_th_1",
+                "03": "omi7_M_th_1",
+                "04": "omi9_M_th_1",
+                "05": "omi11_M_th_1",
+                "06": "omi13_M_th_1",
+                "07": "omi15_M_th_1"
             },
             "2f": {
                 "00": "level2_M_th1",
@@ -14167,133 +21474,133 @@
                 "07": "level2_M_th1"
             },
             "31": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "32": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "33": {
-                "00": "omi0",
-                "01": "omi2",
-                "02": "omi4",
-                "03": "omi6",
-                "04": "omi8",
-                "05": "omi10",
-                "06": "omi12",
-                "07": "omi14",
+                "00": "omi0_M_th_1",
+                "01": "omi2_M_th_1",
+                "02": "omi4_M_th_1",
+                "03": "omi6_M_th_1",
+                "04": "omi8_M_th_1",
+                "05": "omi10_M_th_1",
+                "06": "omi12_M_th_1",
+                "07": "omi14_M_th_1",
                 "flags": ["sue_source"]
             },
             "34": {
-                "00": "omi1",
-                "01": "omi3",
-                "02": "omi5",
-                "03": "omi7",
-                "04": "omi9",
-                "05": "omi11",
-                "06": "omi13",
-                "07": "omi15",
+                "00": "omi1_M_th_1",
+                "01": "omi3_M_th_1",
+                "02": "omi5_M_th_1",
+                "03": "omi7_M_th_1",
+                "04": "omi9_M_th_1",
+                "05": "omi11_M_th_1",
+                "06": "omi13_M_th_1",
+                "07": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "35": {
-                "00": "omi0",
-                "01": "omi2",
-                "02": "omi4",
-                "03": "omi6",
-                "04": "omi8",
-                "05": "omi10",
-                "06": "omi12",
-                "07": "omi14",
+                "00": "omi0_M_th_1",
+                "01": "omi2_M_th_1",
+                "02": "omi4_M_th_1",
+                "03": "omi6_M_th_1",
+                "04": "omi8_M_th_1",
+                "05": "omi10_M_th_1",
+                "06": "omi12_M_th_1",
+                "07": "omi14_M_th_1",
                 "flags": ["sue_source"]
             },
             "36": {
-                "00": "omi1",
-                "01": "omi3",
-                "02": "omi5",
-                "03": "omi7",
-                "04": "omi9",
-                "05": "omi11",
-                "06": "omi13",
-                "07": "omi15",
+                "00": "omi1_M_th_1",
+                "01": "omi3_M_th_1",
+                "02": "omi5_M_th_1",
+                "03": "omi7_M_th_1",
+                "04": "omi9_M_th_1",
+                "05": "omi11_M_th_1",
+                "06": "omi13_M_th_1",
+                "07": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "37": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "38": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "39": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "3a": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "3b": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "3c": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "3d": {
@@ -14309,44 +21616,44 @@
         },
         "8530": {
             "00": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "01": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "02": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "03": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "04": {
                 "00": "level2_M_th1",
@@ -14359,124 +21666,124 @@
                 "07": "level2_M_th1"
             },
             "05": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "06": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "07": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "08": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "09": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "0a": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "0b": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "0c": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "0d": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "0e": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "0f": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "10": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "11": {
                 "00": "level2_M_th1",
@@ -14509,204 +21816,204 @@
                 "07": "level2_M_th1"
             },
             "14": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "15": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "16": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "17": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "18": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "19": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "1a": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "1b": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "1c": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "1d": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "1e": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "1f": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only",
+                "02": "self_M_info_only",
+                "03": "self_M_info_only",
+                "04": "self_M_info_only",
+                "05": "self_M_info_only",
+                "06": "self_M_info_only",
+                "07": "self_M_info_only"
             },
             "20": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "21": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "22": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "23": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "24": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "25": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "26": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "27": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "28": {
                 "00": "level2_M_th1",
@@ -15145,25 +22452,25 @@
         },
         "06b6": {
             "00": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1"
@@ -15172,22 +22479,22 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
@@ -15727,44 +23034,44 @@
         },
         "d773": {
             "00": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "01": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "02": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "05": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "06": {
                 "00": "level2_M_th1"
             },
             "07": {
-                "00": "nx0",
+                "00": "nx0_M_th_1",
                 "flags": ["cs_possible"]
             },
             "08": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "09": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "0a": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "0b": {
                 "00": "level2_M_th1"
             },
             "0c": {
-                "00": "nx0_sue"
+                "00": "nx0_M_th_1_sue"
             },
             "0d": {
                 "00": "level2_M_th1"
@@ -15776,33 +23083,33 @@
                 "00": "level2_M_th1"
             },
             "10": {
-                "00": "nx0",
+                "00": "nx0_M_th_1",
                 "flags": ["cs_possible"]
             },
             "11": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "12": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "13": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "14": {
-                "00": "nx0_sue"
+                "00": "nx0_M_th_1_sue"
             },
             "15": {
                 "00": "level2_M_th1",
                 "flags": ["cs_possible"]
             },
             "16": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "17": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "18": {
-                "00": "nx0_sue"
+                "00": "nx0_M_th_1_sue"
             },
             "19": {
                 "00": "level2_M_th1"
@@ -15811,13 +23118,13 @@
                 "00": "level2_M_th1"
             },
             "1b": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "1c": {
-                "00": "nx0_sue"
+                "00": "nx0_M_th_1_sue"
             },
             "1d": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "1e": {
                 "00": "level2_M_th1"
@@ -15826,34 +23133,34 @@
                 "00": "level2_M_th1"
             },
             "20": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "21": {
-                "00": "nx0"
+                "00": "nx0_M_th_32perDay"
             },
             "22": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "23": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "24": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "25": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             },
             "26": {
                 "00": "level2_M_th1"
             },
             "27": {
-                "00": "nx0_sue"
+                "00": "nx0_M_th_1_sue"
             },
             "28": {
                 "00": "level2_M_th1"
             },
             "29": {
-                "00": "nx0"
+                "00": "nx0_M_th_1"
             }
         },
         "7a0e": {
@@ -15870,10 +23177,10 @@
                 "03": "level2_M_th1"
             },
             "02": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_th_1",
+                "01": "mc1_M_th_1",
+                "02": "mc2_M_th_1",
+                "03": "mc3_M_th_1"
             },
             "03": {
                 "00": "level2_M_th1",
@@ -15906,10 +23213,10 @@
                 "03": "level2_M_th1"
             },
             "08": {
-                "00": "mc0",
-                "01": "mc1",
-                "02": "mc2",
-                "03": "mc3"
+                "00": "mc0_M_th_1",
+                "01": "mc1_M_th_1",
+                "02": "mc2_M_th_1",
+                "03": "mc3_M_th_1"
             },
             "09": {
                 "00": "level2_M_th1",
@@ -15932,40 +23239,40 @@
         },
         "df2a": {
             "00": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "02": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "03": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "04": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "05": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "06": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "07": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "08": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0a": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0b": {
-                "00": "self"
+                "00": "self_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1"
@@ -15992,25 +23299,25 @@
                 "00": "level2_M_th1"
             },
             "14": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "15": {
                 "00": "level2_M_th1"
             },
             "16": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "17": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "18": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "19": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "1a": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "1b": {
                 "00": "tod_step_check_fault"
@@ -16046,16 +23353,16 @@
                 "00": "level2_M_th1"
             },
             "26": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "27": {
                 "00": "level2_M_th1"
             },
             "28": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "29": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "2a": {
                 "00": "rcs_osc_error_0"
@@ -16070,13 +23377,13 @@
                 "00": "level2_M_th1"
             },
             "2e": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "2f": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "30": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "31": {
                 "00": "level2_M_th1"
@@ -16097,19 +23404,19 @@
                 "00": "level2_M_th1"
             },
             "37": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "38": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "39": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "3a": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "3b": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "3c": {
                 "00": "level2_M_th1"
@@ -16126,13 +23433,13 @@
         },
         "d9ef": {
             "00": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "02": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
@@ -16141,13 +23448,13 @@
                 "00": "level2_M_th1"
             },
             "05": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "06": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "07": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "08": {
                 "00": "level2_M_th1"
@@ -16158,210 +23465,210 @@
         },
         "a9aa": {
             "00": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "01": {
-                "00": "level2_M_core0_L",
-                "01": "level2_M_core1_L",
-                "02": "level2_M_core2_L",
-                "03": "level2_M_core3_L",
-                "04": "level2_M_core4_L",
-                "05": "level2_M_core5_L",
-                "06": "level2_M_core6_L",
-                "07": "level2_M_core7_L",
-                "08": "level2_M_core8_L",
-                "09": "level2_M_core9_L",
-                "0a": "level2_M_core10_L",
-                "0b": "level2_M_core11_L",
-                "0c": "level2_M_core12_L",
-                "0d": "level2_M_core13_L",
-                "0e": "level2_M_core14_L",
-                "0f": "level2_M_core15_L",
-                "10": "level2_M_core16_L",
-                "11": "level2_M_core17_L",
-                "12": "level2_M_core18_L",
-                "13": "level2_M_core19_L",
-                "14": "level2_M_core20_L",
-                "15": "level2_M_core21_L",
-                "16": "level2_M_core22_L",
-                "17": "level2_M_core23_L",
-                "18": "level2_M_core24_L",
-                "19": "level2_M_core25_L",
-                "1a": "level2_M_core26_L",
-                "1b": "level2_M_core27_L",
-                "1c": "level2_M_core28_L",
-                "1d": "level2_M_core29_L",
-                "1e": "level2_M_core30_L",
-                "1f": "level2_M_core31_L"
+                "00": "level2_M_core0_L_th_1",
+                "01": "level2_M_core1_L_th_1",
+                "02": "level2_M_core2_L_th_1",
+                "03": "level2_M_core3_L_th_1",
+                "04": "level2_M_core4_L_th_1",
+                "05": "level2_M_core5_L_th_1",
+                "06": "level2_M_core6_L_th_1",
+                "07": "level2_M_core7_L_th_1",
+                "08": "level2_M_core8_L_th_1",
+                "09": "level2_M_core9_L_th_1",
+                "0a": "level2_M_core10_L_th_1",
+                "0b": "level2_M_core11_L_th_1",
+                "0c": "level2_M_core12_L_th_1",
+                "0d": "level2_M_core13_L_th_1",
+                "0e": "level2_M_core14_L_th_1",
+                "0f": "level2_M_core15_L_th_1",
+                "10": "level2_M_core16_L_th_1",
+                "11": "level2_M_core17_L_th_1",
+                "12": "level2_M_core18_L_th_1",
+                "13": "level2_M_core19_L_th_1",
+                "14": "level2_M_core20_L_th_1",
+                "15": "level2_M_core21_L_th_1",
+                "16": "level2_M_core22_L_th_1",
+                "17": "level2_M_core23_L_th_1",
+                "18": "level2_M_core24_L_th_1",
+                "19": "level2_M_core25_L_th_1",
+                "1a": "level2_M_core26_L_th_1",
+                "1b": "level2_M_core27_L_th_1",
+                "1c": "level2_M_core28_L_th_1",
+                "1d": "level2_M_core29_L_th_1",
+                "1e": "level2_M_core30_L_th_1",
+                "1f": "level2_M_core31_L_th_1"
             },
             "02": {
-                "00": "level2_M_core0_L",
-                "01": "level2_M_core1_L",
-                "02": "level2_M_core2_L",
-                "03": "level2_M_core3_L",
-                "04": "level2_M_core4_L",
-                "05": "level2_M_core5_L",
-                "06": "level2_M_core6_L",
-                "07": "level2_M_core7_L",
-                "08": "level2_M_core8_L",
-                "09": "level2_M_core9_L",
-                "0a": "level2_M_core10_L",
-                "0b": "level2_M_core11_L",
-                "0c": "level2_M_core12_L",
-                "0d": "level2_M_core13_L",
-                "0e": "level2_M_core14_L",
-                "0f": "level2_M_core15_L",
-                "10": "level2_M_core16_L",
-                "11": "level2_M_core17_L",
-                "12": "level2_M_core18_L",
-                "13": "level2_M_core19_L",
-                "14": "level2_M_core20_L",
-                "15": "level2_M_core21_L",
-                "16": "level2_M_core22_L",
-                "17": "level2_M_core23_L",
-                "18": "level2_M_core24_L",
-                "19": "level2_M_core25_L",
-                "1a": "level2_M_core26_L",
-                "1b": "level2_M_core27_L",
-                "1c": "level2_M_core28_L",
-                "1d": "level2_M_core29_L",
-                "1e": "level2_M_core30_L",
-                "1f": "level2_M_core31_L"
+                "00": "level2_M_core0_L_th_1",
+                "01": "level2_M_core1_L_th_1",
+                "02": "level2_M_core2_L_th_1",
+                "03": "level2_M_core3_L_th_1",
+                "04": "level2_M_core4_L_th_1",
+                "05": "level2_M_core5_L_th_1",
+                "06": "level2_M_core6_L_th_1",
+                "07": "level2_M_core7_L_th_1",
+                "08": "level2_M_core8_L_th_1",
+                "09": "level2_M_core9_L_th_1",
+                "0a": "level2_M_core10_L_th_1",
+                "0b": "level2_M_core11_L_th_1",
+                "0c": "level2_M_core12_L_th_1",
+                "0d": "level2_M_core13_L_th_1",
+                "0e": "level2_M_core14_L_th_1",
+                "0f": "level2_M_core15_L_th_1",
+                "10": "level2_M_core16_L_th_1",
+                "11": "level2_M_core17_L_th_1",
+                "12": "level2_M_core18_L_th_1",
+                "13": "level2_M_core19_L_th_1",
+                "14": "level2_M_core20_L_th_1",
+                "15": "level2_M_core21_L_th_1",
+                "16": "level2_M_core22_L_th_1",
+                "17": "level2_M_core23_L_th_1",
+                "18": "level2_M_core24_L_th_1",
+                "19": "level2_M_core25_L_th_1",
+                "1a": "level2_M_core26_L_th_1",
+                "1b": "level2_M_core27_L_th_1",
+                "1c": "level2_M_core28_L_th_1",
+                "1d": "level2_M_core29_L_th_1",
+                "1e": "level2_M_core30_L_th_1",
+                "1f": "level2_M_core31_L_th_1"
             },
             "03": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "04": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "05": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "06": {
@@ -16399,212 +23706,212 @@
                 "1f": "level2_M_th1"
             },
             "07": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L",
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1",
                 "flags": ["cs_possible"]
             },
             "08": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "09": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_info_only",
+                "01": "core1_M_info_only",
+                "02": "core2_M_info_only",
+                "03": "core3_M_info_only",
+                "04": "core4_M_info_only",
+                "05": "core5_M_info_only",
+                "06": "core6_M_info_only",
+                "07": "core7_M_info_only",
+                "08": "core8_M_info_only",
+                "09": "core9_M_info_only",
+                "0a": "core10_M_info_only",
+                "0b": "core11_M_info_only",
+                "0c": "core12_M_info_only",
+                "0d": "core13_M_info_only",
+                "0e": "core14_M_info_only",
+                "0f": "core15_M_info_only",
+                "10": "core16_M_info_only",
+                "11": "core17_M_info_only",
+                "12": "core18_M_info_only",
+                "13": "core19_M_info_only",
+                "14": "core20_M_info_only",
+                "15": "core21_M_info_only",
+                "16": "core22_M_info_only",
+                "17": "core23_M_info_only",
+                "18": "core24_M_info_only",
+                "19": "core25_M_info_only",
+                "1a": "core26_M_info_only",
+                "1b": "core27_M_info_only",
+                "1c": "core28_M_info_only",
+                "1d": "core29_M_info_only",
+                "1e": "core30_M_info_only",
+                "1f": "core31_M_info_only"
             },
             "0a": {
-                "00": "level2_M_core0_L",
-                "01": "level2_M_core1_L",
-                "02": "level2_M_core2_L",
-                "03": "level2_M_core3_L",
-                "04": "level2_M_core4_L",
-                "05": "level2_M_core5_L",
-                "06": "level2_M_core6_L",
-                "07": "level2_M_core7_L",
-                "08": "level2_M_core8_L",
-                "09": "level2_M_core9_L",
-                "0a": "level2_M_core10_L",
-                "0b": "level2_M_core11_L",
-                "0c": "level2_M_core12_L",
-                "0d": "level2_M_core13_L",
-                "0e": "level2_M_core14_L",
-                "0f": "level2_M_core15_L",
-                "10": "level2_M_core16_L",
-                "11": "level2_M_core17_L",
-                "12": "level2_M_core18_L",
-                "13": "level2_M_core19_L",
-                "14": "level2_M_core20_L",
-                "15": "level2_M_core21_L",
-                "16": "level2_M_core22_L",
-                "17": "level2_M_core23_L",
-                "18": "level2_M_core24_L",
-                "19": "level2_M_core25_L",
-                "1a": "level2_M_core26_L",
-                "1b": "level2_M_core27_L",
-                "1c": "level2_M_core28_L",
-                "1d": "level2_M_core29_L",
-                "1e": "level2_M_core30_L",
-                "1f": "level2_M_core31_L",
+                "00": "level2_M_core0_L_th_1",
+                "01": "level2_M_core1_L_th_1",
+                "02": "level2_M_core2_L_th_1",
+                "03": "level2_M_core3_L_th_1",
+                "04": "level2_M_core4_L_th_1",
+                "05": "level2_M_core5_L_th_1",
+                "06": "level2_M_core6_L_th_1",
+                "07": "level2_M_core7_L_th_1",
+                "08": "level2_M_core8_L_th_1",
+                "09": "level2_M_core9_L_th_1",
+                "0a": "level2_M_core10_L_th_1",
+                "0b": "level2_M_core11_L_th_1",
+                "0c": "level2_M_core12_L_th_1",
+                "0d": "level2_M_core13_L_th_1",
+                "0e": "level2_M_core14_L_th_1",
+                "0f": "level2_M_core15_L_th_1",
+                "10": "level2_M_core16_L_th_1",
+                "11": "level2_M_core17_L_th_1",
+                "12": "level2_M_core18_L_th_1",
+                "13": "level2_M_core19_L_th_1",
+                "14": "level2_M_core20_L_th_1",
+                "15": "level2_M_core21_L_th_1",
+                "16": "level2_M_core22_L_th_1",
+                "17": "level2_M_core23_L_th_1",
+                "18": "level2_M_core24_L_th_1",
+                "19": "level2_M_core25_L_th_1",
+                "1a": "level2_M_core26_L_th_1",
+                "1b": "level2_M_core27_L_th_1",
+                "1c": "level2_M_core28_L_th_1",
+                "1d": "level2_M_core29_L_th_1",
+                "1e": "level2_M_core30_L_th_1",
+                "1f": "level2_M_core31_L_th_1",
                 "flags": ["cs_possible"]
             },
             "0b": {
-                "00": "level2_M_core0_L",
-                "01": "level2_M_core1_L",
-                "02": "level2_M_core2_L",
-                "03": "level2_M_core3_L",
-                "04": "level2_M_core4_L",
-                "05": "level2_M_core5_L",
-                "06": "level2_M_core6_L",
-                "07": "level2_M_core7_L",
-                "08": "level2_M_core8_L",
-                "09": "level2_M_core9_L",
-                "0a": "level2_M_core10_L",
-                "0b": "level2_M_core11_L",
-                "0c": "level2_M_core12_L",
-                "0d": "level2_M_core13_L",
-                "0e": "level2_M_core14_L",
-                "0f": "level2_M_core15_L",
-                "10": "level2_M_core16_L",
-                "11": "level2_M_core17_L",
-                "12": "level2_M_core18_L",
-                "13": "level2_M_core19_L",
-                "14": "level2_M_core20_L",
-                "15": "level2_M_core21_L",
-                "16": "level2_M_core22_L",
-                "17": "level2_M_core23_L",
-                "18": "level2_M_core24_L",
-                "19": "level2_M_core25_L",
-                "1a": "level2_M_core26_L",
-                "1b": "level2_M_core27_L",
-                "1c": "level2_M_core28_L",
-                "1d": "level2_M_core29_L",
-                "1e": "level2_M_core30_L",
-                "1f": "level2_M_core31_L",
+                "00": "level2_M_core0_L_th_1",
+                "01": "level2_M_core1_L_th_1",
+                "02": "level2_M_core2_L_th_1",
+                "03": "level2_M_core3_L_th_1",
+                "04": "level2_M_core4_L_th_1",
+                "05": "level2_M_core5_L_th_1",
+                "06": "level2_M_core6_L_th_1",
+                "07": "level2_M_core7_L_th_1",
+                "08": "level2_M_core8_L_th_1",
+                "09": "level2_M_core9_L_th_1",
+                "0a": "level2_M_core10_L_th_1",
+                "0b": "level2_M_core11_L_th_1",
+                "0c": "level2_M_core12_L_th_1",
+                "0d": "level2_M_core13_L_th_1",
+                "0e": "level2_M_core14_L_th_1",
+                "0f": "level2_M_core15_L_th_1",
+                "10": "level2_M_core16_L_th_1",
+                "11": "level2_M_core17_L_th_1",
+                "12": "level2_M_core18_L_th_1",
+                "13": "level2_M_core19_L_th_1",
+                "14": "level2_M_core20_L_th_1",
+                "15": "level2_M_core21_L_th_1",
+                "16": "level2_M_core22_L_th_1",
+                "17": "level2_M_core23_L_th_1",
+                "18": "level2_M_core24_L_th_1",
+                "19": "level2_M_core25_L_th_1",
+                "1a": "level2_M_core26_L_th_1",
+                "1b": "level2_M_core27_L_th_1",
+                "1c": "level2_M_core28_L_th_1",
+                "1d": "level2_M_core29_L_th_1",
+                "1e": "level2_M_core30_L_th_1",
+                "1f": "level2_M_core31_L_th_1",
                 "flags": ["cs_possible"]
             },
             "0c": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L"
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1"
             },
             "0d": {
                 "00": "master_power_bus_chip_procedure",
@@ -16641,38 +23948,38 @@
                 "1f": "master_power_bus_chip_procedure"
             },
             "0e": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L"
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1",
@@ -16811,106 +24118,106 @@
                 "1f": "level2_M_th1"
             },
             "13": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "14": {
-                "00": "level2_M_core0_L",
-                "01": "level2_M_core1_L",
-                "02": "level2_M_core2_L",
-                "03": "level2_M_core3_L",
-                "04": "level2_M_core4_L",
-                "05": "level2_M_core5_L",
-                "06": "level2_M_core6_L",
-                "07": "level2_M_core7_L",
-                "08": "level2_M_core8_L",
-                "09": "level2_M_core9_L",
-                "0a": "level2_M_core10_L",
-                "0b": "level2_M_core11_L",
-                "0c": "level2_M_core12_L",
-                "0d": "level2_M_core13_L",
-                "0e": "level2_M_core14_L",
-                "0f": "level2_M_core15_L",
-                "10": "level2_M_core16_L",
-                "11": "level2_M_core17_L",
-                "12": "level2_M_core18_L",
-                "13": "level2_M_core19_L",
-                "14": "level2_M_core20_L",
-                "15": "level2_M_core21_L",
-                "16": "level2_M_core22_L",
-                "17": "level2_M_core23_L",
-                "18": "level2_M_core24_L",
-                "19": "level2_M_core25_L",
-                "1a": "level2_M_core26_L",
-                "1b": "level2_M_core27_L",
-                "1c": "level2_M_core28_L",
-                "1d": "level2_M_core29_L",
-                "1e": "level2_M_core30_L",
-                "1f": "level2_M_core31_L"
+                "00": "level2_M_core0_L_th_1",
+                "01": "level2_M_core1_L_th_1",
+                "02": "level2_M_core2_L_th_1",
+                "03": "level2_M_core3_L_th_1",
+                "04": "level2_M_core4_L_th_1",
+                "05": "level2_M_core5_L_th_1",
+                "06": "level2_M_core6_L_th_1",
+                "07": "level2_M_core7_L_th_1",
+                "08": "level2_M_core8_L_th_1",
+                "09": "level2_M_core9_L_th_1",
+                "0a": "level2_M_core10_L_th_1",
+                "0b": "level2_M_core11_L_th_1",
+                "0c": "level2_M_core12_L_th_1",
+                "0d": "level2_M_core13_L_th_1",
+                "0e": "level2_M_core14_L_th_1",
+                "0f": "level2_M_core15_L_th_1",
+                "10": "level2_M_core16_L_th_1",
+                "11": "level2_M_core17_L_th_1",
+                "12": "level2_M_core18_L_th_1",
+                "13": "level2_M_core19_L_th_1",
+                "14": "level2_M_core20_L_th_1",
+                "15": "level2_M_core21_L_th_1",
+                "16": "level2_M_core22_L_th_1",
+                "17": "level2_M_core23_L_th_1",
+                "18": "level2_M_core24_L_th_1",
+                "19": "level2_M_core25_L_th_1",
+                "1a": "level2_M_core26_L_th_1",
+                "1b": "level2_M_core27_L_th_1",
+                "1c": "level2_M_core28_L_th_1",
+                "1d": "level2_M_core29_L_th_1",
+                "1e": "level2_M_core30_L_th_1",
+                "1f": "level2_M_core31_L_th_1"
             },
             "15": {
-                "00": "level2_M_core0_L",
-                "01": "level2_M_core1_L",
-                "02": "level2_M_core2_L",
-                "03": "level2_M_core3_L",
-                "04": "level2_M_core4_L",
-                "05": "level2_M_core5_L",
-                "06": "level2_M_core6_L",
-                "07": "level2_M_core7_L",
-                "08": "level2_M_core8_L",
-                "09": "level2_M_core9_L",
-                "0a": "level2_M_core10_L",
-                "0b": "level2_M_core11_L",
-                "0c": "level2_M_core12_L",
-                "0d": "level2_M_core13_L",
-                "0e": "level2_M_core14_L",
-                "0f": "level2_M_core15_L",
-                "10": "level2_M_core16_L",
-                "11": "level2_M_core17_L",
-                "12": "level2_M_core18_L",
-                "13": "level2_M_core19_L",
-                "14": "level2_M_core20_L",
-                "15": "level2_M_core21_L",
-                "16": "level2_M_core22_L",
-                "17": "level2_M_core23_L",
-                "18": "level2_M_core24_L",
-                "19": "level2_M_core25_L",
-                "1a": "level2_M_core26_L",
-                "1b": "level2_M_core27_L",
-                "1c": "level2_M_core28_L",
-                "1d": "level2_M_core29_L",
-                "1e": "level2_M_core30_L",
-                "1f": "level2_M_core31_L"
+                "00": "level2_M_core0_L_th_1",
+                "01": "level2_M_core1_L_th_1",
+                "02": "level2_M_core2_L_th_1",
+                "03": "level2_M_core3_L_th_1",
+                "04": "level2_M_core4_L_th_1",
+                "05": "level2_M_core5_L_th_1",
+                "06": "level2_M_core6_L_th_1",
+                "07": "level2_M_core7_L_th_1",
+                "08": "level2_M_core8_L_th_1",
+                "09": "level2_M_core9_L_th_1",
+                "0a": "level2_M_core10_L_th_1",
+                "0b": "level2_M_core11_L_th_1",
+                "0c": "level2_M_core12_L_th_1",
+                "0d": "level2_M_core13_L_th_1",
+                "0e": "level2_M_core14_L_th_1",
+                "0f": "level2_M_core15_L_th_1",
+                "10": "level2_M_core16_L_th_1",
+                "11": "level2_M_core17_L_th_1",
+                "12": "level2_M_core18_L_th_1",
+                "13": "level2_M_core19_L_th_1",
+                "14": "level2_M_core20_L_th_1",
+                "15": "level2_M_core21_L_th_1",
+                "16": "level2_M_core22_L_th_1",
+                "17": "level2_M_core23_L_th_1",
+                "18": "level2_M_core24_L_th_1",
+                "19": "level2_M_core25_L_th_1",
+                "1a": "level2_M_core26_L_th_1",
+                "1b": "level2_M_core27_L_th_1",
+                "1c": "level2_M_core28_L_th_1",
+                "1d": "level2_M_core29_L_th_1",
+                "1e": "level2_M_core30_L_th_1",
+                "1f": "level2_M_core31_L_th_1"
             },
             "16": {
                 "00": "level2_M_th1",
@@ -17153,398 +24460,398 @@
         },
         "2aeb": {
             "00": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "01": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "02": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "03": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "04": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "05": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "06": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "07": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "08": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "09": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "0a": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "0b": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "0c": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "0d": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "0e": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "0f": {
-                "00": "iolink0",
-                "01": "iolink4",
-                "02": "iolink8",
-                "03": "iolink12"
+                "00": "iolink0_M_th_1",
+                "01": "iolink4_M_th_1",
+                "02": "iolink8_M_th_1",
+                "03": "iolink12_M_th_1"
             },
             "10": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "11": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "12": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "13": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "14": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "15": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "16": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "17": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "18": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "19": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "1a": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "1b": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "1c": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "1d": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "1e": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "1f": {
-                "00": "iolink1",
-                "01": "iolink5",
-                "02": "iolink9",
-                "03": "iolink13"
+                "00": "iolink1_M_th_1",
+                "01": "iolink5_M_th_1",
+                "02": "iolink9_M_th_1",
+                "03": "iolink13_M_th_1"
             },
             "20": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "21": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "22": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "23": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "24": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "25": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "26": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "27": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "28": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "29": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "2a": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "2b": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "2c": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "2d": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "2e": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "2f": {
-                "00": "iolink2",
-                "01": "iolink6",
-                "02": "iolink10",
-                "03": "iolink14"
+                "00": "iolink2_M_th_1",
+                "01": "iolink6_M_th_1",
+                "02": "iolink10_M_th_1",
+                "03": "iolink14_M_th_1"
             },
             "30": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "31": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "32": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "33": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "34": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "35": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "36": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "37": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "38": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "39": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "3a": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "3b": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "3c": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "3d": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "3e": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             },
             "3f": {
-                "00": "iolink3",
-                "01": "iolink7",
-                "02": "iolink11",
-                "03": "iolink15"
+                "00": "iolink3_M_th_1",
+                "01": "iolink7_M_th_1",
+                "02": "iolink11_M_th_1",
+                "03": "iolink15_M_th_1"
             }
         },
         "8b5b": {
             "00": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1"
             },
             "01": {
                 "00": "level2_M_th1",
@@ -17555,12 +24862,12 @@
                 "05": "level2_M_th1"
             },
             "02": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay"
             },
             "03": {
                 "00": "level2_M_th1",
@@ -17579,12 +24886,12 @@
                 "05": "level2_M_th1"
             },
             "05": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay"
             },
             "06": {
                 "00": "level2_M_th1",
@@ -17603,20 +24910,20 @@
                 "05": "level2_M_th1"
             },
             "08": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1"
             },
             "09": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1"
             },
             "0a": {
                 "00": "level2_M_th1",
@@ -17675,12 +24982,12 @@
                 "05": "level2_M_th1"
             },
             "11": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1"
             },
             "12": {
                 "00": "level2_M_th1",
@@ -17699,28 +25006,28 @@
                 "05": "level2_M_th1"
             },
             "14": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1"
             },
             "15": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1"
             },
             "16": {
-                "00": "level2_M_self_L",
-                "01": "level2_M_self_L",
-                "02": "level2_M_self_L",
-                "03": "level2_M_self_L",
-                "04": "level2_M_self_L",
-                "05": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1",
+                "01": "level2_M_self_L_th_1",
+                "02": "level2_M_self_L_th_1",
+                "03": "level2_M_self_L_th_1",
+                "04": "level2_M_self_L_th_1",
+                "05": "level2_M_self_L_th_1"
             },
             "17": {
                 "00": "level2_M_th1",
@@ -19043,14 +26350,14 @@
                 "07": "level2_M_th1"
             },
             "08": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "09": {
                 "00": "level2_M_th1",
@@ -19063,87 +26370,87 @@
                 "07": "level2_M_th1"
             },
             "0a": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "0b": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "0c": {
-                "00": "omi_bus0",
-                "01": "omi_bus2",
-                "02": "omi_bus4",
-                "03": "omi_bus6",
-                "04": "omi_bus8",
-                "05": "omi_bus10",
-                "06": "omi_bus12",
-                "07": "omi_bus14",
+                "00": "omi_bus0_th_1",
+                "01": "omi_bus2_th_1",
+                "02": "omi_bus4_th_1",
+                "03": "omi_bus6_th_1",
+                "04": "omi_bus8_th_1",
+                "05": "omi_bus10_th_1",
+                "06": "omi_bus12_th_1",
+                "07": "omi_bus14_th_1",
                 "flags": ["sue_source"]
             },
             "0d": {
-                "00": "omi_bus1",
-                "01": "omi_bus3",
-                "02": "omi_bus5",
-                "03": "omi_bus7",
-                "04": "omi_bus9",
-                "05": "omi_bus11",
-                "06": "omi_bus13",
-                "07": "omi_bus15",
+                "00": "omi_bus1_th_1",
+                "01": "omi_bus3_th_1",
+                "02": "omi_bus5_th_1",
+                "03": "omi_bus7_th_1",
+                "04": "omi_bus9_th_1",
+                "05": "omi_bus11_th_1",
+                "06": "omi_bus13_th_1",
+                "07": "omi_bus15_th_1",
                 "flags": ["sue_source"]
             },
             "0e": {
-                "00": "omi_bus0",
-                "01": "omi_bus2",
-                "02": "omi_bus4",
-                "03": "omi_bus6",
-                "04": "omi_bus8",
-                "05": "omi_bus10",
-                "06": "omi_bus12",
-                "07": "omi_bus14"
+                "00": "omi_bus0_th_32perDay",
+                "01": "omi_bus2_th_32perDay",
+                "02": "omi_bus4_th_32perDay",
+                "03": "omi_bus6_th_32perDay",
+                "04": "omi_bus8_th_32perDay",
+                "05": "omi_bus10_th_32perDay",
+                "06": "omi_bus12_th_32perDay",
+                "07": "omi_bus14_th_32perDay"
             },
             "0f": {
-                "00": "omi_bus1",
-                "01": "omi_bus3",
-                "02": "omi_bus5",
-                "03": "omi_bus7",
-                "04": "omi_bus9",
-                "05": "omi_bus11",
-                "06": "omi_bus13",
-                "07": "omi_bus15"
+                "00": "omi_bus1_th_32perDay",
+                "01": "omi_bus3_th_32perDay",
+                "02": "omi_bus5_th_32perDay",
+                "03": "omi_bus7_th_32perDay",
+                "04": "omi_bus9_th_32perDay",
+                "05": "omi_bus11_th_32perDay",
+                "06": "omi_bus13_th_32perDay",
+                "07": "omi_bus15_th_32perDay"
             },
             "10": {
-                "00": "connected_ocmb0",
-                "01": "connected_ocmb2",
-                "02": "connected_ocmb4",
-                "03": "connected_ocmb6",
-                "04": "connected_ocmb8",
-                "05": "connected_ocmb10",
-                "06": "connected_ocmb12",
-                "07": "connected_ocmb14",
+                "00": "connected_ocmb0_M_th_1",
+                "01": "connected_ocmb2_M_th_1",
+                "02": "connected_ocmb4_M_th_1",
+                "03": "connected_ocmb6_M_th_1",
+                "04": "connected_ocmb8_M_th_1",
+                "05": "connected_ocmb10_M_th_1",
+                "06": "connected_ocmb12_M_th_1",
+                "07": "connected_ocmb14_M_th_1",
                 "flags": ["sue_source"]
             },
             "11": {
-                "00": "connected_ocmb1",
-                "01": "connected_ocmb3",
-                "02": "connected_ocmb5",
-                "03": "connected_ocmb7",
-                "04": "connected_ocmb9",
-                "05": "connected_ocmb11",
-                "06": "connected_ocmb13",
-                "07": "connected_ocmb15",
+                "00": "connected_ocmb1_M_th_1",
+                "01": "connected_ocmb3_M_th_1",
+                "02": "connected_ocmb5_M_th_1",
+                "03": "connected_ocmb7_M_th_1",
+                "04": "connected_ocmb9_M_th_1",
+                "05": "connected_ocmb11_M_th_1",
+                "06": "connected_ocmb13_M_th_1",
+                "07": "connected_ocmb15_M_th_1",
                 "flags": ["sue_source"]
             },
             "12": {
@@ -19187,36 +26494,36 @@
                 "07": "level2_M_th1"
             },
             "16": {
-                "00": "channel_timeout_omi0",
-                "01": "channel_timeout_omi2",
-                "02": "channel_timeout_omi4",
-                "03": "channel_timeout_omi6",
-                "04": "channel_timeout_omi8",
-                "05": "channel_timeout_omi10",
-                "06": "channel_timeout_omi12",
-                "07": "channel_timeout_omi14",
+                "00": "channel_timeout_omi0_th_1",
+                "01": "channel_timeout_omi2_th_1",
+                "02": "channel_timeout_omi4_th_1",
+                "03": "channel_timeout_omi6_th_1",
+                "04": "channel_timeout_omi8_th_1",
+                "05": "channel_timeout_omi10_th_1",
+                "06": "channel_timeout_omi12_th_1",
+                "07": "channel_timeout_omi14_th_1",
                 "flags": ["sue_source"]
             },
             "17": {
-                "00": "channel_timeout_omi1",
-                "01": "channel_timeout_omi3",
-                "02": "channel_timeout_omi5",
-                "03": "channel_timeout_omi7",
-                "04": "channel_timeout_omi9",
-                "05": "channel_timeout_omi11",
-                "06": "channel_timeout_omi13",
-                "07": "channel_timeout_omi15",
+                "00": "channel_timeout_omi1_th_1",
+                "01": "channel_timeout_omi3_th_1",
+                "02": "channel_timeout_omi5_th_1",
+                "03": "channel_timeout_omi7_th_1",
+                "04": "channel_timeout_omi9_th_1",
+                "05": "channel_timeout_omi11_th_1",
+                "06": "channel_timeout_omi13_th_1",
+                "07": "channel_timeout_omi15_th_1",
                 "flags": ["sue_source"]
             },
             "18": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "19": {
                 "00": "level2_M_th1",
@@ -19229,44 +26536,44 @@
                 "07": "level2_M_th1"
             },
             "1a": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "1b": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "1c": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "1d": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "1e": {
                 "00": "level2_M_th1",
@@ -19279,24 +26586,24 @@
                 "07": "level2_M_th1"
             },
             "1f": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "20": {
-                "00": "mcc0",
-                "01": "mcc1",
-                "02": "mcc2",
-                "03": "mcc3",
-                "04": "mcc4",
-                "05": "mcc5",
-                "06": "mcc6",
-                "07": "mcc7"
+                "00": "mcc0_M_th_1",
+                "01": "mcc1_M_th_1",
+                "02": "mcc2_M_th_1",
+                "03": "mcc3_M_th_1",
+                "04": "mcc4_M_th_1",
+                "05": "mcc5_M_th_1",
+                "06": "mcc6_M_th_1",
+                "07": "mcc7_M_th_1"
             },
             "21": {
                 "00": "level2_M_th1",
@@ -19319,25 +26626,25 @@
                 "07": "level2_M_th1"
             },
             "23": {
-                "00": "omi0",
-                "01": "omi2",
-                "02": "omi4",
-                "03": "omi6",
-                "04": "omi8",
-                "05": "omi10",
-                "06": "omi12",
-                "07": "omi14",
+                "00": "omi0_M_th_1",
+                "01": "omi2_M_th_1",
+                "02": "omi4_M_th_1",
+                "03": "omi6_M_th_1",
+                "04": "omi8_M_th_1",
+                "05": "omi10_M_th_1",
+                "06": "omi12_M_th_1",
+                "07": "omi14_M_th_1",
                 "flags": ["sue_source"]
             },
             "24": {
-                "00": "omi1",
-                "01": "omi3",
-                "02": "omi5",
-                "03": "omi7",
-                "04": "omi9",
-                "05": "omi11",
-                "06": "omi13",
-                "07": "omi15",
+                "00": "omi1_M_th_1",
+                "01": "omi3_M_th_1",
+                "02": "omi5_M_th_1",
+                "03": "omi7_M_th_1",
+                "04": "omi9_M_th_1",
+                "05": "omi11_M_th_1",
+                "06": "omi13_M_th_1",
+                "07": "omi15_M_th_1",
                 "flags": ["sue_source"]
             },
             "25": {
@@ -19363,52 +26670,52 @@
         },
         "384d": {
             "00": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec1_M_th_32perDay"
             },
             "01": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec1_M_th_32perDay"
             },
             "02": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec1_M_th_32perDay"
             },
             "03": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec1_M_th_32perDay"
             },
             "04": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec1_M_th_32perDay"
             },
             "05": {
                 "00": "level2_M_th1",
                 "01": "level2_M_th1"
             },
             "06": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_info_only",
+                "01": "pec1_M_info_only"
             },
             "07": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_info_only",
+                "01": "pec1_M_info_only"
             },
             "08": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_info_only",
+                "01": "pec1_M_info_only"
             },
             "09": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_info_only",
+                "01": "pec1_M_info_only"
             },
             "0a": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_info_only",
+                "01": "pec1_M_info_only"
             },
             "0b": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_info_only",
+                "01": "pec1_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1",
@@ -19443,12 +26750,12 @@
                 "01": "level2_M_th1"
             },
             "14": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec1_M_th_32perDay"
             },
             "15": {
-                "00": "self",
-                "01": "self"
+                "00": "pec0_M_th_32perDay",
+                "01": "pec1_M_th_32perDay"
             },
             "16": {
                 "00": "level2_M_th1",
@@ -19621,10 +26928,10 @@
         },
         "5c6e": {
             "00": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "02": {
                 "00": "level2_M_th1"
@@ -19645,43 +26952,43 @@
                 "00": "level2_M_th1"
             },
             "08": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "09": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
                 "00": "level2_M_th1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
                 "00": "level2_M_th1"
             },
             "0f": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "10": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "11": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "12": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "13": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "14": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "15": {
                 "00": "level2_M_th1"
@@ -19690,7 +26997,7 @@
                 "00": "level2_M_th1"
             },
             "17": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_32perDay"
             },
             "18": {
                 "00": "level2_M_th1"
@@ -19707,363 +27014,363 @@
         },
         "4427": {
             "00": {
-                "00": "framer_error_iolink0",
-                "01": "framer_error_iolink4",
-                "02": "framer_error_iolink8",
-                "03": "framer_error_iolink12"
+                "00": "framer_error_iolink0_th_1",
+                "01": "framer_error_iolink4_th_1",
+                "02": "framer_error_iolink8_th_1",
+                "03": "framer_error_iolink12_th_1"
             },
             "01": {
-                "00": "framer_error_iolink0",
-                "01": "framer_error_iolink4",
-                "02": "framer_error_iolink8",
-                "03": "framer_error_iolink12"
+                "00": "framer_error_iolink0_th_1",
+                "01": "framer_error_iolink4_th_1",
+                "02": "framer_error_iolink8_th_1",
+                "03": "framer_error_iolink12_th_1"
             },
             "02": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "03": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "04": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "05": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "06": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "07": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "08": {
-                "00": "framer_error_iolink0",
-                "01": "framer_error_iolink4",
-                "02": "framer_error_iolink8",
-                "03": "framer_error_iolink12"
+                "00": "framer_error_iolink0_th_1",
+                "01": "framer_error_iolink4_th_1",
+                "02": "framer_error_iolink8_th_1",
+                "03": "framer_error_iolink12_th_1"
             },
             "09": {
-                "00": "framer_error_iolink0",
-                "01": "framer_error_iolink4",
-                "02": "framer_error_iolink8",
-                "03": "framer_error_iolink12"
+                "00": "framer_error_iolink0_th_1",
+                "01": "framer_error_iolink4_th_1",
+                "02": "framer_error_iolink8_th_1",
+                "03": "framer_error_iolink12_th_1"
             },
             "0a": {
-                "00": "framer_error_iolink0",
-                "01": "framer_error_iolink4",
-                "02": "framer_error_iolink8",
-                "03": "framer_error_iolink12"
+                "00": "framer_error_iolink0_th_1",
+                "01": "framer_error_iolink4_th_1",
+                "02": "framer_error_iolink8_th_1",
+                "03": "framer_error_iolink12_th_1"
             },
             "0b": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "0c": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "0d": {
-                "00": "bus_endpoints_iolink0",
-                "01": "bus_endpoints_iolink4",
-                "02": "bus_endpoints_iolink8",
-                "03": "bus_endpoints_iolink12"
+                "00": "bus_endpoints_iolink0_th_1",
+                "01": "bus_endpoints_iolink4_th_1",
+                "02": "bus_endpoints_iolink8_th_1",
+                "03": "bus_endpoints_iolink12_th_1"
             },
             "10": {
-                "00": "framer_error_iolink1",
-                "01": "framer_error_iolink5",
-                "02": "framer_error_iolink9",
-                "03": "framer_error_iolink13"
+                "00": "framer_error_iolink1_th_1",
+                "01": "framer_error_iolink5_th_1",
+                "02": "framer_error_iolink9_th_1",
+                "03": "framer_error_iolink13_th_1"
             },
             "11": {
-                "00": "framer_error_iolink1",
-                "01": "framer_error_iolink5",
-                "02": "framer_error_iolink9",
-                "03": "framer_error_iolink13"
+                "00": "framer_error_iolink1_th_1",
+                "01": "framer_error_iolink5_th_1",
+                "02": "framer_error_iolink9_th_1",
+                "03": "framer_error_iolink13_th_1"
             },
             "12": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "13": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "14": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "15": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "16": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "17": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "18": {
-                "00": "framer_error_iolink1",
-                "01": "framer_error_iolink5",
-                "02": "framer_error_iolink9",
-                "03": "framer_error_iolink13"
+                "00": "framer_error_iolink1_th_1",
+                "01": "framer_error_iolink5_th_1",
+                "02": "framer_error_iolink9_th_1",
+                "03": "framer_error_iolink13_th_1"
             },
             "19": {
-                "00": "framer_error_iolink1",
-                "01": "framer_error_iolink5",
-                "02": "framer_error_iolink9",
-                "03": "framer_error_iolink13"
+                "00": "framer_error_iolink1_th_1",
+                "01": "framer_error_iolink5_th_1",
+                "02": "framer_error_iolink9_th_1",
+                "03": "framer_error_iolink13_th_1"
             },
             "1a": {
-                "00": "framer_error_iolink1",
-                "01": "framer_error_iolink5",
-                "02": "framer_error_iolink9",
-                "03": "framer_error_iolink13"
+                "00": "framer_error_iolink1_th_1",
+                "01": "framer_error_iolink5_th_1",
+                "02": "framer_error_iolink9_th_1",
+                "03": "framer_error_iolink13_th_1"
             },
             "1b": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "1c": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "1d": {
-                "00": "bus_endpoints_iolink1",
-                "01": "bus_endpoints_iolink5",
-                "02": "bus_endpoints_iolink9",
-                "03": "bus_endpoints_iolink13"
+                "00": "bus_endpoints_iolink1_th_1",
+                "01": "bus_endpoints_iolink5_th_1",
+                "02": "bus_endpoints_iolink9_th_1",
+                "03": "bus_endpoints_iolink13_th_1"
             },
             "20": {
-                "00": "framer_error_iolink2",
-                "01": "framer_error_iolink6",
-                "02": "framer_error_iolink10",
-                "03": "framer_error_iolink14"
+                "00": "framer_error_iolink2_th_1",
+                "01": "framer_error_iolink6_th_1",
+                "02": "framer_error_iolink10_th_1",
+                "03": "framer_error_iolink14_th_1"
             },
             "21": {
-                "00": "framer_error_iolink2",
-                "01": "framer_error_iolink6",
-                "02": "framer_error_iolink10",
-                "03": "framer_error_iolink14"
+                "00": "framer_error_iolink2_th_1",
+                "01": "framer_error_iolink6_th_1",
+                "02": "framer_error_iolink10_th_1",
+                "03": "framer_error_iolink14_th_1"
             },
             "22": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "23": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "24": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "25": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "26": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "27": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "28": {
-                "00": "framer_error_iolink2",
-                "01": "framer_error_iolink6",
-                "02": "framer_error_iolink10",
-                "03": "framer_error_iolink14"
+                "00": "framer_error_iolink2_th_1",
+                "01": "framer_error_iolink6_th_1",
+                "02": "framer_error_iolink10_th_1",
+                "03": "framer_error_iolink14_th_1"
             },
             "29": {
-                "00": "framer_error_iolink2",
-                "01": "framer_error_iolink6",
-                "02": "framer_error_iolink10",
-                "03": "framer_error_iolink14"
+                "00": "framer_error_iolink2_th_1",
+                "01": "framer_error_iolink6_th_1",
+                "02": "framer_error_iolink10_th_1",
+                "03": "framer_error_iolink14_th_1"
             },
             "2a": {
-                "00": "framer_error_iolink2",
-                "01": "framer_error_iolink6",
-                "02": "framer_error_iolink10",
-                "03": "framer_error_iolink14"
+                "00": "framer_error_iolink2_th_1",
+                "01": "framer_error_iolink6_th_1",
+                "02": "framer_error_iolink10_th_1",
+                "03": "framer_error_iolink14_th_1"
             },
             "2b": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "2c": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "2d": {
-                "00": "bus_endpoints_iolink2",
-                "01": "bus_endpoints_iolink6",
-                "02": "bus_endpoints_iolink10",
-                "03": "bus_endpoints_iolink14"
+                "00": "bus_endpoints_iolink2_th_1",
+                "01": "bus_endpoints_iolink6_th_1",
+                "02": "bus_endpoints_iolink10_th_1",
+                "03": "bus_endpoints_iolink14_th_1"
             },
             "30": {
-                "00": "framer_error_iolink3",
-                "01": "framer_error_iolink7",
-                "02": "framer_error_iolink11",
-                "03": "framer_error_iolink15"
+                "00": "framer_error_iolink3_th_1",
+                "01": "framer_error_iolink7_th_1",
+                "02": "framer_error_iolink11_th_1",
+                "03": "framer_error_iolink15_th_1"
             },
             "31": {
-                "00": "framer_error_iolink3",
-                "01": "framer_error_iolink7",
-                "02": "framer_error_iolink11",
-                "03": "framer_error_iolink15"
+                "00": "framer_error_iolink3_th_1",
+                "01": "framer_error_iolink7_th_1",
+                "02": "framer_error_iolink11_th_1",
+                "03": "framer_error_iolink15_th_1"
             },
             "32": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "33": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "34": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "35": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "36": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "37": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1"
             },
             "38": {
-                "00": "framer_error_iolink3",
-                "01": "framer_error_iolink7",
-                "02": "framer_error_iolink11",
-                "03": "framer_error_iolink15"
+                "00": "framer_error_iolink3_th_1",
+                "01": "framer_error_iolink7_th_1",
+                "02": "framer_error_iolink11_th_1",
+                "03": "framer_error_iolink15_th_1"
             },
             "39": {
-                "00": "framer_error_iolink3",
-                "01": "framer_error_iolink7",
-                "02": "framer_error_iolink11",
-                "03": "framer_error_iolink15"
+                "00": "framer_error_iolink3_th_1",
+                "01": "framer_error_iolink7_th_1",
+                "02": "framer_error_iolink11_th_1",
+                "03": "framer_error_iolink15_th_1"
             },
             "3a": {
-                "00": "framer_error_iolink3",
-                "01": "framer_error_iolink7",
-                "02": "framer_error_iolink11",
-                "03": "framer_error_iolink15"
+                "00": "framer_error_iolink3_th_1",
+                "01": "framer_error_iolink7_th_1",
+                "02": "framer_error_iolink11_th_1",
+                "03": "framer_error_iolink15_th_1"
             },
             "3b": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "3c": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             },
             "3d": {
-                "00": "bus_endpoints_iolink3",
-                "01": "bus_endpoints_iolink7",
-                "02": "bus_endpoints_iolink11",
-                "03": "bus_endpoints_iolink15"
+                "00": "bus_endpoints_iolink3_th_1",
+                "01": "bus_endpoints_iolink7_th_1",
+                "02": "bus_endpoints_iolink11_th_1",
+                "03": "bus_endpoints_iolink15_th_1"
             }
         },
         "0bb9": {
             "00": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1"
@@ -20072,22 +27379,22 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
@@ -20183,14 +27490,14 @@
                 "07": "level2_M_th1"
             },
             "07": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "08": {
                 "00": "level2_M_th1",
@@ -20363,14 +27670,14 @@
                 "07": "level2_M_th1"
             },
             "19": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay",
+                "02": "self_M_th_32perDay",
+                "03": "self_M_th_32perDay",
+                "04": "self_M_th_32perDay",
+                "05": "self_M_th_32perDay",
+                "06": "self_M_th_32perDay",
+                "07": "self_M_th_32perDay"
             },
             "1a": {
                 "00": "level2_M_th1",
@@ -20403,14 +27710,14 @@
                 "07": "level2_M_th1"
             },
             "1d": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1",
+                "06": "self_M_th_1",
+                "07": "self_M_th_1"
             },
             "1e": {
                 "00": "level2_M_th1",
@@ -20433,24 +27740,24 @@
                 "07": "level2_M_th1"
             },
             "20": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1",
+                "06": "self_M_th_1",
+                "07": "self_M_th_1"
             },
             "21": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1",
+                "06": "self_M_th_1",
+                "07": "self_M_th_1"
             },
             "22": {
                 "00": "level2_M_th1",
@@ -20719,44 +28026,44 @@
                 "07": "level2_M_th1"
             },
             "06": {
-                "00": "opencapi_iolink0",
-                "01": "opencapi_iolink2",
-                "02": "opencapi_iolink4",
-                "03": "opencapi_iolink6",
-                "04": "opencapi_iolink8",
-                "05": "opencapi_iolink10",
-                "06": "opencapi_iolink12",
-                "07": "opencapi_iolink14"
+                "00": "opencapi_iolink0_M_th_32perDay",
+                "01": "opencapi_iolink2_M_th_32perDay",
+                "02": "opencapi_iolink4_M_th_32perDay",
+                "03": "opencapi_iolink6_M_th_32perDay",
+                "04": "opencapi_iolink8_M_th_32perDay",
+                "05": "opencapi_iolink10_M_th_32perDay",
+                "06": "opencapi_iolink12_M_th_32perDay",
+                "07": "opencapi_iolink14_M_th_32perDay"
             },
             "07": {
-                "00": "opencapi_iolink1",
-                "01": "opencapi_iolink3",
-                "02": "opencapi_iolink5",
-                "03": "opencapi_iolink7",
-                "04": "opencapi_iolink9",
-                "05": "opencapi_iolink11",
-                "06": "opencapi_iolink13",
-                "07": "opencapi_iolink15"
+                "00": "opencapi_iolink1_M_th_32perDay",
+                "01": "opencapi_iolink3_M_th_32perDay",
+                "02": "opencapi_iolink5_M_th_32perDay",
+                "03": "opencapi_iolink7_M_th_32perDay",
+                "04": "opencapi_iolink9_M_th_32perDay",
+                "05": "opencapi_iolink11_M_th_32perDay",
+                "06": "opencapi_iolink13_M_th_32perDay",
+                "07": "opencapi_iolink15_M_th_32perDay"
             },
             "08": {
-                "00": "opencapi_iolink0",
-                "01": "opencapi_iolink2",
-                "02": "opencapi_iolink4",
-                "03": "opencapi_iolink6",
-                "04": "opencapi_iolink8",
-                "05": "opencapi_iolink10",
-                "06": "opencapi_iolink12",
-                "07": "opencapi_iolink14"
+                "00": "opencapi_iolink0_M_th_32perDay",
+                "01": "opencapi_iolink2_M_th_32perDay",
+                "02": "opencapi_iolink4_M_th_32perDay",
+                "03": "opencapi_iolink6_M_th_32perDay",
+                "04": "opencapi_iolink8_M_th_32perDay",
+                "05": "opencapi_iolink10_M_th_32perDay",
+                "06": "opencapi_iolink12_M_th_32perDay",
+                "07": "opencapi_iolink14_M_th_32perDay"
             },
             "09": {
-                "00": "opencapi_iolink1",
-                "01": "opencapi_iolink3",
-                "02": "opencapi_iolink5",
-                "03": "opencapi_iolink7",
-                "04": "opencapi_iolink9",
-                "05": "opencapi_iolink11",
-                "06": "opencapi_iolink13",
-                "07": "opencapi_iolink15"
+                "00": "opencapi_iolink1_M_th_32perDay",
+                "01": "opencapi_iolink3_M_th_32perDay",
+                "02": "opencapi_iolink5_M_th_32perDay",
+                "03": "opencapi_iolink7_M_th_32perDay",
+                "04": "opencapi_iolink9_M_th_32perDay",
+                "05": "opencapi_iolink11_M_th_32perDay",
+                "06": "opencapi_iolink13_M_th_32perDay",
+                "07": "opencapi_iolink15_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1",
@@ -21099,24 +28406,24 @@
                 "07": "level2_M_th1"
             },
             "2c": {
-                "00": "opencapi_iolink0",
-                "01": "opencapi_iolink2",
-                "02": "opencapi_iolink4",
-                "03": "opencapi_iolink6",
-                "04": "opencapi_iolink8",
-                "05": "opencapi_iolink10",
-                "06": "opencapi_iolink12",
-                "07": "opencapi_iolink14"
+                "00": "opencapi_iolink0_M_th_1",
+                "01": "opencapi_iolink2_M_th_1",
+                "02": "opencapi_iolink4_M_th_1",
+                "03": "opencapi_iolink6_M_th_1",
+                "04": "opencapi_iolink8_M_th_1",
+                "05": "opencapi_iolink10_M_th_1",
+                "06": "opencapi_iolink12_M_th_1",
+                "07": "opencapi_iolink14_M_th_1"
             },
             "2d": {
-                "00": "opencapi_iolink1",
-                "01": "opencapi_iolink3",
-                "02": "opencapi_iolink5",
-                "03": "opencapi_iolink7",
-                "04": "opencapi_iolink9",
-                "05": "opencapi_iolink11",
-                "06": "opencapi_iolink13",
-                "07": "opencapi_iolink15"
+                "00": "opencapi_iolink1_M_th_1",
+                "01": "opencapi_iolink3_M_th_1",
+                "02": "opencapi_iolink5_M_th_1",
+                "03": "opencapi_iolink7_M_th_1",
+                "04": "opencapi_iolink9_M_th_1",
+                "05": "opencapi_iolink11_M_th_1",
+                "06": "opencapi_iolink13_M_th_1",
+                "07": "opencapi_iolink15_M_th_1"
             },
             "2e": {
                 "00": "level2_M_th1",
@@ -21139,24 +28446,24 @@
                 "07": "level2_M_th1"
             },
             "30": {
-                "00": "iolink0",
-                "01": "iolink2",
-                "02": "iolink4",
-                "03": "iolink6",
-                "04": "iolink8",
-                "05": "iolink10",
-                "06": "iolink12",
-                "07": "iolink14"
+                "00": "iolink0_M_info_only",
+                "01": "iolink2_M_info_only",
+                "02": "iolink4_M_info_only",
+                "03": "iolink6_M_info_only",
+                "04": "iolink8_M_info_only",
+                "05": "iolink10_M_info_only",
+                "06": "iolink12_M_info_only",
+                "07": "iolink14_M_info_only"
             },
             "31": {
-                "00": "iolink1",
-                "01": "iolink3",
-                "02": "iolink5",
-                "03": "iolink7",
-                "04": "iolink9",
-                "05": "iolink11",
-                "06": "iolink13",
-                "07": "iolink15"
+                "00": "iolink1_M_info_only",
+                "01": "iolink3_M_info_only",
+                "02": "iolink5_M_info_only",
+                "03": "iolink7_M_info_only",
+                "04": "iolink9_M_info_only",
+                "05": "iolink11_M_info_only",
+                "06": "iolink13_M_info_only",
+                "07": "iolink15_M_info_only"
             },
             "32": {
                 "00": "level2_M_th1",
@@ -21179,45 +28486,45 @@
                 "07": "level2_M_th1"
             },
             "34": {
-                "00": "iolink0",
-                "01": "iolink2",
-                "02": "iolink4",
-                "03": "iolink6",
-                "04": "iolink8",
-                "05": "iolink10",
-                "06": "iolink12",
-                "07": "iolink14"
+                "00": "iolink0_M_th_32perDay",
+                "01": "iolink2_M_th_32perDay",
+                "02": "iolink4_M_th_32perDay",
+                "03": "iolink6_M_th_32perDay",
+                "04": "iolink8_M_th_32perDay",
+                "05": "iolink10_M_th_32perDay",
+                "06": "iolink12_M_th_32perDay",
+                "07": "iolink14_M_th_32perDay"
             },
             "35": {
-                "00": "iolink1",
-                "01": "iolink3",
-                "02": "iolink5",
-                "03": "iolink7",
-                "04": "iolink9",
-                "05": "iolink11",
-                "06": "iolink13",
-                "07": "iolink15"
+                "00": "iolink1_M_th_32perDay",
+                "01": "iolink3_M_th_32perDay",
+                "02": "iolink5_M_th_32perDay",
+                "03": "iolink7_M_th_32perDay",
+                "04": "iolink9_M_th_32perDay",
+                "05": "iolink11_M_th_32perDay",
+                "06": "iolink13_M_th_32perDay",
+                "07": "iolink15_M_th_32perDay"
             },
             "36": {
-                "00": "iolink0",
-                "01": "iolink2",
-                "02": "iolink4",
-                "03": "iolink6",
-                "04": "iolink8",
-                "05": "iolink10",
-                "06": "iolink12",
-                "07": "iolink14",
+                "00": "iolink0_M_th_1",
+                "01": "iolink2_M_th_1",
+                "02": "iolink4_M_th_1",
+                "03": "iolink6_M_th_1",
+                "04": "iolink8_M_th_1",
+                "05": "iolink10_M_th_1",
+                "06": "iolink12_M_th_1",
+                "07": "iolink14_M_th_1",
                 "flags": ["cs_possible"]
             },
             "37": {
-                "00": "iolink1",
-                "01": "iolink3",
-                "02": "iolink5",
-                "03": "iolink7",
-                "04": "iolink9",
-                "05": "iolink11",
-                "06": "iolink13",
-                "07": "iolink15",
+                "00": "iolink1_M_th_1",
+                "01": "iolink3_M_th_1",
+                "02": "iolink5_M_th_1",
+                "03": "iolink7_M_th_1",
+                "04": "iolink9_M_th_1",
+                "05": "iolink11_M_th_1",
+                "06": "iolink13_M_th_1",
+                "07": "iolink15_M_th_1",
                 "flags": ["cs_possible"]
             },
             "38": {
@@ -21243,258 +28550,258 @@
                 "flags": ["cs_possible"]
             },
             "3a": {
-                "00": "opencapi_iolink0",
-                "01": "opencapi_iolink2",
-                "02": "opencapi_iolink4",
-                "03": "opencapi_iolink6",
-                "04": "opencapi_iolink8",
-                "05": "opencapi_iolink10",
-                "06": "opencapi_iolink12",
-                "07": "opencapi_iolink14",
+                "00": "opencapi_iolink0_M_th_1",
+                "01": "opencapi_iolink2_M_th_1",
+                "02": "opencapi_iolink4_M_th_1",
+                "03": "opencapi_iolink6_M_th_1",
+                "04": "opencapi_iolink8_M_th_1",
+                "05": "opencapi_iolink10_M_th_1",
+                "06": "opencapi_iolink12_M_th_1",
+                "07": "opencapi_iolink14_M_th_1",
                 "flags": ["cs_possible"]
             },
             "3b": {
-                "00": "opencapi_iolink1",
-                "01": "opencapi_iolink3",
-                "02": "opencapi_iolink5",
-                "03": "opencapi_iolink7",
-                "04": "opencapi_iolink9",
-                "05": "opencapi_iolink11",
-                "06": "opencapi_iolink13",
-                "07": "opencapi_iolink15",
+                "00": "opencapi_iolink1_M_th_1",
+                "01": "opencapi_iolink3_M_th_1",
+                "02": "opencapi_iolink5_M_th_1",
+                "03": "opencapi_iolink7_M_th_1",
+                "04": "opencapi_iolink9_M_th_1",
+                "05": "opencapi_iolink11_M_th_1",
+                "06": "opencapi_iolink13_M_th_1",
+                "07": "opencapi_iolink15_M_th_1",
                 "flags": ["cs_possible"]
             },
             "3c": {
-                "00": "iolink0",
-                "01": "iolink2",
-                "02": "iolink4",
-                "03": "iolink6",
-                "04": "iolink8",
-                "05": "iolink10",
-                "06": "iolink12",
-                "07": "iolink14",
+                "00": "iolink0_M_th_1",
+                "01": "iolink2_M_th_1",
+                "02": "iolink4_M_th_1",
+                "03": "iolink6_M_th_1",
+                "04": "iolink8_M_th_1",
+                "05": "iolink10_M_th_1",
+                "06": "iolink12_M_th_1",
+                "07": "iolink14_M_th_1",
                 "flags": ["cs_possible"]
             },
             "3d": {
-                "00": "iolink1",
-                "01": "iolink3",
-                "02": "iolink5",
-                "03": "iolink7",
-                "04": "iolink9",
-                "05": "iolink11",
-                "06": "iolink13",
-                "07": "iolink15",
+                "00": "iolink1_M_th_1",
+                "01": "iolink3_M_th_1",
+                "02": "iolink5_M_th_1",
+                "03": "iolink7_M_th_1",
+                "04": "iolink9_M_th_1",
+                "05": "iolink11_M_th_1",
+                "06": "iolink13_M_th_1",
+                "07": "iolink15_M_th_1",
                 "flags": ["cs_possible"]
             }
         },
         "682c": {
             "00": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "01": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "02": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "03": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "04": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "05": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "06": {
@@ -21532,108 +28839,108 @@
                 "1f": "level2_M_th1"
             },
             "07": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "08": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "09": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0a": {
@@ -21671,143 +28978,143 @@
                 "1f": "level2_M_th1"
             },
             "0b": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "0c": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "0d": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "0e": {
-                "00": "core0_sue",
-                "01": "core1_sue",
-                "02": "core2_sue",
-                "03": "core3_sue",
-                "04": "core4_sue",
-                "05": "core5_sue",
-                "06": "core6_sue",
-                "07": "core7_sue",
-                "08": "core8_sue",
-                "09": "core9_sue",
-                "0a": "core10_sue",
-                "0b": "core11_sue",
-                "0c": "core12_sue",
-                "0d": "core13_sue",
-                "0e": "core14_sue",
-                "0f": "core15_sue",
-                "10": "core16_sue",
-                "11": "core17_sue",
-                "12": "core18_sue",
-                "13": "core19_sue",
-                "14": "core20_sue",
-                "15": "core21_sue",
-                "16": "core22_sue",
-                "17": "core23_sue",
-                "18": "core24_sue",
-                "19": "core25_sue",
-                "1a": "core26_sue",
-                "1b": "core27_sue",
-                "1c": "core28_sue",
-                "1d": "core29_sue",
-                "1e": "core30_sue",
-                "1f": "core31_sue"
+                "00": "core0_M_th_1_sue",
+                "01": "core1_M_th_1_sue",
+                "02": "core2_M_th_1_sue",
+                "03": "core3_M_th_1_sue",
+                "04": "core4_M_th_1_sue",
+                "05": "core5_M_th_1_sue",
+                "06": "core6_M_th_1_sue",
+                "07": "core7_M_th_1_sue",
+                "08": "core8_M_th_1_sue",
+                "09": "core9_M_th_1_sue",
+                "0a": "core10_M_th_1_sue",
+                "0b": "core11_M_th_1_sue",
+                "0c": "core12_M_th_1_sue",
+                "0d": "core13_M_th_1_sue",
+                "0e": "core14_M_th_1_sue",
+                "0f": "core15_M_th_1_sue",
+                "10": "core16_M_th_1_sue",
+                "11": "core17_M_th_1_sue",
+                "12": "core18_M_th_1_sue",
+                "13": "core19_M_th_1_sue",
+                "14": "core20_M_th_1_sue",
+                "15": "core21_M_th_1_sue",
+                "16": "core22_M_th_1_sue",
+                "17": "core23_M_th_1_sue",
+                "18": "core24_M_th_1_sue",
+                "19": "core25_M_th_1_sue",
+                "1a": "core26_M_th_1_sue",
+                "1b": "core27_M_th_1_sue",
+                "1c": "core28_M_th_1_sue",
+                "1d": "core29_M_th_1_sue",
+                "1e": "core30_M_th_1_sue",
+                "1f": "core31_M_th_1_sue"
             },
             "0f": {
                 "00": "level2_M_th1",
@@ -21912,38 +29219,38 @@
                 "1f": "level2_M_th1"
             },
             "12": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "13": {
@@ -22015,177 +29322,177 @@
                 "1f": "level2_M_th1"
             },
             "15": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "16": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "17": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "18": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "19": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "1a": {
@@ -22257,72 +29564,72 @@
                 "1f": "level2_M_th1"
             },
             "1c": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "1d": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "1e": {
@@ -22360,73 +29667,73 @@
                 "1f": "level2_M_th1"
             },
             "1f": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "20": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "21": {
@@ -22532,108 +29839,108 @@
                 "1f": "level2_M_th1"
             },
             "24": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "25": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_5perHour",
+                "01": "core1_M_th_5perHour",
+                "02": "core2_M_th_5perHour",
+                "03": "core3_M_th_5perHour",
+                "04": "core4_M_th_5perHour",
+                "05": "core5_M_th_5perHour",
+                "06": "core6_M_th_5perHour",
+                "07": "core7_M_th_5perHour",
+                "08": "core8_M_th_5perHour",
+                "09": "core9_M_th_5perHour",
+                "0a": "core10_M_th_5perHour",
+                "0b": "core11_M_th_5perHour",
+                "0c": "core12_M_th_5perHour",
+                "0d": "core13_M_th_5perHour",
+                "0e": "core14_M_th_5perHour",
+                "0f": "core15_M_th_5perHour",
+                "10": "core16_M_th_5perHour",
+                "11": "core17_M_th_5perHour",
+                "12": "core18_M_th_5perHour",
+                "13": "core19_M_th_5perHour",
+                "14": "core20_M_th_5perHour",
+                "15": "core21_M_th_5perHour",
+                "16": "core22_M_th_5perHour",
+                "17": "core23_M_th_5perHour",
+                "18": "core24_M_th_5perHour",
+                "19": "core25_M_th_5perHour",
+                "1a": "core26_M_th_5perHour",
+                "1b": "core27_M_th_5perHour",
+                "1c": "core28_M_th_5perHour",
+                "1d": "core29_M_th_5perHour",
+                "1e": "core30_M_th_5perHour",
+                "1f": "core31_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "26": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31",
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1",
                 "flags": ["cs_possible"]
             },
             "27": {
@@ -22705,38 +30012,38 @@
                 "1f": "level2_M_th1"
             },
             "29": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "2a": {
                 "00": "level2_M_th1",
@@ -22773,38 +30080,38 @@
                 "1f": "level2_M_th1"
             },
             "2b": {
-                "00": "core0_M_level2_M",
-                "01": "core1_M_level2_M",
-                "02": "core2_M_level2_M",
-                "03": "core3_M_level2_M",
-                "04": "core4_M_level2_M",
-                "05": "core5_M_level2_M",
-                "06": "core6_M_level2_M",
-                "07": "core7_M_level2_M",
-                "08": "core8_M_level2_M",
-                "09": "core9_M_level2_M",
-                "0a": "core10_M_level2_M",
-                "0b": "core11_M_level2_M",
-                "0c": "core12_M_level2_M",
-                "0d": "core13_M_level2_M",
-                "0e": "core14_M_level2_M",
-                "0f": "core15_M_level2_M",
-                "10": "core16_M_level2_M",
-                "11": "core17_M_level2_M",
-                "12": "core18_M_level2_M",
-                "13": "core19_M_level2_M",
-                "14": "core20_M_level2_M",
-                "15": "core21_M_level2_M",
-                "16": "core22_M_level2_M",
-                "17": "core23_M_level2_M",
-                "18": "core24_M_level2_M",
-                "19": "core25_M_level2_M",
-                "1a": "core26_M_level2_M",
-                "1b": "core27_M_level2_M",
-                "1c": "core28_M_level2_M",
-                "1d": "core29_M_level2_M",
-                "1e": "core30_M_level2_M",
-                "1f": "core31_M_level2_M",
+                "00": "core0_M_level2_M_th_5perHour",
+                "01": "core1_M_level2_M_th_5perHour",
+                "02": "core2_M_level2_M_th_5perHour",
+                "03": "core3_M_level2_M_th_5perHour",
+                "04": "core4_M_level2_M_th_5perHour",
+                "05": "core5_M_level2_M_th_5perHour",
+                "06": "core6_M_level2_M_th_5perHour",
+                "07": "core7_M_level2_M_th_5perHour",
+                "08": "core8_M_level2_M_th_5perHour",
+                "09": "core9_M_level2_M_th_5perHour",
+                "0a": "core10_M_level2_M_th_5perHour",
+                "0b": "core11_M_level2_M_th_5perHour",
+                "0c": "core12_M_level2_M_th_5perHour",
+                "0d": "core13_M_level2_M_th_5perHour",
+                "0e": "core14_M_level2_M_th_5perHour",
+                "0f": "core15_M_level2_M_th_5perHour",
+                "10": "core16_M_level2_M_th_5perHour",
+                "11": "core17_M_level2_M_th_5perHour",
+                "12": "core18_M_level2_M_th_5perHour",
+                "13": "core19_M_level2_M_th_5perHour",
+                "14": "core20_M_level2_M_th_5perHour",
+                "15": "core21_M_level2_M_th_5perHour",
+                "16": "core22_M_level2_M_th_5perHour",
+                "17": "core23_M_level2_M_th_5perHour",
+                "18": "core24_M_level2_M_th_5perHour",
+                "19": "core25_M_level2_M_th_5perHour",
+                "1a": "core26_M_level2_M_th_5perHour",
+                "1b": "core27_M_level2_M_th_5perHour",
+                "1c": "core28_M_level2_M_th_5perHour",
+                "1d": "core29_M_level2_M_th_5perHour",
+                "1e": "core30_M_level2_M_th_5perHour",
+                "1f": "core31_M_level2_M_th_5perHour",
                 "flags": ["cs_possible"]
             },
             "2c": {
@@ -22842,38 +30149,38 @@
                 "1f": "level2_M_th1"
             },
             "2d": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "2e": {
                 "00": "level2_M_th1",
@@ -23080,38 +30387,38 @@
                 "1f": "level2_M_th1"
             },
             "34": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             },
             "35": {
                 "00": "level2_M_th1",
@@ -23182,38 +30489,38 @@
                 "1f": "level2_M_th1"
             },
             "37": {
-                "00": "core0_M_level2_L",
-                "01": "core1_M_level2_L",
-                "02": "core2_M_level2_L",
-                "03": "core3_M_level2_L",
-                "04": "core4_M_level2_L",
-                "05": "core5_M_level2_L",
-                "06": "core6_M_level2_L",
-                "07": "core7_M_level2_L",
-                "08": "core8_M_level2_L",
-                "09": "core9_M_level2_L",
-                "0a": "core10_M_level2_L",
-                "0b": "core11_M_level2_L",
-                "0c": "core12_M_level2_L",
-                "0d": "core13_M_level2_L",
-                "0e": "core14_M_level2_L",
-                "0f": "core15_M_level2_L",
-                "10": "core16_M_level2_L",
-                "11": "core17_M_level2_L",
-                "12": "core18_M_level2_L",
-                "13": "core19_M_level2_L",
-                "14": "core20_M_level2_L",
-                "15": "core21_M_level2_L",
-                "16": "core22_M_level2_L",
-                "17": "core23_M_level2_L",
-                "18": "core24_M_level2_L",
-                "19": "core25_M_level2_L",
-                "1a": "core26_M_level2_L",
-                "1b": "core27_M_level2_L",
-                "1c": "core28_M_level2_L",
-                "1d": "core29_M_level2_L",
-                "1e": "core30_M_level2_L",
-                "1f": "core31_M_level2_L"
+                "00": "core0_M_level2_L_th_1",
+                "01": "core1_M_level2_L_th_1",
+                "02": "core2_M_level2_L_th_1",
+                "03": "core3_M_level2_L_th_1",
+                "04": "core4_M_level2_L_th_1",
+                "05": "core5_M_level2_L_th_1",
+                "06": "core6_M_level2_L_th_1",
+                "07": "core7_M_level2_L_th_1",
+                "08": "core8_M_level2_L_th_1",
+                "09": "core9_M_level2_L_th_1",
+                "0a": "core10_M_level2_L_th_1",
+                "0b": "core11_M_level2_L_th_1",
+                "0c": "core12_M_level2_L_th_1",
+                "0d": "core13_M_level2_L_th_1",
+                "0e": "core14_M_level2_L_th_1",
+                "0f": "core15_M_level2_L_th_1",
+                "10": "core16_M_level2_L_th_1",
+                "11": "core17_M_level2_L_th_1",
+                "12": "core18_M_level2_L_th_1",
+                "13": "core19_M_level2_L_th_1",
+                "14": "core20_M_level2_L_th_1",
+                "15": "core21_M_level2_L_th_1",
+                "16": "core22_M_level2_L_th_1",
+                "17": "core23_M_level2_L_th_1",
+                "18": "core24_M_level2_L_th_1",
+                "19": "core25_M_level2_L_th_1",
+                "1a": "core26_M_level2_L_th_1",
+                "1b": "core27_M_level2_L_th_1",
+                "1c": "core28_M_level2_L_th_1",
+                "1d": "core29_M_level2_L_th_1",
+                "1e": "core30_M_level2_L_th_1",
+                "1f": "core31_M_level2_L_th_1"
             },
             "38": {
                 "00": "neighbor_core",
@@ -23454,88 +30761,88 @@
                 "1f": "level2_M_th1"
             },
             "3f": {
-                "00": "core0",
-                "01": "core1",
-                "02": "core2",
-                "03": "core3",
-                "04": "core4",
-                "05": "core5",
-                "06": "core6",
-                "07": "core7",
-                "08": "core8",
-                "09": "core9",
-                "0a": "core10",
-                "0b": "core11",
-                "0c": "core12",
-                "0d": "core13",
-                "0e": "core14",
-                "0f": "core15",
-                "10": "core16",
-                "11": "core17",
-                "12": "core18",
-                "13": "core19",
-                "14": "core20",
-                "15": "core21",
-                "16": "core22",
-                "17": "core23",
-                "18": "core24",
-                "19": "core25",
-                "1a": "core26",
-                "1b": "core27",
-                "1c": "core28",
-                "1d": "core29",
-                "1e": "core30",
-                "1f": "core31"
+                "00": "core0_M_th_1",
+                "01": "core1_M_th_1",
+                "02": "core2_M_th_1",
+                "03": "core3_M_th_1",
+                "04": "core4_M_th_1",
+                "05": "core5_M_th_1",
+                "06": "core6_M_th_1",
+                "07": "core7_M_th_1",
+                "08": "core8_M_th_1",
+                "09": "core9_M_th_1",
+                "0a": "core10_M_th_1",
+                "0b": "core11_M_th_1",
+                "0c": "core12_M_th_1",
+                "0d": "core13_M_th_1",
+                "0e": "core14_M_th_1",
+                "0f": "core15_M_th_1",
+                "10": "core16_M_th_1",
+                "11": "core17_M_th_1",
+                "12": "core18_M_th_1",
+                "13": "core19_M_th_1",
+                "14": "core20_M_th_1",
+                "15": "core21_M_th_1",
+                "16": "core22_M_th_1",
+                "17": "core23_M_th_1",
+                "18": "core24_M_th_1",
+                "19": "core25_M_th_1",
+                "1a": "core26_M_th_1",
+                "1b": "core27_M_th_1",
+                "1c": "core28_M_th_1",
+                "1d": "core29_M_th_1",
+                "1e": "core30_M_th_1",
+                "1f": "core31_M_th_1"
             }
         },
         "b4dc": {
             "00": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_th_32perDay",
+                "01": "mc1_M_th_32perDay",
+                "02": "mc2_M_th_32perDay",
+                "03": "mc3_M_th_32perDay"
             },
             "01": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_th_32perDay",
+                "01": "mc1_M_th_32perDay",
+                "02": "mc2_M_th_32perDay",
+                "03": "mc3_M_th_32perDay"
             },
             "02": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_th_32perDay",
+                "01": "mc1_M_th_32perDay",
+                "02": "mc2_M_th_32perDay",
+                "03": "mc3_M_th_32perDay"
             },
             "03": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_th_32perDay",
+                "01": "mc1_M_th_32perDay",
+                "02": "mc2_M_th_32perDay",
+                "03": "mc3_M_th_32perDay"
             },
             "04": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "05": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "06": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "07": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "08": {
                 "00": "level2_M_th1",
@@ -23556,10 +30863,10 @@
                 "03": "level2_M_th1"
             },
             "0b": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1",
@@ -23610,16 +30917,16 @@
                 "03": "level2_M_th1"
             },
             "14": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "15": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self"
+                "00": "mc0_M_info_only",
+                "01": "mc1_M_info_only",
+                "02": "mc2_M_info_only",
+                "03": "mc3_M_info_only"
             },
             "16": {
                 "00": "level2_M_th1",
@@ -23876,25 +31183,25 @@
         },
         "06b9": {
             "00": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1"
@@ -23903,22 +31210,22 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
@@ -23944,124 +31251,124 @@
         },
         "9865": {
             "00": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_th_32perDay",
+                "01": "iohs1_M_th_32perDay",
+                "02": "iohs2_M_th_32perDay",
+                "03": "iohs3_M_th_32perDay",
+                "04": "iohs4_M_th_32perDay",
+                "05": "iohs5_M_th_32perDay",
+                "06": "iohs6_M_th_32perDay",
+                "07": "iohs7_M_th_32perDay"
             },
             "01": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_th_32perDay",
+                "01": "iohs1_M_th_32perDay",
+                "02": "iohs2_M_th_32perDay",
+                "03": "iohs3_M_th_32perDay",
+                "04": "iohs4_M_th_32perDay",
+                "05": "iohs5_M_th_32perDay",
+                "06": "iohs6_M_th_32perDay",
+                "07": "iohs7_M_th_32perDay"
             },
             "02": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_th_32perDay",
+                "01": "iohs1_M_th_32perDay",
+                "02": "iohs2_M_th_32perDay",
+                "03": "iohs3_M_th_32perDay",
+                "04": "iohs4_M_th_32perDay",
+                "05": "iohs5_M_th_32perDay",
+                "06": "iohs6_M_th_32perDay",
+                "07": "iohs7_M_th_32perDay"
             },
             "03": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_th_32perDay",
+                "01": "iohs1_M_th_32perDay",
+                "02": "iohs2_M_th_32perDay",
+                "03": "iohs3_M_th_32perDay",
+                "04": "iohs4_M_th_32perDay",
+                "05": "iohs5_M_th_32perDay",
+                "06": "iohs6_M_th_32perDay",
+                "07": "iohs7_M_th_32perDay"
             },
             "04": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_th_32perDay",
+                "01": "iohs1_M_th_32perDay",
+                "02": "iohs2_M_th_32perDay",
+                "03": "iohs3_M_th_32perDay",
+                "04": "iohs4_M_th_32perDay",
+                "05": "iohs5_M_th_32perDay",
+                "06": "iohs6_M_th_32perDay",
+                "07": "iohs7_M_th_32perDay"
             },
             "05": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_th_32perDay",
+                "01": "iohs1_M_th_32perDay",
+                "02": "iohs2_M_th_32perDay",
+                "03": "iohs3_M_th_32perDay",
+                "04": "iohs4_M_th_32perDay",
+                "05": "iohs5_M_th_32perDay",
+                "06": "iohs6_M_th_32perDay",
+                "07": "iohs7_M_th_32perDay"
             },
             "06": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_info_only",
+                "01": "iohs1_M_info_only",
+                "02": "iohs2_M_info_only",
+                "03": "iohs3_M_info_only",
+                "04": "iohs4_M_info_only",
+                "05": "iohs5_M_info_only",
+                "06": "iohs6_M_info_only",
+                "07": "iohs7_M_info_only"
             },
             "07": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_info_only",
+                "01": "iohs1_M_info_only",
+                "02": "iohs2_M_info_only",
+                "03": "iohs3_M_info_only",
+                "04": "iohs4_M_info_only",
+                "05": "iohs5_M_info_only",
+                "06": "iohs6_M_info_only",
+                "07": "iohs7_M_info_only"
             },
             "08": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_info_only",
+                "01": "iohs1_M_info_only",
+                "02": "iohs2_M_info_only",
+                "03": "iohs3_M_info_only",
+                "04": "iohs4_M_info_only",
+                "05": "iohs5_M_info_only",
+                "06": "iohs6_M_info_only",
+                "07": "iohs7_M_info_only"
             },
             "09": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_info_only",
+                "01": "iohs1_M_info_only",
+                "02": "iohs2_M_info_only",
+                "03": "iohs3_M_info_only",
+                "04": "iohs4_M_info_only",
+                "05": "iohs5_M_info_only",
+                "06": "iohs6_M_info_only",
+                "07": "iohs7_M_info_only"
             },
             "0a": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_info_only",
+                "01": "iohs1_M_info_only",
+                "02": "iohs2_M_info_only",
+                "03": "iohs3_M_info_only",
+                "04": "iohs4_M_info_only",
+                "05": "iohs5_M_info_only",
+                "06": "iohs6_M_info_only",
+                "07": "iohs7_M_info_only"
             },
             "0b": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_info_only",
+                "01": "iohs1_M_info_only",
+                "02": "iohs2_M_info_only",
+                "03": "iohs3_M_info_only",
+                "04": "iohs4_M_info_only",
+                "05": "iohs5_M_info_only",
+                "06": "iohs6_M_info_only",
+                "07": "iohs7_M_info_only"
             },
             "0c": {
                 "00": "level2_M_th1",
@@ -24144,24 +31451,24 @@
                 "07": "level2_M_th1"
             },
             "14": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_th_32perDay",
+                "01": "iohs1_M_th_32perDay",
+                "02": "iohs2_M_th_32perDay",
+                "03": "iohs3_M_th_32perDay",
+                "04": "iohs4_M_th_32perDay",
+                "05": "iohs5_M_th_32perDay",
+                "06": "iohs6_M_th_32perDay",
+                "07": "iohs7_M_th_32perDay"
             },
             "15": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self",
-                "06": "self",
-                "07": "self"
+                "00": "iohs0_M_th_32perDay",
+                "01": "iohs1_M_th_32perDay",
+                "02": "iohs2_M_th_32perDay",
+                "03": "iohs3_M_th_32perDay",
+                "04": "iohs4_M_th_32perDay",
+                "05": "iohs5_M_th_32perDay",
+                "06": "iohs6_M_th_32perDay",
+                "07": "iohs7_M_th_32perDay"
             },
             "16": {
                 "00": "level2_M_th1",
@@ -24594,12 +31901,12 @@
                 "05": "level2_M_th1"
             },
             "01": {
-                "00": "self",
-                "01": "self",
-                "02": "self",
-                "03": "self",
-                "04": "self",
-                "05": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1",
+                "02": "self_M_th_1",
+                "03": "self_M_th_1",
+                "04": "self_M_th_1",
+                "05": "self_M_th_1"
             },
             "02": {
                 "00": "level2_M_th1",
@@ -24636,68 +31943,68 @@
         },
         "2911": {
             "00": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay"
             },
             "01": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "02": {
-                "00": "self_sue",
-                "01": "self_sue"
+                "00": "self_M_th_1_sue",
+                "01": "self_M_th_1_sue"
             },
             "03": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_32perDay",
+                "01": "self_M_th_32perDay"
             },
             "04": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "05": {
                 "00": "level2_M_th1",
                 "01": "level2_M_th1"
             },
             "06": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "07": {
                 "00": "level2_M_th1",
                 "01": "level2_M_th1"
             },
             "08": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "09": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "0a": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "0b": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only"
             },
             "0c": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "0d": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "0e": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "0f": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_info_only",
+                "01": "self_M_info_only"
             },
             "10": {
                 "00": "level2_M_th1",
@@ -24720,16 +32027,16 @@
                 "01": "level2_M_th1"
             },
             "15": {
-                "00": "self_M_level2_L",
-                "01": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1",
+                "01": "self_M_level2_L_th_1"
             },
             "16": {
                 "00": "level2_M_th1",
                 "01": "level2_M_th1"
             },
             "17": {
-                "00": "self_M_level2_L",
-                "01": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1",
+                "01": "self_M_level2_L_th_1"
             },
             "18": {
                 "00": "level2_M_th1",
@@ -24756,28 +32063,28 @@
                 "01": "level2_M_th1"
             },
             "1e": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "1f": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "20": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "21": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "22": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "23": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "24": {
                 "00": "level2_M_th1",
@@ -24800,12 +32107,12 @@
                 "01": "level2_M_th1"
             },
             "29": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "2a": {
-                "00": "self",
-                "01": "self"
+                "00": "self_M_th_1",
+                "01": "self_M_th_1"
             },
             "2b": {
                 "00": "level2_M_th1",
@@ -24822,25 +32129,25 @@
         },
         "06b7": {
             "00": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "01": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "02": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "03": {
                 "00": "level2_M_th1"
             },
             "04": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "05": {
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "07": {
                 "00": "level2_M_th1"
@@ -24849,22 +32156,22 @@
                 "00": "level2_M_th1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "0a": {
                 "00": "level2_M_th1"
             },
             "0b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0d": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0e": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_1"
             },
             "0f": {
                 "00": "level2_M_th1"
@@ -24950,24 +32257,24 @@
                 "07": "level2_M_th1"
             },
             "06": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14"
+                "00": "smp_bus_iolink0_info_only",
+                "01": "smp_bus_iolink2_info_only",
+                "02": "smp_bus_iolink4_info_only",
+                "03": "smp_bus_iolink6_info_only",
+                "04": "smp_bus_iolink8_info_only",
+                "05": "smp_bus_iolink10_info_only",
+                "06": "smp_bus_iolink12_info_only",
+                "07": "smp_bus_iolink14_info_only"
             },
             "07": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15"
+                "00": "smp_bus_iolink1_info_only",
+                "01": "smp_bus_iolink3_info_only",
+                "02": "smp_bus_iolink5_info_only",
+                "03": "smp_bus_iolink7_info_only",
+                "04": "smp_bus_iolink9_info_only",
+                "05": "smp_bus_iolink11_info_only",
+                "06": "smp_bus_iolink13_info_only",
+                "07": "smp_bus_iolink15_info_only"
             },
             "08": {
                 "00": "level2_M_th1",
@@ -25030,44 +32337,44 @@
                 "07": "level2_M_th1"
             },
             "0e": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14"
+                "00": "smp_bus_iolink0_info_only",
+                "01": "smp_bus_iolink2_info_only",
+                "02": "smp_bus_iolink4_info_only",
+                "03": "smp_bus_iolink6_info_only",
+                "04": "smp_bus_iolink8_info_only",
+                "05": "smp_bus_iolink10_info_only",
+                "06": "smp_bus_iolink12_info_only",
+                "07": "smp_bus_iolink14_info_only"
             },
             "0f": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15"
+                "00": "smp_bus_iolink1_info_only",
+                "01": "smp_bus_iolink3_info_only",
+                "02": "smp_bus_iolink5_info_only",
+                "03": "smp_bus_iolink7_info_only",
+                "04": "smp_bus_iolink9_info_only",
+                "05": "smp_bus_iolink11_info_only",
+                "06": "smp_bus_iolink13_info_only",
+                "07": "smp_bus_iolink15_info_only"
             },
             "10": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14"
+                "00": "smp_bus_iolink0_info_only",
+                "01": "smp_bus_iolink2_info_only",
+                "02": "smp_bus_iolink4_info_only",
+                "03": "smp_bus_iolink6_info_only",
+                "04": "smp_bus_iolink8_info_only",
+                "05": "smp_bus_iolink10_info_only",
+                "06": "smp_bus_iolink12_info_only",
+                "07": "smp_bus_iolink14_info_only"
             },
             "11": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15"
+                "00": "smp_bus_iolink1_info_only",
+                "01": "smp_bus_iolink3_info_only",
+                "02": "smp_bus_iolink5_info_only",
+                "03": "smp_bus_iolink7_info_only",
+                "04": "smp_bus_iolink9_info_only",
+                "05": "smp_bus_iolink11_info_only",
+                "06": "smp_bus_iolink13_info_only",
+                "07": "smp_bus_iolink15_info_only"
             },
             "12": {
                 "00": "level2_M_th1",
@@ -25270,24 +32577,24 @@
                 "07": "level2_M_th1"
             },
             "26": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14"
+                "00": "smp_bus_iolink0_info_only",
+                "01": "smp_bus_iolink2_info_only",
+                "02": "smp_bus_iolink4_info_only",
+                "03": "smp_bus_iolink6_info_only",
+                "04": "smp_bus_iolink8_info_only",
+                "05": "smp_bus_iolink10_info_only",
+                "06": "smp_bus_iolink12_info_only",
+                "07": "smp_bus_iolink14_info_only"
             },
             "27": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15"
+                "00": "smp_bus_iolink1_info_only",
+                "01": "smp_bus_iolink3_info_only",
+                "02": "smp_bus_iolink5_info_only",
+                "03": "smp_bus_iolink7_info_only",
+                "04": "smp_bus_iolink9_info_only",
+                "05": "smp_bus_iolink11_info_only",
+                "06": "smp_bus_iolink13_info_only",
+                "07": "smp_bus_iolink15_info_only"
             },
             "28": {
                 "00": "level2_M_th1",
@@ -25310,64 +32617,64 @@
                 "07": "level2_M_th1"
             },
             "2a": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14"
+                "00": "smp_bus_iolink0_th_1",
+                "01": "smp_bus_iolink2_th_1",
+                "02": "smp_bus_iolink4_th_1",
+                "03": "smp_bus_iolink6_th_1",
+                "04": "smp_bus_iolink8_th_1",
+                "05": "smp_bus_iolink10_th_1",
+                "06": "smp_bus_iolink12_th_1",
+                "07": "smp_bus_iolink14_th_1"
             },
             "2b": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15"
+                "00": "smp_bus_iolink1_th_1",
+                "01": "smp_bus_iolink3_th_1",
+                "02": "smp_bus_iolink5_th_1",
+                "03": "smp_bus_iolink7_th_1",
+                "04": "smp_bus_iolink9_th_1",
+                "05": "smp_bus_iolink11_th_1",
+                "06": "smp_bus_iolink13_th_1",
+                "07": "smp_bus_iolink15_th_1"
             },
             "2c": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14"
+                "00": "smp_bus_iolink0_th_32perDay",
+                "01": "smp_bus_iolink2_th_32perDay",
+                "02": "smp_bus_iolink4_th_32perDay",
+                "03": "smp_bus_iolink6_th_32perDay",
+                "04": "smp_bus_iolink8_th_32perDay",
+                "05": "smp_bus_iolink10_th_32perDay",
+                "06": "smp_bus_iolink12_th_32perDay",
+                "07": "smp_bus_iolink14_th_32perDay"
             },
             "2d": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15"
+                "00": "smp_bus_iolink1_th_32perDay",
+                "01": "smp_bus_iolink3_th_32perDay",
+                "02": "smp_bus_iolink5_th_32perDay",
+                "03": "smp_bus_iolink7_th_32perDay",
+                "04": "smp_bus_iolink9_th_32perDay",
+                "05": "smp_bus_iolink11_th_32perDay",
+                "06": "smp_bus_iolink13_th_32perDay",
+                "07": "smp_bus_iolink15_th_32perDay"
             },
             "2e": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14"
+                "00": "smp_bus_iolink0_th_1",
+                "01": "smp_bus_iolink2_th_1",
+                "02": "smp_bus_iolink4_th_1",
+                "03": "smp_bus_iolink6_th_1",
+                "04": "smp_bus_iolink8_th_1",
+                "05": "smp_bus_iolink10_th_1",
+                "06": "smp_bus_iolink12_th_1",
+                "07": "smp_bus_iolink14_th_1"
             },
             "2f": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15"
+                "00": "smp_bus_iolink1_th_1",
+                "01": "smp_bus_iolink3_th_1",
+                "02": "smp_bus_iolink5_th_1",
+                "03": "smp_bus_iolink7_th_1",
+                "04": "smp_bus_iolink9_th_1",
+                "05": "smp_bus_iolink11_th_1",
+                "06": "smp_bus_iolink13_th_1",
+                "07": "smp_bus_iolink15_th_1"
             },
             "30": {
                 "00": "level2_M_th1",
@@ -25390,146 +32697,146 @@
                 "07": "level2_M_th1"
             },
             "32": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14"
+                "00": "smp_bus_iolink0_info_only",
+                "01": "smp_bus_iolink2_info_only",
+                "02": "smp_bus_iolink4_info_only",
+                "03": "smp_bus_iolink6_info_only",
+                "04": "smp_bus_iolink8_info_only",
+                "05": "smp_bus_iolink10_info_only",
+                "06": "smp_bus_iolink12_info_only",
+                "07": "smp_bus_iolink14_info_only"
             },
             "33": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15"
+                "00": "smp_bus_iolink1_info_only",
+                "01": "smp_bus_iolink3_info_only",
+                "02": "smp_bus_iolink5_info_only",
+                "03": "smp_bus_iolink7_info_only",
+                "04": "smp_bus_iolink9_info_only",
+                "05": "smp_bus_iolink11_info_only",
+                "06": "smp_bus_iolink13_info_only",
+                "07": "smp_bus_iolink15_info_only"
             },
             "34": {
-                "00": "iolink0",
-                "01": "iolink2",
-                "02": "iolink4",
-                "03": "iolink6",
-                "04": "iolink8",
-                "05": "iolink10",
-                "06": "iolink12",
-                "07": "iolink14"
+                "00": "iolink0_M_th_32perDay",
+                "01": "iolink2_M_th_32perDay",
+                "02": "iolink4_M_th_32perDay",
+                "03": "iolink6_M_th_32perDay",
+                "04": "iolink8_M_th_32perDay",
+                "05": "iolink10_M_th_32perDay",
+                "06": "iolink12_M_th_32perDay",
+                "07": "iolink14_M_th_32perDay"
             },
             "35": {
-                "00": "iolink1",
-                "01": "iolink3",
-                "02": "iolink5",
-                "03": "iolink7",
-                "04": "iolink9",
-                "05": "iolink11",
-                "06": "iolink13",
-                "07": "iolink15"
+                "00": "iolink1_M_th_32perDay",
+                "01": "iolink3_M_th_32perDay",
+                "02": "iolink5_M_th_32perDay",
+                "03": "iolink7_M_th_32perDay",
+                "04": "iolink9_M_th_32perDay",
+                "05": "iolink11_M_th_32perDay",
+                "06": "iolink13_M_th_32perDay",
+                "07": "iolink15_M_th_32perDay"
             },
             "36": {
-                "00": "iolink0",
-                "01": "iolink2",
-                "02": "iolink4",
-                "03": "iolink6",
-                "04": "iolink8",
-                "05": "iolink10",
-                "06": "iolink12",
-                "07": "iolink14",
+                "00": "iolink0_M_th_1",
+                "01": "iolink2_M_th_1",
+                "02": "iolink4_M_th_1",
+                "03": "iolink6_M_th_1",
+                "04": "iolink8_M_th_1",
+                "05": "iolink10_M_th_1",
+                "06": "iolink12_M_th_1",
+                "07": "iolink14_M_th_1",
                 "flags": ["cs_possible"]
             },
             "37": {
-                "00": "iolink1",
-                "01": "iolink3",
-                "02": "iolink5",
-                "03": "iolink7",
-                "04": "iolink9",
-                "05": "iolink11",
-                "06": "iolink13",
-                "07": "iolink15",
+                "00": "iolink1_M_th_1",
+                "01": "iolink3_M_th_1",
+                "02": "iolink5_M_th_1",
+                "03": "iolink7_M_th_1",
+                "04": "iolink9_M_th_1",
+                "05": "iolink11_M_th_1",
+                "06": "iolink13_M_th_1",
+                "07": "iolink15_M_th_1",
                 "flags": ["cs_possible"]
             },
             "38": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14",
+                "00": "smp_bus_iolink0_th_1",
+                "01": "smp_bus_iolink2_th_1",
+                "02": "smp_bus_iolink4_th_1",
+                "03": "smp_bus_iolink6_th_1",
+                "04": "smp_bus_iolink8_th_1",
+                "05": "smp_bus_iolink10_th_1",
+                "06": "smp_bus_iolink12_th_1",
+                "07": "smp_bus_iolink14_th_1",
                 "flags": ["cs_possible"]
             },
             "39": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15",
+                "00": "smp_bus_iolink1_th_1",
+                "01": "smp_bus_iolink3_th_1",
+                "02": "smp_bus_iolink5_th_1",
+                "03": "smp_bus_iolink7_th_1",
+                "04": "smp_bus_iolink9_th_1",
+                "05": "smp_bus_iolink11_th_1",
+                "06": "smp_bus_iolink13_th_1",
+                "07": "smp_bus_iolink15_th_1",
                 "flags": ["cs_possible"]
             },
             "3a": {
-                "00": "smp_bus_iolink0",
-                "01": "smp_bus_iolink2",
-                "02": "smp_bus_iolink4",
-                "03": "smp_bus_iolink6",
-                "04": "smp_bus_iolink8",
-                "05": "smp_bus_iolink10",
-                "06": "smp_bus_iolink12",
-                "07": "smp_bus_iolink14",
+                "00": "smp_bus_iolink0_th_1",
+                "01": "smp_bus_iolink2_th_1",
+                "02": "smp_bus_iolink4_th_1",
+                "03": "smp_bus_iolink6_th_1",
+                "04": "smp_bus_iolink8_th_1",
+                "05": "smp_bus_iolink10_th_1",
+                "06": "smp_bus_iolink12_th_1",
+                "07": "smp_bus_iolink14_th_1",
                 "flags": ["cs_possible"]
             },
             "3b": {
-                "00": "smp_bus_iolink1",
-                "01": "smp_bus_iolink3",
-                "02": "smp_bus_iolink5",
-                "03": "smp_bus_iolink7",
-                "04": "smp_bus_iolink9",
-                "05": "smp_bus_iolink11",
-                "06": "smp_bus_iolink13",
-                "07": "smp_bus_iolink15",
+                "00": "smp_bus_iolink1_th_1",
+                "01": "smp_bus_iolink3_th_1",
+                "02": "smp_bus_iolink5_th_1",
+                "03": "smp_bus_iolink7_th_1",
+                "04": "smp_bus_iolink9_th_1",
+                "05": "smp_bus_iolink11_th_1",
+                "06": "smp_bus_iolink13_th_1",
+                "07": "smp_bus_iolink15_th_1",
                 "flags": ["cs_possible"]
             },
             "3c": {
-                "00": "iolink0",
-                "01": "iolink2",
-                "02": "iolink4",
-                "03": "iolink6",
-                "04": "iolink8",
-                "05": "iolink10",
-                "06": "iolink12",
-                "07": "iolink14",
+                "00": "iolink0_M_th_1",
+                "01": "iolink2_M_th_1",
+                "02": "iolink4_M_th_1",
+                "03": "iolink6_M_th_1",
+                "04": "iolink8_M_th_1",
+                "05": "iolink10_M_th_1",
+                "06": "iolink12_M_th_1",
+                "07": "iolink14_M_th_1",
                 "flags": ["cs_possible"]
             },
             "3d": {
-                "00": "iolink1",
-                "01": "iolink3",
-                "02": "iolink5",
-                "03": "iolink7",
-                "04": "iolink9",
-                "05": "iolink11",
-                "06": "iolink13",
-                "07": "iolink15",
+                "00": "iolink1_M_th_1",
+                "01": "iolink3_M_th_1",
+                "02": "iolink5_M_th_1",
+                "03": "iolink7_M_th_1",
+                "04": "iolink9_M_th_1",
+                "05": "iolink11_M_th_1",
+                "06": "iolink13_M_th_1",
+                "07": "iolink15_M_th_1",
                 "flags": ["cs_possible"]
             }
         },
         "e0bb": {
             "00": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "01": {
                 "00": "level2_M_th1"
             },
             "02": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "03": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "04": {
                 "00": "level2_M_th1"
@@ -25538,13 +32845,13 @@
                 "00": "level2_M_th1"
             },
             "06": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "07": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "08": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "09": {
                 "00": "level2_M_th1"
@@ -25555,85 +32862,85 @@
         },
         "91d3": {
             "00": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "01": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "02": {
-                "00": "self_sue"
+                "00": "self_M_th_1_sue"
             },
             "03": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "04": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "05": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "06": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "07": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "08": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "09": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "0a": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "0b": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "0c": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "0d": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "0e": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "0f": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "10": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "11": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "12": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "13": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "14": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "15": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "16": {
                 "00": "level2_M_th1"
             },
             "17": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "18": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "19": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "1a": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "1b": {
                 "00": "level2_M_th1"
@@ -25654,58 +32961,58 @@
                 "00": "level2_M_th1"
             },
             "21": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "22": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "23": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "24": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "25": {
-                "00": "self_M_level2_L"
+                "00": "self_M_level2_L_th_1"
             },
             "26": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "27": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "28": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "29": {
                 "00": "level2_M_th1"
             },
             "2a": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "2b": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "2c": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "2d": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "2e": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "2f": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "30": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "31": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "32": {
-                "00": "self"
+                "00": "self_M_th_32perDay"
             },
             "33": {
                 "00": "level2_M_th1"
@@ -25720,22 +33027,22 @@
                 "00": "level2_M_th1"
             },
             "37": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "38": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "39": {
-                "00": "self"
+                "00": "self_M_th_1"
             },
             "3a": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_32perDay"
             },
             "3b": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_32perDay"
             },
             "3c": {
-                "00": "level2_M_self_L"
+                "00": "level2_M_self_L_th_32perDay"
             },
             "3d": {
                 "00": "level2_M_th1"