diff --git a/RDMSharp/RDM/Enum/ERDM_IdentifyMode.cs b/RDMSharp/RDM/Enum/ERDM_IdentifyMode.cs
index 38ba3f8..1c46143 100644
--- a/RDMSharp/RDM/Enum/ERDM_IdentifyMode.cs
+++ b/RDMSharp/RDM/Enum/ERDM_IdentifyMode.cs
@@ -1,6 +1,11 @@
-namespace RDMSharp
+using RDMSharp.Metadata;
+using RDMSharp.Metadata.JSON;
+
+namespace RDMSharp
 {
     //E1.37-1
+    [DataTreeObject(ERDM_Parameter.IDENTIFY_MODE, Command.ECommandDublicte.GetResponse)]
+    [DataTreeObject(ERDM_Parameter.IDENTIFY_MODE, Command.ECommandDublicte.SetRequest)]
     public enum ERDM_IdentifyMode : byte
     {
         QUIET = 0x00,
diff --git a/RDMSharp/RDM/Enum/ERDM_LampMode.cs b/RDMSharp/RDM/Enum/ERDM_LampMode.cs
index e4a9157..16964bd 100644
--- a/RDMSharp/RDM/Enum/ERDM_LampMode.cs
+++ b/RDMSharp/RDM/Enum/ERDM_LampMode.cs
@@ -1,7 +1,11 @@
-using System.ComponentModel;
+using RDMSharp.Metadata;
+using RDMSharp.Metadata.JSON;
+using System.ComponentModel;
 
 namespace RDMSharp
 {
+    [DataTreeObject(ERDM_Parameter.LAMP_ON_MODE, Command.ECommandDublicte.GetResponse)]
+    [DataTreeObject(ERDM_Parameter.LAMP_ON_MODE, Command.ECommandDublicte.SetRequest)]
     public enum ERDM_LampMode : byte
     {
         [Description("Lamp Stays off until directly instructed to Strike.")]
diff --git a/RDMSharp/RDM/Enum/ERDM_LampState.cs b/RDMSharp/RDM/Enum/ERDM_LampState.cs
index c26ca8c..16d97d2 100644
--- a/RDMSharp/RDM/Enum/ERDM_LampState.cs
+++ b/RDMSharp/RDM/Enum/ERDM_LampState.cs
@@ -1,7 +1,11 @@
-using System.ComponentModel;
+using RDMSharp.Metadata;
+using RDMSharp.Metadata.JSON;
+using System.ComponentModel;
 
 namespace RDMSharp
 {
+    [DataTreeObject(ERDM_Parameter.LAMP_STATE, Command.ECommandDublicte.GetResponse)]
+    [DataTreeObject(ERDM_Parameter.LAMP_STATE, Command.ECommandDublicte.SetRequest)]
     public enum ERDM_LampState : byte
     {
         [Description("Off")]
diff --git a/RDMSharp/RDM/Enum/ERDM_MergeMode.cs b/RDMSharp/RDM/Enum/ERDM_MergeMode.cs
index 940bd48..8aef7ed 100644
--- a/RDMSharp/RDM/Enum/ERDM_MergeMode.cs
+++ b/RDMSharp/RDM/Enum/ERDM_MergeMode.cs
@@ -1,5 +1,10 @@
-namespace RDMSharp
+using RDMSharp.Metadata;
+using RDMSharp.Metadata.JSON;
+
+namespace RDMSharp
 {
+    [DataTreeObject(ERDM_Parameter.PRESET_MERGEMODE, Command.ECommandDublicte.GetResponse)]
+    [DataTreeObject(ERDM_Parameter.PRESET_MERGEMODE, Command.ECommandDublicte.SetRequest)]
     public enum ERDM_MergeMode : byte
     {
         DEFAULT = 0x00,
diff --git a/RDMSharp/RDM/Enum/ERDM_PowerState.cs b/RDMSharp/RDM/Enum/ERDM_PowerState.cs
index ab97ecf..0aac8b2 100644
--- a/RDMSharp/RDM/Enum/ERDM_PowerState.cs
+++ b/RDMSharp/RDM/Enum/ERDM_PowerState.cs
@@ -1,5 +1,10 @@
-namespace RDMSharp
+using RDMSharp.Metadata;
+using RDMSharp.Metadata.JSON;
+
+namespace RDMSharp
 {
+    [DataTreeObject(ERDM_Parameter.POWER_STATE, Command.ECommandDublicte.GetResponse)]
+    [DataTreeObject(ERDM_Parameter.POWER_STATE, Command.ECommandDublicte.SetRequest)]
     public enum ERDM_PowerState : byte
     {
         FULL_OFF = 0x00,
diff --git a/RDMSharp/RDM/Enum/ERDM_ProductDetail.cs b/RDMSharp/RDM/Enum/ERDM_ProductDetail.cs
index 57c1be6..21a45c1 100644
--- a/RDMSharp/RDM/Enum/ERDM_ProductDetail.cs
+++ b/RDMSharp/RDM/Enum/ERDM_ProductDetail.cs
@@ -1,5 +1,9 @@
-namespace RDMSharp
+using RDMSharp.Metadata;
+using RDMSharp.Metadata.JSON;
+
+namespace RDMSharp
 {
+    [DataTreeObject(ERDM_Parameter.PRODUCT_DETAIL_ID_LIST, Command.ECommandDublicte.GetResponse)]
     public enum ERDM_ProductDetail : ushort
     {
         NONE = 0x0000,
diff --git a/RDMSharp/RDM/Enum/ERDM_ResetType.cs b/RDMSharp/RDM/Enum/ERDM_ResetType.cs
index 1e74b99..8e6cdd0 100644
--- a/RDMSharp/RDM/Enum/ERDM_ResetType.cs
+++ b/RDMSharp/RDM/Enum/ERDM_ResetType.cs
@@ -1,5 +1,9 @@
-namespace RDMSharp
+using RDMSharp.Metadata;
+using RDMSharp.Metadata.JSON;
+
+namespace RDMSharp
 {
+    [DataTreeObject(ERDM_Parameter.RESET_DEVICE, Command.ECommandDublicte.SetRequest)]
     public enum ERDM_ResetType : byte
     {
         Warm = 0x01,
diff --git a/RDMSharp/RDM/Enum/ERDM_ShippingLockState.cs b/RDMSharp/RDM/Enum/ERDM_ShippingLockState.cs
index d13a6c0..9178799 100644
--- a/RDMSharp/RDM/Enum/ERDM_ShippingLockState.cs
+++ b/RDMSharp/RDM/Enum/ERDM_ShippingLockState.cs
@@ -1,6 +1,11 @@
-namespace RDMSharp
+using RDMSharp.Metadata;
+using RDMSharp.Metadata.JSON;
+
+namespace RDMSharp
 {
     //E1.37-5
+    [DataTreeObject(ERDM_Parameter.SHIPPING_LOCK, Command.ECommandDublicte.GetResponse)]
+    [DataTreeObject(ERDM_Parameter.SHIPPING_LOCK, Command.ECommandDublicte.SetRequest)]
     public enum ERDM_ShippingLockState : byte
     {
         /// <summary>
diff --git a/RDMSharp/RDM/Enum/ERDM_Status.cs b/RDMSharp/RDM/Enum/ERDM_Status.cs
index 53db912..4626f84 100644
--- a/RDMSharp/RDM/Enum/ERDM_Status.cs
+++ b/RDMSharp/RDM/Enum/ERDM_Status.cs
@@ -4,6 +4,8 @@
 namespace RDMSharp
 {
     [DataTreeObject(ERDM_Parameter.STATUS_MESSAGES, Command.ECommandDublicte.GetRequest)]
+    [DataTreeObject(ERDM_Parameter.SUB_DEVICE_STATUS_REPORT_THRESHOLD, Command.ECommandDublicte.GetResponse)]
+    [DataTreeObject(ERDM_Parameter.SUB_DEVICE_STATUS_REPORT_THRESHOLD, Command.ECommandDublicte.SetRequest)]
     public enum ERDM_Status : byte
     {
         NONE = 0x00,