diff --git a/resources/linux/vscpd.json b/resources/linux/vscpd.json
index 261242f0b..ae65dc605 100644
--- a/resources/linux/vscpd.json
+++ b/resources/linux/vscpd.json
@@ -187,7 +187,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level I logger driver down"
           },
           "subscribe": [
             {
@@ -307,7 +307,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level I can4vscp driver down"
           },
           "subscribe": [
             {
@@ -427,7 +427,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level I socketcan driver down"
           },
           "subscribe": [
             {
@@ -547,7 +547,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level I can232 driver down"
           },
           "subscribe": [
             {
@@ -667,7 +667,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level II Logger driver down"
           },
           "subscribe": [
             {
@@ -785,7 +785,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level II lmsensors driver down"
           },
           "subscribe": [
             {
@@ -903,7 +903,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level II socketcan driver down"
           },
           "subscribe": [
             {
@@ -1021,7 +1021,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level II mqtt driver down"
           },
           "subscribe": [
             {
@@ -1139,7 +1139,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level II tcpiplink driver down"
           },
           "subscribe": [
             {
@@ -1257,7 +1257,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level II rawethernet driver down"
           },
           "subscribe": [
             {
@@ -1375,7 +1375,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level II sim driver down"
           },
           "subscribe": [
             {
@@ -1493,7 +1493,7 @@
             "topic": "vscp-daemon/{{srvguid}}/drivers/{{ifguid}}/will",
             "qos": 1,
             "retain": true,
-            "payload": "vscpl2drv-energy-p1 driver down"
+            "payload": "Level II 1-wire driver down"
           },
           "subscribe": [
             {
diff --git a/src/vscp/common/mdf.h b/src/vscp/common/mdf.h
index d3c3d81bb..3b35acaed 100644
--- a/src/vscp/common/mdf.h
+++ b/src/vscp/common/mdf.h
@@ -120,6 +120,7 @@ typedef enum mdf_record_type {
   mdf_type_decision_matrix,
   mdf_type_action,
   mdf_type_action_item,
+  mdf_type_action_sub_item,
   mdf_type_action_param,
   mdf_type_event,
   mdf_type_event_item,
@@ -166,6 +167,7 @@ typedef enum mdf_record_type {
   mdf_type_manual_sub_item,   // Manual content"
   mdf_type_redirection,
   mdf_type_alarm,
+  mdf_type_alarm_item,
   mdf_type_generic_string,           // Used for direct item editing
   mdf_type_generic_number,           // Used for direct item editing
   mdf_type_generic_url,              // Used for direct item editing
@@ -3867,6 +3869,13 @@ class CMDF : public CMDF_Object {
   */
   std::deque<CMDF_Bit *> *getAlarmList() { return &m_list_alarm; };
 
+  /*!
+    Get the alarm list
+    (Alternative consistent with other bit list getters)
+    @return Pointer to the alarm list.
+  */
+  std::deque<CMDF_Bit *> *getAlarmListBits() { return &m_list_alarm; };
+
   // ----------------------------------------------------------------------------
 
   /*!