diff --git a/cpp/dmi/hw.pb.cc b/cpp/dmi/hw.pb.cc
index 563ab4d..d25ab3d 100644
--- a/cpp/dmi/hw.pb.cc
+++ b/cpp/dmi/hw.pb.cc
@@ -689,67 +689,75 @@
   "NT_TYPE_CPU\020\n\022\032\n\026COMPONENT_TYPE_BATTERY\020"
   "\013\022\032\n\026COMPONENT_TYPE_STORAGE\020\014\022\031\n\025COMPONE"
   "NT_TYPE_MEMORY\020\r\022\036\n\032COMPONENT_TYPE_TRANS"
-  "CEIVER\020\016*\263\001\n\023ComponentAdminState\022\036\n\032COMP"
+  "CEIVER\020\016*\363\001\n\023ComponentAdminState\022\036\n\032COMP"
   "_ADMIN_STATE_UNDEFINED\020\000\022\034\n\030COMP_ADMIN_S"
   "TATE_UNKNOWN\020\001\022\033\n\027COMP_ADMIN_STATE_LOCKE"
   "D\020\002\022\"\n\036COMP_ADMIN_STATE_SHUTTING_DOWN\020\003\022"
-  "\035\n\031COMP_ADMIN_STATE_UNLOCKED\020\004*\250\001\n\022Compo"
-  "nentOperState\022\035\n\031COMP_OPER_STATE_UNDEFIN"
-  "ED\020\000\022\033\n\027COMP_OPER_STATE_UNKNOWN\020\001\022\034\n\030COM"
-  "P_OPER_STATE_DISABLED\020\002\022\033\n\027COMP_OPER_STA"
-  "TE_ENABLED\020\003\022\033\n\027COMP_OPER_STATE_TESTING\020"
-  "\004*\246\001\n\023ComponentUsageState\022\036\n\032COMP_USAGE_"
-  "STATE_UNDEFINED\020\000\022\034\n\030COMP_USAGE_STATE_UN"
-  "KNOWN\020\001\022\031\n\025COMP_USAGE_STATE_IDLE\020\002\022\033\n\027CO"
-  "MP_USAGE_STATE_ACTIVE\020\003\022\031\n\025COMP_USAGE_ST"
-  "ATE_BUSY\020\004*\217\002\n\023ComponentAlarmState\022\036\n\032CO"
-  "MP_ALARM_STATE_UNDEFINED\020\000\022\034\n\030COMP_ALARM"
-  "_STATE_UNKNOWN\020\001\022!\n\035COMP_ALARM_STATE_UND"
-  "ER_REPAIR\020\002\022\035\n\031COMP_ALARM_STATE_CRITICAL"
-  "\020\003\022\032\n\026COMP_ALARM_STATE_MAJOR\020\004\022\032\n\026COMP_A"
-  "LARM_STATE_MINOR\020\005\022\034\n\030COMP_ALARM_STATE_W"
-  "ARNING\020\006\022\"\n\036COMP_ALARM_STATE_INDETERMINA"
-  "TE\020\007*\274\001\n\025ComponentStandbyState\022 \n\034COMP_S"
-  "TANDBY_STATE_UNDEFINED\020\000\022\036\n\032COMP_STANDBY"
-  "_STATE_UNKNOWN\020\001\022\032\n\026COMP_STANDBY_STATE_H"
-  "OT\020\002\022\033\n\027COMP_STANDBY_STATE_COLD\020\003\022(\n$COM"
-  "P_STANDBY_STATE_PROVIDING_SERVICE\020\004*\235\003\n\r"
-  "DataValueType\022\030\n\024VALUE_TYPE_UNDEFINED\020\000\022"
-  "\024\n\020VALUE_TYPE_OTHER\020\001\022\026\n\022VALUE_TYPE_UNKN"
-  "OWN\020\002\022\027\n\023VALUE_TYPE_VOLTS_AC\020\003\022\027\n\023VALUE_"
-  "TYPE_VOLTS_DC\020\004\022\026\n\022VALUE_TYPE_AMPERES\020\005\022"
-  "\024\n\020VALUE_TYPE_WATTS\020\006\022\024\n\020VALUE_TYPE_HERT"
-  "Z\020\007\022\026\n\022VALUE_TYPE_CELSIUS\020\010\022\031\n\025VALUE_TYP"
-  "E_PERCENT_RH\020\t\022\022\n\016VALUE_TYPE_RPM\020\n\022\022\n\016VA"
-  "LUE_TYPE_CMM\020\013\022\032\n\026VALUE_TYPE_TRUTH_VALUE"
-  "\020\014\022\026\n\022VALUE_TYPE_PERCENT\020\r\022\025\n\021VALUE_TYPE"
-  "_METERS\020\016\022\024\n\020VALUE_TYPE_BYTES\020\017\022\022\n\016VALUE"
-  "_TYPE_DBM\020\020*\244\003\n\nValueScale\022\031\n\025VALUE_SCAL"
-  "E_UNDEFINED\020\000\022\025\n\021VALUE_SCALE_YOCTO\020\001\022\025\n\021"
-  "VALUE_SCALE_ZEPTO\020\002\022\024\n\020VALUE_SCALE_ATTO\020"
-  "\003\022\025\n\021VALUE_SCALE_FEMTO\020\004\022\024\n\020VALUE_SCALE_"
-  "PICO\020\005\022\024\n\020VALUE_SCALE_NANO\020\006\022\025\n\021VALUE_SC"
-  "ALE_MICRO\020\007\022\025\n\021VALUE_SCALE_MILLI\020\010\022\025\n\021VA"
-  "LUE_SCALE_UNITS\020\t\022\024\n\020VALUE_SCALE_KILO\020\n\022"
-  "\024\n\020VALUE_SCALE_MEGA\020\013\022\024\n\020VALUE_SCALE_GIG"
-  "A\020\014\022\024\n\020VALUE_SCALE_TERA\020\r\022\024\n\020VALUE_SCALE"
-  "_PETA\020\016\022\023\n\017VALUE_SCALE_EXA\020\017\022\025\n\021VALUE_SC"
-  "ALE_ZETTA\020\020\022\025\n\021VALUE_SCALE_YOTTA\020\021*\202\001\n\014S"
-  "ensorStatus\022\033\n\027SENSOR_STATUS_UNDEFINED\020\000"
-  "\022\024\n\020SENSOR_STATUS_OK\020\001\022\035\n\031SENSOR_STATUS_"
-  "UNAVAILABLE\020\002\022 \n\034SENSOR_STATUS_NONOPERAT"
-  "IONAL\020\003*\244\001\n\017TransceiverType\022\022\n\016TYPE_UNDE"
-  "FINED\020\000\022\014\n\010ETHERNET\020\001\022\010\n\004GPON\020\002\022\t\n\005XGPON"
-  "\020\003\022\n\n\006XGSPON\020\004\022\010\n\004CPON\020\005\022\013\n\007NG_PON2\020\006\022\010\n"
-  "\004EPON\020\007\022\025\n\021COMBO_GPON_XGSPON\020\010\022\026\n\021TYPE_N"
-  "OT_DETECTED\020\377\001B;Z9github.com/opencord/de"
-  "vice-management-interface/v3/go/dmib\006pro"
-  "to3"
+  "\035\n\031COMP_ADMIN_STATE_UNLOCKED\020\004\022\035\n\031COMP_A"
+  "DMIN_STATE_ISOLATED\020\006\022\037\n\033COMP_ADMIN_STAT"
+  "E_PROHIBITED\020\005*\303\003\n\022ComponentOperState\022\035\n"
+  "\031COMP_OPER_STATE_UNDEFINED\020\000\022\033\n\027COMP_OPE"
+  "R_STATE_UNKNOWN\020\001\022\034\n\030COMP_OPER_STATE_DIS"
+  "ABLED\020\002\022\033\n\027COMP_OPER_STATE_ENABLED\020\003\022\033\n\027"
+  "COMP_OPER_STATE_TESTING\020\004\022\032\n\026COMP_OPER_S"
+  "TATE_NORMAL\020\005\022\037\n\033COMP_OPER_STATE_CONFIGU"
+  "RING\020\006\022%\n!COMP_OPER_STATE_AUTOMATIC_LOAD"
+  "ING\020\007\022\032\n\026COMP_OPER_STATE_FAILED\020\010\022&\n\"COM"
+  "P_OPER_STATE_HIGH_TEMP_SHUTDOWN\020\t\022#\n\037COM"
+  "P_OPER_STATE_MANUAL_SHUTDOWN\020\n\022)\n%COMP_O"
+  "PER_STATE_POWER_SAVING_SHUTDOWN\020\013\022!\n\035COM"
+  "P_OPER_STATE_TYPE_MISMATCH\020\014*\246\001\n\023Compone"
+  "ntUsageState\022\036\n\032COMP_USAGE_STATE_UNDEFIN"
+  "ED\020\000\022\034\n\030COMP_USAGE_STATE_UNKNOWN\020\001\022\031\n\025CO"
+  "MP_USAGE_STATE_IDLE\020\002\022\033\n\027COMP_USAGE_STAT"
+  "E_ACTIVE\020\003\022\031\n\025COMP_USAGE_STATE_BUSY\020\004*\217\002"
+  "\n\023ComponentAlarmState\022\036\n\032COMP_ALARM_STAT"
+  "E_UNDEFINED\020\000\022\034\n\030COMP_ALARM_STATE_UNKNOW"
+  "N\020\001\022!\n\035COMP_ALARM_STATE_UNDER_REPAIR\020\002\022\035"
+  "\n\031COMP_ALARM_STATE_CRITICAL\020\003\022\032\n\026COMP_AL"
+  "ARM_STATE_MAJOR\020\004\022\032\n\026COMP_ALARM_STATE_MI"
+  "NOR\020\005\022\034\n\030COMP_ALARM_STATE_WARNING\020\006\022\"\n\036C"
+  "OMP_ALARM_STATE_INDETERMINATE\020\007*\274\001\n\025Comp"
+  "onentStandbyState\022 \n\034COMP_STANDBY_STATE_"
+  "UNDEFINED\020\000\022\036\n\032COMP_STANDBY_STATE_UNKNOW"
+  "N\020\001\022\032\n\026COMP_STANDBY_STATE_HOT\020\002\022\033\n\027COMP_"
+  "STANDBY_STATE_COLD\020\003\022(\n$COMP_STANDBY_STA"
+  "TE_PROVIDING_SERVICE\020\004*\235\003\n\rDataValueType"
+  "\022\030\n\024VALUE_TYPE_UNDEFINED\020\000\022\024\n\020VALUE_TYPE"
+  "_OTHER\020\001\022\026\n\022VALUE_TYPE_UNKNOWN\020\002\022\027\n\023VALU"
+  "E_TYPE_VOLTS_AC\020\003\022\027\n\023VALUE_TYPE_VOLTS_DC"
+  "\020\004\022\026\n\022VALUE_TYPE_AMPERES\020\005\022\024\n\020VALUE_TYPE"
+  "_WATTS\020\006\022\024\n\020VALUE_TYPE_HERTZ\020\007\022\026\n\022VALUE_"
+  "TYPE_CELSIUS\020\010\022\031\n\025VALUE_TYPE_PERCENT_RH\020"
+  "\t\022\022\n\016VALUE_TYPE_RPM\020\n\022\022\n\016VALUE_TYPE_CMM\020"
+  "\013\022\032\n\026VALUE_TYPE_TRUTH_VALUE\020\014\022\026\n\022VALUE_T"
+  "YPE_PERCENT\020\r\022\025\n\021VALUE_TYPE_METERS\020\016\022\024\n\020"
+  "VALUE_TYPE_BYTES\020\017\022\022\n\016VALUE_TYPE_DBM\020\020*\244"
+  "\003\n\nValueScale\022\031\n\025VALUE_SCALE_UNDEFINED\020\000"
+  "\022\025\n\021VALUE_SCALE_YOCTO\020\001\022\025\n\021VALUE_SCALE_Z"
+  "EPTO\020\002\022\024\n\020VALUE_SCALE_ATTO\020\003\022\025\n\021VALUE_SC"
+  "ALE_FEMTO\020\004\022\024\n\020VALUE_SCALE_PICO\020\005\022\024\n\020VAL"
+  "UE_SCALE_NANO\020\006\022\025\n\021VALUE_SCALE_MICRO\020\007\022\025"
+  "\n\021VALUE_SCALE_MILLI\020\010\022\025\n\021VALUE_SCALE_UNI"
+  "TS\020\t\022\024\n\020VALUE_SCALE_KILO\020\n\022\024\n\020VALUE_SCAL"
+  "E_MEGA\020\013\022\024\n\020VALUE_SCALE_GIGA\020\014\022\024\n\020VALUE_"
+  "SCALE_TERA\020\r\022\024\n\020VALUE_SCALE_PETA\020\016\022\023\n\017VA"
+  "LUE_SCALE_EXA\020\017\022\025\n\021VALUE_SCALE_ZETTA\020\020\022\025"
+  "\n\021VALUE_SCALE_YOTTA\020\021*\202\001\n\014SensorStatus\022\033"
+  "\n\027SENSOR_STATUS_UNDEFINED\020\000\022\024\n\020SENSOR_ST"
+  "ATUS_OK\020\001\022\035\n\031SENSOR_STATUS_UNAVAILABLE\020\002"
+  "\022 \n\034SENSOR_STATUS_NONOPERATIONAL\020\003*\244\001\n\017T"
+  "ransceiverType\022\022\n\016TYPE_UNDEFINED\020\000\022\014\n\010ET"
+  "HERNET\020\001\022\010\n\004GPON\020\002\022\t\n\005XGPON\020\003\022\n\n\006XGSPON\020"
+  "\004\022\010\n\004CPON\020\005\022\013\n\007NG_PON2\020\006\022\010\n\004EPON\020\007\022\025\n\021CO"
+  "MBO_GPON_XGSPON\020\010\022\026\n\021TYPE_NOT_DETECTED\020\377"
+  "\001B;Z9github.com/opencord/device-manageme"
+  "nt-interface/v3/go/dmib\006proto3"
   ;
 ::google::protobuf::internal::DescriptorTable descriptor_table_dmi_2fhw_2eproto = {
   false, InitDefaults_dmi_2fhw_2eproto, 
   descriptor_table_protodef_dmi_2fhw_2eproto,
-  "dmi/hw.proto", &assign_descriptors_table_dmi_2fhw_2eproto, 6523,
+  "dmi/hw.proto", &assign_descriptors_table_dmi_2fhw_2eproto, 6870,
 };
 
 void AddDescriptors_dmi_2fhw_2eproto() {
@@ -976,6 +984,8 @@
     case 2:
     case 3:
     case 4:
+    case 5:
+    case 6:
       return true;
     default:
       return false;
@@ -993,6 +1003,14 @@
     case 2:
     case 3:
     case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 10:
+    case 11:
+    case 12:
       return true;
     default:
       return false;