From f14fda4c07ea0dd94fe2315c76cd33e50e5de38a Mon Sep 17 00:00:00 2001
From: Ben Youngblood <bx.youngblood@gmail.com>
Date: Tue, 11 Jul 2023 17:12:32 -0700
Subject: [PATCH] Use Z-Wave XML to generate command/device class mappings

This also adds support for new command classes in the 2022B
specification.
---
 lib/grizzly/zwave/command_classes.ex    |   138 +-
 lib/grizzly/zwave/device_classes.ex     |   201 +-
 lib/grizzly/zwave/generated_mappings.ex |   298 +
 lib/mix/tasks/zwave.gen.xml.ex          |   139 +
 mix.exs                                 |     1 +
 mix.lock                                |     1 +
 resources/ZWave_custom_cmd_classes.xml  | 18826 ++++++++++++----------
 7 files changed, 10642 insertions(+), 8962 deletions(-)
 create mode 100644 lib/grizzly/zwave/generated_mappings.ex
 create mode 100644 lib/mix/tasks/zwave.gen.xml.ex

diff --git a/lib/grizzly/zwave/command_classes.ex b/lib/grizzly/zwave/command_classes.ex
index 102e28a8..8db3f422 100644
--- a/lib/grizzly/zwave/command_classes.ex
+++ b/lib/grizzly/zwave/command_classes.ex
@@ -4,153 +4,27 @@ defmodule Grizzly.ZWave.CommandClasses do
   defmodule Generate do
     @moduledoc false
 
-    @mappings [
-      {0x00, :no_operation},
-      {0x02, :zensor_net},
-      {0x20, :basic},
-      {0x21, :controller_replication},
-      {0x22, :application_status},
-      {0x23, :zip},
-      {0x24, :security_panel_mode},
-      {0x25, :switch_binary},
-      {0x26, :switch_multilevel},
-      {0x27, :switch_all},
-      {0x28, :switch_toggle_binary},
-      {0x2A, :chimney_fan},
-      {0x2B, :scene_activation},
-      {0x2C, :scene_actuator_conf},
-      {0x2D, :scene_controller_conf},
-      {0x2E, :security_panel_zone},
-      {0x2F, :security_panel_zone_sensor},
-      {0x30, :sensor_binary},
-      {0x31, :sensor_multilevel},
-      {0x32, :meter},
-      {0x33, :switch_color},
-      {0x34, :network_management_inclusion},
-      {0x35, :meter_pulse},
-      {0x36, :basic_tariff_info},
-      {0x37, :hrv_status},
-      {0x38, :thermostat_heating},
-      {0x39, :hrv_control},
-      {0x3A, :dcp_config},
-      {0x3B, :dcp_monitor},
-      {0x3C, :meter_tbl_config},
-      {0x3D, :meter_tbl_monitor},
-      {0x3E, :meter_tbl_push},
-      {0x3F, :prepayment},
-      {0x40, :thermostat_mode},
-      {0x41, :prepayment_encapsulation},
-      {0x42, :thermostat_operating_state},
-      {0x43, :thermostat_setpoint},
-      {0x44, :thermostat_fan_mode},
-      {0x45, :thermostat_fan_state},
-      {0x46, :climate_control_schedule},
-      {0x47, :thermostat_setback},
-      {0x48, :rate_tbl_config},
-      {0x49, :rate_tbl_monitor},
-      {0x4A, :tariff_config},
-      {0x4B, :tariff_tbl_monitor},
-      {0x4C, :door_lock_logging},
-      {0x4D, :network_management_basic},
-      {0x4E, :schedule_entry_lock},
-      {0x4F, :zip_6lowpan},
-      {0x50, :basic_window_covering},
-      {0x51, :mtp_window_covering},
-      {0x52, :network_management_proxy},
-      {0x53, :schedule},
-      {0x54, :network_management_primary},
-      {0x55, :transport_service},
-      {0x56, :crc_16_encap},
-      {0x57, :application_capability},
-      {0x58, :zip_nd},
-      {0x59, :association_group_info},
-      {0x5A, :device_reset_locally},
-      {0x5B, :central_scene},
-      {0x5C, :ip_association},
-      {0x5D, :antitheft},
-      {0x5E, :zwaveplus_info},
-      {0x5F, :zip_gateway},
-      {0x60, :multi_channel},
-      {0x61, :zip_portal},
-      {0x62, :door_lock},
-      {0x63, :user_code},
-      {0x64, :humidity_control_setpoint},
-      {0x65, :dmx},
-      {0x66, :barrier_operator},
-      {0x67, :network_management_installation_maintenance},
-      {0x68, :zip_naming},
-      {0x69, :mailbox},
-      {0x6A, :window_covering},
-      {0x6B, :irrigation},
-      {0x6C, :supervision},
-      {0x6D, :humidity_control_mode},
-      {0x6E, :humidity_control_operating_state},
-      {0x6F, :entry_control},
-      {0x70, :configuration},
-      {0x71, :alarm},
-      {0x72, :manufacturer_specific},
-      {0x73, :powerlevel},
-      {0x74, :inclusion_controller},
-      {0x75, :protection},
-      {0x76, :lock},
-      {0x77, :node_naming},
-      {0x78, :node_provisioning},
-      {0x7A, :firmware_update_md},
-      {0x7B, :grouping_name},
-      {0x7C, :remote_association_activate},
-      {0x7D, :remote_association},
-      {0x7E, :antitheft_unlock},
-      {0x80, :battery},
-      {0x81, :clock},
-      {0x82, :hail},
-      {0x84, :wake_up},
-      {0x85, :association},
-      {0x86, :version},
-      {0x87, :indicator},
-      {0x88, :proprietary},
-      {0x89, :language},
-      {0x8A, :time},
-      {0x8B, :time_parameters},
-      {0x8C, :geographic_location},
-      {0x8E, :multi_channel_association},
-      {0x8F, :multi_cmd},
-      {0x90, :energy_production},
-      {0x91, :manufacturer_proprietary},
-      {0x92, :screen_md},
-      {0x93, :screen_attributes},
-      {0x94, :simple_av_control},
-      {0x95, :av_content_directory_md},
-      {0x96, :av_content_renderer_status},
-      {0x97, :av_content_search_md},
-      {0x98, :security},
-      {0x99, :av_tagging_md},
-      {0x9A, :ip_configuration},
-      {0x9B, :association_command_configuration},
-      {0x9C, :sensor_alarm},
-      {0x9D, :silence_alarm},
-      {0x9E, :sensor_configuration},
-      {0x9F, :security_2},
-      {0xEF, :mark},
-      {0xF0, :non_interoperable}
-    ]
+    import Grizzly.ZWave.GeneratedMappings, only: [command_class_mappings: 0]
 
     defmacro __before_compile__(_) do
+      mappings = command_class_mappings()
+
       to_byte =
-        for {byte, command_class} <- @mappings do
+        for {byte, command_class} <- mappings do
           quote do
             def to_byte(unquote(command_class)), do: unquote(byte)
           end
         end
 
       from_byte =
-        for {byte, command_class} <- @mappings do
+        for {byte, command_class} <- mappings do
           quote do
             def from_byte(unquote(byte)), do: {:ok, unquote(command_class)}
           end
         end
 
       command_classes =
-        @mappings
+        mappings
         |> Enum.map(&elem(&1, 1))
         |> Enum.reverse()
         |> Enum.reduce(&{:|, [], [&1, &2]})
diff --git a/lib/grizzly/zwave/device_classes.ex b/lib/grizzly/zwave/device_classes.ex
index dce79da4..d6090d21 100644
--- a/lib/grizzly/zwave/device_classes.ex
+++ b/lib/grizzly/zwave/device_classes.ex
@@ -6,211 +6,48 @@ defmodule Grizzly.ZWave.DeviceClasses do
   defmodule Generate do
     @moduledoc false
 
-    @basic_mappings [
-      {0x01, :controller},
-      {0x02, :static_controller},
-      {0x03, :slave},
-      {0x04, :routing_slave}
-    ]
-
-    @generic_mappings [
-      {0x01, :generic_controller},
-      {0x02, :static_controller},
-      {0x03, :av_control_point},
-      {0x04, :display},
-      {0x05, :network_extender},
-      {0x06, :appliance},
-      {0x07, :sensor_notification},
-      {0x08, :thermostat},
-      {0x09, :window_covering},
-      {0x0F, :repeater_slave},
-      {0x10, :switch_binary},
-      {0x11, :switch_multilevel},
-      {0x12, :switch_remote},
-      {0x13, :switch_toggle},
-      {0x15, :zip_node},
-      {0x16, :ventilation},
-      {0x17, :security_panel},
-      {0x18, :wall_controller},
-      {0x20, :sensor_binary},
-      {0x21, :sensor_multilevel},
-      {0x30, :meter_pulse},
-      {0x31, :meter},
-      {0x40, :entry_control},
-      {0x50, :semi_interoperable},
-      {0xA1, :sensor_alarm},
-      {0xFF, :non_interoperable}
-    ]
-
-    @specific_mappings [
-      # generic controller (0x01)
-      {:generic_controller, 0x00, :not_used},
-      {:generic_controller, 0x01, :portable_remote_controller},
-      {:generic_controller, 0x02, :portable_scene_controller},
-      {:generic_controller, 0x03, :installer_tool},
-      {:generic_controller, 0x04, :remote_control_av},
-      {:generic_controller, 0x06, :remote_control_simple},
-      # static controller (0x02)
-      {:static_controller, 0x00, :not_used},
-      {:static_controller, 0x01, :pc_controller},
-      {:static_controller, 0x02, :scene_controller},
-      {:static_controller, 0x03, :static_installer_tool},
-      {:static_controller, 0x04, :set_top_box},
-      {:static_controller, 0x05, :sub_system_controller},
-      {:static_controller, 0x06, :tv},
-      {:static_controller, 0x07, :gateway},
-      # av control point (0x03)
-      {:av_control_point, 0x00, :not_used},
-      {:av_control_point, 0x01, :sound_switch},
-      {:av_control_point, 0x04, :satellite_receiver},
-      {:av_control_point, 0x11, :satellite_receiver_v2},
-      {:av_control_point, 0x12, :doorbell},
-      # display
-      {:display, 0x00, :not_used},
-      {:display, 0x01, :simple_display},
-      # network_extender
-      {:network_extender, 0x00, :not_used},
-      {:network_extender, 0x01, :secure_extender},
-      # appliance
-      {:appliance, 0x00, :not_used},
-      {:appliance, 0x01, :general_appliance},
-      {:appliance, 0x02, :kitchen_appliance},
-      {:appliance, 0x03, :laundry_appliance},
-      # sensor_notification
-      {:sensor_notification, 0x00, :not_used},
-      {:sensor_notification, 0x01, :notification_sensor},
-      # thermostat
-      {:thermostat, 0x00, :not_used},
-      {:thermostat, 0x01, :thermostat_heating},
-      {:thermostat, 0x02, :thermostat_general},
-      {:thermostat, 0x03, :setback_schedule_thermostat},
-      {:thermostat, 0x04, :setpoint_thermostat},
-      {:thermostat, 0x05, :setback_thermostat},
-      {:thermostat, 0x06, :thermostat_general_v2},
-      # window covering
-      {:window_covering, 0x00, :not_used},
-      {:window_covering, 0x01, :simple_window_covering},
-      # switch_binary
-      {:switch_binary, 0x00, :not_used},
-      {:switch_binary, 0x01, :power_switch_binary},
-      {:switch_binary, 0x02, :color_tunable_binary},
-      {:switch_binary, 0x03, :scene_switch_binary},
-      {:switch_binary, 0x04, :power_strip},
-      {:switch_binary, 0x05, :siren},
-      {:switch_binary, 0x06, :valve_open_close},
-      {:switch_binary, 0x07, :irrigation_controller},
-      # switch multilevel
-      {:switch_multilevel, 0x00, :not_used},
-      {:switch_multilevel, 0x01, :power_switch_multilevel},
-      {:switch_multilevel, 0x02, :color_tunable_multilevel},
-      {:switch_multilevel, 0x03, :motor_multipositions},
-      {:switch_multilevel, 0x04, :scene_switch_multilevel},
-      {:switch_multilevel, 0x05, :class_a_motor_control},
-      {:switch_multilevel, 0x06, :class_b_motor_control},
-      {:switch_multilevel, 0x07, :class_c_motor_control},
-      {:switch_multilevel, 0x08, :fan_switch},
-      # repeater slave
-      {:repeater_slave, 0x00, :not_used},
-      {:repeater_slave, 0x01, :repeater_slave},
-      {:repeater_slave, 0x02, :virtual_node},
-      # switch remote (0x13)
-      {:switch_remote, 0x00, :not_used},
-      {:switch_remote, 0x01, :switch_remote_binary},
-      {:switch_remote, 0x02, :switch_remote_multilevel},
-      {:switch_remote, 0x03, :switch_remote_toggle_binary},
-      {:switch_remote, 0x04, :switch_remote_toggle_multilevel},
-      # switch toggle (0x14)
-      {:switch_toggle, 0x00, :not_used},
-      {:switch_toggle, 0x01, :switch_toggle_binary},
-      {:switch_toggle, 0x02, :switch_toggle_multilevel},
-      # zip node (0x15)
-      {:zip_node, 0x00, :not_used},
-      {:zip_node, 0x01, :zip_adv_node},
-      {:zip_node, 0x02, :zip_tun_node},
-      # security_panel (0x17)
-      {:security_panel, 0x00, :not_used},
-      {:security_panel, 0x01, :zoned_security_panel},
-      # wall controller (0x18)
-      {:wall_controller, 0x00, :not_used},
-      {:wall_controller, 0x01, :basic_wall_controller},
-      # sensor binary (0x20)
-      {:sensor_binary, 0x00, :not_used},
-      {:sensor_binary, 0x01, :routing_sensor_binary},
-      # sensor multilevel (0x21)
-      {:sensor_multilevel, 0x00, :not_used},
-      {:sensor_multilevel, 0x01, :routing_sensor_multilevel},
-      {:sensor_multilevel, 0x02, :chimney_fan},
-      # meter pulse (0x30)
-      {:meter_pulse, 0x00, :not_used},
-      # meter (0x31)
-      {:meter, 0x00, :not_used},
-      {:meter, 0x01, :simple_meter},
-      {:meter, 0x02, :adv_energy_meter},
-      {:meter, 0x03, :whole_home_meter_simple},
-      # entry control (0x40)
-      {:entry_control, 0x00, :not_used},
-      {:entry_control, 0x01, :door_lock},
-      {:entry_control, 0x02, :advanced_door_lock},
-      {:entry_control, 0x03, :secure_keypad_door_lock},
-      {:entry_control, 0x04, :secure_keypad_door_lock_deadbolt},
-      {:entry_control, 0x05, :secure_door},
-      {:entry_control, 0x06, :secure_gate},
-      {:entry_control, 0x07, :secure_barrier_addon},
-      {:entry_control, 0x08, :secure_barrier_open_only},
-      {:entry_control, 0x09, :secure_barrier_close_only},
-      {:entry_control, 0x0A, :secure_lockbox},
-      {:entry_control, 0x0B, :secure_keypad},
-      # semi interoperable (0x50)
-      {:semi_interoperable, 0x00, :not_used},
-      {:semi_interoperable, 0x01, :energy_production},
-      # sensor alarm (0xA1)
-      {:sensor_alarm, 0x00, :not_used},
-      {:sensor_alarm, 0x01, :basic_routing_alarm_sensor},
-      {:sensor_alarm, 0x02, :routing_alarm_sensor},
-      {:sensor_alarm, 0x03, :basic_zensor_net_alarm_sensor},
-      {:sensor_alarm, 0x04, :zensor_net_alarm_sensor},
-      {:sensor_alarm, 0x05, :adv_zensor_net_alarm_sensor},
-      {:sensor_alarm, 0x06, :basic_routing_smoke_sensor},
-      {:sensor_alarm, 0x07, :routing_smoke_sensor},
-      {:sensor_alarm, 0x08, :basic_zensor_net_smoke_sensor},
-      {:sensor_alarm, 0x09, :zensor_net_smoke_sensor},
-      {:sensor_alarm, 0x0A, :adv_zensor_net_smoke_sensor},
-      {:sensor_alarm, 0x0B, :alarm_sensor},
-      # non interoperable (0xFF)
-      {:non_interoperable, 0x00, :not_used}
-    ]
+    import Grizzly.ZWave.GeneratedMappings,
+      only: [
+        basic_device_class_mappings: 0,
+        generic_device_class_mappings: 0,
+        specific_device_class_mappings: 0
+      ]
 
     defmacro __before_compile__(_) do
+      basic_mappings = basic_device_class_mappings()
+      generic_mappings = generic_device_class_mappings()
+      specific_mappings = specific_device_class_mappings()
+
       basic_device_class_from_byte =
-        for {byte, device_class} <- @basic_mappings do
+        for {byte, device_class} <- basic_mappings do
           quote do
             def basic_device_class_from_byte(unquote(byte)), do: {:ok, unquote(device_class)}
           end
         end
 
       basic_device_class_to_byte =
-        for {byte, device_class} <- @basic_mappings do
+        for {byte, device_class} <- basic_mappings do
           quote do
             def basic_device_class_to_byte(unquote(device_class)), do: unquote(byte)
           end
         end
 
       generic_device_class_from_byte =
-        for {byte, device_class} <- @generic_mappings do
+        for {byte, device_class} <- generic_mappings do
           quote do
             def generic_device_class_from_byte(unquote(byte)), do: {:ok, unquote(device_class)}
           end
         end
 
       generic_device_class_to_byte =
-        for {byte, device_class} <- @generic_mappings do
+        for {byte, device_class} <- generic_mappings do
           quote do
             def generic_device_class_to_byte(unquote(device_class)), do: unquote(byte)
           end
         end
 
       specific_device_class_from_byte =
-        for {gen_class, byte, spec_class} <- @specific_mappings do
+        for {gen_class, byte, spec_class} <- specific_mappings do
           quote do
             def specific_device_class_from_byte(unquote(gen_class), unquote(byte)),
               do: {:ok, unquote(spec_class)}
@@ -218,7 +55,7 @@ defmodule Grizzly.ZWave.DeviceClasses do
         end
 
       specific_device_class_to_byte =
-        for {gen_class, byte, spec_class} <- @specific_mappings do
+        for {gen_class, byte, spec_class} <- specific_mappings do
           quote do
             def specific_device_class_to_byte(unquote(gen_class), unquote(spec_class)),
               do: unquote(byte)
@@ -226,19 +63,19 @@ defmodule Grizzly.ZWave.DeviceClasses do
         end
 
       basic_classes_union =
-        @basic_mappings
+        basic_mappings
         |> Enum.map(&elem(&1, 1))
         |> Enum.reverse()
         |> Enum.reduce(&{:|, [], [&1, &2]})
 
       generic_classes_union =
-        @generic_mappings
+        generic_mappings
         |> Enum.map(&elem(&1, 1))
         |> Enum.reverse()
         |> Enum.reduce(&{:|, [], [&1, &2]})
 
       specific_classes_union =
-        @specific_mappings
+        specific_mappings
         |> Enum.map(&elem(&1, 2))
         |> Enum.reverse()
         |> Enum.uniq()
diff --git a/lib/grizzly/zwave/generated_mappings.ex b/lib/grizzly/zwave/generated_mappings.ex
new file mode 100644
index 00000000..283632c8
--- /dev/null
+++ b/lib/grizzly/zwave/generated_mappings.ex
@@ -0,0 +1,298 @@
+# !! THIS FILE IS GENERATED BY `mix zwave.gen.xml`
+# !! DO NOT EDIT DIRECTLY
+
+defmodule Grizzly.ZWave.GeneratedMappings do
+  @moduledoc false
+  def command_class_mappings() do
+    [
+      {0, :no_operation},
+      {1, :zwave_cmd_class},
+      {2, :zensor_net},
+      {4, :zwave_cmd_class_lr},
+      {32, :basic},
+      {33, :controller_replication},
+      {34, :application_status},
+      {35, :zip},
+      {36, :security_panel_mode},
+      {37, :switch_binary},
+      {38, :switch_multilevel},
+      {39, :switch_all},
+      {40, :switch_toggle_binary},
+      {41, :switch_toggle_multilevel},
+      {42, :chimney_fan},
+      {43, :scene_activation},
+      {44, :scene_actuator_conf},
+      {45, :scene_controller_conf},
+      {46, :security_panel_zone},
+      {47, :security_panel_zone_sensor},
+      {48, :sensor_binary},
+      {49, :sensor_multilevel},
+      {50, :meter},
+      {51, :switch_color},
+      {52, :network_management_inclusion},
+      {53, :meter_pulse},
+      {54, :basic_tariff_info},
+      {55, :hrv_status},
+      {56, :thermostat_heating},
+      {57, :hrv_control},
+      {58, :dcp_config},
+      {59, :dcp_monitor},
+      {60, :meter_tbl_config},
+      {61, :meter_tbl_monitor},
+      {62, :meter_tbl_push},
+      {63, :prepayment},
+      {64, :thermostat_mode},
+      {65, :prepayment_encapsulation},
+      {66, :thermostat_operating_state},
+      {67, :thermostat_setpoint},
+      {68, :thermostat_fan_mode},
+      {69, :thermostat_fan_state},
+      {70, :climate_control_schedule},
+      {71, :thermostat_setback},
+      {72, :rate_tbl_config},
+      {73, :rate_tbl_monitor},
+      {74, :tariff_config},
+      {75, :tariff_tbl_monitor},
+      {76, :door_lock_logging},
+      {77, :network_management_basic},
+      {78, :schedule_entry_lock},
+      {79, :zip_6lowpan},
+      {80, :basic_window_covering},
+      {81, :mtp_window_covering},
+      {82, :network_management_proxy},
+      {83, :schedule},
+      {84, :network_management_primary},
+      {85, :transport_service},
+      {86, :crc_16_encap},
+      {87, :application_capability},
+      {88, :zip_nd},
+      {89, :association_group_info},
+      {90, :device_reset_locally},
+      {91, :central_scene},
+      {92, :ip_association},
+      {93, :antitheft},
+      {94, :zwaveplus_info},
+      {95, :zip_gateway},
+      {96, :multi_channel},
+      {97, :zip_portal},
+      {98, :door_lock},
+      {99, :user_code},
+      {100, :humidity_control_setpoint},
+      {101, :dmx},
+      {102, :barrier_operator},
+      {103, :network_management_installation_maintenance},
+      {104, :zip_naming},
+      {105, :mailbox},
+      {106, :window_covering},
+      {107, :irrigation},
+      {108, :supervision},
+      {109, :humidity_control_mode},
+      {110, :humidity_control_operating_state},
+      {111, :entry_control},
+      {112, :configuration},
+      {113, :alarm},
+      {114, :manufacturer_specific},
+      {115, :powerlevel},
+      {116, :inclusion_controller},
+      {117, :protection},
+      {118, :lock},
+      {119, :node_naming},
+      {120, :node_provisioning},
+      {121, :sound_switch},
+      {122, :firmware_update_md},
+      {123, :grouping_name},
+      {124, :remote_association_activate},
+      {125, :remote_association},
+      {126, :antitheft_unlock},
+      {128, :battery},
+      {129, :clock},
+      {130, :hail},
+      {132, :wake_up},
+      {133, :association},
+      {134, :version},
+      {135, :indicator},
+      {136, :proprietary},
+      {137, :language},
+      {138, :time},
+      {139, :time_parameters},
+      {140, :geographic_location},
+      {142, :multi_channel_association},
+      {143, :multi_cmd},
+      {144, :energy_production},
+      {145, :manufacturer_proprietary},
+      {146, :screen_md},
+      {147, :screen_attributes},
+      {148, :simple_av_control},
+      {149, :av_content_directory_md},
+      {150, :av_content_renderer_status},
+      {151, :av_content_search_md},
+      {152, :security},
+      {153, :av_tagging_md},
+      {154, :ip_configuration},
+      {155, :association_command_configuration},
+      {156, :sensor_alarm},
+      {157, :silence_alarm},
+      {158, :sensor_configuration},
+      {159, :security_2},
+      {160, :ir_repeater},
+      {161, :authentication},
+      {162, :authentication_media_write},
+      {163, :generic_schedule},
+      {239, :mark},
+      {240, :non_interoperable}
+    ]
+  end
+
+  def basic_device_class_mappings() do
+    [{1, :controller}, {2, :static_controller}, {3, :slave}, {4, :routing_slave}]
+  end
+
+  def generic_device_class_mappings() do
+    [
+      {1, :generic_controller},
+      {2, :static_controller},
+      {3, :av_control_point},
+      {4, :display},
+      {5, :network_extender},
+      {6, :appliance},
+      {7, :sensor_notification},
+      {8, :thermostat},
+      {9, :window_covering},
+      {15, :repeater_slave},
+      {16, :switch_binary},
+      {17, :switch_multilevel},
+      {18, :switch_remote},
+      {19, :switch_toggle},
+      {21, :zip_node},
+      {22, :ventilation},
+      {23, :security_panel},
+      {24, :wall_controller},
+      {32, :sensor_binary},
+      {33, :sensor_multilevel},
+      {48, :meter_pulse},
+      {49, :meter},
+      {64, :entry_control},
+      {80, :semi_interoperable},
+      {161, :sensor_alarm},
+      {255, :non_interoperable}
+    ]
+  end
+
+  def specific_device_class_mappings() do
+    [
+      {:appliance, 0, :not_used},
+      {:appliance, 1, :general_appliance},
+      {:appliance, 2, :kitchen_appliance},
+      {:appliance, 3, :laundry_appliance},
+      {:av_control_point, 0, :not_used},
+      {:av_control_point, 1, :sound_switch},
+      {:av_control_point, 4, :satellite_receiver},
+      {:av_control_point, 17, :satellite_receiver_v2},
+      {:av_control_point, 18, :doorbell},
+      {:display, 0, :not_used},
+      {:display, 1, :simple_display},
+      {:entry_control, 0, :not_used},
+      {:entry_control, 1, :door_lock},
+      {:entry_control, 2, :advanced_door_lock},
+      {:entry_control, 3, :secure_keypad_door_lock},
+      {:entry_control, 4, :secure_keypad_door_lock_deadbolt},
+      {:entry_control, 5, :secure_door},
+      {:entry_control, 6, :secure_gate},
+      {:entry_control, 7, :secure_barrier_addon},
+      {:entry_control, 8, :secure_barrier_open_only},
+      {:entry_control, 9, :secure_barrier_close_only},
+      {:entry_control, 10, :secure_lockbox},
+      {:entry_control, 11, :secure_keypad},
+      {:generic_controller, 0, :not_used},
+      {:generic_controller, 1, :portable_remote_controller},
+      {:generic_controller, 2, :portable_scene_controller},
+      {:generic_controller, 3, :portable_installer_tool},
+      {:generic_controller, 4, :remote_control_av},
+      {:generic_controller, 6, :remote_control_simple},
+      {:meter, 0, :not_used},
+      {:meter, 1, :simple_meter},
+      {:meter, 2, :adv_energy_control},
+      {:meter, 3, :whole_home_meter_simple},
+      {:meter_pulse, 0, :not_used},
+      {:network_extender, 0, :not_used},
+      {:network_extender, 1, :secure_extender},
+      {:non_interoperable, 0, :not_used},
+      {:repeater_slave, 0, :not_used},
+      {:repeater_slave, 1, :repeater_slave},
+      {:repeater_slave, 2, :virtual_node},
+      {:repeater_slave, 3, :ir_repeater},
+      {:security_panel, 0, :not_used},
+      {:security_panel, 1, :zoned_security_panel},
+      {:semi_interoperable, 0, :not_used},
+      {:semi_interoperable, 1, :energy_production},
+      {:sensor_alarm, 0, :not_used},
+      {:sensor_alarm, 1, :basic_routing_alarm_sensor},
+      {:sensor_alarm, 2, :routing_alarm_sensor},
+      {:sensor_alarm, 3, :basic_zensor_net_alarm_sensor},
+      {:sensor_alarm, 4, :zensor_net_alarm_sensor},
+      {:sensor_alarm, 5, :adv_zensor_net_alarm_sensor},
+      {:sensor_alarm, 6, :basic_routing_smoke_sensor},
+      {:sensor_alarm, 7, :routing_smoke_sensor},
+      {:sensor_alarm, 8, :basic_zensor_net_smoke_sensor},
+      {:sensor_alarm, 9, :zensor_net_smoke_sensor},
+      {:sensor_alarm, 10, :adv_zensor_net_smoke_sensor},
+      {:sensor_alarm, 11, :alarm_sensor},
+      {:sensor_binary, 0, :not_used},
+      {:sensor_binary, 1, :routing_sensor_binary},
+      {:sensor_multilevel, 0, :not_used},
+      {:sensor_multilevel, 1, :routing_sensor_multilevel},
+      {:sensor_multilevel, 2, :chimney_fan},
+      {:sensor_notification, 0, :not_used},
+      {:sensor_notification, 1, :notification_sensor},
+      {:static_controller, 0, :not_used},
+      {:static_controller, 1, :pc_controller},
+      {:static_controller, 2, :scene_controller},
+      {:static_controller, 3, :static_installer_tool},
+      {:static_controller, 4, :set_top_box},
+      {:static_controller, 5, :sub_system_controller},
+      {:static_controller, 6, :tv},
+      {:static_controller, 7, :gateway},
+      {:switch_binary, 0, :not_used},
+      {:switch_binary, 1, :power_switch_binary},
+      {:switch_binary, 2, :color_tunable_binary},
+      {:switch_binary, 3, :scene_switch_binary},
+      {:switch_binary, 4, :power_strip},
+      {:switch_binary, 5, :siren},
+      {:switch_binary, 6, :valve_open_close},
+      {:switch_binary, 7, :irrigation_controller},
+      {:switch_multilevel, 0, :not_used},
+      {:switch_multilevel, 1, :power_switch_multilevel},
+      {:switch_multilevel, 2, :color_tunable_multilevel},
+      {:switch_multilevel, 3, :motor_multiposition},
+      {:switch_multilevel, 4, :scene_switch_multilevel},
+      {:switch_multilevel, 5, :class_a_motor_control},
+      {:switch_multilevel, 6, :class_b_motor_control},
+      {:switch_multilevel, 7, :class_c_motor_control},
+      {:switch_multilevel, 8, :fan_switch},
+      {:switch_remote, 0, :not_used},
+      {:switch_remote, 1, :switch_remote_binary},
+      {:switch_remote, 2, :switch_remote_multilevel},
+      {:switch_remote, 3, :switch_remote_toggle_binary},
+      {:switch_remote, 4, :switch_remote_toggle_multilevel},
+      {:switch_toggle, 0, :not_used},
+      {:switch_toggle, 1, :switch_toggle_binary},
+      {:switch_toggle, 2, :switch_toggle_multilevel},
+      {:thermostat, 0, :not_used},
+      {:thermostat, 1, :thermostat_heating},
+      {:thermostat, 2, :thermostat_general},
+      {:thermostat, 3, :setback_schedule_thermostat},
+      {:thermostat, 4, :setpoint_thermostat},
+      {:thermostat, 5, :setback_thermostat},
+      {:thermostat, 6, :thermostat_general_v2},
+      {:ventilation, 0, :not_used},
+      {:ventilation, 1, :residential_hrv},
+      {:wall_controller, 0, :not_used},
+      {:wall_controller, 1, :basic_wall_controller},
+      {:window_covering, 0, :not_used},
+      {:window_covering, 1, :simple_window_covering},
+      {:zip_node, 0, :not_used},
+      {:zip_node, 1, :zip_tun_node},
+      {:zip_node, 2, :zip_adv_node}
+    ]
+  end
+end
diff --git a/lib/mix/tasks/zwave.gen.xml.ex b/lib/mix/tasks/zwave.gen.xml.ex
new file mode 100644
index 00000000..ef247128
--- /dev/null
+++ b/lib/mix/tasks/zwave.gen.xml.ex
@@ -0,0 +1,139 @@
+if Code.ensure_loaded?(SweetXml) do
+  defmodule Mix.Tasks.Zwave.Gen.Xml do
+    @moduledoc """
+    Generates a module that provides mappings based on the data in `ZWave_custom_cmd_classes.xml`.
+
+      mix zwave.gen.xml
+
+    ### Flags
+
+    * `--input <path>` - reads the xml from the provided path
+    * `--dry-run` - print the generated module out to the console
+    * `--output <path>` - writes the generated module at the provided path
+    """
+
+    use Mix.Task
+
+    import SweetXml
+
+    @shortdoc "Generates a module that provides mappings based on the data in `ZWave_custom_cmd_classes.xml`"
+
+    @switches [dry_run: :boolean]
+
+    @command_class_name_overrides %{
+      0x4F => :zip_6lowpan,
+      0x59 => :association_group_info,
+      0x96 => :av_content_renderer_status
+    }
+
+    def run(args) do
+      {opts, _, _} = OptionParser.parse(args, switches: @switches)
+
+      input_path = Keyword.get(opts, :input, "resources/ZWave_custom_cmd_classes.xml")
+
+      doc = input_path |> File.read!() |> parse()
+
+      command_class_mappings = build_macro(:command_class_mappings, command_class_mappings(doc))
+
+      basic_device_class_mappings =
+        build_macro(:basic_device_class_mappings, basic_device_class_mappings(doc))
+
+      generic_device_class_mappings =
+        build_macro(:generic_device_class_mappings, generic_device_class_mappings(doc))
+
+      specific_device_class_mappings =
+        build_macro(:specific_device_class_mappings, specific_device_class_mappings(doc))
+
+      module =
+        quote do
+          defmodule Grizzly.ZWave.GeneratedMappings do
+            @moduledoc false
+
+            unquote(command_class_mappings)
+            unquote(basic_device_class_mappings)
+            unquote(generic_device_class_mappings)
+            unquote(specific_device_class_mappings)
+          end
+        end
+
+      module_code = module |> Macro.to_string() |> Code.format_string!()
+
+      module_code =
+        """
+        # !! THIS FILE IS GENERATED BY `mix zwave.gen.xml`
+        # !! DO NOT EDIT DIRECTLY
+
+        #{module_code}
+        """
+
+      if opts[:dry_run] do
+        Mix.shell().info(module_code)
+      else
+        output_path = Keyword.get(opts, :output, "lib/grizzly/zwave/generated_mappings.ex")
+
+        Mix.Generator.create_file(output_path, module_code)
+      end
+    end
+
+    defp build_macro(name, value) do
+      quote do
+        defmacro unquote(name)(), do: unquote(value)
+      end
+    end
+
+    defp command_class_mappings(doc) do
+      doc
+      |> xpath(~x"//zw_classes/cmd_class"l, key: ~x"@key"s, name: ~x"@name"s)
+      |> Enum.map(key_name_mapper("COMMAND_CLASS_", @command_class_name_overrides))
+      |> Enum.uniq_by(fn {key, _} -> key end)
+      |> Enum.sort()
+    end
+
+    defp basic_device_class_mappings(doc) do
+      doc
+      |> xpath(~x"//zw_classes/bas_dev"l, key: ~x"@key"s, name: ~x"@name"s)
+      |> Enum.map(key_name_mapper("BASIC_TYPE_"))
+      |> Enum.sort()
+    end
+
+    defp generic_device_class_mappings(doc) do
+      doc
+      |> xpath(~x"//zw_classes/gen_dev"l, key: ~x"@key"s, name: ~x"@name"s)
+      |> Enum.map(key_name_mapper("GENERIC_TYPE_"))
+      |> Enum.sort()
+    end
+
+    defp specific_device_class_mappings(doc) do
+      doc
+      |> xpath(~x"//zw_classes/gen_dev"l,
+        generic_type: ~x"@name"s,
+        specific_types: [~x"./spec_dev"l, key: ~x"@key"s, name: ~x"@name"s]
+      )
+      |> Enum.flat_map(fn %{generic_type: generic_type, specific_types: specific_types} ->
+        Enum.map(specific_types, fn %{name: name, key: key} ->
+          generic_type = parse_name(generic_type, "GENERIC_TYPE_")
+          specific_type = parse_name(name, "SPECIFIC_TYPE_")
+          key = parse_hex_string(key)
+          Macro.escape({generic_type, key, specific_type})
+        end)
+      end)
+      |> Enum.sort()
+    end
+
+    defp key_name_mapper(name_prefix, name_overrides \\ %{}) do
+      fn %{name: name, key: key} ->
+        key = parse_hex_string(key)
+        name = Map.get(name_overrides, key, parse_name(name, name_prefix))
+        {key, name}
+      end
+    end
+
+    defp parse_hex_string(string) do
+      string |> String.replace_leading("0x", "") |> String.to_integer(16)
+    end
+
+    defp parse_name(name, prefix) do
+      name |> String.replace(prefix, "") |> Macro.underscore() |> String.to_atom()
+    end
+  end
+end
diff --git a/mix.exs b/mix.exs
index e0653f46..1271d38c 100644
--- a/mix.exs
+++ b/mix.exs
@@ -38,6 +38,7 @@ defmodule Grizzly.MixProject do
       {:muontrap, "~> 1.0 or ~> 0.4"},
       {:ex_doc, "~> 0.21", only: :docs, runtime: false},
       {:credo, "~> 1.4", only: [:dev, :test], runtime: false},
+      {:sweet_xml, "~> 0.7", only: [:dev, :test]},
       {:junit_formatter, "~> 3.3", only: :test},
       {:beam_notify, "~> 1.0 or ~> 0.2.0"}
     ]
diff --git a/mix.lock b/mix.lock
index 67365a44..745e6700 100644
--- a/mix.lock
+++ b/mix.lock
@@ -17,4 +17,5 @@
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},
   "muontrap": {:hex, :muontrap, "1.3.1", "828e095467ba81f59774bd1285428a69cd89ec98e87cb421cc886b56f921ede6", [:make, :mix], [{:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "f789de809d5ab124a30c8fa24a6b3b477824ca786a57347493ff35301120ab04"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.3.1", "2c54013ecf170e249e9291ed0a62e5832f70a476c61da16f6aac6dca0189f2af", [:mix], [], "hexpm", "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"},
+  "sweet_xml": {:hex, :sweet_xml, "0.7.3", "debb256781c75ff6a8c5cbf7981146312b66f044a2898f453709a53e5031b45b", [:mix], [], "hexpm", "e110c867a1b3fe74bfc7dd9893aa851f0eed5518d0d7cad76d7baafd30e4f5ba"},
 }
diff --git a/resources/ZWave_custom_cmd_classes.xml b/resources/ZWave_custom_cmd_classes.xml
index 8886e635..cd40d6a9 100644
--- a/resources/ZWave_custom_cmd_classes.xml
+++ b/resources/ZWave_custom_cmd_classes.xml
@@ -1,20 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<zw_classes>
-    <bas_dev read_only="false" name="BASIC_TYPE_CONTROLLER" key="0x01" help="Controller" comment="Node is a portable controller " />
-    <bas_dev read_only="false" name="BASIC_TYPE_ROUTING_SLAVE" key="0x04" help="Routing Slave" comment="Node is a slave with routing capabilities" />
-    <bas_dev read_only="false" name="BASIC_TYPE_SLAVE" key="0x03" help="Slave" comment="Node is a slave" />
-    <bas_dev read_only="false" name="BASIC_TYPE_STATIC_CONTROLLER" key="0x02" help="Static Controller" comment="Node is a static controller" />
-    <gen_dev key="0x03" name="GENERIC_TYPE_AV_CONTROL_POINT" help="Av Control Point" read_only="false" comment="AV Control Point">
+<?xml version="1.0" encoding="utf-8"?>
+<zw_classes version="2.7.4">
+    <bas_dev key="0x01" name="BASIC_TYPE_CONTROLLER" help="Controller" comment="Node is a portable controller" />
+    <bas_dev key="0x04" name="BASIC_TYPE_ROUTING_SLAVE" help="Routing Slave" comment="Node is a slave with routing capabilities" />
+    <bas_dev key="0x03" name="BASIC_TYPE_SLAVE" help="Slave" comment="Node is a slave" />
+    <bas_dev key="0x02" name="BASIC_TYPE_STATIC_CONTROLLER" help="Static Controller" comment="Node is a static controller" />
+    <gen_dev key="0x03" name="GENERIC_TYPE_AV_CONTROL_POINT" help="Av Control Point" comment="AV Control Point">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
-        <spec_dev key="0x12" name="SPECIFIC_TYPE_DOORBELL" help="Doorbell" comment="" />
+        <spec_dev key="0x12" name="SPECIFIC_TYPE_DOORBELL" help="Doorbell" />
         <spec_dev key="0x04" name="SPECIFIC_TYPE_SATELLITE_RECEIVER" help="Satellite Receiver" comment="Satellite Receiver" />
         <spec_dev key="0x11" name="SPECIFIC_TYPE_SATELLITE_RECEIVER_V2" help="Satellite Receiver V2" comment="Satellite Receiver V2" />
+        <spec_dev key="0x01" name="SPECIFIC_TYPE_SOUND_SWITCH" help="Sound Switch" />
     </gen_dev>
-    <gen_dev key="0x04" name="GENERIC_TYPE_DISPLAY" help="Display" read_only="false" comment="">
+    <gen_dev key="0x04" name="GENERIC_TYPE_DISPLAY" help="Display">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_SIMPLE_DISPLAY" help="Simple Display" comment="Display (simple) Device Type" />
     </gen_dev>
-    <gen_dev key="0x40" name="GENERIC_TYPE_ENTRY_CONTROL" help="Entry Control" read_only="false" comment="Entry Control">
+    <gen_dev key="0x40" name="GENERIC_TYPE_ENTRY_CONTROL" help="Entry Control" comment="Entry Control">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_DOOR_LOCK" help="Door Lock" comment="Door Lock" />
         <spec_dev key="0x02" name="SPECIFIC_TYPE_ADVANCED_DOOR_LOCK" help="Advanced Door Lock" comment="Advanced Door Lock" />
@@ -28,73 +29,74 @@
         <spec_dev key="0x0A" name="SPECIFIC_TYPE_SECURE_LOCKBOX" help="Secure Lockbox" comment="SDS12724" />
         <spec_dev key="0x0B" name="SPECIFIC_TYPE_SECURE_KEYPAD" help="Secure Keypad" />
     </gen_dev>
-    <gen_dev key="0x01" name="GENERIC_TYPE_GENERIC_CONTROLLER" help="Generic Controller" read_only="false" comment="Remote Controller">
+    <gen_dev key="0x01" name="GENERIC_TYPE_GENERIC_CONTROLLER" help="Generic Controller" comment="Remote Controller">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_PORTABLE_REMOTE_CONTROLLER" help="Portable Remote Controller" comment="Remote Control (Multi Purpose) Device Type" />
         <spec_dev key="0x02" name="SPECIFIC_TYPE_PORTABLE_SCENE_CONTROLLER" help="Portable Scene Controller" comment="Portable Scene Controller" />
-        <spec_dev key="0x03" name="SPECIFIC_TYPE_PORTABLE_INSTALLER_TOOL" help="Portable Installer Tool" comment="" />
+        <spec_dev key="0x03" name="SPECIFIC_TYPE_PORTABLE_INSTALLER_TOOL" help="Portable Installer Tool" />
         <spec_dev key="0x04" name="SPECIFIC_TYPE_REMOTE_CONTROL_AV" help="Remote Control AV" comment="Remote Control (AV) Device Type" />
         <spec_dev key="0x06" name="SPECIFIC_TYPE_REMOTE_CONTROL_SIMPLE" help="Remote Control Simple" comment="Remote Control (Simple) Device Type" />
     </gen_dev>
-    <gen_dev key="0x31" name="GENERIC_TYPE_METER" help="Meter" read_only="false" comment="Meter">
+    <gen_dev key="0x31" name="GENERIC_TYPE_METER" help="Meter" comment="Meter">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_SIMPLE_METER" help="Simple Meter" comment="Sub Energy Meter Device Type" />
         <spec_dev key="0x02" name="SPECIFIC_TYPE_ADV_ENERGY_CONTROL" help="Adv Energy Control" comment="Whole Home Energy Meter (Advanced) Device Type" />
         <spec_dev key="0x03" name="SPECIFIC_TYPE_WHOLE_HOME_METER_SIMPLE" help="Whole Home Meter Simple" comment="Whole Home Meter (Simple) Device Type" />
     </gen_dev>
-    <gen_dev key="0x30" name="GENERIC_TYPE_METER_PULSE" help="Meter Pulse" read_only="false" comment="Pulse Meter">
+    <gen_dev key="0x30" name="GENERIC_TYPE_METER_PULSE" help="Meter Pulse" comment="Pulse Meter">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
     </gen_dev>
-    <gen_dev key="0xFF" name="GENERIC_TYPE_NON_INTEROPERABLE" help="Non Interoperable" read_only="false" comment="Non interoperable">
+    <gen_dev key="0xFF" name="GENERIC_TYPE_NON_INTEROPERABLE" help="Non Interoperable" comment="Non interoperable">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
     </gen_dev>
-    <gen_dev key="0x0F" name="GENERIC_TYPE_REPEATER_SLAVE" help="Repeater Slave" read_only="false" comment="Repeater Slave">
+    <gen_dev key="0x0F" name="GENERIC_TYPE_REPEATER_SLAVE" help="Repeater Slave" comment="Repeater Slave">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_REPEATER_SLAVE" help="Repeater Slave" comment="Basic Repeater Slave" />
-        <spec_dev key="0x02" name="SPECIFIC_TYPE_VIRTUAL_NODE" help="Virtual Node" comment="" />
+        <spec_dev key="0x02" name="SPECIFIC_TYPE_VIRTUAL_NODE" help="Virtual Node" />
+        <spec_dev key="0x03" name="SPECIFIC_TYPE_IR_REPEATER" help="IR Repeater" />
     </gen_dev>
-    <gen_dev key="0x17" name="GENERIC_TYPE_SECURITY_PANEL" help="Security Panel" read_only="false" comment="">
+    <gen_dev key="0x17" name="GENERIC_TYPE_SECURITY_PANEL" help="Security Panel">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
-        <spec_dev key="0x01" name="SPECIFIC_TYPE_ZONED_SECURITY_PANEL" help="Zoned Security Panel" comment="" />
+        <spec_dev key="0x01" name="SPECIFIC_TYPE_ZONED_SECURITY_PANEL" help="Zoned Security Panel" />
     </gen_dev>
-    <gen_dev key="0x50" name="GENERIC_TYPE_SEMI_INTEROPERABLE" help="Semi Interoperable" read_only="false" comment="Semi Interoperable">
+    <gen_dev key="0x50" name="GENERIC_TYPE_SEMI_INTEROPERABLE" help="Semi Interoperable" comment="Semi Interoperable">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_ENERGY_PRODUCTION" help="Energy Production" comment="Energy Production" />
     </gen_dev>
-    <gen_dev key="0xA1" name="GENERIC_TYPE_SENSOR_ALARM" help="Sensor Alarm" read_only="false" comment="">
+    <gen_dev key="0xA1" name="GENERIC_TYPE_SENSOR_ALARM" help="Sensor Alarm">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
-        <spec_dev key="0x05" name="SPECIFIC_TYPE_ADV_ZENSOR_NET_ALARM_SENSOR" help="Adv Zensor Net Alarm Sensor" comment="" />
-        <spec_dev key="0x0A" name="SPECIFIC_TYPE_ADV_ZENSOR_NET_SMOKE_SENSOR" help="Adv Zensor Net Smoke Sensor" comment="" />
-        <spec_dev key="0x01" name="SPECIFIC_TYPE_BASIC_ROUTING_ALARM_SENSOR" help="Basic Routing Alarm Sensor" comment="" />
-        <spec_dev key="0x06" name="SPECIFIC_TYPE_BASIC_ROUTING_SMOKE_SENSOR" help="Basic Routing Smoke Sensor" comment="" />
-        <spec_dev key="0x03" name="SPECIFIC_TYPE_BASIC_ZENSOR_NET_ALARM_SENSOR" help="Basic Zensor Net Alarm Sensor" comment="" />
-        <spec_dev key="0x08" name="SPECIFIC_TYPE_BASIC_ZENSOR_NET_SMOKE_SENSOR" help="Basic Zensor Net Smoke Sensor" comment="" />
-        <spec_dev key="0x02" name="SPECIFIC_TYPE_ROUTING_ALARM_SENSOR" help="Routing Alarm Sensor" comment="" />
-        <spec_dev key="0x07" name="SPECIFIC_TYPE_ROUTING_SMOKE_SENSOR" help="Routing Smoke Sensor" comment="" />
-        <spec_dev key="0x04" name="SPECIFIC_TYPE_ZENSOR_NET_ALARM_SENSOR" help="Zensor Net Alarm Sensor" comment="" />
-        <spec_dev key="0x09" name="SPECIFIC_TYPE_ZENSOR_NET_SMOKE_SENSOR" help="Zensor Net Smoke Sensor" comment="" />
+        <spec_dev key="0x05" name="SPECIFIC_TYPE_ADV_ZENSOR_NET_ALARM_SENSOR" help="Adv Zensor Net Alarm Sensor" />
+        <spec_dev key="0x0A" name="SPECIFIC_TYPE_ADV_ZENSOR_NET_SMOKE_SENSOR" help="Adv Zensor Net Smoke Sensor" />
+        <spec_dev key="0x01" name="SPECIFIC_TYPE_BASIC_ROUTING_ALARM_SENSOR" help="Basic Routing Alarm Sensor" />
+        <spec_dev key="0x06" name="SPECIFIC_TYPE_BASIC_ROUTING_SMOKE_SENSOR" help="Basic Routing Smoke Sensor" />
+        <spec_dev key="0x03" name="SPECIFIC_TYPE_BASIC_ZENSOR_NET_ALARM_SENSOR" help="Basic Zensor Net Alarm Sensor" />
+        <spec_dev key="0x08" name="SPECIFIC_TYPE_BASIC_ZENSOR_NET_SMOKE_SENSOR" help="Basic Zensor Net Smoke Sensor" />
+        <spec_dev key="0x02" name="SPECIFIC_TYPE_ROUTING_ALARM_SENSOR" help="Routing Alarm Sensor" />
+        <spec_dev key="0x07" name="SPECIFIC_TYPE_ROUTING_SMOKE_SENSOR" help="Routing Smoke Sensor" />
+        <spec_dev key="0x04" name="SPECIFIC_TYPE_ZENSOR_NET_ALARM_SENSOR" help="Zensor Net Alarm Sensor" />
+        <spec_dev key="0x09" name="SPECIFIC_TYPE_ZENSOR_NET_SMOKE_SENSOR" help="Zensor Net Smoke Sensor" />
         <spec_dev key="0x0B" name="SPECIFIC_TYPE_ALARM_SENSOR" help="Alarm Sensor" comment="Sensor (Alarm) Device Type" />
     </gen_dev>
-    <gen_dev key="0x20" name="GENERIC_TYPE_SENSOR_BINARY" help="Sensor Binary" read_only="false" comment="Binary Sensor">
+    <gen_dev key="0x20" name="GENERIC_TYPE_SENSOR_BINARY" help="Sensor Binary" comment="Binary Sensor">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_ROUTING_SENSOR_BINARY" help="Routing Sensor Binary" comment="Routing Binary Sensor" />
     </gen_dev>
-    <gen_dev key="0x21" name="GENERIC_TYPE_SENSOR_MULTILEVEL" help="Sensor Multilevel" read_only="false" comment="Multilevel Sensor">
+    <gen_dev key="0x21" name="GENERIC_TYPE_SENSOR_MULTILEVEL" help="Sensor Multilevel" comment="Multilevel Sensor">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_ROUTING_SENSOR_MULTILEVEL" help="Routing Sensor Multilevel" comment="Sensor (Multilevel) Device Type" />
-        <spec_dev key="0x02" name="SPECIFIC_TYPE_CHIMNEY_FAN" help="Chimney Fan" comment="" />
+        <spec_dev key="0x02" name="SPECIFIC_TYPE_CHIMNEY_FAN" help="Chimney Fan" />
     </gen_dev>
-    <gen_dev key="0x02" name="GENERIC_TYPE_STATIC_CONTROLLER" help="Static Controller" read_only="false" comment="Static Controller">
+    <gen_dev key="0x02" name="GENERIC_TYPE_STATIC_CONTROLLER" help="Static Controller" comment="Static Controller">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_PC_CONTROLLER" help="Pc Controller" comment="Central Controller Device Type" />
         <spec_dev key="0x02" name="SPECIFIC_TYPE_SCENE_CONTROLLER" help="Scene Controller" comment="Scene Controller" />
-        <spec_dev key="0x03" name="SPECIFIC_TYPE_STATIC_INSTALLER_TOOL" help="Static Installer Tool" comment="" />
+        <spec_dev key="0x03" name="SPECIFIC_TYPE_STATIC_INSTALLER_TOOL" help="Static Installer Tool" />
         <spec_dev key="0x04" name="SPECIFIC_TYPE_SET_TOP_BOX" help="Set Top Box" comment="Set Top Box Device Type" />
         <spec_dev key="0x05" name="SPECIFIC_TYPE_SUB_SYSTEM_CONTROLLER" help="Sub System Controller" comment="Sub System Controller Device Type" />
         <spec_dev key="0x06" name="SPECIFIC_TYPE_TV" help="TV" comment="TV Device Type" />
         <spec_dev key="0x07" name="SPECIFIC_TYPE_GATEWAY" help="Gateway" comment="Gateway Device Type" />
     </gen_dev>
-    <gen_dev key="0x10" name="GENERIC_TYPE_SWITCH_BINARY" help="Switch Binary" read_only="false" comment="Binary Switch">
+    <gen_dev key="0x10" name="GENERIC_TYPE_SWITCH_BINARY" help="Switch Binary" comment="Binary Switch">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_POWER_SWITCH_BINARY" help="Power Switch Binary" comment="On/Off Power Switch Device Type" />
         <spec_dev key="0x03" name="SPECIFIC_TYPE_SCENE_SWITCH_BINARY" help="Scene Switch Binary" comment="Binary Scene Switch" />
@@ -104,7 +106,7 @@
         <spec_dev key="0x02" name="SPECIFIC_TYPE_COLOR_TUNABLE_BINARY" help="Binary Tunable Color Light" />
         <spec_dev key="0x07" name="SPECIFIC_TYPE_IRRIGATION_CONTROLLER" help="Irrigation Controller" />
     </gen_dev>
-    <gen_dev key="0x11" name="GENERIC_TYPE_SWITCH_MULTILEVEL" help="Switch Multilevel" read_only="false" comment="Multilevel Switch">
+    <gen_dev key="0x11" name="GENERIC_TYPE_SWITCH_MULTILEVEL" help="Switch Multilevel" comment="Multilevel Switch">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x05" name="SPECIFIC_TYPE_CLASS_A_MOTOR_CONTROL" help="Class A Motor Control" comment="Window Covering No Position/Endpoint Device Type" />
         <spec_dev key="0x06" name="SPECIFIC_TYPE_CLASS_B_MOTOR_CONTROL" help="Class B Motor Control" comment="Window Covering Endpoint Aware Device Type" />
@@ -113,81 +115,73 @@
         <spec_dev key="0x01" name="SPECIFIC_TYPE_POWER_SWITCH_MULTILEVEL" help="Power Switch Multilevel" comment="Light Dimmer Switch Device Type" />
         <spec_dev key="0x04" name="SPECIFIC_TYPE_SCENE_SWITCH_MULTILEVEL" help="Scene Switch Multilevel" comment="Multilevel Scene Switch" />
         <spec_dev key="0x08" name="SPECIFIC_TYPE_FAN_SWITCH" help="Fan Switch" comment="Fan Switch Device Type" />
-        <spec_dev key="0x02" name="SPECIFIC_TYPE_COLOR_TUNABLE_MULTILEVEL" help="Multilevel Tunable Color Light" comment="" />
+        <spec_dev key="0x02" name="SPECIFIC_TYPE_COLOR_TUNABLE_MULTILEVEL" help="Multilevel Tunable Color Light" />
     </gen_dev>
-    <gen_dev key="0x12" name="GENERIC_TYPE_SWITCH_REMOTE" help="Switch Remote" read_only="false" comment="Remote Switch">
+    <gen_dev key="0x12" name="GENERIC_TYPE_SWITCH_REMOTE" help="Switch Remote" comment="Remote Switch">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_SWITCH_REMOTE_BINARY" help="Switch Remote Binary" comment="Binary Remote Switch" />
         <spec_dev key="0x02" name="SPECIFIC_TYPE_SWITCH_REMOTE_MULTILEVEL" help="Switch Remote Multilevel" comment="Multilevel Remote Switch" />
         <spec_dev key="0x03" name="SPECIFIC_TYPE_SWITCH_REMOTE_TOGGLE_BINARY" help="Switch Remote Toggle Binary" comment="Binary Toggle Remote Switch" />
         <spec_dev key="0x04" name="SPECIFIC_TYPE_SWITCH_REMOTE_TOGGLE_MULTILEVEL" help="Switch Remote Toggle Multilevel" comment="Multilevel Toggle Remote Switch" />
     </gen_dev>
-    <gen_dev key="0x13" name="GENERIC_TYPE_SWITCH_TOGGLE" help="Switch Toggle" read_only="false" comment="Toggle Switch">
+    <gen_dev key="0x13" name="GENERIC_TYPE_SWITCH_TOGGLE" help="Switch Toggle" comment="Toggle Switch">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_SWITCH_TOGGLE_BINARY" help="Switch Toggle Binary" comment="Binary Toggle Switch" />
         <spec_dev key="0x02" name="SPECIFIC_TYPE_SWITCH_TOGGLE_MULTILEVEL" help="Switch Toggle Multilevel" comment="Multilevel Toggle Switch" />
     </gen_dev>
-    <gen_dev key="0x08" name="GENERIC_TYPE_THERMOSTAT" help="Thermostat" read_only="false" comment="Thermostat">
+    <gen_dev key="0x08" name="GENERIC_TYPE_THERMOSTAT" help="Thermostat" comment="Thermostat">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x03" name="SPECIFIC_TYPE_SETBACK_SCHEDULE_THERMOSTAT" help="Setback Schedule Thermostat" comment="Setback Schedule Thermostat" />
         <spec_dev key="0x05" name="SPECIFIC_TYPE_SETBACK_THERMOSTAT" help="Setback Thermostat" comment="Thermostat (Setback) Device Type" />
-        <spec_dev key="0x04" name="SPECIFIC_TYPE_SETPOINT_THERMOSTAT" help="Setpoint Thermostat" comment="" />
+        <spec_dev key="0x04" name="SPECIFIC_TYPE_SETPOINT_THERMOSTAT" help="Setpoint Thermostat" />
         <spec_dev key="0x02" name="SPECIFIC_TYPE_THERMOSTAT_GENERAL" help="Thermostat General" comment="Thermostat General" />
         <spec_dev key="0x06" name="SPECIFIC_TYPE_THERMOSTAT_GENERAL_V2" help="Thermostat General V2" comment="Thermostat (HVAC) Device Type" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_THERMOSTAT_HEATING" help="Thermostat Heating" comment="Thermostat Heating" />
     </gen_dev>
-    <gen_dev key="0x16" name="GENERIC_TYPE_VENTILATION" help="Ventilation" read_only="false" comment="">
+    <gen_dev key="0x16" name="GENERIC_TYPE_VENTILATION" help="Ventilation">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
-        <spec_dev key="0x01" name="SPECIFIC_TYPE_RESIDENTIAL_HRV" help="Residential Hrv" comment="" />
+        <spec_dev key="0x01" name="SPECIFIC_TYPE_RESIDENTIAL_HRV" help="Residential Hrv" />
     </gen_dev>
-    <gen_dev key="0x09" name="GENERIC_TYPE_WINDOW_COVERING" help="Window Covering" read_only="false" comment="Window Covering">
+    <gen_dev key="0x09" name="GENERIC_TYPE_WINDOW_COVERING" help="Window Covering" comment="Window Covering">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_SIMPLE_WINDOW_COVERING" help="Simple Window Covering" comment="Simple Window Covering Control" />
     </gen_dev>
-    <gen_dev key="0x15" name="GENERIC_TYPE_ZIP_NODE" help="Zip Node" read_only="false" comment="">
+    <gen_dev key="0x15" name="GENERIC_TYPE_ZIP_NODE" help="Zip Node">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
-        <spec_dev key="0x02" name="SPECIFIC_TYPE_ZIP_ADV_NODE" help="Zip Adv Node" comment="" />
-        <spec_dev key="0x01" name="SPECIFIC_TYPE_ZIP_TUN_NODE" help="Zip Tun Node" comment="" />
+        <spec_dev key="0x02" name="SPECIFIC_TYPE_ZIP_ADV_NODE" help="Zip Adv Node" />
+        <spec_dev key="0x01" name="SPECIFIC_TYPE_ZIP_TUN_NODE" help="Zip Tun Node" />
     </gen_dev>
-    <gen_dev key="0x18" name="GENERIC_TYPE_WALL_CONTROLLER" help="Wall Controller" read_only="false" comment="">
+    <gen_dev key="0x18" name="GENERIC_TYPE_WALL_CONTROLLER" help="Wall Controller">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_BASIC_WALL_CONTROLLER" help="Basic Wall Controller" comment="Wall Controller Device Type" />
     </gen_dev>
-    <gen_dev key="0x05" name="GENERIC_TYPE_NETWORK_EXTENDER" help="Network Extender" read_only="false" comment="Network Extender Generic Device Class">
+    <gen_dev key="0x05" name="GENERIC_TYPE_NETWORK_EXTENDER" help="Network Extender" comment="Network Extender Generic Device Class">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_SECURE_EXTENDER" help="Secure Extender" comment="Specific Device Secure Extender" />
     </gen_dev>
-    <gen_dev key="0x06" name="GENERIC_TYPE_APPLIANCE" help="Appliance" read_only="false" comment="">
+    <gen_dev key="0x06" name="GENERIC_TYPE_APPLIANCE" help="Appliance">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class Not Used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_GENERAL_APPLIANCE" help="General Appliance" />
         <spec_dev key="0x02" name="SPECIFIC_TYPE_KITCHEN_APPLIANCE" help="Kitchen Appliance" />
         <spec_dev key="0x03" name="SPECIFIC_TYPE_LAUNDRY_APPLIANCE" help="Laundry Appliance" />
     </gen_dev>
-    <gen_dev key="0x07" name="GENERIC_TYPE_SENSOR_NOTIFICATION" help="Sensor Notification" read_only="false">
+    <gen_dev key="0x07" name="GENERIC_TYPE_SENSOR_NOTIFICATION" help="Sensor Notification">
         <spec_dev key="0x00" name="SPECIFIC_TYPE_NOT_USED" help="Not Used" comment="Specific Device Class not used" />
         <spec_dev key="0x01" name="SPECIFIC_TYPE_NOTIFICATION_SENSOR" help="Notification Sensor" />
     </gen_dev>
-    <cmd_class key="0x71" version="1" name="COMMAND_CLASS_ALARM" help="Command Class Alarm" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x04" name="ALARM_GET" help="Alarm Get" comment="">
-            <param key="0x00" name="Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x71" version="1" name="COMMAND_CLASS_ALARM" help="Command Class Alarm" comment="[DEPRECATED]">
+        <cmd key="0x04" name="ALARM_GET" help="Alarm Get" support_mode="RX">
+            <param key="0x00" name="Alarm Type" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="ALARM_REPORT" help="Alarm Report" comment="">
-            <param key="0x00" name="Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Alarm Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="ALARM_REPORT" help="Alarm Report" support_mode="TX">
+            <param key="0x00" name="Alarm Type" type="BYTE" />
+            <param key="0x01" name="Alarm Level" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x71" version="2" name="COMMAND_CLASS_ALARM" help="Command Class Alarm" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x04" name="ALARM_GET" help="Alarm Get" comment="">
-            <param key="0x00" name="Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="ZWave Alarm Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x71" version="2" name="COMMAND_CLASS_ALARM" help="Command Class Alarm" comment="[DEPRECATED]">
+        <cmd key="0x04" name="ALARM_GET" help="Alarm Get" support_mode="RX">
+            <param key="0x00" name="Alarm Type" type="BYTE" />
+            <param key="0x01" name="ZWave Alarm Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -203,22 +197,15 @@
                 <const key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x05" name="ALARM_REPORT" help="Alarm Report" comment="">
-            <param key="0x00" name="Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Alarm Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Zensor Net Source Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="ZWave Alarm Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x05" name="ALARM_REPORT" help="Alarm Report" support_mode="TX">
+            <param key="0x00" name="Alarm Type" type="BYTE" />
+            <param key="0x01" name="Alarm Level" type="BYTE" />
+            <param key="0x02" name="Zensor Net Source Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="ZWave Alarm Status" type="BYTE">
                 <bitflag key="0x01" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="ZWave Alarm Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x04" name="ZWave Alarm Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -233,18 +220,14 @@
                 <const key="0x0B" flagname="Clock" flagmask="0x0B" />
                 <const key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x05" name="ZWave Alarm Event" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Number of Event Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Event Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x05" name="ZWave Alarm Event" type="BYTE" />
+            <param key="0x06" name="Number of Event Parameters" type="BYTE" />
+            <param key="0x07" name="Event Parameter" type="VARIANT">
+                <variant paramoffs="6" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x06" name="ALARM_SET" help="Alarm Set" comment="">
-            <param key="0x00" name="ZWave Alarm Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x06" name="ALARM_SET" help="Alarm Set" support_mode="RX">
+            <param key="0x00" name="ZWave Alarm Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -259,21 +242,20 @@
                 <const key="0x0B" flagname="Clock" flagmask="0x0B" />
                 <const key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="ZWave Alarm Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x01" name="ZWave Alarm Status" type="BYTE">
                 <bitflag key="0x01" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x02" flagname="On" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="ALARM_TYPE_SUPPORTED_GET" help="Alarm Type Supported Get" comment="" />
-        <cmd key="0x08" name="ALARM_TYPE_SUPPORTED_REPORT" help="Alarm Type Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x07" name="ALARM_TYPE_SUPPORTED_GET" help="Alarm Type Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="ALARM_TYPE_SUPPORTED_REPORT" help="Alarm Type Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="V1 Alarm" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" lenoffs="0" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Smoke" flagmask="0x01" />
                 <bitflag key="0x02" flagname="CO" flagmask="0x02" />
@@ -290,12 +272,10 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x71" version="3" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" read_only="false" comment="">
-        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x71" version="3" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" comment="[DEPRECATED]">
+        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" support_mode="RX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -310,26 +290,17 @@
                 <const key="0x0B" flagname="Clock" flagmask="0x0B" />
                 <const key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x02" name="Event" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Event" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="V1 Alarm Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Notification Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" support_mode="TX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="V1 Alarm Level" type="BYTE" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Notification Status" type="BYTE">
                 <bitflag key="0x01" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x04" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -344,23 +315,19 @@
                 <const key="0x0B" flagname="Clock" flagmask="0x0B" />
                 <const key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x05" name="Event" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" shifter="0" />
+            <param key="0x05" name="Event" type="BYTE" />
+            <param key="0x06" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Sequence" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Event Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-            <param key="0x08" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Event Parameter" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x1F" />
             </param>
+            <param key="0x08" name="Sequence Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" comment="">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -375,21 +342,20 @@
                 <const key="0x0B" flagname="Clock" flagmask="0x0B" />
                 <const key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Notification Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x01" name="Notification Status" type="BYTE">
                 <bitflag key="0x01" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x02" flagname="On" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" comment="" />
-        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="V1 Alarm" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" lenoffs="0" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Smoke" flagmask="0x01" />
                 <bitflag key="0x02" flagname="CO" flagmask="0x02" />
@@ -405,8 +371,8 @@
                 <bitflag key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -422,8 +388,8 @@
                 <const key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report" support_mode="TX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -438,21 +404,19 @@
                 <const key="0x0B" flagname="Clock" flagmask="0x0B" />
                 <const key="0x0C" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" lenoffs="0" />
+            <param key="0x02" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x71" version="4" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" read_only="false" comment="">
-        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x71" version="4" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" comment="[DEPRECATED]">
+        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" support_mode="RX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -469,26 +433,18 @@
                 <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x02" name="Event" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Event" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="V1 Alarm Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" support_mode="TX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="V1 Alarm Level" type="BYTE" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x04" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -505,23 +461,19 @@
                 <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x05" name="Event" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" shifter="0" />
+            <param key="0x05" name="Event" type="BYTE" />
+            <param key="0x06" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Sequence" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Event Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-            <param key="0x08" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Event Parameter" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x1F" />
             </param>
+            <param key="0x08" name="Sequence Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" comment="">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -538,21 +490,21 @@
                 <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x01" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" comment="" />
-        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="V1 Alarm" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" lenoffs="0" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Smoke" flagmask="0x01" />
                 <bitflag key="0x02" flagname="CO" flagmask="0x02" />
@@ -570,8 +522,8 @@
                 <bitflag key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -589,8 +541,8 @@
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report" support_mode="TX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -607,21 +559,19 @@
                 <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" lenoffs="0" />
+            <param key="0x02" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x71" version="5" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" read_only="false" comment="">
-        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x71" version="5" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" comment="[DEPRECATED]">
+        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" support_mode="RX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -638,26 +588,18 @@
                 <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x02" name="Event" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Event" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="V1 Alarm Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" support_mode="TX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="V1 Alarm Level" type="BYTE" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x04" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -674,23 +616,19 @@
                 <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x05" name="Event" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" shifter="0" />
+            <param key="0x05" name="Event" type="BYTE" />
+            <param key="0x06" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Sequence" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Event Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-            <param key="0x08" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Event Parameter" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x1F" />
             </param>
+            <param key="0x08" name="Sequence Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" comment="">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -707,21 +645,21 @@
                 <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x01" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" comment="" />
-        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="V1 Alarm" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" lenoffs="0" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Smoke" flagmask="0x01" />
                 <bitflag key="0x02" flagname="CO" flagmask="0x02" />
@@ -739,8 +677,8 @@
                 <bitflag key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -758,8 +696,8 @@
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report" support_mode="TX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -776,21 +714,19 @@
                 <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
                 <const key="0x0E" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" lenoffs="0" />
+            <param key="0x02" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x71" version="6" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" read_only="false" comment="">
-        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x71" version="6" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" comment="[DEPRECATED]">
+        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" support_mode="RX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -808,26 +744,18 @@
                 <const key="0x0E" flagname="Siren" flagmask="0x0E" />
                 <const key="0x0F" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x02" name="Event" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Event" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="V1 Alarm Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" support_mode="TX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="V1 Alarm Level" type="BYTE" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x04" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -845,23 +773,19 @@
                 <const key="0x0E" flagname="Siren" flagmask="0x0E" />
                 <const key="0x0F" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x05" name="Event" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" shifter="0" />
+            <param key="0x05" name="Event" type="BYTE" />
+            <param key="0x06" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Sequence" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Event Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-            <param key="0x08" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Event Parameter" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x1F" />
             </param>
+            <param key="0x08" name="Sequence Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" comment="">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -879,21 +803,21 @@
                 <const key="0x0E" flagname="Siren" flagmask="0x0E" />
                 <const key="0x0F" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x01" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" comment="" />
-        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="V1 Alarm" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" lenoffs="0" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Smoke" flagmask="0x01" />
                 <bitflag key="0x02" flagname="CO" flagmask="0x02" />
@@ -912,8 +836,8 @@
                 <bitflag key="0x0F" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -932,8 +856,8 @@
                 <const key="0x0F" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report" support_mode="TX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -951,21 +875,19 @@
                 <const key="0x0E" flagname="Siren" flagmask="0x0E" />
                 <const key="0x0F" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" lenoffs="0" />
+            <param key="0x02" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x71" version="7" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" read_only="false" comment="">
-        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x71" version="7" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" comment="[DEPRECATED]">
+        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" support_mode="RX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -987,26 +909,18 @@
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
                 <const key="0x13" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x02" name="Event" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Event" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="V1 Alarm Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" support_mode="TX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="V1 Alarm Level" type="BYTE" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x04" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1028,23 +942,19 @@
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
                 <const key="0x13" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x05" name="Event" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" shifter="0" />
+            <param key="0x05" name="Event" type="BYTE" />
+            <param key="0x06" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Sequence" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Event Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-            <param key="0x08" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Event Parameter" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x1F" />
             </param>
+            <param key="0x08" name="Sequence Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" comment="">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1066,21 +976,21 @@
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
                 <const key="0x13" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x01" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" comment="" />
-        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="V1 Alarm" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" lenoffs="0" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Smoke" flagmask="0x01" />
                 <bitflag key="0x02" flagname="CO" flagmask="0x02" />
@@ -1103,8 +1013,8 @@
                 <bitflag key="0x13" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1127,8 +1037,8 @@
                 <const key="0x13" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report" support_mode="TX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1150,21 +1060,56 @@
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
                 <const key="0x13" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" lenoffs="0" />
+            <param key="0x02" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x71" version="8" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification" read_only="false" comment="">
-        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x71" version="8" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification">
+        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" support_mode="RX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="Notification Type" type="CONST">
+                <const key="0x00" flagname="Reserved" flagmask="0x00" />
+                <const key="0x01" flagname="Smoke" flagmask="0x01" />
+                <const key="0x02" flagname="CO" flagmask="0x02" />
+                <const key="0x03" flagname="CO2" flagmask="0x03" />
+                <const key="0x04" flagname="Heat" flagmask="0x04" />
+                <const key="0x05" flagname="Water" flagmask="0x05" />
+                <const key="0x06" flagname="Access Control" flagmask="0x06" />
+                <const key="0x07" flagname="Home Security" flagmask="0x07" />
+                <const key="0x08" flagname="Power Management" flagmask="0x08" />
+                <const key="0x09" flagname="System" flagmask="0x09" />
+                <const key="0x0A" flagname="Emergency" flagmask="0x0A" />
+                <const key="0x0B" flagname="Clock" flagmask="0x0B" />
+                <const key="0x0C" flagname="Appliance" flagmask="0x0C" />
+                <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
+                <const key="0x0E" flagname="Siren" flagmask="0x0E" />
+                <const key="0x0F" flagname="Water Valve" flagmask="0x0F" />
+                <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
+                <const key="0x11" flagname="Irrigation" flagmask="0x11" />
+                <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
+            </param>
+            <param key="0x02" name="Event" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" support_mode="TX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="V1 Alarm Level" type="BYTE" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Notification Status" type="CONST">
+                <const key="0x00" flagname="Off" flagmask="0x00" />
+                <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
+                <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x04" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1184,28 +1129,93 @@
                 <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
                 <const key="0x11" flagname="Irrigation" flagmask="0x11" />
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
-                <const key="0x13" flagname="First" flagmask="0xFF" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
+            </param>
+            <param key="0x05" name="Event" type="BYTE" />
+            <param key="0x06" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="Sequence" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Event" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Event Parameter" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x1F" />
             </param>
+            <param key="0x08" name="Sequence Number" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" comment="">
-            <param key="0x00" name="V1 Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="V1 Alarm Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
+                <const key="0x00" flagname="Reserved" flagmask="0x00" />
+                <const key="0x01" flagname="Smoke" flagmask="0x01" />
+                <const key="0x02" flagname="CO" flagmask="0x02" />
+                <const key="0x03" flagname="CO2" flagmask="0x03" />
+                <const key="0x04" flagname="Heat" flagmask="0x04" />
+                <const key="0x05" flagname="Water" flagmask="0x05" />
+                <const key="0x06" flagname="Access Control" flagmask="0x06" />
+                <const key="0x07" flagname="Home Security" flagmask="0x07" />
+                <const key="0x08" flagname="Power Management" flagmask="0x08" />
+                <const key="0x09" flagname="System" flagmask="0x09" />
+                <const key="0x0A" flagname="Emergency" flagmask="0x0A" />
+                <const key="0x0B" flagname="Clock" flagmask="0x0B" />
+                <const key="0x0C" flagname="Appliance" flagmask="0x0C" />
+                <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
+                <const key="0x0E" flagname="Siren" flagmask="0x0E" />
+                <const key="0x0F" flagname="Water Valve" flagmask="0x0F" />
+                <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
+                <const key="0x11" flagname="Irrigation" flagmask="0x11" />
+                <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x03" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x01" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        </cmd>
+        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="V1 Alarm" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
+                <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
+                <bitflag key="0x01" flagname="Smoke" flagmask="0x01" />
+                <bitflag key="0x02" flagname="CO" flagmask="0x02" />
+                <bitflag key="0x03" flagname="CO2" flagmask="0x03" />
+                <bitflag key="0x04" flagname="Heat" flagmask="0x04" />
+                <bitflag key="0x05" flagname="Water" flagmask="0x05" />
+                <bitflag key="0x06" flagname="Access Control" flagmask="0x06" />
+                <bitflag key="0x07" flagname="Home Security" flagmask="0x07" />
+                <bitflag key="0x08" flagname="Power Management" flagmask="0x08" />
+                <bitflag key="0x09" flagname="System" flagmask="0x09" />
+                <bitflag key="0x0A" flagname="Emergency" flagmask="0x0A" />
+                <bitflag key="0x0B" flagname="Clock" flagmask="0x0B" />
+                <bitflag key="0x0C" flagname="Appliance" flagmask="0x0C" />
+                <bitflag key="0x0D" flagname="Home Health" flagmask="0x0D" />
+                <bitflag key="0x0E" flagname="Siren" flagmask="0x0E" />
+                <bitflag key="0x0F" flagname="Water Valve" flagmask="0x0F" />
+                <bitflag key="0x10" flagname="Weather Alarm" flagmask="0x10" />
+                <bitflag key="0x11" flagname="Irrigation" flagmask="0x11" />
+                <bitflag key="0x12" flagname="Gas Alarm" flagmask="0x12" />
+                <bitflag key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <bitflag key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <bitflag key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <bitflag key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <bitflag key="0x17" flagname="First" flagmask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1225,25 +1235,128 @@
                 <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
                 <const key="0x11" flagname="Irrigation" flagmask="0x11" />
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
-                <const key="0x13" flagname="First" flagmask="0xFF" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report" support_mode="TX">
+            <param key="0x00" name="Notification Type" type="CONST">
+                <const key="0x00" flagname="Reserved" flagmask="0x00" />
+                <const key="0x01" flagname="Smoke" flagmask="0x01" />
+                <const key="0x02" flagname="CO" flagmask="0x02" />
+                <const key="0x03" flagname="CO2" flagmask="0x03" />
+                <const key="0x04" flagname="Heat" flagmask="0x04" />
+                <const key="0x05" flagname="Water" flagmask="0x05" />
+                <const key="0x06" flagname="Access Control" flagmask="0x06" />
+                <const key="0x07" flagname="Home Security" flagmask="0x07" />
+                <const key="0x08" flagname="Power Management" flagmask="0x08" />
+                <const key="0x09" flagname="System" flagmask="0x09" />
+                <const key="0x0A" flagname="Emergency" flagmask="0x0A" />
+                <const key="0x0B" flagname="Clock" flagmask="0x0B" />
+                <const key="0x0C" flagname="Appliance" flagmask="0x0C" />
+                <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
+                <const key="0x0E" flagname="Siren" flagmask="0x0E" />
+                <const key="0x0F" flagname="Water Valve" flagmask="0x0F" />
+                <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
+                <const key="0x11" flagname="Irrigation" flagmask="0x11" />
+                <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
+            </param>
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Event" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x71" version="9" name="COMMAND_CLASS_NOTIFICATION" help="Command Class Notification">
+        <cmd key="0x04" name="NOTIFICATION_GET" help="Notification Get" support_mode="RX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="Notification Type" type="CONST">
+                <const key="0x00" flagname="Reserved" flagmask="0x00" />
+                <const key="0x01" flagname="Smoke" flagmask="0x01" />
+                <const key="0x02" flagname="CO" flagmask="0x02" />
+                <const key="0x03" flagname="CO2" flagmask="0x03" />
+                <const key="0x04" flagname="Heat" flagmask="0x04" />
+                <const key="0x05" flagname="Water" flagmask="0x05" />
+                <const key="0x06" flagname="Access Control" flagmask="0x06" />
+                <const key="0x07" flagname="Home Security" flagmask="0x07" />
+                <const key="0x08" flagname="Power Management" flagmask="0x08" />
+                <const key="0x09" flagname="System" flagmask="0x09" />
+                <const key="0x0A" flagname="Emergency" flagmask="0x0A" />
+                <const key="0x0B" flagname="Clock" flagmask="0x0B" />
+                <const key="0x0C" flagname="Appliance" flagmask="0x0C" />
+                <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
+                <const key="0x0E" flagname="Siren" flagmask="0x0E" />
+                <const key="0x0F" flagname="Water Valve" flagmask="0x0F" />
+                <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
+                <const key="0x11" flagname="Irrigation" flagmask="0x11" />
+                <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
+            </param>
+            <param key="0x02" name="Event" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="NOTIFICATION_REPORT" help="Notification Report" support_mode="TX">
+            <param key="0x00" name="V1 Alarm Type" type="BYTE" />
+            <param key="0x01" name="V1 Alarm Level" type="BYTE" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Notification Status" type="CONST">
+                <const key="0x00" flagname="Off" flagmask="0x00" />
+                <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
+                <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
-            <param key="0x06" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" shifter="0" />
+            <param key="0x04" name="Notification Type" type="CONST">
+                <const key="0x00" flagname="Reserved" flagmask="0x00" />
+                <const key="0x01" flagname="Smoke" flagmask="0x01" />
+                <const key="0x02" flagname="CO" flagmask="0x02" />
+                <const key="0x03" flagname="CO2" flagmask="0x03" />
+                <const key="0x04" flagname="Heat" flagmask="0x04" />
+                <const key="0x05" flagname="Water" flagmask="0x05" />
+                <const key="0x06" flagname="Access Control" flagmask="0x06" />
+                <const key="0x07" flagname="Home Security" flagmask="0x07" />
+                <const key="0x08" flagname="Power Management" flagmask="0x08" />
+                <const key="0x09" flagname="System" flagmask="0x09" />
+                <const key="0x0A" flagname="Emergency" flagmask="0x0A" />
+                <const key="0x0B" flagname="Clock" flagmask="0x0B" />
+                <const key="0x0C" flagname="Appliance" flagmask="0x0C" />
+                <const key="0x0D" flagname="Home Health" flagmask="0x0D" />
+                <const key="0x0E" flagname="Siren" flagmask="0x0E" />
+                <const key="0x0F" flagname="Water Valve" flagmask="0x0F" />
+                <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
+                <const key="0x11" flagname="Irrigation" flagmask="0x11" />
+                <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
+            </param>
+            <param key="0x05" name="Event" type="BYTE" />
+            <param key="0x06" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Event Parameters Length" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Sequence" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Event Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-            <param key="0x08" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Event Parameter" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x1F" />
             </param>
+            <param key="0x08" name="Sequence Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" comment="">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x06" name="NOTIFICATION_SET" help="Notification Set" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1263,23 +1376,27 @@
                 <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
                 <const key="0x11" flagname="Irrigation" flagmask="0x11" />
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
-                <const key="0x13" flagname="First" flagmask="0xFF" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Notification Status" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x01" name="Notification Status" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="No pending notifications" flagmask="0xFE" />
                 <const key="0x02" flagname="On" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" comment="" />
-        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x07" name="NOTIFICATION_SUPPORTED_GET" help="Notification Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="NOTIFICATION_SUPPORTED_REPORT" help="Notification Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="V1 Alarm" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" lenoffs="0" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Smoke" flagmask="0x01" />
                 <bitflag key="0x02" flagname="CO" flagmask="0x02" />
@@ -1299,11 +1416,15 @@
                 <bitflag key="0x10" flagname="Weather Alarm" flagmask="0x10" />
                 <bitflag key="0x11" flagname="Irrigation" flagmask="0x11" />
                 <bitflag key="0x12" flagname="Gas Alarm" flagmask="0x12" />
-                <bitflag key="0x13" flagname="First" flagmask="0xFF" />
+                <bitflag key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <bitflag key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <bitflag key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <bitflag key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <bitflag key="0x17" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="EVENT_SUPPORTED_GET" help="Event Supported Get" support_mode="RX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1323,11 +1444,15 @@
                 <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
                 <const key="0x11" flagname="Irrigation" flagmask="0x11" />
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
-                <const key="0x13" flagname="First" flagmask="0xFF" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report">
-            <param key="0x00" name="Notification Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="EVENT_SUPPORTED_REPORT" help="Event Supported Report" support_mode="TX">
+            <param key="0x00" name="Notification Type" type="CONST">
                 <const key="0x00" flagname="Reserved" flagmask="0x00" />
                 <const key="0x01" flagname="Smoke" flagmask="0x01" />
                 <const key="0x02" flagname="CO" flagmask="0x02" />
@@ -1347,305 +1472,330 @@
                 <const key="0x10" flagname="Weather Alarm" flagmask="0x10" />
                 <const key="0x11" flagname="Irrigation" flagmask="0x11" />
                 <const key="0x12" flagname="Gas Alarm" flagmask="0x12" />
-                <const key="0x13" flagname="First" flagmask="0xFF" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" shifter="0" />
+                <const key="0x13" flagname="Pest Control" flagmask="0x13" />
+                <const key="0x14" flagname="Light sensor" flagmask="0x14" />
+                <const key="0x15" flagname="Water Quality Monitoring" flagmask="0x15" />
+                <const key="0x16" flagname="Home monitoring" flagmask="0x16" />
+                <const key="0x17" flagname="First" flagmask="0xFF" />
+            </param>
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Bit Masks" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" lenoffs="0" />
+            <param key="0x02" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="1" lenmask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x22" version="1" name="COMMAND_CLASS_APPLICATION_STATUS" help="Command Class Application Status" read_only="false" comment="">
-        <cmd key="0x01" name="APPLICATION_BUSY" help="Application Busy" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="The status field">
+    <cmd_class key="0x22" version="1" name="COMMAND_CLASS_APPLICATION_STATUS" help="Command Class Application Status">
+        <cmd key="0x01" name="APPLICATION_BUSY" help="Application Busy" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST" comment="The status field">
                 <const key="0x00" flagname="Try again later" flagmask="0x00" />
                 <const key="0x01" flagname="Try again in Wait Time seconds" flagmask="0x01" />
                 <const key="0x02" flagname="Request queued, executed later" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Wait Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Wait Time" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="APPLICATION_REJECTED_REQUEST" help="Application Rejected Request" comment="">
-            <param key="0x00" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x02" name="APPLICATION_REJECTED_REQUEST" help="Application Rejected Request" support_mode="TX">
+            <param key="0x00" name="Status" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x9B" version="1" name="COMMAND_CLASS_ASSOCIATION_COMMAND_CONFIGURATION" help="Command Class Association Command Configuration" read_only="false" comment="">
-        <cmd key="0x04" name="COMMAND_CONFIGURATION_GET" help="Command Configuration Get" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-        </cmd>
-        <cmd key="0x05" name="COMMAND_CONFIGURATION_REPORT" help="Command Configuration Report" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reports to follow" fieldmask="0x0F" shifter="0" />
+    <cmd_class key="0x9B" version="1" name="COMMAND_CLASS_ASSOCIATION_COMMAND_CONFIGURATION" help="Command Class Association Command Configuration">
+        <cmd key="0x04" name="COMMAND_CONFIGURATION_GET" help="Command Configuration Get" support_mode="RX">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x05" name="COMMAND_CONFIGURATION_REPORT" help="Command Configuration Report" support_mode="TX">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reports to follow" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x70" shifter="4" />
                 <bitflag key="0x02" flagname="First" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Command length" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Command Class identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Command identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Command byte" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x03" name="Command length" type="BYTE" />
+            <param key="0x04" name="Command Class identifier" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x05" name="Command identifier" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x06" name="Command byte" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x03" name="COMMAND_CONFIGURATION_SET" help="Command Configuration Set" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Command length" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Command Class identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Command identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Command byte" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x03" name="COMMAND_CONFIGURATION_SET" help="Command Configuration Set" support_mode="RX">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Command length" type="BYTE" />
+            <param key="0x03" name="Command Class identifier" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x04" name="Command identifier" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x05" name="Command byte" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x01" name="COMMAND_RECORDS_SUPPORTED_GET" help="Command Records Supported Get" comment="" />
-        <cmd key="0x02" name="COMMAND_RECORDS_SUPPORTED_REPORT" help="Command Records Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x01" name="COMMAND_RECORDS_SUPPORTED_GET" help="Command Records Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="COMMAND_RECORDS_SUPPORTED_REPORT" help="Command Records Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Conf. Cmd" flagmask="0x01" />
                 <bitflag key="0x01" flagname="V/C" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Max command length" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Free Command records" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Max Command records" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Free Command records" type="WORD" />
+            <param key="0x02" name="Max Command records" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x85" version="1" name="COMMAND_CLASS_ASSOCIATION" help="Command Class Association" read_only="false" comment="">
-        <cmd key="0x02" name="ASSOCIATION_GET" help="Association Get" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x85" version="1" name="COMMAND_CLASS_ASSOCIATION" help="Command Class Association">
+        <cmd key="0x02" name="ASSOCIATION_GET" help="Association Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="ASSOCIATION_GROUPINGS_GET" help="Association Groupings Get" comment="" />
-        <cmd key="0x06" name="ASSOCIATION_GROUPINGS_REPORT" help="Association Groupings Report" comment="">
-            <param key="0x00" name="Supported Groupings" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="ASSOCIATION_GROUPINGS_GET" help="Association Groupings Get" support_mode="RX" />
+        <cmd key="0x06" name="ASSOCIATION_GROUPINGS_REPORT" help="Association Groupings Report" support_mode="TX">
+            <param key="0x00" name="Supported Groupings" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="ASSOCIATION_REMOVE" help="Association Remove" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x04" name="ASSOCIATION_REMOVE" help="Association Remove" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x03" name="ASSOCIATION_REPORT" help="Association Report" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Max Nodes Supported" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="NodeID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x03" name="ASSOCIATION_REPORT" help="Association Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Max Nodes Supported" type="BYTE" />
+            <param key="0x02" name="Reports to Follow" type="BYTE" />
+            <param key="0x03" name="NodeID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x01" name="ASSOCIATION_SET" help="Association Set" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x01" name="ASSOCIATION_SET" help="Association Set" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x85" version="2" name="COMMAND_CLASS_ASSOCIATION" help="Command Class Association" read_only="false" comment="">
-        <cmd key="0x02" name="ASSOCIATION_GET" help="Association Get" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x85" version="2" name="COMMAND_CLASS_ASSOCIATION" help="Command Class Association">
+        <cmd key="0x02" name="ASSOCIATION_GET" help="Association Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="ASSOCIATION_GROUPINGS_GET" help="Association Groupings Get" comment="" />
-        <cmd key="0x06" name="ASSOCIATION_GROUPINGS_REPORT" help="Association Groupings Report" comment="">
-            <param key="0x00" name="Supported Groupings" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="ASSOCIATION_GROUPINGS_GET" help="Association Groupings Get" support_mode="RX" />
+        <cmd key="0x06" name="ASSOCIATION_GROUPINGS_REPORT" help="Association Groupings Report" support_mode="TX">
+            <param key="0x00" name="Supported Groupings" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="ASSOCIATION_REMOVE" help="Association Remove" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x04" name="ASSOCIATION_REMOVE" help="Association Remove" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x03" name="ASSOCIATION_REPORT" help="Association Report" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Max Nodes Supported" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="ASSOCIATION_REPORT" help="Association Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Max Nodes Supported" type="BYTE" />
+            <param key="0x02" name="Reports to Follow" type="BYTE" />
+            <param key="0x03" name="NodeID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x02" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="NodeID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        </cmd>
+        <cmd key="0x01" name="ASSOCIATION_SET" help="Association Set" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x01" name="ASSOCIATION_SET" help="Association Set" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0B" name="ASSOCIATION_SPECIFIC_GROUP_GET" help="Association Specific Group Get" support_mode="RX" />
+        <cmd key="0x0C" name="ASSOCIATION_SPECIFIC_GROUP_REPORT" help="Association Specific Group Report" support_mode="TX">
+            <param key="0x00" name="Group" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x85" version="3" name="COMMAND_CLASS_ASSOCIATION" help="Command Class Association">
+        <cmd key="0x02" name="ASSOCIATION_GET" help="Association Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="ASSOCIATION_GROUPINGS_GET" help="Association Groupings Get" support_mode="RX" />
+        <cmd key="0x06" name="ASSOCIATION_GROUPINGS_REPORT" help="Association Groupings Report" support_mode="TX">
+            <param key="0x00" name="Supported Groupings" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="ASSOCIATION_REMOVE" help="Association Remove" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        </cmd>
+        <cmd key="0x03" name="ASSOCIATION_REPORT" help="Association Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Max Nodes Supported" type="BYTE" />
+            <param key="0x02" name="Reports to Follow" type="BYTE" />
+            <param key="0x03" name="NodeID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0B" name="ASSOCIATION_SPECIFIC_GROUP_GET" help="Association Specific Group Get" comment="" />
-        <cmd key="0x0C" name="ASSOCIATION_SPECIFIC_GROUP_REPORT" help="Association Specific Group Report" comment="">
-            <param key="0x00" name="Group" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x01" name="ASSOCIATION_SET" help="Association Set" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
+        <cmd key="0x0B" name="ASSOCIATION_SPECIFIC_GROUP_GET" help="Association Specific Group Get" support_mode="RX" />
+        <cmd key="0x0C" name="ASSOCIATION_SPECIFIC_GROUP_REPORT" help="Association Specific Group Report" support_mode="TX">
+            <param key="0x00" name="Group" type="BYTE" />
+        </cmd>
     </cmd_class>
-    <cmd_class key="0x95" version="1" name="COMMAND_CLASS_AV_CONTENT_DIRECTORY_MD" help="Command Class Av Content Directory Md" read_only="false" comment="">
-        <cmd key="0x03" name="AV_CONTENT_BROWSE_MD_BY_LETTER_GET" help="Av Content Browse Md By Letter Get" comment="" />
-        <cmd key="0x04" name="AV_CONTENT_BROWSE_MD_BY_LETTER_REPORT" help="Av Content Browse Md By Letter Report" comment="" />
-        <cmd key="0x05" name="AV_CONTENT_BROWSE_MD_CHILD_COUNT_GET" help="Av Content Browse Md Child Count Get" comment="" />
-        <cmd key="0x06" name="AV_CONTENT_BROWSE_MD_CHILD_COUNT_REPORT" help="Av Content Browse Md Child Count Report" comment="" />
-        <cmd key="0x01" name="AV_CONTENT_BROWSE_MD_GET" help="Av Content Browse Md Get" comment="" />
-        <cmd key="0x02" name="AV_CONTENT_BROWSE_MD_REPORT" help="Av Content Browse Md Report" comment="" />
-        <cmd key="0x07" name="AV_MATCH_ITEM_TO_RENDERER_MD_GET" help="Av Match Item To Renderer Md Get" comment="" />
-        <cmd key="0x08" name="AV_MATCH_ITEM_TO_RENDERER_MD_REPORT" help="Av Match Item To Renderer Md Report" comment="" />
+    <cmd_class key="0x95" version="1" name="COMMAND_CLASS_AV_CONTENT_DIRECTORY_MD" help="Command Class Av Content Directory Md">
+        <cmd key="0x03" name="AV_CONTENT_BROWSE_MD_BY_LETTER_GET" help="Av Content Browse Md By Letter Get" />
+        <cmd key="0x04" name="AV_CONTENT_BROWSE_MD_BY_LETTER_REPORT" help="Av Content Browse Md By Letter Report" />
+        <cmd key="0x05" name="AV_CONTENT_BROWSE_MD_CHILD_COUNT_GET" help="Av Content Browse Md Child Count Get" />
+        <cmd key="0x06" name="AV_CONTENT_BROWSE_MD_CHILD_COUNT_REPORT" help="Av Content Browse Md Child Count Report" />
+        <cmd key="0x01" name="AV_CONTENT_BROWSE_MD_GET" help="Av Content Browse Md Get" />
+        <cmd key="0x02" name="AV_CONTENT_BROWSE_MD_REPORT" help="Av Content Browse Md Report" />
+        <cmd key="0x07" name="AV_MATCH_ITEM_TO_RENDERER_MD_GET" help="Av Match Item To Renderer Md Get" />
+        <cmd key="0x08" name="AV_MATCH_ITEM_TO_RENDERER_MD_REPORT" help="Av Match Item To Renderer Md Report" />
     </cmd_class>
-    <cmd_class key="0x97" version="1" name="COMMAND_CLASS_AV_CONTENT_SEARCH_MD" help="Command Class Av Content Search Md" read_only="false" comment="">
-        <cmd key="0x01" name="AV_CONTENT_SEARCH_MD_GET" help="Av Content Search Md Get" comment="" />
-        <cmd key="0x02" name="AV_CONTENT_SEARCH_MD_REPORT" help="Av Content Search Md Report" comment="" />
+    <cmd_class key="0x97" version="1" name="COMMAND_CLASS_AV_CONTENT_SEARCH_MD" help="Command Class Av Content Search Md">
+        <cmd key="0x01" name="AV_CONTENT_SEARCH_MD_GET" help="Av Content Search Md Get" />
+        <cmd key="0x02" name="AV_CONTENT_SEARCH_MD_REPORT" help="Av Content Search Md Report" />
     </cmd_class>
-    <cmd_class key="0x96" version="1" name="COMMAND_CLASS_AV_RENDERER_STATUS" help="Command Class Av Renderer Status" read_only="false" comment="">
-        <cmd key="0x01" name="AV_RENDERER_STATUS_GET" help="Av Renderer Status Get" comment="" />
-        <cmd key="0x02" name="AV_RENDERER_STATUS_REPORT" help="Av Renderer Status Report" comment="" />
+    <cmd_class key="0x96" version="1" name="COMMAND_CLASS_AV_RENDERER_STATUS" help="Command Class Av Renderer Status">
+        <cmd key="0x01" name="AV_RENDERER_STATUS_GET" help="Av Renderer Status Get" />
+        <cmd key="0x02" name="AV_RENDERER_STATUS_REPORT" help="Av Renderer Status Report" />
     </cmd_class>
-    <cmd_class key="0x99" version="1" name="COMMAND_CLASS_AV_TAGGING_MD" help="Command Class Av Tagging Md" read_only="false" comment="">
-        <cmd key="0x01" name="AV_TAGGING_MD_GET" help="Av Tagging Md Get" comment="" />
-        <cmd key="0x02" name="AV_TAGGING_MD_REPORT" help="Av Tagging Md Report" comment="" />
+    <cmd_class key="0x99" version="1" name="COMMAND_CLASS_AV_TAGGING_MD" help="Command Class Av Tagging Md">
+        <cmd key="0x01" name="AV_TAGGING_MD_GET" help="Av Tagging Md Get" />
+        <cmd key="0x02" name="AV_TAGGING_MD_REPORT" help="Av Tagging Md Report" />
     </cmd_class>
-    <cmd_class key="0x36" version="1" name="COMMAND_CLASS_BASIC_TARIFF_INFO" help="Command Class Basic Tariff Info" read_only="false" comment="">
-        <cmd key="0x01" name="BASIC_TARIFF_INFO_GET" help="Basic Tariff Info Get" comment="" />
-        <cmd key="0x02" name="BASIC_TARIFF_INFO_REPORT" help="Basic Tariff Info Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Total No. Import Rates" fieldmask="0x0F" shifter="0" />
+    <cmd_class key="0x36" version="1" name="COMMAND_CLASS_BASIC_TARIFF_INFO" help="Command Class Basic Tariff Info">
+        <cmd key="0x01" name="BASIC_TARIFF_INFO_GET" help="Basic Tariff Info Get" support_mode="RX" />
+        <cmd key="0x02" name="BASIC_TARIFF_INFO_REPORT" help="Basic Tariff Info Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Total No. Import Rates" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved1" fieldmask="0x70" shifter="4" />
                 <bitflag key="0x02" flagname="Dual" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="E1 Current Rate in Use" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="E1 Current Rate in Use" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="E1 Rate Consumption Register" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="E1 Time for Next Rate Hours" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="E1 Time for Next Rate Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="E1 Time for Next Rate Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="E2 Current Rate in Use" fieldmask="0x0F" shifter="0" />
+            <param key="0x02" name="E1 Rate Consumption Register" type="DWORD" />
+            <param key="0x03" name="E1 Time for Next Rate Hours" type="BYTE" />
+            <param key="0x04" name="E1 Time for Next Rate Minutes" type="BYTE" />
+            <param key="0x05" name="E1 Time for Next Rate Seconds" type="BYTE" />
+            <param key="0x06" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="E2 Current Rate in Use" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved3" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x07" name="E2 Rate Consumption Register" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x07" name="E2 Rate Consumption Register" type="DWORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x50" version="1" name="COMMAND_CLASS_BASIC_WINDOW_COVERING" help="Command Class Basic Window Covering" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x01" name="BASIC_WINDOW_COVERING_START_LEVEL_CHANGE" help="Basic Window Covering Start Level Change" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x3F" shifter="0" />
+    <cmd_class key="0x50" version="1" name="COMMAND_CLASS_BASIC_WINDOW_COVERING" help="Command Class Basic Window Covering" comment="[OBSOLETED]">
+        <cmd key="0x01" name="BASIC_WINDOW_COVERING_START_LEVEL_CHANGE" help="Basic Window Covering Start Level Change" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Open/ Close" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Reserved2" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x02" name="BASIC_WINDOW_COVERING_STOP_LEVEL_CHANGE" help="Basic Window Covering Stop Level Change" comment="" />
+        <cmd key="0x02" name="BASIC_WINDOW_COVERING_STOP_LEVEL_CHANGE" help="Basic Window Covering Stop Level Change" support_mode="RX" />
     </cmd_class>
-    <cmd_class key="0x20" version="1" name="COMMAND_CLASS_BASIC" help="Command Class Basic" read_only="false" comment="">
-        <cmd key="0x02" name="BASIC_GET" help="Basic Get" comment="" />
-        <cmd key="0x03" name="BASIC_REPORT" help="Basic Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x20" version="1" name="COMMAND_CLASS_BASIC" help="Command Class Basic">
+        <cmd key="0x02" name="BASIC_GET" help="Basic Get" support_mode="RX" />
+        <cmd key="0x03" name="BASIC_REPORT" help="Basic Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="BASIC_SET" help="Basic Set" support_mode="RX">
+            <param key="0x00" name="Value" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x20" version="2" name="COMMAND_CLASS_BASIC" help="Command Class Basic">
+        <cmd key="0x02" name="BASIC_GET" help="Basic Get" support_mode="RX" />
+        <cmd key="0x03" name="BASIC_REPORT" help="Basic Report" support_mode="TX">
+            <param key="0x00" name="Current Value" type="BYTE" />
+            <param key="0x01" name="Target Value" type="BYTE" />
+            <param key="0x02" name="Duration" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="BASIC_SET" help="Basic Set" support_mode="RX">
+            <param key="0x00" name="Value" type="BYTE" />
         </cmd>
-        <cmd key="0x01" name="BASIC_SET" help="Basic Set" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x80" version="1" name="COMMAND_CLASS_BATTERY" help="Command Class Battery">
+        <cmd key="0x02" name="BATTERY_GET" help="Battery Get" support_mode="RX" />
+        <cmd key="0x03" name="BATTERY_REPORT" help="Battery Report" support_mode="TX">
+            <param key="0x00" name="Battery Level" type="BYTE">
+                <bitflag key="0x01" flagname="battery low warning" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x20" version="2" name="COMMAND_CLASS_BASIC" help="Command Class Basic" read_only="false" comment="">
-        <cmd key="0x02" name="BASIC_GET" help="Basic Get" comment="" />
-        <cmd key="0x03" name="BASIC_REPORT" help="Basic Report" comment="">
-            <param key="0x00" name="Current Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x80" version="2" name="COMMAND_CLASS_BATTERY" help="Command Class Battery">
+        <cmd key="0x02" name="BATTERY_GET" help="Battery Get" support_mode="RX" />
+        <cmd key="0x03" name="BATTERY_REPORT" help="Battery Report" support_mode="TX">
+            <param key="0x00" name="Battery Level" type="BYTE">
+                <bitflag key="0x01" flagname="battery low warning" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Target Value" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Replace/recharge" fieldmask="0x03" />
+                <bitflag key="0x01" flagname="Low fluid" flagmask="0x04" />
+                <bitflag key="0x02" flagname="Overheating" flagmask="0x08" />
+                <bitflag key="0x03" flagname="Backup battery" flagmask="0x10" />
+                <bitflag key="0x04" flagname="Rechargeable" flagmask="0x20" />
+                <fieldenum key="0x05" fieldname="Charging Status" fieldmask="0xC0" shifter="6">
+                    <fieldenum value="Discharging" />
+                    <fieldenum value="Charging" />
+                    <fieldenum value="Maintaining" />
+                </fieldenum>
             </param>
-            <param key="0x02" name="Duration" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Disconnected" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xFE" shifter="1" />
             </param>
         </cmd>
-        <cmd key="0x01" name="BASIC_SET" help="Basic Set" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="BATTERY_HEALTH_GET" help="Battery Health Get" />
+        <cmd key="0x05" name="BATTERY_HEALTH_REPORT" help="Battery Health Report">
+            <param key="0x00" name="Maximum Capacity" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x02" name="Battery Temperature" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x80" version="1" name="COMMAND_CLASS_BATTERY" help="Command Class Battery" read_only="false" comment="">
-        <cmd key="0x02" name="BATTERY_GET" help="Battery Get" comment="" />
-        <cmd key="0x03" name="BATTERY_REPORT" help="Battery Report" comment="">
-            <param key="0x00" name="Battery Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x80" version="3" name="COMMAND_CLASS_BATTERY" help="Command Class Battery">
+        <cmd key="0x02" name="BATTERY_GET" help="Battery Get" support_mode="RX" />
+        <cmd key="0x03" name="BATTERY_REPORT" help="Battery Report" support_mode="TX">
+            <param key="0x00" name="Battery Level" type="BYTE">
                 <bitflag key="0x01" flagname="battery low warning" flagmask="0xFF" />
             </param>
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Replace/recharge" fieldmask="0x03" />
+                <bitflag key="0x01" flagname="Low fluid" flagmask="0x04" />
+                <bitflag key="0x02" flagname="Overheating" flagmask="0x08" />
+                <bitflag key="0x03" flagname="Backup battery" flagmask="0x10" />
+                <bitflag key="0x04" flagname="Rechargeable" flagmask="0x20" />
+                <fieldenum key="0x05" fieldname="Charging Status" fieldmask="0xC0" shifter="6">
+                    <fieldenum value="Discharging" />
+                    <fieldenum value="Charging" />
+                    <fieldenum value="Maintaining" />
+                </fieldenum>
+            </param>
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Disconnected" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Low Temperature Status" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved1" fieldmask="0xFC" shifter="2" />
+            </param>
+        </cmd>
+        <cmd key="0x04" name="BATTERY_HEALTH_GET" help="Battery Health Get" />
+        <cmd key="0x05" name="BATTERY_HEALTH_REPORT" help="Battery Health Report">
+            <param key="0x00" name="Maximum Capacity" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x02" name="Battery Temperature" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
+            </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x2A" version="1" name="COMMAND_CLASS_CHIMNEY_FAN" help="Command Class Chimney Fan" read_only="false" comment="">
-        <cmd key="0x20" name="CHIMNEY_FAN_ALARM_LOG_GET" help="Chimney Fan Alarm Log Get" comment="" />
-        <cmd key="0x21" name="CHIMNEY_FAN_ALARM_LOG_REPORT" help="Chimney Fan Alarm Log Report" comment="">
-            <param key="0x00" name="Alarm Event 1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+    <cmd_class key="0x2A" version="1" name="COMMAND_CLASS_CHIMNEY_FAN" help="Command Class Chimney Fan">
+        <cmd key="0x20" name="CHIMNEY_FAN_ALARM_LOG_GET" help="Chimney Fan Alarm Log Get" />
+        <cmd key="0x21" name="CHIMNEY_FAN_ALARM_LOG_REPORT" help="Chimney Fan Alarm Log Report">
+            <param key="0x00" name="Alarm Event 1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Reserved11" flagmask="0x01" />
                 <bitflag key="0x01" flagname="External Alarm 1" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Sensor Error 1" flagmask="0x04" />
@@ -1653,7 +1803,7 @@
                 <bitfield key="0x04" fieldname="Reserved12" fieldmask="0x70" shifter="4" />
                 <bitflag key="0x05" flagname="Alarm still active 1" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Alarm Event 2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x01" name="Alarm Event 2" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Reserved21" flagmask="0x01" />
                 <bitflag key="0x01" flagname="External Alarm 2" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Sensor Error 2" flagmask="0x04" />
@@ -1661,7 +1811,7 @@
                 <bitfield key="0x04" fieldname="Reserved22" fieldmask="0x70" shifter="4" />
                 <bitflag key="0x05" flagname="Alarm still active 2" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Alarm Event 3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x02" name="Alarm Event 3" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Reserved31" flagmask="0x01" />
                 <bitflag key="0x01" flagname="External Alarm 3" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Sensor Error 3" flagmask="0x04" />
@@ -1669,7 +1819,7 @@
                 <bitfield key="0x04" fieldname="Reserved32" fieldmask="0x70" shifter="4" />
                 <bitflag key="0x05" flagname="Alarm still active 3" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Alarm Event 4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x03" name="Alarm Event 4" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Reserved41" flagmask="0x01" />
                 <bitflag key="0x01" flagname="External Alarm 4" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Sensor Error 4" flagmask="0x04" />
@@ -1677,7 +1827,7 @@
                 <bitfield key="0x04" fieldname="Reserved42" fieldmask="0x70" shifter="4" />
                 <bitflag key="0x05" flagname="Alarm still active 4" flagmask="0x80" />
             </param>
-            <param key="0x04" name="Alarm Event 5" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x04" name="Alarm Event 5" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Reserved51" flagmask="0x01" />
                 <bitflag key="0x01" flagname="External Alarm 5" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Sensor Error 5" flagmask="0x04" />
@@ -1686,25 +1836,25 @@
                 <bitflag key="0x05" flagname="Alarm still active 5" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x1F" name="CHIMNEY_FAN_ALARM_LOG_SET" help="Chimney Fan Alarm Log Set" comment="">
-            <param key="0x00" name="Message" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x1F" name="CHIMNEY_FAN_ALARM_LOG_SET" help="Chimney Fan Alarm Log Set">
+            <param key="0x00" name="Message" type="CONST">
                 <const key="0x00" flagname="Reset log" flagmask="0x08" />
             </param>
         </cmd>
-        <cmd key="0x23" name="CHIMNEY_FAN_ALARM_STATUS_GET" help="Chimney Fan Alarm Status Get" comment="" />
-        <cmd key="0x24" name="CHIMNEY_FAN_ALARM_STATUS_REPORT" help="Chimney Fan Alarm Status Report" comment="">
-            <param key="0x00" name="Alarm Status" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x23" name="CHIMNEY_FAN_ALARM_STATUS_GET" help="Chimney Fan Alarm Status Get" />
+        <cmd key="0x24" name="CHIMNEY_FAN_ALARM_STATUS_REPORT" help="Chimney Fan Alarm Status Report">
+            <param key="0x00" name="Alarm Status" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Service" flagmask="0x01" />
                 <bitflag key="0x01" flagname="External Alarm" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Sensor Error" flagmask="0x04" />
                 <bitflag key="0x03" flagname="Alarm Temperature Exceeded" flagmask="0x08" />
-                <bitfield key="0x04" fieldname="Not Used " fieldmask="0x30" shifter="4" />
+                <bitfield key="0x04" fieldname="Not Used" fieldmask="0x30" shifter="4" />
                 <bitflag key="0x05" flagname="Speed change Enable" flagmask="0x40" />
                 <bitflag key="0x06" flagname="Start Temperature Exceeded" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x22" name="CHIMNEY_FAN_ALARM_STATUS_SET" help="Chimney Fan Alarm Status Set" comment="">
-            <param key="0x00" name="Message" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x22" name="CHIMNEY_FAN_ALARM_STATUS_SET" help="Chimney Fan Alarm Status Set">
+            <param key="0x00" name="Message" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Not Used1" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Acknowledge External Alarm" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Acknowledge Sensor Error" flagmask="0x04" />
@@ -1712,179 +1862,156 @@
                 <bitfield key="0x04" fieldname="Not Used2" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x0E" name="CHIMNEY_FAN_ALARM_TEMP_GET" help="Chimney Fan Alarm Temp Get" comment="" />
-        <cmd key="0x0F" name="CHIMNEY_FAN_ALARM_TEMP_REPORT" help="Chimney Fan Alarm Temp Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x0E" name="CHIMNEY_FAN_ALARM_TEMP_GET" help="Chimney Fan Alarm Temp Get" />
+        <cmd key="0x0F" name="CHIMNEY_FAN_ALARM_TEMP_REPORT" help="Chimney Fan Alarm Temp Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x01" name="Value" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="CHIMNEY_FAN_ALARM_TEMP_SET" help="Chimney Fan Alarm Temp Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x0D" name="CHIMNEY_FAN_ALARM_TEMP_SET" help="Chimney Fan Alarm Temp Set">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x01" name="Value" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x11" name="CHIMNEY_FAN_BOOST_TIME_GET" help="Chimney Fan Boost Time Get" comment="" />
-        <cmd key="0x12" name="CHIMNEY_FAN_BOOST_TIME_REPORT" help="Chimney Fan Boost Time Report" comment="">
-            <param key="0x00" name="Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x11" name="CHIMNEY_FAN_BOOST_TIME_GET" help="Chimney Fan Boost Time Get" />
+        <cmd key="0x12" name="CHIMNEY_FAN_BOOST_TIME_REPORT" help="Chimney Fan Boost Time Report">
+            <param key="0x00" name="Time" type="BYTE" />
         </cmd>
-        <cmd key="0x10" name="CHIMNEY_FAN_BOOST_TIME_SET" help="Chimney Fan Boost Time Set" comment="">
-            <param key="0x00" name="Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x10" name="CHIMNEY_FAN_BOOST_TIME_SET" help="Chimney Fan Boost Time Set">
+            <param key="0x00" name="Time" type="BYTE" />
         </cmd>
-        <cmd key="0x28" name="CHIMNEY_FAN_DEFAULT_SET" help="Chimney Fan Default Set" comment="" />
-        <cmd key="0x26" name="CHIMNEY_FAN_MIN_SPEED_GET" help="Chimney Fan Min Speed Get" comment="" />
-        <cmd key="0x27" name="CHIMNEY_FAN_MIN_SPEED_REPORT" help="Chimney Fan Min Speed Report" comment="">
-            <param key="0x00" name="Min Speed" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x28" name="CHIMNEY_FAN_DEFAULT_SET" help="Chimney Fan Default Set" />
+        <cmd key="0x26" name="CHIMNEY_FAN_MIN_SPEED_GET" help="Chimney Fan Min Speed Get" />
+        <cmd key="0x27" name="CHIMNEY_FAN_MIN_SPEED_REPORT" help="Chimney Fan Min Speed Report">
+            <param key="0x00" name="Min Speed" type="BYTE" />
         </cmd>
-        <cmd key="0x25" name="CHIMNEY_FAN_MIN_SPEED_SET" help="Chimney Fan Min Speed Set" comment="">
-            <param key="0x00" name="Min Speed" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x25" name="CHIMNEY_FAN_MIN_SPEED_SET" help="Chimney Fan Min Speed Set">
+            <param key="0x00" name="Min Speed" type="BYTE" />
         </cmd>
-        <cmd key="0x17" name="CHIMNEY_FAN_MODE_GET" help="Chimney Fan Mode Get" comment="" />
-        <cmd key="0x18" name="CHIMNEY_FAN_MODE_REPORT" help="Chimney Fan Mode Report" comment="">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x17" name="CHIMNEY_FAN_MODE_GET" help="Chimney Fan Mode Get" />
+        <cmd key="0x18" name="CHIMNEY_FAN_MODE_REPORT" help="Chimney Fan Mode Report">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="ON" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x16" name="CHIMNEY_FAN_MODE_SET" help="Chimney Fan Mode Set" comment="">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x16" name="CHIMNEY_FAN_MODE_SET" help="Chimney Fan Mode Set">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="ON" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x1A" name="CHIMNEY_FAN_SETUP_GET" help="Chimney Fan Setup Get" comment="" />
-        <cmd key="0x1B" name="CHIMNEY_FAN_SETUP_REPORT" help="Chimney Fan Setup Report" comment="">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x1A" name="CHIMNEY_FAN_SETUP_GET" help="Chimney Fan Setup Get" />
+        <cmd key="0x1B" name="CHIMNEY_FAN_SETUP_REPORT" help="Chimney Fan Setup Report">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="ON" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Boost Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Boost Time" type="BYTE" />
+            <param key="0x02" name="Stop Time" type="BYTE" />
+            <param key="0x03" name="Min. Speed" type="BYTE" />
+            <param key="0x04" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size 1" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale 1" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Precision 1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Stop Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Start Temperature" type="VARIANT">
+                <variant paramoffs="4" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Min. Speed" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size 1" fieldmask="0x07" shifter="0" />
-                <bitfield key="0x01" fieldname="Scale 1" fieldmask="0x18" shifter="3" />
-                <bitfield key="0x02" fieldname="Precision 1" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x05" name="Start Temperature" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="4" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
-            </param>
-            <param key="0x06" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size 2" fieldmask="0x07" shifter="0" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size 2" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale 2" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision 2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Stop Temperature" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x07" name="Stop Temperature" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x07" />
             </param>
-            <param key="0x08" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size 3" fieldmask="0x07" shifter="0" />
+            <param key="0x08" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size 3" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale 3" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision 3" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x09" name="Alarm Temperature Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="8" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x09" name="Alarm Temperature Value" type="VARIANT">
+                <variant paramoffs="8" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x19" name="CHIMNEY_FAN_SETUP_SET" help="Chimney Fan Setup Set" comment="">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x19" name="CHIMNEY_FAN_SETUP_SET" help="Chimney Fan Setup Set">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="ON" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Boost Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Stop Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Min. Speed" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size 1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Boost Time" type="BYTE" />
+            <param key="0x02" name="Stop Time" type="BYTE" />
+            <param key="0x03" name="Min. Speed" type="BYTE" />
+            <param key="0x04" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size 1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale 1" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision 1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Start Temperature" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="4" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x05" name="Start Temperature" type="VARIANT">
+                <variant paramoffs="4" sizemask="0x07" />
             </param>
-            <param key="0x06" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size 2" fieldmask="0x07" shifter="0" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size 2" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale 2" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision 2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Stop Temperature" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x07" name="Stop Temperature" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x07" />
             </param>
-            <param key="0x08" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size 3" fieldmask="0x07" shifter="0" />
+            <param key="0x08" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size 3" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale 3" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision 3" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x09" name="Alarm Temperature Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="8" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x09" name="Alarm Temperature Value" type="VARIANT">
+                <variant paramoffs="8" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x05" name="CHIMNEY_FAN_SPEED_GET" help="Chimney Fan Speed Get" comment="" />
-        <cmd key="0x06" name="CHIMNEY_FAN_SPEED_REPORT" help="Chimney Fan Speed Report" comment="">
-            <param key="0x00" name="Speed" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="CHIMNEY_FAN_SPEED_GET" help="Chimney Fan Speed Get" />
+        <cmd key="0x06" name="CHIMNEY_FAN_SPEED_REPORT" help="Chimney Fan Speed Report">
+            <param key="0x00" name="Speed" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="CHIMNEY_FAN_SPEED_SET" help="Chimney Fan Speed Set" comment="">
-            <param key="0x00" name="Speed" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x04" name="CHIMNEY_FAN_SPEED_SET" help="Chimney Fan Speed Set">
+            <param key="0x00" name="Speed" type="BYTE">
                 <bitflag key="0x01" flagname="Speed down" flagmask="0x65" />
                 <bitflag key="0x02" flagname="Speed up" flagmask="0xC8" />
             </param>
         </cmd>
-        <cmd key="0x08" name="CHIMNEY_FAN_START_TEMP_GET" help="Chimney Fan Start Temp Get" comment="" />
-        <cmd key="0x09" name="CHIMNEY_FAN_START_TEMP_REPORT" help="Chimney Fan Start Temp Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x08" name="CHIMNEY_FAN_START_TEMP_GET" help="Chimney Fan Start Temp Get" />
+        <cmd key="0x09" name="CHIMNEY_FAN_START_TEMP_REPORT" help="Chimney Fan Start Temp Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x01" name="Value" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x07" name="CHIMNEY_FAN_START_TEMP_SET" help="Chimney Fan Start Temp Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x07" name="CHIMNEY_FAN_START_TEMP_SET" help="Chimney Fan Start Temp Set">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x01" name="Value" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x02" name="CHIMNEY_FAN_STATE_GET" help="Chimney Fan State Get" comment="" />
-        <cmd key="0x03" name="CHIMNEY_FAN_STATE_REPORT" help="Chimney Fan State Report" comment="">
-            <param key="0x00" name="State" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="CHIMNEY_FAN_STATE_GET" help="Chimney Fan State Get" />
+        <cmd key="0x03" name="CHIMNEY_FAN_STATE_REPORT" help="Chimney Fan State Report">
+            <param key="0x00" name="State" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="Boost" flagmask="0x01" />
                 <const key="0x02" flagname="Exhaust" flagmask="0x02" />
@@ -1893,19 +2020,19 @@
                 <const key="0x05" flagname="Stop" flagmask="0x05" />
                 <const key="0x06" flagname="Venting_EX" flagmask="0x06" />
                 <const key="0x07" flagname="Service" flagmask="0x07" />
-                <const key="0x08" flagname="Sensor Failure  " flagmask="0x08" />
+                <const key="0x08" flagname="Sensor Failure" flagmask="0x08" />
                 <const key="0x09" flagname="Chimney Fire" flagmask="0x09" />
                 <const key="0x0A" flagname="External alarm" flagmask="0x0A" />
             </param>
         </cmd>
-        <cmd key="0x01" name="CHIMNEY_FAN_STATE_SET" help="Chimney Fan State Set" comment="">
-            <param key="0x00" name="State" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="CHIMNEY_FAN_STATE_SET" help="Chimney Fan State Set">
+            <param key="0x00" name="State" type="CONST">
                 <const key="0x00" flagname="Next State" flagmask="0x01" />
             </param>
         </cmd>
-        <cmd key="0x1D" name="CHIMNEY_FAN_STATUS_GET" help="Chimney Fan Status Get" comment="" />
-        <cmd key="0x1E" name="CHIMNEY_FAN_STATUS_REPORT" help="Chimney Fan Status Report" comment="">
-            <param key="0x00" name="State" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x1D" name="CHIMNEY_FAN_STATUS_GET" help="Chimney Fan Status Get" />
+        <cmd key="0x1E" name="CHIMNEY_FAN_STATUS_REPORT" help="Chimney Fan Status Report">
+            <param key="0x00" name="State" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="Boost" flagmask="0x01" />
                 <const key="0x02" flagname="Exhaust" flagmask="0x02" />
@@ -1914,426 +2041,340 @@
                 <const key="0x05" flagname="Stop" flagmask="0x05" />
                 <const key="0x06" flagname="Venting_EX" flagmask="0x06" />
                 <const key="0x07" flagname="Service" flagmask="0x07" />
-                <const key="0x08" flagname="Sensor Failure  " flagmask="0x08" />
+                <const key="0x08" flagname="Sensor Failure" flagmask="0x08" />
                 <const key="0x09" flagname="Chimney Fire" flagmask="0x09" />
                 <const key="0x0A" flagname="External alarm" flagmask="0x0A" />
             </param>
-            <param key="0x01" name="Speed" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Alarm Status" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x01" name="Speed" type="BYTE" />
+            <param key="0x02" name="Alarm Status" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Service" flagmask="0x01" />
                 <bitflag key="0x01" flagname="External Alarm" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Sensor Error" flagmask="0x04" />
                 <bitflag key="0x03" flagname="Alarm Temperature Exceeded" flagmask="0x08" />
-                <bitfield key="0x04" fieldname="Not Used " fieldmask="0x30" shifter="4" />
+                <bitfield key="0x04" fieldname="Not Used" fieldmask="0x30" shifter="4" />
                 <bitflag key="0x05" flagname="Speed change Enable" flagmask="0x40" />
                 <bitflag key="0x06" flagname="Start Temperature Exceeded" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x04" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="3" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x04" name="Value" type="VARIANT">
+                <variant paramoffs="3" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x0B" name="CHIMNEY_FAN_STOP_TEMP_GET" help="Chimney Fan Stop Temp Get" comment="" />
-        <cmd key="0x0C" name="CHIMNEY_FAN_STOP_TEMP_REPORT" help="Chimney Fan Stop Temp Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x0B" name="CHIMNEY_FAN_STOP_TEMP_GET" help="Chimney Fan Stop Temp Get" />
+        <cmd key="0x0C" name="CHIMNEY_FAN_STOP_TEMP_REPORT" help="Chimney Fan Stop Temp Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x01" name="Value" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="CHIMNEY_FAN_STOP_TEMP_SET" help="Chimney Fan Stop Temp Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x0A" name="CHIMNEY_FAN_STOP_TEMP_SET" help="Chimney Fan Stop Temp Set">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x01" name="Value" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x14" name="CHIMNEY_FAN_STOP_TIME_GET" help="Chimney Fan Stop Time Get" comment="" />
-        <cmd key="0x15" name="CHIMNEY_FAN_STOP_TIME_REPORT" help="Chimney Fan Stop Time Report" comment="">
-            <param key="0x00" name="Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x14" name="CHIMNEY_FAN_STOP_TIME_GET" help="Chimney Fan Stop Time Get" />
+        <cmd key="0x15" name="CHIMNEY_FAN_STOP_TIME_REPORT" help="Chimney Fan Stop Time Report">
+            <param key="0x00" name="Time" type="BYTE" />
         </cmd>
-        <cmd key="0x13" name="CHIMNEY_FAN_STOP_TIME_SET" help="Chimney Fan Stop Time Set" comment="">
-            <param key="0x00" name="Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x13" name="CHIMNEY_FAN_STOP_TIME_SET" help="Chimney Fan Stop Time Set">
+            <param key="0x00" name="Time" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x46" version="1" name="COMMAND_CLASS_CLIMATE_CONTROL_SCHEDULE" help="Command Class Climate Control Schedule" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x04" name="SCHEDULE_CHANGED_GET" help="Schedule Changed Get" comment="" />
-        <cmd key="0x05" name="SCHEDULE_CHANGED_REPORT" help="Schedule Changed Report" comment="">
-            <param key="0x00" name="ChangeCounter" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x02" name="SCHEDULE_GET" help="Schedule Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Weekday" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x46" version="1" name="COMMAND_CLASS_CLIMATE_CONTROL_SCHEDULE" help="Command Class Climate Control Schedule" comment="[DEPRECATED]">
+        <cmd key="0x04" name="SCHEDULE_CHANGED_GET" help="Schedule Changed Get" support_mode="RX" />
+        <cmd key="0x05" name="SCHEDULE_CHANGED_REPORT" help="Schedule Changed Report" support_mode="TX">
+            <param key="0x00" name="ChangeCounter" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="SCHEDULE_GET" help="Schedule Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Weekday" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
         </cmd>
-        <cmd key="0x07" name="SCHEDULE_OVERRIDE_GET" help="Schedule Override Get" comment="" />
-        <cmd key="0x08" name="SCHEDULE_OVERRIDE_REPORT" help="Schedule Override Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Override Type" fieldmask="0x03" shifter="0" />
+        <cmd key="0x07" name="SCHEDULE_OVERRIDE_GET" help="Schedule Override Get" support_mode="RX" />
+        <cmd key="0x08" name="SCHEDULE_OVERRIDE_REPORT" help="Schedule Override Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Override Type" fieldmask="0x03">
+                    <fieldenum value="No override" />
+                    <fieldenum value="Temporary override" />
+                    <fieldenum value="Permanent override" />
+                    <fieldenum value="Reserved" />
+                </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Override State" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="No override" flagmask="0x00" />
-                <const key="0x01" flagname="Temporary override" flagmask="0x01" />
-                <const key="0x02" flagname="Permanent override" flagmask="0x02" />
-                <const key="0x03" flagname="Reserved" flagmask="0x03" />
+            <param key="0x01" name="Override State" type="CONST">
+                <const key="0x00" flagname="Frost Protection" flagmask="0x79" />
+                <const key="0x01" flagname="Energy Saving Mode" flagmask="0x7A" />
+                <const key="0x02" flagname="Unused State" flagmask="0x7F" />
             </param>
         </cmd>
-        <cmd key="0x06" name="SCHEDULE_OVERRIDE_SET" help="Schedule Override Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Override Type" fieldmask="0x03" shifter="0" />
+        <cmd key="0x06" name="SCHEDULE_OVERRIDE_SET" help="Schedule Override Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Override Type" fieldmask="0x03">
+                    <fieldenum value="No override" />
+                    <fieldenum value="Temporary override" />
+                    <fieldenum value="Permanent override" />
+                    <fieldenum value="Reserved" />
+                </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Override State" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="No override" flagmask="0x00" />
-                <const key="0x01" flagname="Temporary override" flagmask="0x01" />
-                <const key="0x02" flagname="Permanent override" flagmask="0x02" />
-                <const key="0x03" flagname="Reserved" flagmask="0x03" />
+            <param key="0x01" name="Override State" type="CONST">
+                <const key="0x00" flagname="Frost Protection" flagmask="0x79" />
+                <const key="0x01" flagname="Energy Saving Mode" flagmask="0x7A" />
+                <const key="0x02" flagname="Unused State" flagmask="0x7F" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SCHEDULE_REPORT" help="Schedule Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Weekday" fieldmask="0x07" shifter="0" />
+        <cmd key="0x03" name="SCHEDULE_REPORT" help="Schedule Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Weekday" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Switchpoint 0" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Switchpoint 1" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Switchpoint 2" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Switchpoint 3" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Switchpoint 4" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Switchpoint 5" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Switchpoint 6" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Switchpoint 7" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Switchpoint 8" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x01" name="SCHEDULE_SET" help="Schedule Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Weekday" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Switchpoint 0" type="BIT_24" />
+            <param key="0x02" name="Switchpoint 1" type="BIT_24" />
+            <param key="0x03" name="Switchpoint 2" type="BIT_24" />
+            <param key="0x04" name="Switchpoint 3" type="BIT_24" />
+            <param key="0x05" name="Switchpoint 4" type="BIT_24" />
+            <param key="0x06" name="Switchpoint 5" type="BIT_24" />
+            <param key="0x07" name="Switchpoint 6" type="BIT_24" />
+            <param key="0x08" name="Switchpoint 7" type="BIT_24" />
+            <param key="0x09" name="Switchpoint 8" type="BIT_24" />
+        </cmd>
+        <cmd key="0x01" name="SCHEDULE_SET" help="Schedule Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Weekday" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Switchpoint 0" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Switchpoint 1" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Switchpoint 2" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Switchpoint 3" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Switchpoint 4" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Switchpoint 5" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Switchpoint 6" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Switchpoint 7" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Switchpoint 8" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Switchpoint 0" type="BIT_24" />
+            <param key="0x02" name="Switchpoint 1" type="BIT_24" />
+            <param key="0x03" name="Switchpoint 2" type="BIT_24" />
+            <param key="0x04" name="Switchpoint 3" type="BIT_24" />
+            <param key="0x05" name="Switchpoint 4" type="BIT_24" />
+            <param key="0x06" name="Switchpoint 5" type="BIT_24" />
+            <param key="0x07" name="Switchpoint 6" type="BIT_24" />
+            <param key="0x08" name="Switchpoint 7" type="BIT_24" />
+            <param key="0x09" name="Switchpoint 8" type="BIT_24" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x81" version="1" name="COMMAND_CLASS_CLOCK" help="Command Class Clock" read_only="false" comment="">
-        <cmd key="0x05" name="CLOCK_GET" help="Clock Get" comment="" />
-        <cmd key="0x06" name="CLOCK_REPORT" help="Clock Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Weekday" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x01" name="Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x04" name="CLOCK_SET" help="Clock Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Weekday" fieldmask="0xE0" shifter="5" />
+    <cmd_class key="0x81" version="1" name="COMMAND_CLASS_CLOCK" help="Command Class Clock">
+        <cmd key="0x05" name="CLOCK_GET" help="Clock Get" support_mode="RX" />
+        <cmd key="0x06" name="CLOCK_REPORT" help="Clock Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour" fieldmask="0x1F" />
+                <fieldenum key="0x01" fieldname="Weekday" fieldmask="0xE0" shifter="5">
+                    <fieldenum key="0x01" value="Monday" />
+                    <fieldenum key="0x02" value="Tuesday" />
+                    <fieldenum key="0x03" value="Wednesday" />
+                    <fieldenum key="0x04" value="Thursday" />
+                    <fieldenum key="0x05" value="Friday" />
+                    <fieldenum key="0x06" value="Saturday" />
+                    <fieldenum key="0x07" value="Sunday" />
+                </fieldenum>
             </param>
-            <param key="0x01" name="Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="CLOCK_SET" help="Clock Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour" fieldmask="0x1F" />
+                <fieldenum key="0x01" fieldname="Weekday" fieldmask="0xE0" shifter="5">
+                    <fieldenum key="0x01" value="Monday" />
+                    <fieldenum key="0x02" value="Tuesday" />
+                    <fieldenum key="0x03" value="Wednesday" />
+                    <fieldenum key="0x04" value="Thursday" />
+                    <fieldenum key="0x05" value="Friday" />
+                    <fieldenum key="0x06" value="Saturday" />
+                    <fieldenum key="0x07" value="Sunday" />
+                </fieldenum>
             </param>
+            <param key="0x01" name="Minute" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x70" version="1" name="COMMAND_CLASS_CONFIGURATION" help="Command Class Configuration" read_only="false" comment="">
-        <cmd key="0x05" name="CONFIGURATION_GET" help="Configuration Get" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x06" name="CONFIGURATION_REPORT" help="Configuration Report" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x70" version="1" name="COMMAND_CLASS_CONFIGURATION" help="Command Class Configuration">
+        <cmd key="0x05" name="CONFIGURATION_GET" help="Configuration Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="CONFIGURATION_REPORT" help="Configuration Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Configuration Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Configuration Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="CONFIGURATION_SET" help="Configuration Set" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x04" name="CONFIGURATION_SET" help="Configuration Set" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x78" shifter="3" />
                 <bitflag key="0x02" flagname="Default" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Configuration Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Configuration Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x70" version="2" name="COMMAND_CLASS_CONFIGURATION" help="Command Class Configuration" read_only="false" comment="">
-        <cmd key="0x08" name="CONFIGURATION_BULK_GET" help="Configuration Bulk Get" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x09" name="CONFIGURATION_BULK_REPORT" help="Configuration Bulk Report" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reports to follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x70" version="2" name="COMMAND_CLASS_CONFIGURATION" help="Command Class Configuration">
+        <cmd key="0x08" name="CONFIGURATION_BULK_GET" help="Configuration Bulk Get" support_mode="RX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="CONFIGURATION_BULK_REPORT" help="Configuration Bulk Report" support_mode="TX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+            <param key="0x02" name="Reports to follow" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x38" shifter="3" />
                 <bitflag key="0x02" flagname="Handshake" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Default" flagmask="0x80" />
             </param>
-            <variant_group key="0x04" name="vg" variantKey="0x00" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                    <variant paramoffs="131" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <variant_group key="0x04" name="vg" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Parameter" type="VARIANT">
+                    <variant paramoffs="131" sizemask="0x07" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x07" name="CONFIGURATION_BULK_SET" help="Configuration Bulk Set" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x07" name="CONFIGURATION_BULK_SET" help="Configuration Bulk Set" support_mode="RX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x38" shifter="3" />
                 <bitflag key="0x02" flagname="Handshake" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Default" flagmask="0x80" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                    <variant paramoffs="130" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <variant_group key="0x03" name="vg" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Parameter" type="VARIANT">
+                    <variant paramoffs="130" sizemask="0x07" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x05" name="CONFIGURATION_GET" help="Configuration Get" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="CONFIGURATION_GET" help="Configuration Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="CONFIGURATION_REPORT" help="Configuration Report" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x06" name="CONFIGURATION_REPORT" help="Configuration Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Configuration Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Configuration Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="CONFIGURATION_SET" help="Configuration Set" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x04" name="CONFIGURATION_SET" help="Configuration Set" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x78" shifter="3" />
                 <bitflag key="0x02" flagname="Default" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Configuration Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Configuration Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x70" version="3" name="COMMAND_CLASS_CONFIGURATION" help="Command Class Configuration" read_only="false" comment="">
-        <cmd key="0x08" name="CONFIGURATION_BULK_GET" help="Configuration Bulk Get" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x09" name="CONFIGURATION_BULK_REPORT" help="Configuration Bulk Report" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reports to follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x70" version="3" name="COMMAND_CLASS_CONFIGURATION" help="Command Class Configuration">
+        <cmd key="0x08" name="CONFIGURATION_BULK_GET" help="Configuration Bulk Get" support_mode="RX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="CONFIGURATION_BULK_REPORT" help="Configuration Bulk Report" support_mode="TX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+            <param key="0x02" name="Reports to follow" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x38" shifter="3" />
                 <bitflag key="0x02" flagname="Handshake" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Default" flagmask="0x80" />
             </param>
-            <variant_group key="0x04" name="vg" variantKey="0x00" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                    <variant paramoffs="131" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <variant_group key="0x04" name="vg" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Parameter" type="VARIANT">
+                    <variant paramoffs="131" sizemask="0x07" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x07" name="CONFIGURATION_BULK_SET" help="Configuration Bulk Set" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x07" name="CONFIGURATION_BULK_SET" help="Configuration Bulk Set" support_mode="RX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x38" shifter="3" />
                 <bitflag key="0x02" flagname="Handshake" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Default" flagmask="0x80" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                    <variant paramoffs="130" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <variant_group key="0x03" name="vg" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Parameter" type="VARIANT">
+                    <variant paramoffs="130" sizemask="0x07" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x05" name="CONFIGURATION_GET" help="Configuration Get" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="CONFIGURATION_GET" help="Configuration Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="CONFIGURATION_REPORT" help="Configuration Report" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x06" name="CONFIGURATION_REPORT" help="Configuration Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Configuration Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Configuration Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="CONFIGURATION_SET" help="Configuration Set" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x04" name="CONFIGURATION_SET" help="Configuration Set" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x78" shifter="3" />
                 <bitflag key="0x02" flagname="Default" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Configuration Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Configuration Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="CONFIGURATION_NAME_GET" help="Configuration Name Get">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0A" name="CONFIGURATION_NAME_GET" help="Configuration Name Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
         </cmd>
-        <cmd key="0x0B" name="CONFIGURATION_NAME_REPORT" help="Configuration Name Report">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reports to follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x0B" name="CONFIGURATION_NAME_REPORT" help="Configuration Name Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
+            <param key="0x01" name="Reports to follow" type="BYTE" />
+            <param key="0x02" name="Name" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0C" name="CONFIGURATION_INFO_GET" help="Configuration Info Get">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0C" name="CONFIGURATION_INFO_GET" help="Configuration Info Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
         </cmd>
-        <cmd key="0x0D" name="CONFIGURATION_INFO_REPORT" help="Configuration Info Report">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reports to follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Info" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x0D" name="CONFIGURATION_INFO_REPORT" help="Configuration Info Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
+            <param key="0x01" name="Reports to follow" type="BYTE" />
+            <param key="0x02" name="Info" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0E" name="CONFIGURATION_PROPERTIES_GET" help="Configuration Properties Get">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0E" name="CONFIGURATION_PROPERTIES_GET" help="Configuration Properties Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
         </cmd>
-        <cmd key="0x0F" name="CONFIGURATION_PROPERTIES_REPORT" help="Configuration Properties Report">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x0F" name="CONFIGURATION_PROPERTIES_REPORT" help="Configuration Properties Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <fieldenum key="0x01" fieldname="Format" fieldmask="0x38" shifter="3">
                     <fieldenum value="Signed Integer" />
                     <fieldenum value="Unsigned Integer" />
@@ -2342,143 +2383,105 @@
                 </fieldenum>
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x02" name="Min Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Min Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Max Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x03" name="Max Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x04" name="Default Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
-            </param>
-            <param key="0x05" name="Next Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x04" name="Default Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
+            <param key="0x05" name="Next Parameter Number" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x70" version="4" name="COMMAND_CLASS_CONFIGURATION" help="Command Class Configuration" read_only="false" comment="">
-        <cmd key="0x08" name="CONFIGURATION_BULK_GET" help="Configuration Bulk Get" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x09" name="CONFIGURATION_BULK_REPORT" help="Configuration Bulk Report" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reports to follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x70" version="4" name="COMMAND_CLASS_CONFIGURATION" help="Command Class Configuration">
+        <cmd key="0x08" name="CONFIGURATION_BULK_GET" help="Configuration Bulk Get" support_mode="RX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="CONFIGURATION_BULK_REPORT" help="Configuration Bulk Report" support_mode="TX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+            <param key="0x02" name="Reports to follow" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x38" shifter="3" />
                 <bitflag key="0x02" flagname="Handshake" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Default" flagmask="0x80" />
             </param>
-            <variant_group key="0x04" name="vg" variantKey="0x00" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                    <variant paramoffs="131" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <variant_group key="0x04" name="vg" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Parameter" type="VARIANT">
+                    <variant paramoffs="131" sizemask="0x07" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x07" name="CONFIGURATION_BULK_SET" help="Configuration Bulk Set" comment="">
-            <param key="0x00" name="Parameter Offset" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x07" name="CONFIGURATION_BULK_SET" help="Configuration Bulk Set" support_mode="RX">
+            <param key="0x00" name="Parameter Offset" type="WORD" />
+            <param key="0x01" name="Number of Parameters" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x38" shifter="3" />
                 <bitflag key="0x02" flagname="Handshake" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Default" flagmask="0x80" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="">
-                    <variant paramoffs="130" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <variant_group key="0x03" name="vg" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Parameter" type="VARIANT">
+                    <variant paramoffs="130" sizemask="0x07" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x05" name="CONFIGURATION_GET" help="Configuration Get" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="CONFIGURATION_GET" help="Configuration Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="CONFIGURATION_REPORT" help="Configuration Report" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x06" name="CONFIGURATION_REPORT" help="Configuration Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Configuration Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Configuration Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="CONFIGURATION_SET" help="Configuration Set" comment="">
-            <param key="0x00" name="Parameter Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x04" name="CONFIGURATION_SET" help="Configuration Set" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x78" shifter="3" />
                 <bitflag key="0x02" flagname="Default" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Configuration Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Configuration Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="CONFIGURATION_NAME_GET" help="Configuration Name Get">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0A" name="CONFIGURATION_NAME_GET" help="Configuration Name Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
         </cmd>
-        <cmd key="0x0B" name="CONFIGURATION_NAME_REPORT" help="Configuration Name Report">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reports to follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x0B" name="CONFIGURATION_NAME_REPORT" help="Configuration Name Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
+            <param key="0x01" name="Reports to follow" type="BYTE" />
+            <param key="0x02" name="Name" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0C" name="CONFIGURATION_INFO_GET" help="Configuration Info Get">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0C" name="CONFIGURATION_INFO_GET" help="Configuration Info Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
         </cmd>
-        <cmd key="0x0D" name="CONFIGURATION_INFO_REPORT" help="Configuration Info Report">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reports to follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Info" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x0D" name="CONFIGURATION_INFO_REPORT" help="Configuration Info Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
+            <param key="0x01" name="Reports to follow" type="BYTE" />
+            <param key="0x02" name="Info" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0E" name="CONFIGURATION_PROPERTIES_GET" help="Configuration Properties Get">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0E" name="CONFIGURATION_PROPERTIES_GET" help="Configuration Properties Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
         </cmd>
-        <cmd key="0x0F" name="CONFIGURATION_PROPERTIES_REPORT" help="Configuration Properties Report">
-            <param key="0x00" name="Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x0F" name="CONFIGURATION_PROPERTIES_REPORT" help="Configuration Properties Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="WORD" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <fieldenum key="0x01" fieldname="Format" fieldmask="0x38" shifter="3">
                     <fieldenum value="Signed Integer" />
                     <fieldenum value="Unsigned Integer" />
@@ -2486,243 +2489,126 @@
                     <fieldenum value="Bit field" />
                 </fieldenum>
                 <bitflag key="0x02" flagname="Readonly" flagmask="0x40" />
-                <bitflag key="0x03" flagname="Re-inclusion required" flagmask="0x80" />
+                <bitflag key="0x03" flagname="Altering capabilities" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Min Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Min Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Max Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x03" name="Max Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x04" name="Default Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x04" name="Default Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x05" name="Next Parameter Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x05" name="Next Parameter Number" type="WORD" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Advanced" flagmask="0x01" />
                 <bitflag key="0x01" flagname="No Bulk support" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved1" fieldmask="0xFC" shifter="2" />
             </param>
         </cmd>
-        <cmd key="0x01" name="CONFIGURATION_DEFAULT_RESET" help="Configuration Default Reset" />
+        <cmd key="0x01" name="CONFIGURATION_DEFAULT_RESET" help="Configuration Default Reset" support_mode="RX" />
     </cmd_class>
-    <cmd_class key="0x21" version="1" name="COMMAND_CLASS_CONTROLLER_REPLICATION" help="Command Class Controller Replication" read_only="false" comment="">
-        <cmd key="0x31" name="CTRL_REPLICATION_TRANSFER_GROUP" help="Ctrl Replication Transfer Group" comment="">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Group ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+    <cmd_class key="0x21" version="1" name="COMMAND_CLASS_CONTROLLER_REPLICATION" help="Command Class Controller Replication">
+        <cmd key="0x31" name="CTRL_REPLICATION_TRANSFER_GROUP" help="Ctrl Replication Transfer Group" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Group ID" type="BYTE" />
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x32" name="CTRL_REPLICATION_TRANSFER_GROUP_NAME" help="Ctrl Replication Transfer Group Name" comment="">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Group ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Group Name" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x32" name="CTRL_REPLICATION_TRANSFER_GROUP_NAME" help="Ctrl Replication Transfer Group Name" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Group ID" type="BYTE" />
+            <param key="0x02" name="Group Name" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x33" name="CTRL_REPLICATION_TRANSFER_SCENE" help="Ctrl Replication Transfer Scene" comment="">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Scene ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x33" name="CTRL_REPLICATION_TRANSFER_SCENE" help="Ctrl Replication Transfer Scene" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Scene ID" type="BYTE" />
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Level" type="BYTE" />
         </cmd>
-        <cmd key="0x34" name="CTRL_REPLICATION_TRANSFER_SCENE_NAME" help="Ctrl Replication Transfer Scene Name" comment="">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Scene ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Scene Name" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x34" name="CTRL_REPLICATION_TRANSFER_SCENE_NAME" help="Ctrl Replication Transfer Scene Name" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Scene ID" type="BYTE" />
+            <param key="0x02" name="Scene Name" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x56" version="1" name="COMMAND_CLASS_CRC_16_ENCAP" help="Command Class CRC16 Encap" read_only="false" comment="">
-        <cmd key="0x01" name="CRC_16_ENCAP" help="CRC16 Encap" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Command" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Data" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_DATA">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x03" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x56" version="1" name="COMMAND_CLASS_CRC_16_ENCAP" help="Command Class CRC16 Encap">
+        <cmd key="0x01" name="CRC_16_ENCAP" help="CRC16 Encap" support_mode="RX">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x01" name="Command" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x02" name="Data" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x03" name="Checksum" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x3A" version="1" name="COMMAND_CLASS_DCP_CONFIG" help="Command Class Dcp Config" read_only="false" comment="">
-        <cmd key="0x04" name="DCP_LIST_REMOVE" help="Dcp List Remove" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x03" name="DCP_LIST_SET" help="Dcp List Set" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="DCP Rate ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of DC" fieldmask="0x03" shifter="0" />
+    <cmd_class key="0x3A" version="1" name="COMMAND_CLASS_DCP_CONFIG" help="Command Class Demand Control Plan Configuration">
+        <cmd key="0x04" name="DCP_LIST_REMOVE" help="Dcp List Remove" support_mode="RX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+            <param key="0x03" name="Hour Local Time" type="BYTE" />
+            <param key="0x04" name="Minute Local Time" type="BYTE" />
+            <param key="0x05" name="Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="DCP_LIST_SET" help="Dcp List Set" support_mode="RX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+            <param key="0x03" name="Hour Local Time" type="BYTE" />
+            <param key="0x04" name="Minute Local Time" type="BYTE" />
+            <param key="0x05" name="Second Local Time" type="BYTE" />
+            <param key="0x06" name="DCP Rate ID" type="BYTE" />
+            <param key="0x07" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of DC" fieldmask="0x03" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <variant_group key="0x08" name="vg1" variantKey="0x00" paramOffs="0x07" sizemask="0x03" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <variant_group key="0x08" name="vg1" paramOffs="0x07" sizemask="0x03" sizeoffs="0x00">
+                <param key="0x00" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+                <param key="0x01" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
             </variant_group>
-            <param key="0x09" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0C" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0D" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0E" name="Start Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0F" name="Duration Hour Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x10" name="Duration Minute Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x11" name="Duration Second Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x12" name="Event Priority" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x13" name="Load shedding" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x14" name="Start Association Group" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x15" name="Stop Association Group" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x16" name="Randomization interval" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x01" name="DCP_LIST_SUPPORTED_GET" help="Dcp List Supported Get" comment="" />
-        <cmd key="0x02" name="DCP_LIST_SUPPORTED_REPORT" help="Dcp List Supported Report" comment="">
-            <param key="0x00" name="DCP List Size" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Free DCP List entries" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x09" name="Start Year" type="WORD" />
+            <param key="0x0A" name="Start Month" type="BYTE" />
+            <param key="0x0B" name="Start Day" type="BYTE" />
+            <param key="0x0C" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x0D" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x0E" name="Start Second Local Time" type="BYTE" />
+            <param key="0x0F" name="Duration Hour Time" type="BYTE" />
+            <param key="0x10" name="Duration Minute Time" type="BYTE" />
+            <param key="0x11" name="Duration Second Time" type="BYTE" />
+            <param key="0x12" name="Event Priority" type="BYTE" />
+            <param key="0x13" name="Load shedding" type="BYTE" />
+            <param key="0x14" name="Start Association Group" type="BYTE" />
+            <param key="0x15" name="Stop Association Group" type="BYTE" />
+            <param key="0x16" name="Randomization interval" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="DCP_LIST_SUPPORTED_GET" help="Dcp List Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="DCP_LIST_SUPPORTED_REPORT" help="Dcp List Supported Report" support_mode="TX">
+            <param key="0x00" name="DCP List Size" type="BYTE" />
+            <param key="0x01" name="Free DCP List entries" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x3B" version="1" name="COMMAND_CLASS_DCP_MONITOR" help="Command Class Dcp Monitor" read_only="false" comment="">
-        <cmd key="0x03" name="DCP_EVENT_STATUS_GET" help="Dcp Event Status Get" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x04" name="DCP_EVENT_STATUS_REPORT" help="Dcp Event Status Report" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Event status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x3B" version="1" name="COMMAND_CLASS_DCP_MONITOR" help="Command Class Demand Control Plan Monitor">
+        <cmd key="0x03" name="DCP_EVENT_STATUS_GET" help="Dcp Event Status Get" support_mode="RX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+            <param key="0x03" name="Hour Local Time" type="BYTE" />
+            <param key="0x04" name="Minute Local Time" type="BYTE" />
+            <param key="0x05" name="Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="DCP_EVENT_STATUS_REPORT" help="Dcp Event Status Report" support_mode="TX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+            <param key="0x03" name="Hour Local Time" type="BYTE" />
+            <param key="0x04" name="Minute Local Time" type="BYTE" />
+            <param key="0x05" name="Second Local Time" type="BYTE" />
+            <param key="0x06" name="Event status" type="BYTE">
                 <bitflag key="0x01" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Event Started" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Event Completed" flagmask="0x02" />
@@ -2730,174 +2616,96 @@
                 <bitflag key="0x05" flagname="Event not Applicable" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x01" name="DCP_LIST_GET" help="Dcp List Get" comment="" />
-        <cmd key="0x02" name="DCP_LIST_REPORT" help="Dcp List Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="DCP ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of DC" fieldmask="0x03" shifter="0" />
+        <cmd key="0x01" name="DCP_LIST_GET" help="Dcp List Get" support_mode="RX" />
+        <cmd key="0x02" name="DCP_LIST_REPORT" help="Dcp List Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Year" type="WORD" />
+            <param key="0x02" name="Month" type="BYTE" />
+            <param key="0x03" name="Day" type="BYTE" />
+            <param key="0x04" name="Hour Local Time" type="BYTE" />
+            <param key="0x05" name="Minute Local Time" type="BYTE" />
+            <param key="0x06" name="Second Local Time" type="BYTE" />
+            <param key="0x07" name="DCP ID" type="BYTE" />
+            <param key="0x08" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of DC" fieldmask="0x03" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <variant_group key="0x09" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <variant_group key="0x09" name="vg1" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+                <param key="0x01" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
             </variant_group>
-            <param key="0x0A" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0C" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0D" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0E" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0F" name="Start Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x10" name="Duration Hour Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x11" name="Duration Minute Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x12" name="Duration Second Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x13" name="Event Priority" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x14" name="Load shedding" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x15" name="Start Association Group" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x16" name="Stop Association Group" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x17" name="Randomization interval" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x0A" name="Start Year" type="WORD" />
+            <param key="0x0B" name="Start Month" type="BYTE" />
+            <param key="0x0C" name="Start Day" type="BYTE" />
+            <param key="0x0D" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x0E" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x0F" name="Start Second Local Time" type="BYTE" />
+            <param key="0x10" name="Duration Hour Time" type="BYTE" />
+            <param key="0x11" name="Duration Minute Time" type="BYTE" />
+            <param key="0x12" name="Duration Second Time" type="BYTE" />
+            <param key="0x13" name="Event Priority" type="BYTE" />
+            <param key="0x14" name="Load shedding" type="BYTE" />
+            <param key="0x15" name="Start Association Group" type="BYTE" />
+            <param key="0x16" name="Stop Association Group" type="BYTE" />
+            <param key="0x17" name="Randomization interval" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x4C" version="1" name="COMMAND_CLASS_DOOR_LOCK_LOGGING" help="Command Class Door Lock Logging" read_only="false" comment="">
-        <cmd key="0x01" name="DOOR_LOCK_LOGGING_RECORDS_SUPPORTED_GET" help="Door Lock Logging Records Supported Get" comment="" />
-        <cmd key="0x02" name="DOOR_LOCK_LOGGING_RECORDS_SUPPORTED_REPORT" help="Door Lock Logging Records Supported Report" comment="">
-            <param key="0x00" name="Max records stored" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x03" name="RECORD_GET" help="Record Get" comment="">
-            <param key="0x00" name="Record number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x04" name="RECORD_REPORT" help="Record Report" comment="">
-            <param key="0x00" name="Record number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour Local Time" fieldmask="0x1F" shifter="0" />
+    <cmd_class key="0x4C" version="1" name="COMMAND_CLASS_DOOR_LOCK_LOGGING" help="Command Class Door Lock Logging">
+        <cmd key="0x01" name="DOOR_LOCK_LOGGING_RECORDS_SUPPORTED_GET" help="Door Lock Logging Records Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="DOOR_LOCK_LOGGING_RECORDS_SUPPORTED_REPORT" help="Door Lock Logging Records Supported Report" support_mode="TX">
+            <param key="0x00" name="Max records stored" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="RECORD_GET" help="Record Get" support_mode="RX">
+            <param key="0x00" name="Record number" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="RECORD_REPORT" help="Record Report" support_mode="TX">
+            <param key="0x00" name="Record number" type="BYTE" />
+            <param key="0x01" name="Year" type="WORD" />
+            <param key="0x02" name="Month" type="BYTE" />
+            <param key="0x03" name="Day" type="BYTE" />
+            <param key="0x04" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour Local Time" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Record status" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Event Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="User Code Length" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="USER_CODE" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x05" name="Minute Local Time" type="BYTE" />
+            <param key="0x06" name="Second Local Time" type="BYTE" />
+            <param key="0x07" name="Event Type" type="BYTE" />
+            <param key="0x08" name="User Identifier" type="BYTE" />
+            <param key="0x09" name="User Code Length" type="BYTE" />
+            <param key="0x0A" name="USER_CODE" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x62" version="1" name="COMMAND_CLASS_DOOR_LOCK" help="Command Class Door Lock" read_only="false" comment="">
-        <cmd key="0x05" name="DOOR_LOCK_CONFIGURATION_GET" help="Door Lock Configuration Get" comment="" />
-        <cmd key="0x06" name="DOOR_LOCK_CONFIGURATION_REPORT" help="Door Lock Configuration Report" comment="">
-            <param key="0x00" name="Operation Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x62" version="1" name="COMMAND_CLASS_DOOR_LOCK" help="Command Class Door Lock">
+        <cmd key="0x05" name="DOOR_LOCK_CONFIGURATION_GET" help="Door Lock Configuration Get" support_mode="RX" />
+        <cmd key="0x06" name="DOOR_LOCK_CONFIGURATION_REPORT" help="Door Lock Configuration Report" support_mode="TX">
+            <param key="0x00" name="Operation Type" type="CONST">
                 <const key="0x00" flagname="Constant operation" flagmask="0x01" />
                 <const key="0x01" flagname="Timed operation" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles State" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="DOOR_LOCK_CONFIGURATION_SET" help="Door Lock Configuration Set" comment="">
-            <param key="0x00" name="Operation Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x04" name="DOOR_LOCK_CONFIGURATION_SET" help="Door Lock Configuration Set" support_mode="RX">
+            <param key="0x00" name="Operation Type" type="CONST">
                 <const key="0x00" flagname="Constant operation" flagmask="0x01" />
                 <const key="0x01" flagname="Timed operation" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles State" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="DOOR_LOCK_OPERATION_GET" help="Door Lock Operation Get" comment="" />
-        <cmd key="0x03" name="DOOR_LOCK_OPERATION_REPORT" help="Door Lock Operation Report" comment="">
-            <param key="0x00" name="Door Lock Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="DOOR_LOCK_OPERATION_GET" help="Door Lock Operation Get" support_mode="RX" />
+        <cmd key="0x03" name="DOOR_LOCK_OPERATION_REPORT" help="Door Lock Operation Report" support_mode="TX">
+            <param key="0x00" name="Door Lock Mode" type="CONST">
                 <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
                 <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
                 <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
@@ -2906,22 +2714,16 @@
                 <const key="0x05" flagname="Door Unsecured for outside Door Handles with timeout" flagmask="0x21" />
                 <const key="0x06" flagname="Door Secured" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles Mode" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles Mode" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles Mode" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Door Condition" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Door Condition" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x04" name="Lock Timeout Seconds" type="BYTE" />
         </cmd>
-        <cmd key="0x01" name="DOOR_LOCK_OPERATION_SET" help="Door Lock Operation Set" comment="">
-            <param key="0x00" name="Door Lock Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="DOOR_LOCK_OPERATION_SET" help="Door Lock Operation Set" support_mode="RX">
+            <param key="0x00" name="Door Lock Mode" type="CONST">
                 <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
                 <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
                 <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
@@ -2932,43 +2734,35 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x62" version="2" name="COMMAND_CLASS_DOOR_LOCK" help="Command Class Door Lock" read_only="false" comment="">
-        <cmd key="0x05" name="DOOR_LOCK_CONFIGURATION_GET" help="Door Lock Configuration Get" comment="" />
-        <cmd key="0x06" name="DOOR_LOCK_CONFIGURATION_REPORT" help="Door Lock Configuration Report" comment="">
-            <param key="0x00" name="Operation Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x62" version="2" name="COMMAND_CLASS_DOOR_LOCK" help="Command Class Door Lock">
+        <cmd key="0x05" name="DOOR_LOCK_CONFIGURATION_GET" help="Door Lock Configuration Get" support_mode="RX" />
+        <cmd key="0x06" name="DOOR_LOCK_CONFIGURATION_REPORT" help="Door Lock Configuration Report" support_mode="TX">
+            <param key="0x00" name="Operation Type" type="CONST">
                 <const key="0x00" flagname="Constant operation" flagmask="0x01" />
                 <const key="0x01" flagname="Timed operation" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles State" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="DOOR_LOCK_CONFIGURATION_SET" help="Door Lock Configuration Set" comment="">
-            <param key="0x00" name="Operation Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x04" name="DOOR_LOCK_CONFIGURATION_SET" help="Door Lock Configuration Set" support_mode="RX">
+            <param key="0x00" name="Operation Type" type="CONST">
                 <const key="0x00" flagname="Constant operation" flagmask="0x01" />
                 <const key="0x01" flagname="Timed operation" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles State" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="DOOR_LOCK_OPERATION_GET" help="Door Lock Operation Get" comment="" />
-        <cmd key="0x03" name="DOOR_LOCK_OPERATION_REPORT" help="Door Lock Operation Report" comment="">
-            <param key="0x00" name="Door Lock Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="DOOR_LOCK_OPERATION_GET" help="Door Lock Operation Get" support_mode="RX" />
+        <cmd key="0x03" name="DOOR_LOCK_OPERATION_REPORT" help="Door Lock Operation Report" support_mode="TX">
+            <param key="0x00" name="Door Lock Mode" type="CONST">
                 <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
                 <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
                 <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
@@ -2978,22 +2772,16 @@
                 <const key="0x06" flagname="Door/Lock State Unknown" flagmask="0xFE" />
                 <const key="0x07" flagname="Door Secured" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles Mode" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles Mode" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles Mode" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Door Condition" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Door Condition" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x04" name="Lock Timeout Seconds" type="BYTE" />
         </cmd>
-        <cmd key="0x01" name="DOOR_LOCK_OPERATION_SET" help="Door Lock Operation Set" comment="">
-            <param key="0x00" name="Door Lock Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="DOOR_LOCK_OPERATION_SET" help="Door Lock Operation Set" support_mode="RX">
+            <param key="0x00" name="Door Lock Mode" type="CONST">
                 <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
                 <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
                 <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
@@ -3005,43 +2793,35 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x62" version="3" name="COMMAND_CLASS_DOOR_LOCK" help="Command Class Door Lock" read_only="false" comment="">
-        <cmd key="0x05" name="DOOR_LOCK_CONFIGURATION_GET" help="Door Lock Configuration Get" comment="" />
-        <cmd key="0x06" name="DOOR_LOCK_CONFIGURATION_REPORT" help="Door Lock Configuration Report" comment="">
-            <param key="0x00" name="Operation Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x62" version="3" name="COMMAND_CLASS_DOOR_LOCK" help="Command Class Door Lock">
+        <cmd key="0x05" name="DOOR_LOCK_CONFIGURATION_GET" help="Door Lock Configuration Get" support_mode="RX" />
+        <cmd key="0x06" name="DOOR_LOCK_CONFIGURATION_REPORT" help="Door Lock Configuration Report" support_mode="TX">
+            <param key="0x00" name="Operation Type" type="CONST">
                 <const key="0x00" flagname="Constant operation" flagmask="0x01" />
                 <const key="0x01" flagname="Timed operation" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles State" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="DOOR_LOCK_CONFIGURATION_SET" help="Door Lock Configuration Set" comment="">
-            <param key="0x00" name="Operation Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x04" name="DOOR_LOCK_CONFIGURATION_SET" help="Door Lock Configuration Set" support_mode="RX">
+            <param key="0x00" name="Operation Type" type="CONST">
                 <const key="0x00" flagname="Constant operation" flagmask="0x01" />
                 <const key="0x01" flagname="Timed operation" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles State" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="DOOR_LOCK_OPERATION_GET" help="Door Lock Operation Get" comment="" />
-        <cmd key="0x03" name="DOOR_LOCK_OPERATION_REPORT" help="Door Lock Operation Report" comment="">
-            <param key="0x00" name="Current Door Lock Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="DOOR_LOCK_OPERATION_GET" help="Door Lock Operation Get" support_mode="RX" />
+        <cmd key="0x03" name="DOOR_LOCK_OPERATION_REPORT" help="Door Lock Operation Report" support_mode="TX">
+            <param key="0x00" name="Current Door Lock Mode" type="CONST">
                 <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
                 <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
                 <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
@@ -3051,20 +2831,14 @@
                 <const key="0x06" flagname="Door/Lock State Unknown" flagmask="0xFE" />
                 <const key="0x07" flagname="Door Secured" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Inside Door Handles Mode" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles Mode" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Outside Door Handles Mode" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Door Condition" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Lock Timeout Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Lock Timeout Seconds" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Target Door Lock Mode" type="CONST" typehashcode="0x0B">
+            <param key="0x02" name="Door Condition" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x04" name="Lock Timeout Seconds" type="BYTE" />
+            <param key="0x05" name="Target Door Lock Mode" type="CONST">
                 <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
                 <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
                 <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
@@ -3074,14 +2848,14 @@
                 <const key="0x06" flagname="Door/Lock State Unknown" flagmask="0xFE" />
                 <const key="0x07" flagname="Door Secured" flagmask="0xFF" />
             </param>
-            <param key="0x06" name="Duration" type="CONST" typehashcode="0x0B">
+            <param key="0x06" name="Duration" type="CONST">
                 <const key="0x00" flagname="Already at the Target Value" flagmask="0x00" />
                 <const key="0x01" flagname="Unknown duration" flagmask="0xFE" />
                 <const key="0x02" flagname="Reserved" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="DOOR_LOCK_OPERATION_SET" help="Door Lock Operation Set" comment="">
-            <param key="0x00" name="Door Lock Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="DOOR_LOCK_OPERATION_SET" help="Door Lock Operation Set" support_mode="RX">
+            <param key="0x00" name="Door Lock Mode" type="CONST">
                 <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
                 <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
                 <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
@@ -3093,234 +2867,278 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x90" version="1" name="COMMAND_CLASS_ENERGY_PRODUCTION" help="Command Class Energy Production" read_only="false" comment="">
-        <cmd key="0x02" name="ENERGY_PRODUCTION_GET" help="Energy Production Get" comment="">
-            <param key="0x00" name="Parameter Number" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="Instant energy production" flagmask="0x00" />
-                <const key="0x01" flagname="Total energy production" flagmask="0x01" />
-                <const key="0x02" flagname="Energy production today" flagmask="0x02" />
-                <const key="0x03" flagname="Total production time" flagmask="0x03" />
-            </param>
-        </cmd>
-        <cmd key="0x03" name="ENERGY_PRODUCTION_REPORT" help="Energy Production Report" comment="">
-            <param key="0x00" name="Parameter Number" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="Instant energy production" flagmask="0x00" />
-                <const key="0x01" flagname="Total energy production" flagmask="0x01" />
-                <const key="0x02" flagname="Energy production today" flagmask="0x02" />
-                <const key="0x03" flagname="Total production time" flagmask="0x03" />
+    <cmd_class key="0x62" version="4" name="COMMAND_CLASS_DOOR_LOCK" help="Command Class Door Lock">
+        <cmd key="0x05" name="DOOR_LOCK_CONFIGURATION_GET" help="Door Lock Configuration Get" support_mode="RX" />
+        <cmd key="0x06" name="DOOR_LOCK_CONFIGURATION_REPORT" help="Door Lock Configuration Report" support_mode="TX">
+            <param key="0x00" name="Operation Type" type="CONST">
+                <const key="0x00" flagname="Constant operation" flagmask="0x01" />
+                <const key="0x01" flagname="Timed operation" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
-                <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
-                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Outside Door Handles State" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" />
+            <param key="0x04" name="Auto-relock time" type="WORD" />
+            <param key="0x05" name="Hold and release time" type="WORD" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="TA" flagmask="0x01" />
+                <bitflag key="0x01" flagname="BTB" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved1" fieldmask="0xFC" shifter="2" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x7A" version="1" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Md" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" comment="" />
-        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="DOOR_LOCK_CONFIGURATION_SET" help="Door Lock Configuration Set" support_mode="RX">
+            <param key="0x00" name="Operation Type" type="CONST">
+                <const key="0x00" flagname="Constant operation" flagmask="0x01" />
+                <const key="0x01" flagname="Timed operation" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles State" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Outside Door Handles State" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Seconds" type="BYTE" />
+            <param key="0x04" name="Auto-relock time" type="WORD" />
+            <param key="0x05" name="Hold and release time" type="WORD" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="TA" flagmask="0x01" />
+                <bitflag key="0x01" flagname="BTB" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved1" fieldmask="0xFC" shifter="2" />
             </param>
         </cmd>
-        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" comment="">
-            <param key="0x00" name="Number of Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="zero" flagmask="0x80" />
-            </param>
-            <param key="0x02" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x02" name="DOOR_LOCK_OPERATION_GET" help="Door Lock Operation Get" support_mode="RX" />
+        <cmd key="0x03" name="DOOR_LOCK_OPERATION_REPORT" help="Door Lock Operation Report" support_mode="TX">
+            <param key="0x00" name="Current Door Lock Mode" type="CONST">
+                <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
+                <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
+                <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
+                <const key="0x03" flagname="Door Unsecured for inside Door Handles with timeout" flagmask="0x11" />
+                <const key="0x04" flagname="Door Unsecured for outside Door Handles" flagmask="0x20" />
+                <const key="0x05" flagname="Door Unsecured for outside Door Handles with timeout" flagmask="0x21" />
+                <const key="0x06" flagname="Door/Lock State Unknown" flagmask="0xFE" />
+                <const key="0x07" flagname="Door Secured" flagmask="0xFF" />
             </param>
-        </cmd>
-        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Last" flagmask="0x80" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Inside Door Handles Mode" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Outside Door Handles Mode" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Door Condition" type="BYTE" />
+            <param key="0x03" name="Lock Timeout Minutes" type="BYTE" />
+            <param key="0x04" name="Lock Timeout Seconds" type="BYTE" />
+            <param key="0x05" name="Target Door Lock Mode" type="CONST">
+                <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
+                <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
+                <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
+                <const key="0x03" flagname="Door Unsecured for inside Door Handles with timeout" flagmask="0x11" />
+                <const key="0x04" flagname="Door Unsecured for outside Door Handles" flagmask="0x20" />
+                <const key="0x05" flagname="Door Unsecured for outside Door Handles with timeout" flagmask="0x21" />
+                <const key="0x06" flagname="Door/Lock State Unknown" flagmask="0xFE" />
+                <const key="0x07" flagname="Door Secured" flagmask="0xFF" />
             </param>
-            <param key="0x02" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x06" name="Duration" type="CONST">
+                <const key="0x00" flagname="Already at the Target Value" flagmask="0x00" />
+                <const key="0x01" flagname="Unknown duration" flagmask="0xFE" />
+                <const key="0x02" flagname="Reserved" flagmask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x01" name="DOOR_LOCK_OPERATION_SET" help="Door Lock Operation Set" support_mode="RX">
+            <param key="0x00" name="Door Lock Mode" type="CONST">
+                <const key="0x00" flagname="Door Unsecured" flagmask="0x00" />
+                <const key="0x01" flagname="Door Unsecured with timeout" flagmask="0x01" />
+                <const key="0x02" flagname="Door Unsecured for inside Door Handles" flagmask="0x10" />
+                <const key="0x03" flagname="Door Unsecured for inside Door Handles with timeout" flagmask="0x11" />
+                <const key="0x04" flagname="Door Unsecured for outside Door Handles" flagmask="0x20" />
+                <const key="0x05" flagname="Door Unsecured for outside Door Handles with timeout" flagmask="0x21" />
+                <const key="0x06" flagname="Door/Lock State Unknown" flagmask="0xFE" />
+                <const key="0x07" flagname="Door Secured" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x07" name="DOOR_LOCK_CAPABILITIES_GET" help="Door Lock Capabilities Get" support_mode="RX" />
+        <cmd key="0x08" name="DOOR_LOCK_CAPABILITIES_REPORT" help="Door Lock Capabilities Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Operation type Bit Mask Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Supported Operation Type Bit Mask" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
             </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Supported Door Lock Mode List Length" type="BYTE" />
+            <param key="0x03" name="Supported Door Lock Mode" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
             </param>
-        </cmd>
-        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
-                <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
-                <const key="0x02" flagname="Valid combination" flagmask="0xFF" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Inside Handle Modes Bitmask" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Supported Outside Handle Modes Bitmask" fieldmask="0xF0" shifter="4" />
             </param>
-        </cmd>
-        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="unable to receive without checksum error" flagmask="0x00" />
-                <const key="0x01" flagname="unable to receive" flagmask="0x01" />
-                <const key="0x02" flagname="successfully" flagmask="0xFF" />
+            <param key="0x05" name="Supported door components" type="BYTE" />
+            <param key="0x06" name="Properties3" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="BTBS" flagmask="0x01" />
+                <bitflag key="0x01" flagname="TAS" flagmask="0x02" />
+                <bitflag key="0x02" flagname="HRS" flagmask="0x04" />
+                <bitflag key="0x03" flagname="ARS" flagmask="0x08" />
+                <bitfield key="0x04" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x7A" version="2" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Md" read_only="false" comment="">
-        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" comment="" />
-        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x90" version="1" name="COMMAND_CLASS_ENERGY_PRODUCTION" help="Command Class Energy Production">
+        <cmd key="0x02" name="ENERGY_PRODUCTION_GET" help="Energy Production Get" support_mode="RX">
+            <param key="0x00" name="Parameter Number" type="CONST">
+                <const key="0x00" flagname="Instant energy production" flagmask="0x00" />
+                <const key="0x01" flagname="Total energy production" flagmask="0x01" />
+                <const key="0x02" flagname="Energy production today" flagmask="0x02" />
+                <const key="0x03" flagname="Total production time" flagmask="0x03" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="ENERGY_PRODUCTION_REPORT" help="Energy Production Report" support_mode="TX">
+            <param key="0x00" name="Parameter Number" type="CONST">
+                <const key="0x00" flagname="Instant energy production" flagmask="0x00" />
+                <const key="0x01" flagname="Total energy production" flagmask="0x01" />
+                <const key="0x02" flagname="Energy production today" flagmask="0x02" />
+                <const key="0x03" flagname="Total production time" flagmask="0x03" />
             </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" comment="">
-            <param key="0x00" name="Number of Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
+    </cmd_class>
+    <cmd_class key="0x7A" version="1" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Meta Data" comment="[DEPRECATED]">
+        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" support_mode="RX" />
+        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+        </cmd>
+        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" support_mode="TX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="zero" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Report number 2" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Last" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x03" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Report number 2" type="BYTE" />
+            <param key="0x02" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
         </cmd>
-        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
                 <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
                 <const key="0x02" flagname="Valid combination" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="unable to receive without checksum error" flagmask="0x00" />
                 <const key="0x01" flagname="unable to receive" flagmask="0x01" />
                 <const key="0x02" flagname="successfully" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x7A" version="3" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Md" read_only="false" comment="">
-        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" comment="" />
-        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware 0 ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x7A" version="2" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Meta Data">
+        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" support_mode="RX" />
+        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+        </cmd>
+        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" support_mode="TX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="zero" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Firmware 0 Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Report number 2" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Last" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Firmware Upgradable" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Report number 2" type="BYTE" />
+            <param key="0x02" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x04" name="Number of Firmware Targets" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Checksum" type="WORD" />
+        </cmd>
+        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+        </cmd>
+        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
+                <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
+                <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
+                <const key="0x02" flagname="Valid combination" flagmask="0xFF" />
             </param>
-            <param key="0x05" name="Max Fragment Size " type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
+                <const key="0x00" flagname="unable to receive without checksum error" flagmask="0x00" />
+                <const key="0x01" flagname="unable to receive" flagmask="0x01" />
+                <const key="0x02" flagname="successfully" flagmask="0xFF" />
             </param>
-            <variant_group key="0x06" name="vg1" variantKey="0x00" paramOffs="0x04" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Firmware ID" type="WORD" typehashcode="0x02">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x7A" version="3" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Meta Data">
+        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" support_mode="RX" />
+        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware 0 ID" type="WORD" />
+            <param key="0x02" name="Firmware 0 Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Upgradable" type="BYTE" />
+            <param key="0x04" name="Number of Firmware Targets" type="BYTE" />
+            <param key="0x05" name="Max Fragment Size" type="WORD" />
+            <variant_group key="0x06" name="vg1" paramOffs="0x04" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Firmware ID" type="WORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" comment="">
-            <param key="0x00" name="Number of Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" support_mode="TX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="zero" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Report number 2" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Last" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x03" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Report number 2" type="BYTE" />
+            <param key="0x02" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x03" name="Checksum" type="WORD" />
         </cmd>
-        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Firmware Target" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Fragment Size" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Fragment Size" type="WORD" />
         </cmd>
-        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
                 <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
                 <const key="0x02" flagname="Invalid Fragment Size" flagmask="0x02" />
@@ -3328,95 +3146,61 @@
                 <const key="0x04" flagname="Valid combination" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="unable to receive without checksum error" flagmask="0x00" />
                 <const key="0x01" flagname="unable to receive" flagmask="0x01" />
                 <const key="0x02" flagname="successfully stored" flagmask="0xFE" />
                 <const key="0x03" flagname="successfully" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="WaitTime" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="WaitTime" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x7A" version="4" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Md" read_only="false" comment="">
-        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" comment="" />
-        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware 0 ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Firmware 0 Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Firmware Upgradable" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Number of Firmware Targets" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Max Fragment Size " type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x06" name="vg1" variantKey="0x00" paramOffs="0x04" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Firmware ID" type="WORD" typehashcode="0x02">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
+    <cmd_class key="0x7A" version="4" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Meta Data">
+        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" support_mode="RX" />
+        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware 0 ID" type="WORD" />
+            <param key="0x02" name="Firmware 0 Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Upgradable" type="BYTE" />
+            <param key="0x04" name="Number of Firmware Targets" type="BYTE" />
+            <param key="0x05" name="Max Fragment Size" type="WORD" />
+            <variant_group key="0x06" name="vg1" paramOffs="0x04" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Firmware ID" type="WORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" comment="">
-            <param key="0x00" name="Number of Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" support_mode="TX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="zero" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Report number 2" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Last" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x03" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Report number 2" type="BYTE" />
+            <param key="0x02" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x03" name="Checksum" type="WORD" />
         </cmd>
-        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Firmware Target" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Fragment Size" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Fragment Size" type="WORD" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Activation" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
         </cmd>
-        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
                 <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
                 <const key="0x02" flagname="Invalid Fragment Size" flagmask="0x02" />
@@ -3424,8 +3208,8 @@
                 <const key="0x04" flagname="Valid combination" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="unable to receive without checksum error" flagmask="0x00" />
                 <const key="0x01" flagname="unable to receive" flagmask="0x01" />
                 <const key="0x02" flagname="does not match the Manufacturer ID" flagmask="0x02" />
@@ -3438,127 +3222,73 @@
                 <const key="0x09" flagname="successfully stored" flagmask="0xFE" />
                 <const key="0x0A" flagname="successfully" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="WaitTime" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="WaitTime" type="WORD" />
         </cmd>
-        <cmd key="0x08" name="FIRMWARE_UPDATE_ACTIVATION_SET" help="Firmware Update Activation Set Command">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Firmware Target" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x08" name="FIRMWARE_UPDATE_ACTIVATION_SET" help="Firmware Update Activation Set Command" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
         </cmd>
-        <cmd key="0x09" name="FIRMWARE_UPDATE_ACTIVATION_STATUS_REPORT" help="Firmware Update Activation Status Report">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Firmware Target" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Firmware Update Status" type="CONST" typehashcode="0x0B">
+        <cmd key="0x09" name="FIRMWARE_UPDATE_ACTIVATION_STATUS_REPORT" help="Firmware Update Activation Status Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Firmware Update Status" type="CONST">
                 <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
                 <const key="0x01" flagname="Error activating the firmware" flagmask="0x01" />
                 <const key="0x02" flagname="Firmware update completed successfully" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x7A" version="5" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Md" read_only="false" comment="">
-        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" comment="" />
-        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware 0 ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Firmware 0 Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Firmware Upgradable" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Number of Firmware Targets" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Max Fragment Size " type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x06" name="vg1" variantKey="0x00" paramOffs="0x04" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Firmware ID" type="WORD" typehashcode="0x02">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
+    <cmd_class key="0x7A" version="5" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Meta Data">
+        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" support_mode="RX" />
+        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware 0 ID" type="WORD" />
+            <param key="0x02" name="Firmware 0 Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Upgradable" type="BYTE" />
+            <param key="0x04" name="Number of Firmware Targets" type="BYTE" />
+            <param key="0x05" name="Max Fragment Size" type="WORD" />
+            <variant_group key="0x06" name="vg1" paramOffs="0x04" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Firmware ID" type="WORD" />
             </variant_group>
-            <param key="0x07" name="Hardware Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x07" name="Hardware Version" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" comment="">
-            <param key="0x00" name="Number of Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" support_mode="TX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="zero" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Report number 2" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Last" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Report number 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x03" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Report number 2" type="BYTE" />
+            <param key="0x02" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x03" name="Checksum" type="WORD" />
         </cmd>
-        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Firmware Target" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Fragment Size" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Fragment Size" type="WORD" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Activation" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x06" name="Hardware Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x06" name="Hardware Version" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
                 <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
                 <const key="0x02" flagname="Invalid Fragment Size" flagmask="0x02" />
@@ -3567,8 +3297,8 @@
                 <const key="0x05" flagname="Valid combination" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="unable to receive without checksum error" flagmask="0x00" />
                 <const key="0x01" flagname="unable to receive" flagmask="0x01" />
                 <const key="0x02" flagname="does not match the Manufacturer ID" flagmask="0x02" />
@@ -3582,165 +3312,346 @@
                 <const key="0x0A" flagname="successfully stored" flagmask="0xFE" />
                 <const key="0x0B" flagname="successfully" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="WaitTime" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="WaitTime" type="WORD" />
+        </cmd>
+        <cmd key="0x08" name="FIRMWARE_UPDATE_ACTIVATION_SET" help="Firmware Update Activation Set Command" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="FIRMWARE_UPDATE_ACTIVATION_STATUS_REPORT" help="Firmware Update Activation Status Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Firmware Update Status" type="CONST">
+                <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
+                <const key="0x01" flagname="Error activating the firmware" flagmask="0x01" />
+                <const key="0x02" flagname="Firmware update completed successfully" flagmask="0xFF" />
             </param>
+            <param key="0x05" name="Hardware Version" type="BYTE" />
         </cmd>
-        <cmd key="0x08" name="FIRMWARE_UPDATE_ACTIVATION_SET" help="Firmware Update Activation Set Command">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0A" name="FIRMWARE_UPDATE_MD_PREPARE_GET" help="Firmware Update MD Prepare Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Firmware Target" type="BYTE" />
+            <param key="0x03" name="Fragment Size" type="WORD" />
+            <param key="0x04" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x0B" name="FIRMWARE_UPDATE_MD_PREPARE_REPORT" help="Firmware Update MD Prepare Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
+                <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
+                <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
+                <const key="0x02" flagname="Invalid Fragment Size" flagmask="0x02" />
+                <const key="0x03" flagname="Not downloadable" flagmask="0x03" />
+                <const key="0x04" flagname="Invalid Hardware Version" flagmask="0x04" />
+                <const key="0x05" flagname="Valid combination" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Firmware Checksum" type="WORD" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x7A" version="6" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Meta Data">
+        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" support_mode="RX" />
+        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware 0 ID" type="WORD" />
+            <param key="0x02" name="Firmware 0 Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Upgradable" type="BYTE" />
+            <param key="0x04" name="Number of Firmware Targets" type="BYTE" />
+            <param key="0x05" name="Max Fragment Size" type="WORD" />
+            <variant_group key="0x06" name="vg1" paramOffs="0x04" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Firmware ID" type="WORD" />
+            </variant_group>
+            <param key="0x07" name="Hardware Version" type="BYTE" />
+            <param key="0x08" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="CC" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" support_mode="TX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="zero" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Firmware Target" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Report number 2" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Last" flagmask="0x80" />
             </param>
-            <param key="0x04" name="Hardware Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Report number 2" type="BYTE" />
+            <param key="0x02" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x03" name="Checksum" type="WORD" />
         </cmd>
-        <cmd key="0x09" name="FIRMWARE_UPDATE_ACTIVATION_STATUS_REPORT" help="Firmware Update Activation Status Report">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Firmware ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Fragment Size" type="WORD" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Activation" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x02" name="Checksum" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x06" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
+                <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
+                <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
+                <const key="0x02" flagname="Invalid Fragment Size" flagmask="0x02" />
+                <const key="0x03" flagname="Not upgradable" flagmask="0x03" />
+                <const key="0x04" flagname="Invalid Hardware Version" flagmask="0x04" />
+                <const key="0x05" flagname="Another firmware image" flagmask="0x05" />
+                <const key="0x06" flagname="Insufficient battery level" flagmask="0x06" />
+                <const key="0x07" flagname="Valid combination" flagmask="0xFF" />
             </param>
-            <param key="0x03" name="Firmware Target" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
+                <const key="0x00" flagname="unable to receive without checksum error" flagmask="0x00" />
+                <const key="0x01" flagname="unable to receive" flagmask="0x01" />
+                <const key="0x02" flagname="does not match the Manufacturer ID" flagmask="0x02" />
+                <const key="0x03" flagname="does not match the Firmware ID" flagmask="0x03" />
+                <const key="0x04" flagname="does not match the Firmware Target" flagmask="0x04" />
+                <const key="0x05" flagname="Invalid file header information" flagmask="0x05" />
+                <const key="0x06" flagname="Invalid file header format" flagmask="0x06" />
+                <const key="0x07" flagname="Insufficient memory" flagmask="0x07" />
+                <const key="0x08" flagname="does not match the Hardware version" flagmask="0x08" />
+                <const key="0x09" flagname="successfully, waiting for activation" flagmask="0xFD" />
+                <const key="0x0A" flagname="successfully stored" flagmask="0xFE" />
+                <const key="0x0B" flagname="successfully" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="Firmware Update Status" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="WaitTime" type="WORD" />
+        </cmd>
+        <cmd key="0x08" name="FIRMWARE_UPDATE_ACTIVATION_SET" help="Firmware Update Activation Set Command" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="FIRMWARE_UPDATE_ACTIVATION_STATUS_REPORT" help="Firmware Update Activation Status Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Firmware Update Status" type="CONST">
                 <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
                 <const key="0x01" flagname="Error activating the firmware" flagmask="0x01" />
                 <const key="0x02" flagname="Firmware update completed successfully" flagmask="0xFF" />
             </param>
-            <param key="0x05" name="Hardware Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x0A" name="FIRMWARE_UPDATE_MD_PREPARE_GET" help="Firmware Update MD Prepare Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Firmware Target" type="BYTE" />
+            <param key="0x03" name="Fragment Size" type="WORD" />
+            <param key="0x04" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x0B" name="FIRMWARE_UPDATE_MD_PREPARE_REPORT" help="Firmware Update MD Prepare Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
+                <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
+                <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
+                <const key="0x02" flagname="Invalid Fragment Size" flagmask="0x02" />
+                <const key="0x03" flagname="Not downloadable" flagmask="0x03" />
+                <const key="0x04" flagname="Invalid Hardware Version" flagmask="0x04" />
+                <const key="0x05" flagname="Valid combination" flagmask="0xFF" />
             </param>
+            <param key="0x01" name="Firmware Checksum" type="WORD" />
         </cmd>
-        <cmd key="0x0A" name="FIRMWARE_UPDATE_MD_PREPARE_GET" help="Firmware Update MD Prepare Get">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x7A" version="7" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" help="Command Class Firmware Update Meta Data">
+        <cmd key="0x01" name="FIRMWARE_MD_GET" help="Firmware Md Get" support_mode="RX" />
+        <cmd key="0x02" name="FIRMWARE_MD_REPORT" help="Firmware Md Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware 0 ID" type="WORD" />
+            <param key="0x02" name="Firmware 0 Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Upgradable" type="BYTE" />
+            <param key="0x04" name="Number of Firmware Targets" type="BYTE" />
+            <param key="0x05" name="Max Fragment Size" type="WORD" />
+            <variant_group key="0x06" name="vg1" paramOffs="0x04" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Firmware ID" type="WORD" />
+            </variant_group>
+            <param key="0x07" name="Hardware Version" type="BYTE" />
+            <param key="0x08" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="CC" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Activation" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved1" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Firmware ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x05" name="FIRMWARE_UPDATE_MD_GET" help="Firmware Update Md Get" support_mode="TX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="zero" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Firmware Target" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Report number 2" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="FIRMWARE_UPDATE_MD_REPORT" help="Firmware Update Md Report" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Last" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Fragment Size" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Report number 2" type="BYTE" />
+            <param key="0x02" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x04" name="Hardware Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Checksum" type="WORD" />
+        </cmd>
+        <cmd key="0x03" name="FIRMWARE_UPDATE_MD_REQUEST_GET" help="Firmware Update Md Request Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Fragment Size" type="WORD" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Activation" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
+            <param key="0x06" name="Hardware Version" type="BYTE" />
         </cmd>
-        <cmd key="0x0B" name="FIRMWARE_UPDATE_MD_PREPARE_REPORT" help="Firmware Update MD Prepare Report">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B">
+        <cmd key="0x04" name="FIRMWARE_UPDATE_MD_REQUEST_REPORT" help="Firmware Update Md Request Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
                 <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
                 <const key="0x02" flagname="Invalid Fragment Size" flagmask="0x02" />
                 <const key="0x03" flagname="Not upgradable" flagmask="0x03" />
                 <const key="0x04" flagname="Invalid Hardware Version" flagmask="0x04" />
-                <const key="0x05" flagname="Valid combination" flagmask="0xFF" />
+                <const key="0x05" flagname="Another firmware image" flagmask="0x05" />
+                <const key="0x06" flagname="Insufficient battery level" flagmask="0x06" />
+                <const key="0x07" flagname="Valid combination" flagmask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x07" name="FIRMWARE_UPDATE_MD_STATUS_REPORT" help="Firmware Update Md Status Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
+                <const key="0x00" flagname="unable to receive without checksum error" flagmask="0x00" />
+                <const key="0x01" flagname="unable to receive" flagmask="0x01" />
+                <const key="0x02" flagname="does not match the Manufacturer ID" flagmask="0x02" />
+                <const key="0x03" flagname="does not match the Firmware ID" flagmask="0x03" />
+                <const key="0x04" flagname="does not match the Firmware Target" flagmask="0x04" />
+                <const key="0x05" flagname="Invalid file header information" flagmask="0x05" />
+                <const key="0x06" flagname="Invalid file header format" flagmask="0x06" />
+                <const key="0x07" flagname="Insufficient memory" flagmask="0x07" />
+                <const key="0x08" flagname="does not match the Hardware version" flagmask="0x08" />
+                <const key="0x09" flagname="successfully, waiting for activation" flagmask="0xFD" />
+                <const key="0x0A" flagname="successfully stored" flagmask="0xFE" />
+                <const key="0x0B" flagname="successfully" flagmask="0xFF" />
+            </param>
+            <param key="0x01" name="WaitTime" type="WORD" />
+        </cmd>
+        <cmd key="0x08" name="FIRMWARE_UPDATE_ACTIVATION_SET" help="Firmware Update Activation Set Command" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="FIRMWARE_UPDATE_ACTIVATION_STATUS_REPORT" help="Firmware Update Activation Status Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Checksum" type="WORD" />
+            <param key="0x03" name="Firmware Target" type="BYTE" />
+            <param key="0x04" name="Firmware Update Status" type="CONST">
+                <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
+                <const key="0x01" flagname="Error activating the firmware" flagmask="0x01" />
+                <const key="0x02" flagname="Firmware update completed successfully" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Firmware Checksum" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x0A" name="FIRMWARE_UPDATE_MD_PREPARE_GET" help="Firmware Update MD Prepare Get" support_mode="RX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Firmware ID" type="WORD" />
+            <param key="0x02" name="Firmware Target" type="BYTE" />
+            <param key="0x03" name="Fragment Size" type="WORD" />
+            <param key="0x04" name="Hardware Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x0B" name="FIRMWARE_UPDATE_MD_PREPARE_REPORT" help="Firmware Update MD Prepare Report" support_mode="TX">
+            <param key="0x00" name="Status" type="CONST">
+                <const key="0x00" flagname="Invalid combination" flagmask="0x00" />
+                <const key="0x01" flagname="Requires authentication" flagmask="0x01" />
+                <const key="0x02" flagname="Invalid Fragment Size" flagmask="0x02" />
+                <const key="0x03" flagname="Not downloadable" flagmask="0x03" />
+                <const key="0x04" flagname="Invalid Hardware Version" flagmask="0x04" />
+                <const key="0x05" flagname="Valid combination" flagmask="0xFF" />
             </param>
+            <param key="0x01" name="Firmware Checksum" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x8C" version="1" name="COMMAND_CLASS_GEOGRAPHIC_LOCATION" help="Command Class Geographic Location" read_only="false" comment="">
-        <cmd key="0x02" name="GEOGRAPHIC_LOCATION_GET" help="Geographic Location Get" comment="" />
-        <cmd key="0x03" name="GEOGRAPHIC_LOCATION_REPORT" help="Geographic Location Report" comment="">
-            <param key="0x00" name="Longitude Degrees" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Longitude Minutes" fieldmask="0x7F" shifter="0" />
+    <cmd_class key="0x8C" version="1" name="COMMAND_CLASS_GEOGRAPHIC_LOCATION" help="Command Class Geographic Location">
+        <cmd key="0x02" name="GEOGRAPHIC_LOCATION_GET" help="Geographic Location Get" support_mode="RX" />
+        <cmd key="0x03" name="GEOGRAPHIC_LOCATION_REPORT" help="Geographic Location Report" support_mode="TX">
+            <param key="0x00" name="Longitude Degrees" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Longitude Minutes" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Long. Sign" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Latitude Degrees" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Latitude Minutes" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Latitude Degrees" type="BYTE" />
+            <param key="0x03" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Latitude Minutes" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Lat. Sign" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x01" name="GEOGRAPHIC_LOCATION_SET" help="Geographic Location Set" comment="">
-            <param key="0x00" name="Longitude Degrees" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Longitude Minutes" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x01" name="GEOGRAPHIC_LOCATION_SET" help="Geographic Location Set" support_mode="RX">
+            <param key="0x00" name="Longitude Degrees" type="BYTE" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Longitude Minutes" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Long. Sign" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Latitude Degrees" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Latitude Minutes" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Latitude Degrees" type="BYTE" />
+            <param key="0x03" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Latitude Minutes" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Lat. Sign" flagmask="0x80" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x7B" version="1" name="COMMAND_CLASS_GROUPING_NAME" help="Command Class Grouping Name" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x02" name="GROUPING_NAME_GET" help="Grouping Name Get" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x03" name="GROUPING_NAME_REPORT" help="Grouping Name Report" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x7B" version="1" name="COMMAND_CLASS_GROUPING_NAME" help="Command Class Grouping Name" comment="[DEPRECATED]">
+        <cmd key="0x02" name="GROUPING_NAME_GET" help="Grouping Name Get" support_mode="RX">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="GROUPING_NAME_REPORT" help="Grouping Name Report" support_mode="TX">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Grouping Name" type="ARRAY" typehashcode="0x05" comment="">
+            <param key="0x02" name="Grouping Name" type="ARRAY">
                 <arrayattrib key="0x00" len="16" is_ascii="true" />
             </param>
         </cmd>
-        <cmd key="0x01" name="GROUPING_NAME_SET" help="Grouping Name Set" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" shifter="0" />
+        <cmd key="0x01" name="GROUPING_NAME_SET" help="Grouping Name Set" support_mode="RX">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Grouping Name" type="ARRAY" typehashcode="0x05" comment="">
+            <param key="0x02" name="Grouping Name" type="ARRAY">
                 <arrayattrib key="0x00" len="16" is_ascii="true" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x82" version="1" name="COMMAND_CLASS_HAIL" help="Command Class Hail" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x01" name="HAIL" help="Hail" comment="" />
+    <cmd_class key="0x82" version="1" name="COMMAND_CLASS_HAIL" help="Command Class Hail" comment="[OBSOLETED]">
+        <cmd key="0x01" name="HAIL" help="Hail" support_mode="TX" />
     </cmd_class>
-    <cmd_class key="0x39" version="1" name="COMMAND_CLASS_HRV_CONTROL" help="Command Class Hrv Control" read_only="false" comment="">
-        <cmd key="0x05" name="HRV_CONTROL_BYPASS_GET" help="Hrv Control Bypass  Get" comment="" />
-        <cmd key="0x06" name="HRV_CONTROL_BYPASS_REPORT" help="Hrv Control Bypass Report" comment="">
-            <param key="0x00" name="Bypass" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x04" name="HRV_CONTROL_BYPASS_SET" help="Hrv Control Bypass Set" comment="">
-            <param key="0x00" name="Bypass" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x02" name="HRV_CONTROL_MODE_GET" help="Hrv Control Mode Get" comment="" />
-        <cmd key="0x03" name="HRV_CONTROL_MODE_REPORT" help="Hrv Control Mode Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F" shifter="0">
+    <cmd_class key="0x39" version="1" name="COMMAND_CLASS_HRV_CONTROL" help="Command Class HRV Control">
+        <cmd key="0x05" name="HRV_CONTROL_BYPASS_GET" help="Hrv Control Bypass  Get" support_mode="RX" />
+        <cmd key="0x06" name="HRV_CONTROL_BYPASS_REPORT" help="Hrv Control Bypass Report" support_mode="TX">
+            <param key="0x00" name="Bypass" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="HRV_CONTROL_BYPASS_SET" help="Hrv Control Bypass Set" support_mode="RX">
+            <param key="0x00" name="Bypass" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="HRV_CONTROL_MODE_GET" help="Hrv Control Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="HRV_CONTROL_MODE_REPORT" help="Hrv Control Mode Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F">
                     <fieldenum value="Off" />
                     <fieldenum value="Demand Automatic" />
                     <fieldenum value="Schedule" />
@@ -3750,9 +3661,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x01" name="HRV_CONTROL_MODE_SET" help="Hrv Control Mode Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F" shifter="0">
+        <cmd key="0x01" name="HRV_CONTROL_MODE_SET" help="Hrv Control Mode Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F">
                     <fieldenum value="Off" />
                     <fieldenum value="Demand Automatic" />
                     <fieldenum value="Schedule" />
@@ -3762,10 +3673,10 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="HRV_CONTROL_MODE_SUPPORTED_GET" help="Hrv Control Mode Supported Get" comment="" />
-        <cmd key="0x0B" name="HRV_CONTROL_MODE_SUPPORTED_REPORT" help="Hrv Control Mode Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Manual Control Supported" fieldmask="0x0F" shifter="0">
+        <cmd key="0x0A" name="HRV_CONTROL_MODE_SUPPORTED_GET" help="Hrv Control Mode Supported Get" support_mode="RX" />
+        <cmd key="0x0B" name="HRV_CONTROL_MODE_SUPPORTED_REPORT" help="Hrv Control Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Manual Control Supported" fieldmask="0x0F">
                     <fieldenum value="Bypass Open Close" />
                     <fieldenum value="Bypass Auto" />
                     <fieldenum value="Modulated Bypass" />
@@ -3773,8 +3684,8 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Demand Automatic" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Schedule" flagmask="0x02" />
@@ -3782,21 +3693,17 @@
                 <bitflag key="0x04" flagname="Manual" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x08" name="HRV_CONTROL_VENTILATION_RATE_GET" help="Hrv Control Ventilation Rate  Get" comment="" />
-        <cmd key="0x09" name="HRV_CONTROL_VENTILATION_RATE_REPORT" help="Hrv Control Ventilation Rate  Report" comment="">
-            <param key="0x00" name="Ventilation Rate" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x08" name="HRV_CONTROL_VENTILATION_RATE_GET" help="Hrv Control Ventilation Rate  Get" support_mode="RX" />
+        <cmd key="0x09" name="HRV_CONTROL_VENTILATION_RATE_REPORT" help="Hrv Control Ventilation Rate  Report" support_mode="TX">
+            <param key="0x00" name="Ventilation Rate" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="HRV_CONTROL_VENTILATION_RATE_SET" help="Hrv Control Ventilation Rate Set" comment="">
-            <param key="0x00" name="Ventilation Rate" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x07" name="HRV_CONTROL_VENTILATION_RATE_SET" help="Hrv Control Ventilation Rate Set" support_mode="RX">
+            <param key="0x00" name="Ventilation Rate" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x37" version="1" name="COMMAND_CLASS_HRV_STATUS" help="Command Class Hrv Status" read_only="false" comment="">
-        <cmd key="0x01" name="HRV_STATUS_GET" help="Hrv Status Get" comment="">
-            <param key="0x00" name="Status Parameter" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x37" version="1" name="COMMAND_CLASS_HRV_STATUS" help="Command Class HRV Status">
+        <cmd key="0x01" name="HRV_STATUS_GET" help="Hrv Status Get" support_mode="RX">
+            <param key="0x00" name="Status Parameter" type="CONST">
                 <const key="0x00" flagname="Outdoor Air temperature" flagmask="0x00" />
                 <const key="0x01" flagname="Supply Air temperature" flagmask="0x01" />
                 <const key="0x02" flagname="Exhaust Air temperature" flagmask="0x02" />
@@ -3806,8 +3713,8 @@
                 <const key="0x06" flagname="Remaining filter life" flagmask="0x06" />
             </param>
         </cmd>
-        <cmd key="0x02" name="HRV_STATUS_REPORT" help="Hrv Status Report" comment="">
-            <param key="0x00" name="Status Parameter" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="HRV_STATUS_REPORT" help="Hrv Status Report" support_mode="TX">
+            <param key="0x00" name="Status Parameter" type="CONST">
                 <const key="0x00" flagname="Outdoor Air temperature" flagmask="0x00" />
                 <const key="0x01" flagname="Supply Air temperature" flagmask="0x01" />
                 <const key="0x02" flagname="Exhaust Air temperature" flagmask="0x02" />
@@ -3816,19 +3723,19 @@
                 <const key="0x05" flagname="Relative Humidity in room" flagmask="0x05" />
                 <const key="0x06" flagname="Remaining filter life" flagmask="0x06" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x03" name="HRV_STATUS_SUPPORTED_GET" help="Hrv Status Supported Get" comment="" />
-        <cmd key="0x04" name="HRV_STATUS_SUPPORTED_REPORT" help="Hrv Status Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x03" name="HRV_STATUS_SUPPORTED_GET" help="Hrv Status Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="HRV_STATUS_SUPPORTED_REPORT" help="Hrv Status Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Outdoor Air temperature" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Supply Air temperature" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Exhaust Air temperature" flagmask="0x02" />
@@ -3839,26 +3746,24 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x87" version="1" name="COMMAND_CLASS_INDICATOR" help="Command Class Indicator" read_only="false" comment="">
-        <cmd key="0x02" name="INDICATOR_GET" help="Indicator Get" comment="" />
-        <cmd key="0x03" name="INDICATOR_REPORT" help="Indicator Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x87" version="1" name="COMMAND_CLASS_INDICATOR" help="Command Class Indicator">
+        <cmd key="0x02" name="INDICATOR_GET" help="Indicator Get" support_mode="RX" />
+        <cmd key="0x03" name="INDICATOR_REPORT" help="Indicator Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="INDICATOR_SET" help="Indicator Set" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="INDICATOR_SET" help="Indicator Set" support_mode="RX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x87" version="2" name="COMMAND_CLASS_INDICATOR" help="Command Class Indicator" read_only="false" comment="">
-        <cmd key="0x02" name="INDICATOR_GET" help="Indicator Get" comment="">
-            <param key="0x00" name="Indicator ID" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x87" version="2" name="COMMAND_CLASS_INDICATOR" help="Command Class Indicator">
+        <cmd key="0x02" name="INDICATOR_GET" help="Indicator Get" support_mode="RX">
+            <param key="0x00" name="Indicator ID" type="CONST">
                 <const key="0x00" flagname="NA" flagmask="0x00" />
                 <const key="0x01" flagname="ARMED" flagmask="0x01" />
                 <const key="0x02" flagname="NOT_ARMED" flagmask="0x02" />
@@ -3894,18 +3799,17 @@
                 <const key="0x20" flagname="Buzzer" flagmask="0xF0" />
             </param>
         </cmd>
-        <cmd key="0x03" name="INDICATOR_REPORT" help="Indicator Report" comment="">
-            <param key="0x00" name="Indicator 0 Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x03" name="INDICATOR_REPORT" help="Indicator Report" support_mode="TX">
+            <param key="0x00" name="Indicator 0 Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Indicator Object Count" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Indicator Object Count" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <variant_group key="0x02" name="vg1" variantKey="0x00" paramOffs="0x01" sizemask="0x1F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Indicator ID" type="CONST" typehashcode="0x0B">
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Indicator ID" type="CONST">
                     <const key="0x00" flagname="NA" flagmask="0x00" />
                     <const key="0x01" flagname="ARMED" flagmask="0x01" />
                     <const key="0x02" flagname="NOT_ARMED" flagmask="0x02" />
@@ -3940,30 +3844,27 @@
                     <const key="0x1F" flagname="BUTTON12_INDICATION" flagmask="0x4E" />
                     <const key="0x20" flagname="Buzzer" flagmask="0xF0" />
                 </param>
-                <param key="0x01" name="Property ID" type="CONST" typehashcode="0x0B">
+                <param key="0x01" name="Property ID" type="CONST">
                     <const key="0x00" flagname="Multilevel" flagmask="0x01" />
                     <const key="0x01" flagname="Binary" flagmask="0x02" />
                     <const key="0x02" flagname="On_Off_Period" flagmask="0x03" />
                     <const key="0x03" flagname="On_Off_Cycles" flagmask="0x04" />
                     <const key="0x04" flagname="Low_power" flagmask="0x10" />
                 </param>
-                <param key="0x02" name="Value" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x02" name="Value" type="BYTE" />
             </variant_group>
         </cmd>
-        <cmd key="0x01" name="INDICATOR_SET" help="Indicator Set" comment="">
-            <param key="0x00" name="Indicator 0 Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="INDICATOR_SET" help="Indicator Set" support_mode="RX">
+            <param key="0x00" name="Indicator 0 Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Indicator Object Count" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Indicator Object Count" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <variant_group key="0x02" name="vg1" variantKey="0x00" paramOffs="0x01" sizemask="0x1F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Indicator ID" type="CONST" typehashcode="0x0B">
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Indicator ID" type="CONST">
                     <const key="0x00" flagname="NA" flagmask="0x00" />
                     <const key="0x01" flagname="ARMED" flagmask="0x01" />
                     <const key="0x02" flagname="NOT_ARMED" flagmask="0x02" />
@@ -3998,20 +3899,18 @@
                     <const key="0x1F" flagname="BUTTON12_INDICATION" flagmask="0x4E" />
                     <const key="0x20" flagname="Buzzer" flagmask="0xF0" />
                 </param>
-                <param key="0x01" name="Property ID" type="CONST" typehashcode="0x0B">
+                <param key="0x01" name="Property ID" type="CONST">
                     <const key="0x00" flagname="Multilevel" flagmask="0x01" />
                     <const key="0x01" flagname="Binary" flagmask="0x02" />
                     <const key="0x02" flagname="On_Off_Period" flagmask="0x03" />
                     <const key="0x03" flagname="On_Off_Cycles" flagmask="0x04" />
                     <const key="0x04" flagname="Low_power" flagmask="0x10" />
                 </param>
-                <param key="0x02" name="Value" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x02" name="Value" type="BYTE" />
             </variant_group>
         </cmd>
         <cmd key="0x04" name="INDICATOR_SUPPORTED_GET" help="Indicator Supported Get">
-            <param key="0x00" name="Indicator ID" type="CONST" typehashcode="0x0B">
+            <param key="0x00" name="Indicator ID" type="CONST">
                 <const key="0x00" flagname="NA" flagmask="0x00" />
                 <const key="0x01" flagname="ARMED" flagmask="0x01" />
                 <const key="0x02" flagname="NOT_ARMED" flagmask="0x02" />
@@ -4048,7 +3947,7 @@
             </param>
         </cmd>
         <cmd key="0x05" name="INDICATOR_SUPPORTED_REPORT" help="Indicator Supported Report">
-            <param key="0x00" name="Indicator ID" type="CONST" typehashcode="0x0B">
+            <param key="0x00" name="Indicator ID" type="CONST">
                 <const key="0x00" flagname="NA" flagmask="0x00" />
                 <const key="0x01" flagname="ARMED" flagmask="0x01" />
                 <const key="0x02" flagname="NOT_ARMED" flagmask="0x02" />
@@ -4083,7 +3982,7 @@
                 <const key="0x1F" flagname="BUTTON12_INDICATION" flagmask="0x4E" />
                 <const key="0x20" flagname="Buzzer" flagmask="0xF0" />
             </param>
-            <param key="0x01" name="Next Indicator ID" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="Next Indicator ID" type="CONST">
                 <const key="0x00" flagname="NA" flagmask="0x00" />
                 <const key="0x01" flagname="ARMED" flagmask="0x01" />
                 <const key="0x02" flagname="NOT_ARMED" flagmask="0x02" />
@@ -4118,12 +4017,12 @@
                 <const key="0x1F" flagname="BUTTON12_INDICATION" flagmask="0x4E" />
                 <const key="0x20" flagname="Buzzer" flagmask="0xF0" />
             </param>
-            <param key="0x02" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Property Supported Bit Mask Length" fieldmask="0x1F" shifter="0" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Property Supported Bit Mask Length" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x03" name="Property Supported Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="2" lenmask="0x1F" lenoffs="0" />
+            <param key="0x03" name="Property Supported Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="2" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="Multilevel" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Binary" flagmask="0x02" />
                 <bitflag key="0x02" flagname="On_Off_Period" flagmask="0x03" />
@@ -4132,394 +4031,934 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x9A" version="1" name="COMMAND_CLASS_IP_CONFIGURATION" help="Command Class Ip Configuration" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x02" name="IP_CONFIGURATION_GET" help="Ip Configuration Get" comment="" />
-        <cmd key="0x04" name="IP_CONFIGURATION_RELEASE" help="Ip Configuration Release" comment="" />
-        <cmd key="0x05" name="IP_CONFIGURATION_RENEW" help="Ip Configuration Renew" comment="" />
-        <cmd key="0x03" name="IP_CONFIGURATION_REPORT" help="Ip Configuration Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitflag key="0x00" flagname="Auto DNS" flagmask="0x01" />
-                <bitflag key="0x01" flagname="Auto IP" flagmask="0x02" />
-                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
+    <cmd_class key="0x87" version="3" name="COMMAND_CLASS_INDICATOR" help="Command Class Indicator">
+        <cmd key="0x02" name="INDICATOR_GET" help="Indicator Get" support_mode="RX">
+            <param key="0x00" name="Indicator ID" type="CONST">
+                <const key="0x00" flagname="NA" flagmask="0x00" />
+                <const key="0x01" flagname="Armed" flagmask="0x01" />
+                <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                <const key="0x03" flagname="Ready" flagmask="0x03" />
+                <const key="0x04" flagname="Fault" flagmask="0x04" />
+                <const key="0x05" flagname="Busy" flagmask="0x05" />
+                <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                <const key="0x08" flagname="Ok" flagmask="0x08" />
+                <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="INDICATOR_REPORT" help="Indicator Report" support_mode="TX">
+            <param key="0x00" name="Indicator 0 Value" type="BYTE">
+                <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
+                <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="IP Address" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Indicator Object Count" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Subnet Mask" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Indicator ID" type="CONST">
+                    <const key="0x00" flagname="NA" flagmask="0x00" />
+                    <const key="0x01" flagname="Armed" flagmask="0x01" />
+                    <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                    <const key="0x03" flagname="Ready" flagmask="0x03" />
+                    <const key="0x04" flagname="Fault" flagmask="0x04" />
+                    <const key="0x05" flagname="Busy" flagmask="0x05" />
+                    <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                    <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                    <const key="0x08" flagname="Ok" flagmask="0x08" />
+                    <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                    <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                    <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                    <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                    <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                    <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                    <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                    <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                    <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                    <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                    <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                    <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                    <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                    <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                    <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                    <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                    <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                    <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                    <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                    <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                    <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                    <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                    <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                    <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                    <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                    <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                    <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                    <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                    <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                    <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                    <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                    <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                    <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                    <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+                </param>
+                <param key="0x01" name="Property ID" type="CONST">
+                    <const key="0x00" flagname="Multilevel" flagmask="0x01" />
+                    <const key="0x01" flagname="Binary" flagmask="0x02" />
+                    <const key="0x02" flagname="On/Off Period" flagmask="0x03" />
+                    <const key="0x03" flagname="On/Off Cycles" flagmask="0x04" />
+                    <const key="0x04" flagname="One time On/Off period" flagmask="0x05" />
+                    <const key="0x05" flagname="Timeout (minutes)" flagmask="0x06" />
+                    <const key="0x06" flagname="Timeout (seconds)" flagmask="0x07" />
+                    <const key="0x07" flagname="Timeout (1/100 seconds)" flagmask="0x08" />
+                    <const key="0x08" flagname="Specific volume" flagmask="0x09" />
+                    <const key="0x09" flagname="Low power" flagmask="0x10" />
+                </param>
+                <param key="0x02" name="Value" type="BYTE" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x01" name="INDICATOR_SET" help="Indicator Set" support_mode="RX">
+            <param key="0x00" name="Indicator 0 Value" type="BYTE">
+                <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
+                <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x03" name="Gateway" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Indicator Object Count" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x04" name="DNS1" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Indicator ID" type="CONST">
+                    <const key="0x00" flagname="NA" flagmask="0x00" />
+                    <const key="0x01" flagname="Armed" flagmask="0x01" />
+                    <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                    <const key="0x03" flagname="Ready" flagmask="0x03" />
+                    <const key="0x04" flagname="Fault" flagmask="0x04" />
+                    <const key="0x05" flagname="Busy" flagmask="0x05" />
+                    <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                    <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                    <const key="0x08" flagname="Ok" flagmask="0x08" />
+                    <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                    <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                    <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                    <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                    <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                    <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                    <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                    <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                    <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                    <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                    <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                    <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                    <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                    <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                    <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                    <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                    <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                    <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                    <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                    <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                    <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                    <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                    <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                    <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                    <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                    <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                    <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                    <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                    <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                    <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                    <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                    <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                    <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                    <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+                </param>
+                <param key="0x01" name="Property ID" type="CONST">
+                    <const key="0x00" flagname="Multilevel" flagmask="0x01" />
+                    <const key="0x01" flagname="Binary" flagmask="0x02" />
+                    <const key="0x02" flagname="On/Off Period" flagmask="0x03" />
+                    <const key="0x03" flagname="On/Off Cycles" flagmask="0x04" />
+                    <const key="0x04" flagname="One time On/Off period" flagmask="0x05" />
+                    <const key="0x05" flagname="Timeout (minutes)" flagmask="0x06" />
+                    <const key="0x06" flagname="Timeout (seconds)" flagmask="0x07" />
+                    <const key="0x07" flagname="Timeout (1/100 seconds)" flagmask="0x08" />
+                    <const key="0x08" flagname="Specific volume" flagmask="0x09" />
+                    <const key="0x09" flagname="Low power" flagmask="0x10" />
+                </param>
+                <param key="0x02" name="Value" type="BYTE" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x04" name="INDICATOR_SUPPORTED_GET" help="Indicator Supported Get">
+            <param key="0x00" name="Indicator ID" type="CONST">
+                <const key="0x00" flagname="NA" flagmask="0x00" />
+                <const key="0x01" flagname="Armed" flagmask="0x01" />
+                <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                <const key="0x03" flagname="Ready" flagmask="0x03" />
+                <const key="0x04" flagname="Fault" flagmask="0x04" />
+                <const key="0x05" flagname="Busy" flagmask="0x05" />
+                <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                <const key="0x08" flagname="Ok" flagmask="0x08" />
+                <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
             </param>
-            <param key="0x05" name="DNS2" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x05" name="INDICATOR_SUPPORTED_REPORT" help="Indicator Supported Report">
+            <param key="0x00" name="Indicator ID" type="CONST">
+                <const key="0x00" flagname="NA" flagmask="0x00" />
+                <const key="0x01" flagname="Armed" flagmask="0x01" />
+                <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                <const key="0x03" flagname="Ready" flagmask="0x03" />
+                <const key="0x04" flagname="Fault" flagmask="0x04" />
+                <const key="0x05" flagname="Busy" flagmask="0x05" />
+                <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                <const key="0x08" flagname="Ok" flagmask="0x08" />
+                <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+            </param>
+            <param key="0x01" name="Next Indicator ID" type="CONST">
+                <const key="0x00" flagname="NA" flagmask="0x00" />
+                <const key="0x01" flagname="Armed" flagmask="0x01" />
+                <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                <const key="0x03" flagname="Ready" flagmask="0x03" />
+                <const key="0x04" flagname="Fault" flagmask="0x04" />
+                <const key="0x05" flagname="Busy" flagmask="0x05" />
+                <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                <const key="0x08" flagname="Ok" flagmask="0x08" />
+                <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+            </param>
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Property Supported Bit Mask Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x06" name="LeaseTime" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Property Supported Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="2" lenmask="0x1F" />
+                <bitflag key="0x00" flagname="Multilevel" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Binary" flagmask="0x02" />
+                <bitflag key="0x02" flagname="On/Off Period" flagmask="0x03" />
+                <bitflag key="0x03" flagname="On/Off Cycles" flagmask="0x04" />
+                <bitflag key="0x04" flagname="One time On/Off period" flagmask="0x05" />
+                <bitflag key="0x05" flagname="Timeout (minutes)" flagmask="0x06" />
+                <bitflag key="0x06" flagname="Timeout (seconds)" flagmask="0x07" />
+                <bitflag key="0x07" flagname="Timeout (1/100 seconds)" flagmask="0x08" />
+                <bitflag key="0x08" flagname="Specific volume" flagmask="0x09" />
+                <bitflag key="0x09" flagname="Low power" flagmask="0x10" />
             </param>
         </cmd>
-        <cmd key="0x01" name="IP_CONFIGURATION_SET" help="Ip Configuration Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitflag key="0x00" flagname="Auto DNS" flagmask="0x01" />
-                <bitflag key="0x01" flagname="Auto IP" flagmask="0x02" />
-                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
+    </cmd_class>
+    <cmd_class key="0x87" version="4" name="COMMAND_CLASS_INDICATOR" help="Command Class Indicator">
+        <cmd key="0x02" name="INDICATOR_GET" help="Indicator Get" support_mode="RX">
+            <param key="0x00" name="Indicator ID" type="CONST">
+                <const key="0x00" flagname="NA" flagmask="0x00" />
+                <const key="0x01" flagname="Armed" flagmask="0x01" />
+                <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                <const key="0x03" flagname="Ready" flagmask="0x03" />
+                <const key="0x04" flagname="Fault" flagmask="0x04" />
+                <const key="0x05" flagname="Busy" flagmask="0x05" />
+                <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                <const key="0x08" flagname="Ok" flagmask="0x08" />
+                <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="INDICATOR_REPORT" help="Indicator Report" support_mode="TX">
+            <param key="0x00" name="Indicator 0 Value" type="BYTE">
+                <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
+                <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="IP Address" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Subnet Mask" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Indicator Object Count" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x03" name="Gateway" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Indicator ID" type="CONST">
+                    <const key="0x00" flagname="NA" flagmask="0x00" />
+                    <const key="0x01" flagname="Armed" flagmask="0x01" />
+                    <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                    <const key="0x03" flagname="Ready" flagmask="0x03" />
+                    <const key="0x04" flagname="Fault" flagmask="0x04" />
+                    <const key="0x05" flagname="Busy" flagmask="0x05" />
+                    <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                    <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                    <const key="0x08" flagname="Ok" flagmask="0x08" />
+                    <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                    <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                    <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                    <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                    <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                    <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                    <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                    <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                    <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                    <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                    <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                    <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                    <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                    <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                    <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                    <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                    <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                    <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                    <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                    <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                    <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                    <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                    <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                    <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                    <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                    <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                    <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                    <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                    <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                    <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                    <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                    <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                    <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                    <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+                </param>
+                <param key="0x01" name="Property ID" type="CONST">
+                    <const key="0x00" flagname="Multilevel" flagmask="0x01" />
+                    <const key="0x01" flagname="Binary" flagmask="0x02" />
+                    <const key="0x02" flagname="On/Off Period" flagmask="0x03" />
+                    <const key="0x03" flagname="On/Off Cycles" flagmask="0x04" />
+                    <const key="0x04" flagname="One time On/Off period" flagmask="0x05" />
+                    <const key="0x05" flagname="Timeout (minutes)" flagmask="0x06" />
+                    <const key="0x06" flagname="Timeout (seconds)" flagmask="0x07" />
+                    <const key="0x07" flagname="Timeout (1/100 seconds)" flagmask="0x08" />
+                    <const key="0x08" flagname="Specific volume" flagmask="0x09" />
+                    <const key="0x09" flagname="Low power" flagmask="0x10" />
+                </param>
+                <param key="0x02" name="Value" type="BYTE" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x01" name="INDICATOR_SET" help="Indicator Set" support_mode="RX">
+            <param key="0x00" name="Indicator 0 Value" type="BYTE">
+                <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
+                <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x04" name="DNS1" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Indicator Object Count" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="DNS2" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Indicator ID" type="CONST">
+                    <const key="0x00" flagname="NA" flagmask="0x00" />
+                    <const key="0x01" flagname="Armed" flagmask="0x01" />
+                    <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                    <const key="0x03" flagname="Ready" flagmask="0x03" />
+                    <const key="0x04" flagname="Fault" flagmask="0x04" />
+                    <const key="0x05" flagname="Busy" flagmask="0x05" />
+                    <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                    <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                    <const key="0x08" flagname="Ok" flagmask="0x08" />
+                    <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                    <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                    <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                    <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                    <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                    <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                    <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                    <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                    <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                    <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                    <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                    <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                    <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                    <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                    <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                    <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                    <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                    <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                    <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                    <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                    <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                    <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                    <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                    <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                    <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                    <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                    <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                    <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                    <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                    <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                    <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                    <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                    <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                    <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+                </param>
+                <param key="0x01" name="Property ID" type="CONST">
+                    <const key="0x00" flagname="Multilevel" flagmask="0x01" />
+                    <const key="0x01" flagname="Binary" flagmask="0x02" />
+                    <const key="0x02" flagname="On/Off Period" flagmask="0x03" />
+                    <const key="0x03" flagname="On/Off Cycles" flagmask="0x04" />
+                    <const key="0x04" flagname="One time On/Off period" flagmask="0x05" />
+                    <const key="0x05" flagname="Timeout (minutes)" flagmask="0x06" />
+                    <const key="0x06" flagname="Timeout (seconds)" flagmask="0x07" />
+                    <const key="0x07" flagname="Timeout (1/100 seconds)" flagmask="0x08" />
+                    <const key="0x08" flagname="Specific volume" flagmask="0x09" />
+                    <const key="0x09" flagname="Low power" flagmask="0x10" />
+                </param>
+                <param key="0x02" name="Value" type="BYTE" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x04" name="INDICATOR_SUPPORTED_GET" help="Indicator Supported Get">
+            <param key="0x00" name="Indicator ID" type="CONST">
+                <const key="0x00" flagname="NA" flagmask="0x00" />
+                <const key="0x01" flagname="Armed" flagmask="0x01" />
+                <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                <const key="0x03" flagname="Ready" flagmask="0x03" />
+                <const key="0x04" flagname="Fault" flagmask="0x04" />
+                <const key="0x05" flagname="Busy" flagmask="0x05" />
+                <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                <const key="0x08" flagname="Ok" flagmask="0x08" />
+                <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x89" version="1" name="COMMAND_CLASS_LANGUAGE" help="Command Class Language" read_only="false" comment="">
-        <cmd key="0x02" name="LANGUAGE_GET" help="Language Get" comment="" />
-        <cmd key="0x03" name="LANGUAGE_REPORT" help="Language Report" comment="">
-            <param key="0x00" name="Language" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x05" name="INDICATOR_SUPPORTED_REPORT" help="Indicator Supported Report">
+            <param key="0x00" name="Indicator ID" type="CONST">
+                <const key="0x00" flagname="NA" flagmask="0x00" />
+                <const key="0x01" flagname="Armed" flagmask="0x01" />
+                <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                <const key="0x03" flagname="Ready" flagmask="0x03" />
+                <const key="0x04" flagname="Fault" flagmask="0x04" />
+                <const key="0x05" flagname="Busy" flagmask="0x05" />
+                <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                <const key="0x08" flagname="Ok" flagmask="0x08" />
+                <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+            </param>
+            <param key="0x01" name="Next Indicator ID" type="CONST">
+                <const key="0x00" flagname="NA" flagmask="0x00" />
+                <const key="0x01" flagname="Armed" flagmask="0x01" />
+                <const key="0x02" flagname="Not armed" flagmask="0x02" />
+                <const key="0x03" flagname="Ready" flagmask="0x03" />
+                <const key="0x04" flagname="Fault" flagmask="0x04" />
+                <const key="0x05" flagname="Busy" flagmask="0x05" />
+                <const key="0x06" flagname="Enter ID" flagmask="0x06" />
+                <const key="0x07" flagname="Enter PIN" flagmask="0x07" />
+                <const key="0x08" flagname="Ok" flagmask="0x08" />
+                <const key="0x09" flagname="Not Ok" flagmask="0x09" />
+                <const key="0x0A" flagname="Armed Stay" flagmask="0x0A" />
+                <const key="0x0B" flagname="Armed Away" flagmask="0x0B" />
+                <const key="0x0C" flagname="Alarming" flagmask="0x0C" />
+                <const key="0x0D" flagname="Alarming: Burglar" flagmask="0x0D" />
+                <const key="0x0E" flagname="Alarming: Smoke / Fire" flagmask="0x0E" />
+                <const key="0x0F" flagname="Alarming: Carbon Monoxide" flagmask="0x0F" />
+                <const key="0x10" flagname="Bypass challenge" flagmask="0x10" />
+                <const key="0x11" flagname="Entry Delay" flagmask="0x11" />
+                <const key="0x12" flagname="Exit Delay" flagmask="0x12" />
+                <const key="0x13" flagname="Zone1 armed" flagmask="0x20" />
+                <const key="0x14" flagname="Zone2 armed" flagmask="0x21" />
+                <const key="0x15" flagname="Zone3 armed" flagmask="0x22" />
+                <const key="0x16" flagname="Zone4 armed" flagmask="0x23" />
+                <const key="0x17" flagname="Zone5 armed" flagmask="0x24" />
+                <const key="0x18" flagname="Zone6 armed" flagmask="0x25" />
+                <const key="0x19" flagname="LCD backlight" flagmask="0x30" />
+                <const key="0x1A" flagname="Button backlight letters" flagmask="0x40" />
+                <const key="0x1B" flagname="Button backlight digits" flagmask="0x41" />
+                <const key="0x1C" flagname="Button backlight command" flagmask="0x42" />
+                <const key="0x1D" flagname="Button1 indication" flagmask="0x43" />
+                <const key="0x1E" flagname="Button2 indication" flagmask="0x44" />
+                <const key="0x1F" flagname="Button3 indication" flagmask="0x45" />
+                <const key="0x20" flagname="Button4 indication" flagmask="0x46" />
+                <const key="0x21" flagname="Button5 indication" flagmask="0x47" />
+                <const key="0x22" flagname="Button6 indication" flagmask="0x48" />
+                <const key="0x23" flagname="Button7 indication" flagmask="0x49" />
+                <const key="0x24" flagname="Button8 indication" flagmask="0x4A" />
+                <const key="0x25" flagname="Button9 indication" flagmask="0x4B" />
+                <const key="0x26" flagname="Button10 indication" flagmask="0x4C" />
+                <const key="0x27" flagname="Button11 indication" flagmask="0x4D" />
+                <const key="0x28" flagname="Button12 indication" flagmask="0x4E" />
+                <const key="0x29" flagname="Node Identify" flagmask="0x50" />
+                <const key="0x2A" flagname="Buzzer" flagmask="0xF0" />
+            </param>
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Property Supported Bit Mask Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x03" name="Property Supported Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="2" lenmask="0x1F" />
+                <bitflag key="0x00" flagname="Multilevel" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Binary" flagmask="0x02" />
+                <bitflag key="0x02" flagname="On/Off Period" flagmask="0x03" />
+                <bitflag key="0x03" flagname="On/Off Cycles" flagmask="0x04" />
+                <bitflag key="0x04" flagname="One time On/Off period" flagmask="0x05" />
+                <bitflag key="0x05" flagname="Timeout (minutes)" flagmask="0x06" />
+                <bitflag key="0x06" flagname="Timeout (seconds)" flagmask="0x07" />
+                <bitflag key="0x07" flagname="Timeout (1/100 seconds)" flagmask="0x08" />
+                <bitflag key="0x08" flagname="Specific volume" flagmask="0x09" />
+                <bitflag key="0x09" flagname="Low power" flagmask="0x10" />
             </param>
-            <param key="0x01" name="Country" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x06" name="INDICATOR_DESCRIPTION_GET" help="Indicator Description Get">
+            <param key="0x00" name="Indicator ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="INDICATOR_DESCRIPTION_REPORT" help="Indicator Description Report">
+            <param key="0x00" name="Indicator ID" type="BYTE" />
+            <param key="0x01" name="Description Length" type="BYTE" />
+            <param key="0x02" name="Description" type="VARIANT">
+                <variant paramoffs="1" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="LANGUAGE_SET" help="Language Set" comment="">
-            <param key="0x00" name="Language" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x9A" version="1" name="COMMAND_CLASS_IP_CONFIGURATION" help="Command Class IP Configuration" comment="[OBSOLETED]">
+        <cmd key="0x02" name="IP_CONFIGURATION_GET" help="Ip Configuration Get" support_mode="RX" />
+        <cmd key="0x04" name="IP_CONFIGURATION_RELEASE" help="Ip Configuration Release" support_mode="RX" />
+        <cmd key="0x05" name="IP_CONFIGURATION_RENEW" help="Ip Configuration Renew" support_mode="RX" />
+        <cmd key="0x03" name="IP_CONFIGURATION_REPORT" help="Ip Configuration Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Auto DNS" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Auto IP" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Country" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="IP Address" type="DWORD" />
+            <param key="0x02" name="Subnet Mask" type="DWORD" />
+            <param key="0x03" name="Gateway" type="DWORD" />
+            <param key="0x04" name="DNS1" type="DWORD" />
+            <param key="0x05" name="DNS2" type="DWORD" />
+            <param key="0x06" name="LeaseTime" type="DWORD" />
+        </cmd>
+        <cmd key="0x01" name="IP_CONFIGURATION_SET" help="Ip Configuration Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Auto DNS" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Auto IP" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
+            <param key="0x01" name="IP Address" type="DWORD" />
+            <param key="0x02" name="Subnet Mask" type="DWORD" />
+            <param key="0x03" name="Gateway" type="DWORD" />
+            <param key="0x04" name="DNS1" type="DWORD" />
+            <param key="0x05" name="DNS2" type="DWORD" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x89" version="1" name="COMMAND_CLASS_LANGUAGE" help="Command Class Language">
+        <cmd key="0x02" name="LANGUAGE_GET" help="Language Get" support_mode="RX" />
+        <cmd key="0x03" name="LANGUAGE_REPORT" help="Language Report" support_mode="TX">
+            <param key="0x00" name="Language" type="BIT_24" />
+            <param key="0x01" name="Country" type="WORD" />
+        </cmd>
+        <cmd key="0x01" name="LANGUAGE_SET" help="Language Set" support_mode="RX">
+            <param key="0x00" name="Language" type="BIT_24" />
+            <param key="0x01" name="Country" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x76" version="1" name="COMMAND_CLASS_LOCK" help="Command Class Lock" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x02" name="LOCK_GET" help="Lock Get" comment="" />
-        <cmd key="0x03" name="LOCK_REPORT" help="Lock Report" comment="">
-            <param key="0x00" name="Lock State" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x76" version="1" name="COMMAND_CLASS_LOCK" help="Command Class Lock" comment="[DEPRECATED]">
+        <cmd key="0x02" name="LOCK_GET" help="Lock Get" support_mode="RX" />
+        <cmd key="0x03" name="LOCK_REPORT" help="Lock Report" support_mode="TX">
+            <param key="0x00" name="Lock State" type="BYTE">
                 <bitflag key="0x01" flagname="unlocked" flagmask="0x00" />
                 <bitflag key="0x02" flagname="locked" flagmask="0x01" />
             </param>
         </cmd>
-        <cmd key="0x01" name="LOCK_SET" help="Lock Set" comment="">
-            <param key="0x00" name="Lock State" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="LOCK_SET" help="Lock Set" support_mode="RX">
+            <param key="0x00" name="Lock State" type="BYTE">
                 <bitflag key="0x01" flagname="unlocked" flagmask="0x00" />
                 <bitflag key="0x02" flagname="locked" flagmask="0x01" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x91" version="1" name="COMMAND_CLASS_MANUFACTURER_PROPRIETARY" help="Command Class Manufacturer Proprietary" read_only="false" comment="" />
-    <cmd_class key="0x72" version="1" name="COMMAND_CLASS_MANUFACTURER_SPECIFIC" help="Command Class Manufacturer Specific" read_only="false" comment="">
-        <cmd key="0x04" name="MANUFACTURER_SPECIFIC_GET" help="Manufacturer Specific Get" comment="" />
-        <cmd key="0x05" name="MANUFACTURER_SPECIFIC_REPORT" help="Manufacturer Specific Report" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Product Type ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Product ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x91" version="1" name="COMMAND_CLASS_MANUFACTURER_PROPRIETARY" help="Command Class Manufacturer Proprietary" />
+    <cmd_class key="0x72" version="1" name="COMMAND_CLASS_MANUFACTURER_SPECIFIC" help="Command Class Manufacturer Specific">
+        <cmd key="0x04" name="MANUFACTURER_SPECIFIC_GET" help="Manufacturer Specific Get" support_mode="RX" />
+        <cmd key="0x05" name="MANUFACTURER_SPECIFIC_REPORT" help="Manufacturer Specific Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Product Type ID" type="WORD" />
+            <param key="0x02" name="Product ID" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x72" version="2" name="COMMAND_CLASS_MANUFACTURER_SPECIFIC" help="Command Class Manufacturer Specific" read_only="false" comment="">
-        <cmd key="0x04" name="MANUFACTURER_SPECIFIC_GET" help="Manufacturer Specific Get" comment="" />
-        <cmd key="0x05" name="MANUFACTURER_SPECIFIC_REPORT" help="Manufacturer Specific Report" comment="">
-            <param key="0x00" name="Manufacturer ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Product Type ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Product ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x06" name="DEVICE_SPECIFIC_GET" help="Device Specific Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Device ID Type" fieldmask="0x07" shifter="0">
+    <cmd_class key="0x72" version="2" name="COMMAND_CLASS_MANUFACTURER_SPECIFIC" help="Command Class Manufacturer Specific">
+        <cmd key="0x04" name="MANUFACTURER_SPECIFIC_GET" help="Manufacturer Specific Get" support_mode="RX" />
+        <cmd key="0x05" name="MANUFACTURER_SPECIFIC_REPORT" help="Manufacturer Specific Report" support_mode="TX">
+            <param key="0x00" name="Manufacturer ID" type="WORD" />
+            <param key="0x01" name="Product Type ID" type="WORD" />
+            <param key="0x02" name="Product ID" type="WORD" />
+        </cmd>
+        <cmd key="0x06" name="DEVICE_SPECIFIC_GET" help="Device Specific Get">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Device ID Type" fieldmask="0x07">
                     <fieldenum value="Reserved" />
                     <fieldenum value="Serial Number" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
         </cmd>
-        <cmd key="0x07" name="DEVICE_SPECIFIC_REPORT" help="Device Specific Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Device ID Type" fieldmask="0x07" shifter="0">
+        <cmd key="0x07" name="DEVICE_SPECIFIC_REPORT" help="Device Specific Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Device ID Type" fieldmask="0x07">
                     <fieldenum value="Reserved" />
                     <fieldenum value="Serial Number" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Device ID Data Length Indicator" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Device ID Data Length Indicator" fieldmask="0x1F" />
                 <fieldenum key="0x01" fieldname="Device ID Data Format" fieldmask="0xE0" shifter="5">
                     <fieldenum value="Reserved" />
                     <fieldenum value="Binary" />
                 </fieldenum>
             </param>
-            <param key="0x02" name="Device ID Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
+            <param key="0x02" name="Device ID Data" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0xEF" version="1" name="COMMAND_CLASS_MARK" help="Command Class Mark" read_only="false" comment="" />
-    <cmd_class key="0x35" version="1" name="COMMAND_CLASS_METER_PULSE" help="Command Class Meter Pulse" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x04" name="METER_PULSE_GET" help="Meter Pulse Get" comment="" />
-        <cmd key="0x05" name="METER_PULSE_REPORT" help="Meter Pulse Report" comment="">
-            <param key="0x00" name="Pulse Count" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0xEF" version="1" name="COMMAND_CLASS_MARK" help="Command Class Mark" />
+    <cmd_class key="0x35" version="1" name="COMMAND_CLASS_METER_PULSE" help="Command Class Pulse Meter" comment="[DEPRECATED]">
+        <cmd key="0x04" name="METER_PULSE_GET" help="Meter Pulse Get" support_mode="RX" />
+        <cmd key="0x05" name="METER_PULSE_REPORT" help="Meter Pulse Report" support_mode="TX">
+            <param key="0x00" name="Pulse Count" type="DWORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x3C" version="1" name="COMMAND_CLASS_METER_TBL_CONFIG" help="Command Class Meter Tbl Config" read_only="false" comment="">
-        <cmd key="0x01" name="METER_TBL_TABLE_POINT_ADM_NO_SET" help="Meter Tbl Table Point Adm No Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" shifter="0" />
+    <cmd_class key="0x3C" version="1" name="COMMAND_CLASS_METER_TBL_CONFIG" help="Command Class Meter Table Configuration">
+        <cmd key="0x01" name="METER_TBL_TABLE_POINT_ADM_NO_SET" help="Meter Tbl Table Point Adm No Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Meter Point Adm Number Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
+            <param key="0x01" name="Meter Point Adm Number Character" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x3D" version="1" name="COMMAND_CLASS_METER_TBL_MONITOR" help="Command Class Meter Tbl Monitor" read_only="false" comment="">
-        <cmd key="0x0B" name="METER_TBL_STATUS_REPORT" help="Meter Tbl  Status  Report" comment="">
-            <param key="0x00" name="Reports to follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Current Operating Status" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x02" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Operating Status Event ID" fieldmask="0x1F" shifter="0" />
+    <cmd_class key="0x3D" version="1" name="COMMAND_CLASS_METER_TBL_MONITOR" help="Command Class Meter Table Monitor">
+        <cmd key="0x0B" name="METER_TBL_STATUS_REPORT" help="Meter Tbl  Status  Report" support_mode="TX">
+            <param key="0x00" name="Reports to follow" type="BYTE" />
+            <param key="0x01" name="Current Operating Status" type="BIT_24" />
+            <variant_group key="0x02" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Operating Status Event ID" fieldmask="0x1F" />
                     <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                     <bitflag key="0x02" flagname="Type" flagmask="0x80" />
                 </param>
-                <param key="0x01" name="Year" type="WORD" typehashcode="0x02" comment="">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x02" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x03" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x04" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x05" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x06" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x01" name="Year" type="WORD" />
+                <param key="0x02" name="Month" type="BYTE" />
+                <param key="0x03" name="Day" type="BYTE" />
+                <param key="0x04" name="Hour Local Time" type="BYTE" />
+                <param key="0x05" name="Minute Local Time" type="BYTE" />
+                <param key="0x06" name="Second Local Time" type="BYTE" />
             </variant_group>
         </cmd>
-        <cmd key="0x0A" name="METER_TBL_STATUS_DATE_GET" help="Meter Tbl  Status Date Get" comment="">
-            <param key="0x00" name="Maximum Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Stop Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="Stop Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0C" name="Stop Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x09" name="METER_TBL_STATUS_DEPTH_GET" help="Meter Tbl  Status Depth Get" comment="">
-            <param key="0x00" name="Status Event Log Depth" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x07" name="METER_TBL_STATUS_SUPPORTED_GET" help="Meter Tbl  Status Supported Get" comment="" />
-        <cmd key="0x08" name="METER_TBL_STATUS_SUPPORTED_REPORT" help="Meter Tbl  Status Supported Report" comment="">
-            <param key="0x00" name="Supported Operating Status" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status Event Log Depth" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x0C" name="METER_TBL_CURRENT_DATA_GET" help="Meter Tbl Current Data Get" comment="">
-            <param key="0x00" name="Dataset Requested" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x0D" name="METER_TBL_CURRENT_DATA_REPORT" help="Meter Tbl Current Data Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" shifter="0" />
+        <cmd key="0x0A" name="METER_TBL_STATUS_DATE_GET" help="Meter Tbl  Status Date Get" support_mode="RX">
+            <param key="0x00" name="Maximum Reports" type="BYTE" />
+            <param key="0x01" name="Start Year" type="WORD" />
+            <param key="0x02" name="Start Month" type="BYTE" />
+            <param key="0x03" name="Start Day" type="BYTE" />
+            <param key="0x04" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x05" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x06" name="Start Second Local Time" type="BYTE" />
+            <param key="0x07" name="Stop Year" type="WORD" />
+            <param key="0x08" name="Stop Month" type="BYTE" />
+            <param key="0x09" name="Stop Day" type="BYTE" />
+            <param key="0x0A" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0B" name="Stop Minute Local Time" type="BYTE" />
+            <param key="0x0C" name="Stop Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="METER_TBL_STATUS_DEPTH_GET" help="Meter Tbl  Status Depth Get" support_mode="RX">
+            <param key="0x00" name="Status Event Log Depth" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="METER_TBL_STATUS_SUPPORTED_GET" help="Meter Tbl  Status Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="METER_TBL_STATUS_SUPPORTED_REPORT" help="Meter Tbl  Status Supported Report" support_mode="TX">
+            <param key="0x00" name="Supported Operating Status" type="BIT_24" />
+            <param key="0x01" name="Status Event Log Depth" type="BYTE" />
+        </cmd>
+        <cmd key="0x0C" name="METER_TBL_CURRENT_DATA_GET" help="Meter Tbl Current Data Get" support_mode="RX">
+            <param key="0x00" name="Dataset Requested" type="BIT_24" />
+        </cmd>
+        <cmd key="0x0D" name="METER_TBL_CURRENT_DATA_REPORT" help="Meter Tbl Current Data Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x02" name="Dataset" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x09" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Current Scale" fieldmask="0x1F" shifter="0" />
+            <param key="0x02" name="Dataset" type="BIT_24" />
+            <param key="0x03" name="Year" type="WORD" />
+            <param key="0x04" name="Month" type="BYTE" />
+            <param key="0x05" name="Day" type="BYTE" />
+            <param key="0x06" name="Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Second Local Time" type="BYTE" />
+            <variant_group key="0x09" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Current Scale" fieldmask="0x1F" />
                     <bitfield key="0x01" fieldname="Current Precision" fieldmask="0xE0" shifter="5" />
                 </param>
-                <param key="0x01" name="Current Value" type="DWORD" typehashcode="0x03" comment="">
-                    <dword key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x01" name="Current Value" type="DWORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x0E" name="METER_TBL_HISTORICAL_DATA_GET" help="Meter Tbl Historical Data Get" comment="">
-            <param key="0x00" name="Maximum Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Historical Dataset Requested" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Start Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="Stop Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0C" name="Stop Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0D" name="Stop Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x0F" name="METER_TBL_HISTORICAL_DATA_REPORT" help="Meter Tbl Historical Data Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" shifter="0" />
+        <cmd key="0x0E" name="METER_TBL_HISTORICAL_DATA_GET" help="Meter Tbl Historical Data Get" support_mode="RX">
+            <param key="0x00" name="Maximum Reports" type="BYTE" />
+            <param key="0x01" name="Historical Dataset Requested" type="BIT_24" />
+            <param key="0x02" name="Start Year" type="WORD" />
+            <param key="0x03" name="Start Month" type="BYTE" />
+            <param key="0x04" name="Start Day" type="BYTE" />
+            <param key="0x05" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x06" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x07" name="Start Second Local Time" type="BYTE" />
+            <param key="0x08" name="Stop Year" type="WORD" />
+            <param key="0x09" name="Stop Month" type="BYTE" />
+            <param key="0x0A" name="Stop Day" type="BYTE" />
+            <param key="0x0B" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0C" name="Stop Minute Local Time" type="BYTE" />
+            <param key="0x0D" name="Stop Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x0F" name="METER_TBL_HISTORICAL_DATA_REPORT" help="Meter Tbl Historical Data Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x02" name="Dataset" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x09" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Historical Scale" fieldmask="0x1F" shifter="0" />
+            <param key="0x02" name="Dataset" type="BIT_24" />
+            <param key="0x03" name="Year" type="WORD" />
+            <param key="0x04" name="Month" type="BYTE" />
+            <param key="0x05" name="Day" type="BYTE" />
+            <param key="0x06" name="Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Second Local Time" type="BYTE" />
+            <variant_group key="0x09" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Historical Scale" fieldmask="0x1F" />
                     <bitfield key="0x01" fieldname="Historical Precision" fieldmask="0xE0" shifter="5" />
                 </param>
-                <param key="0x01" name="Historical Value" type="DWORD" typehashcode="0x03" comment="">
-                    <dword key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x01" name="Historical Value" type="DWORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x06" name="METER_TBL_REPORT" help="Meter Tbl Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x06" name="METER_TBL_REPORT" help="Meter Tbl Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x3F" />
                 <bitfield key="0x01" fieldname="Rate Type" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Pay Meter" fieldmask="0x0F" shifter="0">
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Pay Meter" fieldmask="0x0F">
                     <fieldenum value="Reserved" />
                     <fieldenum value="Creditmeter" />
                     <fieldenum value="Prepayment meter" />
@@ -4527,263 +4966,287 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Dataset Supported" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Dataset History Supported" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Data History Supported" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Dataset Supported" type="BIT_24" />
+            <param key="0x03" name="Dataset History Supported" type="BIT_24" />
+            <param key="0x04" name="Data History Supported" type="BIT_24" />
         </cmd>
-        <cmd key="0x05" name="METER_TBL_TABLE_CAPABILITY_GET" help="Meter Tbl Table Capability Get" comment="" />
-        <cmd key="0x03" name="METER_TBL_TABLE_ID_GET" help="Meter Tbl Table Id Get" comment="" />
-        <cmd key="0x04" name="METER_TBL_TABLE_ID_REPORT" help="Meter Tbl Table Id Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="METER_TBL_TABLE_CAPABILITY_GET" help="Meter Tbl Table Capability Get" support_mode="RX" />
+        <cmd key="0x03" name="METER_TBL_TABLE_ID_GET" help="Meter Tbl Table Id Get" support_mode="RX" />
+        <cmd key="0x04" name="METER_TBL_TABLE_ID_REPORT" help="Meter Tbl Table Id Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Meter ID Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
+            <param key="0x01" name="Meter ID Character" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x01" name="METER_TBL_TABLE_POINT_ADM_NO_GET" help="Meter Tbl Table Point Adm No Get" comment="" />
-        <cmd key="0x02" name="METER_TBL_TABLE_POINT_ADM_NO_REPORT" help="Meter Tbl Table Point Adm No Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x01" name="METER_TBL_TABLE_POINT_ADM_NO_GET" help="Meter Tbl Table Point Adm No Get" support_mode="RX" />
+        <cmd key="0x02" name="METER_TBL_TABLE_POINT_ADM_NO_REPORT" help="Meter Tbl Table Point Adm No Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Meter Point Adm Number Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
+            <param key="0x01" name="Meter Point Adm Number Character" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x3D" version="2" name="COMMAND_CLASS_METER_TBL_MONITOR" help="Command Class Meter Tbl Monitor" read_only="false" comment="">
-        <cmd key="0x0B" name="METER_TBL_STATUS_REPORT" help="Meter Tbl  Status  Report" comment="">
-            <param key="0x00" name="Reports to follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Current Operating Status" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x02" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Operating Status Event ID" fieldmask="0x1F" shifter="0" />
+    <cmd_class key="0x3D" version="2" name="COMMAND_CLASS_METER_TBL_MONITOR" help="Command Class Meter Table Monitor">
+        <cmd key="0x0B" name="METER_TBL_STATUS_REPORT" help="Meter Tbl  Status  Report" support_mode="TX">
+            <param key="0x00" name="Reports to follow" type="BYTE" />
+            <param key="0x01" name="Current Operating Status" type="BIT_24" />
+            <variant_group key="0x02" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Operating Status Event ID" fieldmask="0x1F" />
                     <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                     <bitflag key="0x02" flagname="Type" flagmask="0x80" />
                 </param>
-                <param key="0x01" name="Year" type="WORD" typehashcode="0x02" comment="">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x02" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x03" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x04" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x05" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x06" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x01" name="Year" type="WORD" />
+                <param key="0x02" name="Month" type="BYTE" />
+                <param key="0x03" name="Day" type="BYTE" />
+                <param key="0x04" name="Hour Local Time" type="BYTE" />
+                <param key="0x05" name="Minute Local Time" type="BYTE" />
+                <param key="0x06" name="Second Local Time" type="BYTE" />
             </variant_group>
         </cmd>
-        <cmd key="0x0A" name="METER_TBL_STATUS_DATE_GET" help="Meter Tbl  Status Date Get" comment="">
-            <param key="0x00" name="Maximum Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0A" name="METER_TBL_STATUS_DATE_GET" help="Meter Tbl  Status Date Get" support_mode="RX">
+            <param key="0x00" name="Maximum Reports" type="BYTE" />
+            <param key="0x01" name="Start Year" type="WORD" />
+            <param key="0x02" name="Start Month" type="BYTE" />
+            <param key="0x03" name="Start Day" type="BYTE" />
+            <param key="0x04" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x05" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x06" name="Start Second Local Time" type="BYTE" />
+            <param key="0x07" name="Stop Year" type="WORD" />
+            <param key="0x08" name="Stop Month" type="BYTE" />
+            <param key="0x09" name="Stop Day" type="BYTE" />
+            <param key="0x0A" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0B" name="Stop Minute Local Time" type="BYTE" />
+            <param key="0x0C" name="Stop Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="METER_TBL_STATUS_DEPTH_GET" help="Meter Tbl  Status Depth Get" support_mode="RX">
+            <param key="0x00" name="Status Event Log Depth" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="METER_TBL_STATUS_SUPPORTED_GET" help="Meter Tbl  Status Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="METER_TBL_STATUS_SUPPORTED_REPORT" help="Meter Tbl  Status Supported Report" support_mode="TX">
+            <param key="0x00" name="Supported Operating Status" type="BIT_24" />
+            <param key="0x01" name="Status Event Log Depth" type="BYTE" />
+        </cmd>
+        <cmd key="0x0C" name="METER_TBL_CURRENT_DATA_GET" help="Meter Tbl Current Data Get" support_mode="RX">
+            <param key="0x00" name="Dataset Requested" type="BIT_24" />
+        </cmd>
+        <cmd key="0x0D" name="METER_TBL_CURRENT_DATA_REPORT" help="Meter Tbl Current Data Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0x7C" shifter="2" />
+                <bitflag key="0x02" flagname="Operating Status Indication" flagmask="0x80" />
             </param>
-            <param key="0x0A" name="Stop Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Dataset" type="BIT_24" />
+            <param key="0x03" name="Year" type="WORD" />
+            <param key="0x04" name="Month" type="BYTE" />
+            <param key="0x05" name="Day" type="BYTE" />
+            <param key="0x06" name="Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Second Local Time" type="BYTE" />
+            <variant_group key="0x09" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Current Scale" fieldmask="0x1F" />
+                    <bitfield key="0x01" fieldname="Current Precision" fieldmask="0xE0" shifter="5" />
+                </param>
+                <param key="0x01" name="Current Value" type="DWORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x0E" name="METER_TBL_HISTORICAL_DATA_GET" help="Meter Tbl Historical Data Get" support_mode="RX">
+            <param key="0x00" name="Maximum Reports" type="BYTE" />
+            <param key="0x01" name="Historical Dataset Requested" type="BIT_24" />
+            <param key="0x02" name="Start Year" type="WORD" />
+            <param key="0x03" name="Start Month" type="BYTE" />
+            <param key="0x04" name="Start Day" type="BYTE" />
+            <param key="0x05" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x06" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x07" name="Start Second Local Time" type="BYTE" />
+            <param key="0x08" name="Stop Year" type="WORD" />
+            <param key="0x09" name="Stop Month" type="BYTE" />
+            <param key="0x0A" name="Stop Day" type="BYTE" />
+            <param key="0x0B" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0C" name="Stop Minute Local Time" type="BYTE" />
+            <param key="0x0D" name="Stop Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x0F" name="METER_TBL_HISTORICAL_DATA_REPORT" help="Meter Tbl Historical Data Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0x7C" shifter="2" />
+                <bitflag key="0x02" flagname="Operating Status Indication" flagmask="0x80" />
             </param>
-            <param key="0x0B" name="Stop Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Dataset" type="BIT_24" />
+            <param key="0x03" name="Year" type="WORD" />
+            <param key="0x04" name="Month" type="BYTE" />
+            <param key="0x05" name="Day" type="BYTE" />
+            <param key="0x06" name="Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Second Local Time" type="BYTE" />
+            <variant_group key="0x09" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Historical Scale" fieldmask="0x1F" />
+                    <bitfield key="0x01" fieldname="Historical Precision" fieldmask="0xE0" shifter="5" />
+                </param>
+                <param key="0x01" name="Historical Value" type="DWORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x06" name="METER_TBL_REPORT" help="Meter Tbl Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x3F" />
+                <bitfield key="0x01" fieldname="Rate Type" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x0C" name="Stop Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Pay Meter" fieldmask="0x0F">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Creditmeter" />
+                    <fieldenum value="Prepayment meter" />
+                    <fieldenum value="Prepayment meter debt" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
+            <param key="0x02" name="Dataset Supported" type="BIT_24" />
+            <param key="0x03" name="Dataset History Supported" type="BIT_24" />
+            <param key="0x04" name="Data History Supported" type="BIT_24" />
         </cmd>
-        <cmd key="0x09" name="METER_TBL_STATUS_DEPTH_GET" help="Meter Tbl  Status Depth Get" comment="">
-            <param key="0x00" name="Status Event Log Depth" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x05" name="METER_TBL_TABLE_CAPABILITY_GET" help="Meter Tbl Table Capability Get" support_mode="RX" />
+        <cmd key="0x03" name="METER_TBL_TABLE_ID_GET" help="Meter Tbl Table Id Get" support_mode="RX" />
+        <cmd key="0x04" name="METER_TBL_TABLE_ID_REPORT" help="Meter Tbl Table Id Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x01" name="Meter ID Character" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x07" name="METER_TBL_STATUS_SUPPORTED_GET" help="Meter Tbl  Status Supported Get" comment="" />
-        <cmd key="0x08" name="METER_TBL_STATUS_SUPPORTED_REPORT" help="Meter Tbl  Status Supported Report" comment="">
-            <param key="0x00" name="Supported Operating Status" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x01" name="METER_TBL_TABLE_POINT_ADM_NO_GET" help="Meter Tbl Table Point Adm No Get" support_mode="RX" />
+        <cmd key="0x02" name="METER_TBL_TABLE_POINT_ADM_NO_REPORT" help="Meter Tbl Table Point Adm No Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Status Event Log Depth" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Meter Point Adm Number Character" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x0C" name="METER_TBL_CURRENT_DATA_GET" help="Meter Tbl Current Data Get" comment="">
-            <param key="0x00" name="Dataset Requested" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    </cmd_class>
+    <cmd_class key="0x3D" version="3" name="COMMAND_CLASS_METER_TBL_MONITOR" help="Command Class Meter Table Monitor">
+        <cmd key="0x0B" name="METER_TBL_STATUS_REPORT" help="Meter Tbl  Status  Report" support_mode="TX">
+            <param key="0x00" name="Reports to follow" type="BYTE" />
+            <param key="0x01" name="Current Operating Status" type="BIT_24" />
+            <variant_group key="0x02" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Operating Status Event ID" fieldmask="0x1F" />
+                    <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
+                    <bitflag key="0x02" flagname="Type" flagmask="0x80" />
+                </param>
+                <param key="0x01" name="Year" type="WORD" />
+                <param key="0x02" name="Month" type="BYTE" />
+                <param key="0x03" name="Day" type="BYTE" />
+                <param key="0x04" name="Hour Local Time" type="BYTE" />
+                <param key="0x05" name="Minute Local Time" type="BYTE" />
+                <param key="0x06" name="Second Local Time" type="BYTE" />
+            </variant_group>
         </cmd>
-        <cmd key="0x0D" name="METER_TBL_CURRENT_DATA_REPORT" help="Meter Tbl Current Data Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" shifter="0" />
+        <cmd key="0x0A" name="METER_TBL_STATUS_DATE_GET" help="Meter Tbl  Status Date Get" support_mode="RX">
+            <param key="0x00" name="Maximum Reports" type="BYTE" />
+            <param key="0x01" name="Start Year" type="WORD" />
+            <param key="0x02" name="Start Month" type="BYTE" />
+            <param key="0x03" name="Start Day" type="BYTE" />
+            <param key="0x04" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x05" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x06" name="Start Second Local Time" type="BYTE" />
+            <param key="0x07" name="Stop Year" type="WORD" />
+            <param key="0x08" name="Stop Month" type="BYTE" />
+            <param key="0x09" name="Stop Day" type="BYTE" />
+            <param key="0x0A" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0B" name="Stop Minute Local Time" type="BYTE" />
+            <param key="0x0C" name="Stop Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="METER_TBL_STATUS_DEPTH_GET" help="Meter Tbl  Status Depth Get" support_mode="RX">
+            <param key="0x00" name="Status Event Log Depth" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="METER_TBL_STATUS_SUPPORTED_GET" help="Meter Tbl  Status Supported Get" support_mode="RX" />
+        <cmd key="0x08" name="METER_TBL_STATUS_SUPPORTED_REPORT" help="Meter Tbl  Status Supported Report" support_mode="TX">
+            <param key="0x00" name="Supported Operating Status" type="BIT_24" />
+            <param key="0x01" name="Status Event Log Depth" type="BYTE" />
+        </cmd>
+        <cmd key="0x0C" name="METER_TBL_CURRENT_DATA_GET" help="Meter Tbl Current Data Get" support_mode="RX">
+            <param key="0x00" name="Dataset Requested" type="BIT_24" />
+        </cmd>
+        <cmd key="0x0D" name="METER_TBL_CURRENT_DATA_REPORT" help="Meter Tbl Current Data Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x7C" shifter="2" />
                 <bitflag key="0x02" flagname="Operating Status Indication" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Dataset" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x09" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Current Scale" fieldmask="0x1F" shifter="0" />
+            <param key="0x02" name="Dataset" type="BIT_24" />
+            <param key="0x03" name="Year" type="WORD" />
+            <param key="0x04" name="Month" type="BYTE" />
+            <param key="0x05" name="Day" type="BYTE" />
+            <param key="0x06" name="Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Second Local Time" type="BYTE" />
+            <variant_group key="0x09" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Current Scale" fieldmask="0x1F" />
                     <bitfield key="0x01" fieldname="Current Precision" fieldmask="0xE0" shifter="5" />
                 </param>
-                <param key="0x01" name="Current Value" type="DWORD" typehashcode="0x03" comment="">
-                    <dword key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x01" name="Current Value" type="DWORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x0E" name="METER_TBL_HISTORICAL_DATA_GET" help="Meter Tbl Historical Data Get" comment="">
-            <param key="0x00" name="Maximum Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Historical Dataset Requested" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Start Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="Stop Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0C" name="Stop Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0D" name="Stop Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x0F" name="METER_TBL_HISTORICAL_DATA_REPORT" help="Meter Tbl Historical Data Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" shifter="0" />
+        <cmd key="0x0E" name="METER_TBL_HISTORICAL_DATA_GET" help="Meter Tbl Historical Data Get" support_mode="RX">
+            <param key="0x00" name="Maximum Reports" type="BYTE" />
+            <param key="0x01" name="Historical Dataset Requested" type="BIT_24" />
+            <param key="0x02" name="Start Year" type="WORD" />
+            <param key="0x03" name="Start Month" type="BYTE" />
+            <param key="0x04" name="Start Day" type="BYTE" />
+            <param key="0x05" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x06" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x07" name="Start Second Local Time" type="BYTE" />
+            <param key="0x08" name="Stop Year" type="WORD" />
+            <param key="0x09" name="Stop Month" type="BYTE" />
+            <param key="0x0A" name="Stop Day" type="BYTE" />
+            <param key="0x0B" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0C" name="Stop Minute Local Time" type="BYTE" />
+            <param key="0x0D" name="Stop Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x0F" name="METER_TBL_HISTORICAL_DATA_REPORT" help="Meter Tbl Historical Data Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x7C" shifter="2" />
                 <bitflag key="0x02" flagname="Operating Status Indication" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Dataset" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x09" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Historical Scale" fieldmask="0x1F" shifter="0" />
+            <param key="0x02" name="Dataset" type="BIT_24" />
+            <param key="0x03" name="Year" type="WORD" />
+            <param key="0x04" name="Month" type="BYTE" />
+            <param key="0x05" name="Day" type="BYTE" />
+            <param key="0x06" name="Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Second Local Time" type="BYTE" />
+            <variant_group key="0x09" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Historical Scale" fieldmask="0x1F" />
                     <bitfield key="0x01" fieldname="Historical Precision" fieldmask="0xE0" shifter="5" />
                 </param>
-                <param key="0x01" name="Historical Value" type="DWORD" typehashcode="0x03" comment="">
-                    <dword key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x01" name="Historical Value" type="DWORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x06" name="METER_TBL_REPORT" help="Meter Tbl Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x06" name="METER_TBL_REPORT" help="Meter Tbl Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x3F" />
                 <bitfield key="0x01" fieldname="Rate Type" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Pay Meter" fieldmask="0x0F" shifter="0">
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Pay Meter" fieldmask="0x0F">
                     <fieldenum value="Reserved" />
                     <fieldenum value="Creditmeter" />
                     <fieldenum value="Prepayment meter" />
@@ -4791,198 +5254,162 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Dataset Supported" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Dataset History Supported" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Data History Supported" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Dataset Supported" type="BIT_24" />
+            <param key="0x03" name="Dataset History Supported" type="BIT_24" />
+            <param key="0x04" name="Data History Supported" type="BIT_24" />
         </cmd>
-        <cmd key="0x05" name="METER_TBL_TABLE_CAPABILITY_GET" help="Meter Tbl Table Capability Get" comment="" />
-        <cmd key="0x03" name="METER_TBL_TABLE_ID_GET" help="Meter Tbl Table Id Get" comment="" />
-        <cmd key="0x04" name="METER_TBL_TABLE_ID_REPORT" help="Meter Tbl Table Id Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="METER_TBL_TABLE_CAPABILITY_GET" help="Meter Tbl Table Capability Get" support_mode="RX" />
+        <cmd key="0x03" name="METER_TBL_TABLE_ID_GET" help="Meter Tbl Table Id Get" support_mode="RX" />
+        <cmd key="0x04" name="METER_TBL_TABLE_ID_REPORT" help="Meter Tbl Table Id Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Meter ID Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
+            <param key="0x01" name="Meter ID Character" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x01" name="METER_TBL_TABLE_POINT_ADM_NO_GET" help="Meter Tbl Table Point Adm No Get" comment="" />
-        <cmd key="0x02" name="METER_TBL_TABLE_POINT_ADM_NO_REPORT" help="Meter Tbl Table Point Adm No Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x01" name="METER_TBL_TABLE_POINT_ADM_NO_GET" help="Meter Tbl Table Point Adm No Get" support_mode="RX" />
+        <cmd key="0x02" name="METER_TBL_TABLE_POINT_ADM_NO_REPORT" help="Meter Tbl Table Point Adm No Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Characters" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Meter Point Adm Number Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
+            <param key="0x01" name="Meter Point Adm Number Character" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x3E" version="1" name="COMMAND_CLASS_METER_TBL_PUSH" help="Command Class Meter Tbl Push" read_only="false" comment="">
-        <cmd key="0x02" name="METER_TBL_PUSH_CONFIGURATION_GET" help="Meter Tbl Push Configuration Get" comment="" />
-        <cmd key="0x03" name="METER_TBL_PUSH_CONFIGURATION_REPORT" help="Meter Tbl Push Configuration Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Operating Status Push Mode" fieldmask="0x0F" shifter="0" />
+    <cmd_class key="0x3E" version="1" name="COMMAND_CLASS_METER_TBL_PUSH" help="Command Class Meter Table Push">
+        <cmd key="0x02" name="METER_TBL_PUSH_CONFIGURATION_GET" help="Meter Tbl Push Configuration Get" support_mode="RX" />
+        <cmd key="0x03" name="METER_TBL_PUSH_CONFIGURATION_REPORT" help="Meter Tbl Push Configuration Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Operating Status Push Mode" fieldmask="0x0F" />
                 <bitflag key="0x01" flagname="PS" flagmask="0x10" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Push Dataset" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Interval Months" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Interval Days" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Interval Hours" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Interval Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Push Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x01" name="Push Dataset" type="BIT_24" />
+            <param key="0x02" name="Interval Months" type="BYTE" />
+            <param key="0x03" name="Interval Days" type="BYTE" />
+            <param key="0x04" name="Interval Hours" type="BYTE" />
+            <param key="0x05" name="Interval Minutes" type="BYTE" />
+            <param key="0x06" name="Push Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x01" name="METER_TBL_PUSH_CONFIGURATION_SET" help="Meter Tbl Push Configuration Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Operating Status Push Mode" fieldmask="0x0F" shifter="0" />
+        <cmd key="0x01" name="METER_TBL_PUSH_CONFIGURATION_SET" help="Meter Tbl Push Configuration Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Operating Status Push Mode" fieldmask="0x0F" />
                 <bitflag key="0x01" flagname="PS" flagmask="0x10" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Push Dataset" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Interval Months" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Interval Days" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Interval Hours" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Interval Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Push Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x01" name="Push Dataset" type="BIT_24" />
+            <param key="0x02" name="Interval Months" type="BYTE" />
+            <param key="0x03" name="Interval Days" type="BYTE" />
+            <param key="0x04" name="Interval Hours" type="BYTE" />
+            <param key="0x05" name="Interval Minutes" type="BYTE" />
+            <param key="0x06" name="Push Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x32" version="1" name="COMMAND_CLASS_METER" help="Command Class Meter" read_only="false" comment="">
-        <cmd key="0x01" name="METER_GET" help="Meter Get" comment="" />
-        <cmd key="0x02" name="METER_REPORT" help="Meter Report" comment="">
-            <param key="0x00" name="Meter Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x32" version="1" name="COMMAND_CLASS_METER" help="Command Class Meter">
+        <cmd key="0x01" name="METER_GET" help="Meter Get" support_mode="RX" />
+        <cmd key="0x02" name="METER_REPORT" help="Meter Report" support_mode="TX">
+            <param key="0x00" name="Meter Type" type="CONST">
                 <const key="0x00" flagname="Electric meter" flagmask="0x01" />
                 <const key="0x01" flagname="Gas meter" flagmask="0x02" />
                 <const key="0x02" flagname="Water meter" flagmask="0x03" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Meter Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Meter Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x32" version="2" name="COMMAND_CLASS_METER" help="Command Class Meter" read_only="false" comment="">
-        <cmd key="0x01" name="METER_GET" help="Meter Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x32" version="2" name="COMMAND_CLASS_METER" help="Command Class Meter">
+        <cmd key="0x01" name="METER_GET" help="Meter Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x02" name="METER_REPORT" help="Meter Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x02" name="METER_REPORT" help="Meter Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Reserved" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Meter Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Meter Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Delta Time" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Previous Meter Value" type="VARIANT" typehashcode="0x0C" comment="" optionaloffs="0x03" optionalmask="0xFF">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x03" name="Delta Time" type="WORD" />
+            <param key="0x04" name="Previous Meter Value" type="VARIANT" optionaloffs="0x03" optionalmask="0xFF">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x05" name="METER_RESET" help="Meter Reset" comment="" />
-        <cmd key="0x03" name="METER_SUPPORTED_GET" help="Meter Supported Get" comment="" />
-        <cmd key="0x04" name="METER_SUPPORTED_REPORT" help="Meter Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="METER_RESET" help="Meter Reset" support_mode="RX" />
+        <cmd key="0x03" name="METER_SUPPORTED_GET" help="Meter Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="METER_SUPPORTED_REPORT" help="Meter Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved1" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Meter Reset" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale Supported" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Supported" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x32" version="3" name="COMMAND_CLASS_METER" help="Command Class Meter" read_only="false" comment="">
-        <cmd key="0x01" name="METER_GET" help="Meter Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x32" version="3" name="COMMAND_CLASS_METER" help="Command Class Meter">
+        <cmd key="0x01" name="METER_GET" help="Meter Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x38" shifter="3" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xC0" shifter="6" />
             </param>
         </cmd>
-        <cmd key="0x02" name="METER_REPORT" help="Meter Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x02" name="METER_REPORT" help="Meter Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Scale bit 2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale bits 10" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Meter Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
-            </param>
-            <param key="0x03" name="Delta Time" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="false" />
+            <param key="0x02" name="Meter Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x04" name="Previous Meter Value" type="VARIANT" typehashcode="0x0C" comment="" optionaloffs="0x03" optionalmask="0xFF">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x03" name="Delta Time" type="WORD" />
+            <param key="0x04" name="Previous Meter Value" type="VARIANT" optionaloffs="0x03" optionalmask="0xFF">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x05" name="METER_RESET" help="Meter Reset" comment="" />
-        <cmd key="0x03" name="METER_SUPPORTED_GET" help="Meter Supported Get" comment="" />
-        <cmd key="0x04" name="METER_SUPPORTED_REPORT" help="Meter Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="METER_RESET" help="Meter Reset" support_mode="RX" />
+        <cmd key="0x03" name="METER_SUPPORTED_GET" help="Meter Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="METER_SUPPORTED_REPORT" help="Meter Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Meter Type" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="Meter Reset" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Scale Supported" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Scale Supported" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x32" version="4" name="COMMAND_CLASS_METER" help="Command Class Meter" read_only="false" comment="">
-        <cmd key="0x01" name="METER_GET" help="Meter Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x32" version="4" name="COMMAND_CLASS_METER" help="Command Class Meter">
+        <cmd key="0x01" name="METER_GET" help="Meter Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x38" shifter="3" />
                 <fieldenum key="0x02" fieldname="Rate Type" fieldmask="0xC0" shifter="6">
                     <fieldenum value="Reserved" />
@@ -4991,13 +5418,11 @@
                     <fieldenum value="Not to be used" />
                 </fieldenum>
             </param>
-            <param key="0x01" name="Scale 2" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Scale 2" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="METER_REPORT" help="Meter Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F" shifter="0">
+        <cmd key="0x02" name="METER_REPORT" help="Meter Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F">
                     <fieldenum value="Reserved" />
                     <fieldenum value="Electric meter" />
                     <fieldenum value="Gas meter" />
@@ -5011,29 +5436,25 @@
                 </fieldenum>
                 <bitflag key="0x02" flagname="Scale bit 2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale bits 10" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Meter Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Meter Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Delta Time" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Previous Meter Value" type="VARIANT" typehashcode="0x0C" comment="" optionaloffs="0x03" optionalmask="0xFF">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
-            </param>
-            <param key="0x05" name="Scale 2" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Delta Time" type="WORD" />
+            <param key="0x04" name="Previous Meter Value" type="VARIANT" optionaloffs="0x03" optionalmask="0xFF">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
+            <param key="0x05" name="Scale 2" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="METER_RESET" help="Meter Reset" comment="" />
-        <cmd key="0x03" name="METER_SUPPORTED_GET" help="Meter Supported Get" comment="" />
-        <cmd key="0x04" name="METER_SUPPORTED_REPORT" help="Meter Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F" shifter="0">
+        <cmd key="0x05" name="METER_RESET" help="Meter Reset" support_mode="RX" />
+        <cmd key="0x03" name="METER_SUPPORTED_GET" help="Meter Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="METER_SUPPORTED_REPORT" help="Meter Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F">
                     <fieldenum value="Reserved" />
                     <fieldenum value="Electric meter" />
                     <fieldenum value="Gas meter" />
@@ -5047,868 +5468,1167 @@
                 </fieldenum>
                 <bitflag key="0x02" flagname="Meter Reset" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale Supported 0" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Supported 0" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="M.S.T" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Number of Scale Supported Bytes to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Scale Supported" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="2" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
-            </param>
-        </cmd>
-    </cmd_class>
-    <cmd_class key="0x51" version="1" name="COMMAND_CLASS_MTP_WINDOW_COVERING" help="Command Class Mtp Window Covering" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x02" name="MOVE_TO_POSITION_GET" help="Move To Position Get" comment="" />
-        <cmd key="0x03" name="MOVE_TO_POSITION_REPORT" help="Move To Position Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="close" flagmask="0x00" />
-                <bitflag key="0x02" flagname="open" flagmask="0xFF" />
-            </param>
-        </cmd>
-        <cmd key="0x01" name="MOVE_TO_POSITION_SET" help="Move To Position Set" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="close" flagmask="0x00" />
-                <bitflag key="0x02" flagname="open" flagmask="0xFF" />
+            <param key="0x02" name="Number of Scale Supported Bytes to Follow" type="BYTE" />
+            <param key="0x03" name="Scale Supported" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x8E" version="2" name="COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION" help="Command Class Multi Channel Association" read_only="false" comment="">
-        <cmd key="0x02" name="MULTI_CHANNEL_ASSOCIATION_GET" help="Multi Channel Association Get" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x32" version="5" name="COMMAND_CLASS_METER" help="Command Class Meter">
+        <cmd key="0x01" name="METER_GET" help="Meter Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale" fieldmask="0x38" shifter="3" />
+                <fieldenum key="0x02" fieldname="Rate Type" fieldmask="0xC0" shifter="6">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Import" />
+                    <fieldenum value="Export" />
+                    <fieldenum value="Not to be used" />
+                </fieldenum>
             </param>
+            <param key="0x01" name="Scale 2" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_GET" help="Multi Channel Association Groupings Get" comment="" />
-        <cmd key="0x06" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_REPORT" help="Multi Channel Association Groupings Report" comment="">
-            <param key="0x00" name="Supported Groupings" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x02" name="METER_REPORT" help="Meter Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Electric meter" />
+                    <fieldenum value="Gas meter" />
+                    <fieldenum value="Water meter" />
+                    <fieldenum value="Heating meter" />
+                    <fieldenum value="Cooling meter" />
+                </fieldenum>
+                <fieldenum key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Import" />
+                    <fieldenum value="Export" />
+                    <fieldenum value="Not to be used" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="Scale bit 2" flagmask="0x80" />
             </param>
-        </cmd>
-        <cmd key="0x04" name="MULTI_CHANNEL_ASSOCIATION_REMOVE" help="Multi Channel Association Remove" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale bits 10" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Meter Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x02" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
-                <const key="0x00" flagname="Marker" flagmask="0x00" />
+            <param key="0x03" name="Delta Time" type="WORD" />
+            <param key="0x04" name="Previous Meter Value" type="VARIANT" optionaloffs="0x03" optionalmask="0xFF">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Channel Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
-                    <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
-                </param>
-            </variant_group>
+            <param key="0x05" name="Scale 2" type="BYTE" />
         </cmd>
-        <cmd key="0x03" name="MULTI_CHANNEL_ASSOCIATION_REPORT" help="Multi Channel Association Report" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Max Nodes Supported" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x04" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
-                <const key="0x00" flagname="Marker" flagmask="0x00" />
+        <cmd key="0x05" name="METER_RESET" help="Meter Reset" support_mode="RX" />
+        <cmd key="0x03" name="METER_SUPPORTED_GET" help="Meter Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="METER_SUPPORTED_REPORT" help="Meter Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Electric meter" />
+                    <fieldenum value="Gas meter" />
+                    <fieldenum value="Water meter" />
+                    <fieldenum value="Heating meter" />
+                    <fieldenum value="Cooling meter" />
+                </fieldenum>
+                <fieldenum key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Import only" />
+                    <fieldenum value="Export only" />
+                    <fieldenum value="Import and Export" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="Meter Reset" flagmask="0x80" />
             </param>
-            <variant_group key="0x05" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Channel Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Supported 0" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="M.S.T" flagmask="0x80" />
+            </param>
+            <param key="0x02" name="Number of Scale Supported Bytes to Follow" type="BYTE" />
+            <param key="0x03" name="Scale Supported" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x32" version="6" name="COMMAND_CLASS_METER" help="Command Class Meter">
+        <cmd key="0x01" name="METER_GET" help="Meter Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale" fieldmask="0x38" shifter="3" />
+                <fieldenum key="0x02" fieldname="Rate Type" fieldmask="0xC0" shifter="6">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Import" />
+                    <fieldenum value="Export" />
+                    <fieldenum value="Not to be used" />
+                </fieldenum>
+            </param>
+            <param key="0x01" name="Scale 2" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="METER_REPORT" help="Meter Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Electric meter" />
+                    <fieldenum value="Gas meter" />
+                    <fieldenum value="Water meter" />
+                    <fieldenum value="Heating meter" />
+                    <fieldenum value="Cooling meter" />
+                </fieldenum>
+                <fieldenum key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Import" />
+                    <fieldenum value="Export" />
+                    <fieldenum value="Not to be used" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="Scale bit 2" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale bits 10" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x02" name="Meter Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
+            </param>
+            <param key="0x03" name="Delta Time" type="WORD" />
+            <param key="0x04" name="Previous Meter Value" type="VARIANT" optionaloffs="0x03" optionalmask="0xFF">
+                <variant paramoffs="1" sizemask="0x07" />
+            </param>
+            <param key="0x05" name="Scale 2" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="METER_RESET" help="Meter Reset" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Electric meter" />
+                    <fieldenum value="Gas meter" />
+                    <fieldenum value="Water meter" />
+                    <fieldenum value="Heating meter" />
+                    <fieldenum value="Cooling meter" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Size" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x01" name="Meter Value" type="VARIANT">
+                <variant paramoffs="0" sizemask="0xE0" sizeoffs="5" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="METER_SUPPORTED_GET" help="Meter Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="METER_SUPPORTED_REPORT" help="Meter Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Meter Type" fieldmask="0x1F">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Electric meter" />
+                    <fieldenum value="Gas meter" />
+                    <fieldenum value="Water meter" />
+                    <fieldenum value="Heating meter" />
+                    <fieldenum value="Cooling meter" />
+                </fieldenum>
+                <fieldenum key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Import only" />
+                    <fieldenum value="Export only" />
+                    <fieldenum value="Import and Export" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="Meter Reset" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Supported 0" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="M.S.T" flagmask="0x80" />
+            </param>
+            <param key="0x02" name="Number of Scale Supported Bytes to Follow" type="BYTE" />
+            <param key="0x03" name="Scale Supported" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x51" version="1" name="COMMAND_CLASS_MTP_WINDOW_COVERING" help="Command Class Move To Position Window Covering" comment="[OBSOLETED]">
+        <cmd key="0x02" name="MOVE_TO_POSITION_GET" help="Move To Position Get" support_mode="RX" />
+        <cmd key="0x03" name="MOVE_TO_POSITION_REPORT" help="Move To Position Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE">
+                <bitflag key="0x01" flagname="close" flagmask="0x00" />
+                <bitflag key="0x02" flagname="open" flagmask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x01" name="MOVE_TO_POSITION_SET" help="Move To Position Set" support_mode="RX">
+            <param key="0x00" name="Value" type="BYTE">
+                <bitflag key="0x01" flagname="close" flagmask="0x00" />
+                <bitflag key="0x02" flagname="open" flagmask="0xFF" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x8E" version="2" name="COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION" help="Command Class Multi Channel Association">
+        <cmd key="0x02" name="MULTI_CHANNEL_ASSOCIATION_GET" help="Multi Channel Association Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_GET" help="Multi Channel Association Groupings Get" support_mode="RX" />
+        <cmd key="0x06" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_REPORT" help="Multi Channel Association Groupings Report" support_mode="TX">
+            <param key="0x00" name="Supported Groupings" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="MULTI_CHANNEL_ASSOCIATION_REMOVE" help="Multi Channel Association Remove" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+            <param key="0x02" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+                <const key="0x00" flagname="Marker" flagmask="0x00" />
+            </param>
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                     <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x01" name="MULTI_CHANNEL_ASSOCIATION_SET" help="Multi Channel Association Set" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="MULTI_CHANNEL_ASSOCIATION_REPORT" help="Multi Channel Association Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Max Nodes Supported" type="BYTE" />
+            <param key="0x02" name="Reports to Follow" type="BYTE" />
+            <param key="0x03" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x02" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+            <param key="0x04" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
                 <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Channel Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
+            <variant_group key="0x05" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
                 </param>
-                <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x01" name="MULTI_CHANNEL_ASSOCIATION_SET" help="Multi Channel Association Set" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+            <param key="0x02" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+                <const key="0x00" flagname="Marker" flagmask="0x00" />
+            </param>
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                     <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
                 </param>
             </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x8E" version="3" name="COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION" help="Command Class Multi Channel Association" read_only="false" comment="">
-        <cmd key="0x02" name="MULTI_CHANNEL_ASSOCIATION_GET" help="Multi Channel Association Get" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x8E" version="3" name="COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION" help="Command Class Multi Channel Association">
+        <cmd key="0x02" name="MULTI_CHANNEL_ASSOCIATION_GET" help="Multi Channel Association Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_GET" help="Multi Channel Association Groupings Get" comment="" />
-        <cmd key="0x06" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_REPORT" help="Multi Channel Association Groupings Report" comment="">
-            <param key="0x00" name="Supported Groupings" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_GET" help="Multi Channel Association Groupings Get" support_mode="RX" />
+        <cmd key="0x06" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_REPORT" help="Multi Channel Association Groupings Report" support_mode="TX">
+            <param key="0x00" name="Supported Groupings" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="MULTI_CHANNEL_ASSOCIATION_REMOVE" help="Multi Channel Association Remove" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x04" name="MULTI_CHANNEL_ASSOCIATION_REMOVE" help="Multi Channel Association Remove" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x02" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+            <param key="0x02" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
                 <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Channel Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                     <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x03" name="MULTI_CHANNEL_ASSOCIATION_REPORT" help="Multi Channel Association Report" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Max Nodes Supported" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="MULTI_CHANNEL_ASSOCIATION_REPORT" help="Multi Channel Association Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Max Nodes Supported" type="BYTE" />
+            <param key="0x02" name="Reports to Follow" type="BYTE" />
+            <param key="0x03" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x02" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x04" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+                <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <param key="0x03" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <variant_group key="0x05" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x01" name="MULTI_CHANNEL_ASSOCIATION_SET" help="Multi Channel Association Set" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x04" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+            <param key="0x02" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
                 <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <variant_group key="0x05" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Channel Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                     <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x01" name="MULTI_CHANNEL_ASSOCIATION_SET" help="Multi Channel Association Set" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x8E" version="4" name="COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION" help="Command Class Multi Channel Association">
+        <cmd key="0x02" name="MULTI_CHANNEL_ASSOCIATION_GET" help="Multi Channel Association Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_GET" help="Multi Channel Association Groupings Get" support_mode="RX" />
+        <cmd key="0x06" name="MULTI_CHANNEL_ASSOCIATION_GROUPINGS_REPORT" help="Multi Channel Association Groupings Report" support_mode="TX">
+            <param key="0x00" name="Supported Groupings" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="MULTI_CHANNEL_ASSOCIATION_REMOVE" help="Multi Channel Association Remove" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+            <param key="0x02" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+                <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x03" name="MULTI_CHANNEL_ASSOCIATION_REPORT" help="Multi Channel Association Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Max Nodes Supported" type="BYTE" />
+            <param key="0x02" name="Reports to Follow" type="BYTE" />
+            <param key="0x03" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x02" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+            <param key="0x04" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
                 <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Channel Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
+            <variant_group key="0x05" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
                 </param>
-                <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x01" name="MULTI_CHANNEL_ASSOCIATION_SET" help="Multi Channel Association Set" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+            <param key="0x02" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+                <const key="0x00" flagname="Marker" flagmask="0x00" />
+            </param>
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Multi Channel Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                     <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
                 </param>
             </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x60" version="2" name="COMMAND_CLASS_MULTI_CHANNEL" help="Command Class Multi Channel" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x09" name="MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+    <cmd_class key="0x60" version="2" name="COMMAND_CLASS_MULTI_CHANNEL" help="Command Class Multi Channel" comment="[OBSOLETED]">
+        <cmd key="0x09" name="MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0A" name="MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Dynamic" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Command Class" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_CLASS_REF">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x02" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x03" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="MULTI_CHANNEL_CMD_ENCAP" help="Multi Channel Command Encapsulation" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0D" name="MULTI_CHANNEL_CMD_ENCAP" help="Multi Channel Command Encapsulation">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Command" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_DATA">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x03" name="Command" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x04" name="Parameter" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0B" name="MULTI_CHANNEL_END_POINT_FIND" help="Multi Channel End Point Find" comment="">
-            <param key="0x00" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0B" name="MULTI_CHANNEL_END_POINT_FIND" help="Multi Channel End Point Find" support_mode="RX">
+            <param key="0x00" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x01" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
         </cmd>
-        <cmd key="0x0C" name="MULTI_CHANNEL_END_POINT_FIND_REPORT" help="Multi Channel End Point Find Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0C" name="MULTI_CHANNEL_END_POINT_FIND_REPORT" help="Multi Channel End Point Find Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x02" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                     <bitflag key="0x01" flagname="Res" flagmask="0x80" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x07" name="MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" comment="" />
-        <cmd key="0x08" name="MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Res1" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x07" name="MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" support_mode="RX" />
+        <cmd key="0x08" name="MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Res1" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Identical" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Dynamic" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="End Points" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Points" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x06" name="MULTI_INSTANCE_CMD_ENCAP" help="Multi Instance Cmd Encap" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Instance" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x06" name="MULTI_INSTANCE_CMD_ENCAP" help="Multi Instance Cmd Encap">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Instance" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Command" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_DATA">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x02" name="Command" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x03" name="Parameter" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x04" name="MULTI_INSTANCE_GET" help="Multi Instance Get" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x04" name="MULTI_INSTANCE_GET" help="Multi Instance Get">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
         </cmd>
-        <cmd key="0x05" name="MULTI_INSTANCE_REPORT" help="Multi Instance Report" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Instances" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="MULTI_INSTANCE_REPORT" help="Multi Instance Report">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Instances" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x60" version="3" name="COMMAND_CLASS_MULTI_CHANNEL" help="Command Class Multi Channel" read_only="false" comment="">
-        <cmd key="0x09" name="MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+    <cmd_class key="0x60" version="3" name="COMMAND_CLASS_MULTI_CHANNEL" help="Command Class Multi Channel">
+        <cmd key="0x09" name="MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0A" name="MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Dynamic" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Command Class" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_CLASS_REF">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x02" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x03" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="MULTI_CHANNEL_CMD_ENCAP" help="Multi Channel Command Encapsulation" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0D" name="MULTI_CHANNEL_CMD_ENCAP" help="Multi Channel Command Encapsulation">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Command" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_DATA">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x03" name="Command" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x04" name="Parameter" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0B" name="MULTI_CHANNEL_END_POINT_FIND" help="Multi Channel End Point Find" comment="">
-            <param key="0x00" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0B" name="MULTI_CHANNEL_END_POINT_FIND" help="Multi Channel End Point Find" support_mode="RX">
+            <param key="0x00" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x01" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
         </cmd>
-        <cmd key="0x0C" name="MULTI_CHANNEL_END_POINT_FIND_REPORT" help="Multi Channel End Point Find Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0C" name="MULTI_CHANNEL_END_POINT_FIND_REPORT" help="Multi Channel End Point Find Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x02" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                     <bitflag key="0x01" flagname="Res" flagmask="0x80" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x07" name="MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" comment="" />
-        <cmd key="0x08" name="MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Res1" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x07" name="MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" support_mode="RX" />
+        <cmd key="0x08" name="MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Res1" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Identical" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Dynamic" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="End Points" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Points" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x06" name="MULTI_INSTANCE_CMD_ENCAP" help="Multi Instance Cmd Encap" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Instance" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x06" name="MULTI_INSTANCE_CMD_ENCAP" help="Multi Instance Cmd Encap">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Instance" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Command" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_DATA">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x02" name="Command" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x03" name="Parameter" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x04" name="MULTI_INSTANCE_GET" help="Multi Instance Get" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x04" name="MULTI_INSTANCE_GET" help="Multi Instance Get">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
         </cmd>
-        <cmd key="0x05" name="MULTI_INSTANCE_REPORT" help="Multi Instance Report" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Instances" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="MULTI_INSTANCE_REPORT" help="Multi Instance Report">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Instances" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x60" version="4" name="COMMAND_CLASS_MULTI_CHANNEL" help="Command Class Multi Channel" read_only="false" comment="">
-        <cmd key="0x09" name="MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+    <cmd_class key="0x60" version="4" name="COMMAND_CLASS_MULTI_CHANNEL" help="Command Class Multi Channel">
+        <cmd key="0x09" name="MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0A" name="MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Dynamic" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Command Class" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_CLASS_REF">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x02" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x03" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="MULTI_CHANNEL_CMD_ENCAP" help="Multi Channel Command Encapsulation" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0D" name="MULTI_CHANNEL_CMD_ENCAP" help="Multi Channel Command Encapsulation">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Bit address" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Command" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_DATA">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x03" name="Command" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x04" name="Parameter" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0B" name="MULTI_CHANNEL_END_POINT_FIND" help="Multi Channel End Point Find" comment="">
-            <param key="0x00" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0B" name="MULTI_CHANNEL_END_POINT_FIND" help="Multi Channel End Point Find" support_mode="RX">
+            <param key="0x00" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x01" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
         </cmd>
-        <cmd key="0x0C" name="MULTI_CHANNEL_END_POINT_FIND_REPORT" help="Multi Channel End Point Find Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="GEN_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="" encaptype="SPEC_DEV_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0C" name="MULTI_CHANNEL_END_POINT_FIND_REPORT" help="Multi Channel End Point Find Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x02" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
                     <bitflag key="0x01" flagname="Res" flagmask="0x80" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x07" name="MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" comment="" />
-        <cmd key="0x08" name="MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Res1" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x07" name="MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" support_mode="RX" />
+        <cmd key="0x08" name="MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Res1" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Identical" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Dynamic" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Individual End Points" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Individual End Points" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Aggregated End Points" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Points" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res3" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x06" name="MULTI_INSTANCE_CMD_ENCAP" help="Multi Instance Cmd Encap" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Instance" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x06" name="MULTI_INSTANCE_CMD_ENCAP" help="Multi Instance Cmd Encap">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Instance" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Command" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_DATA">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x02" name="Command" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x03" name="Parameter" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x04" name="MULTI_INSTANCE_GET" help="Multi Instance Get" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x04" name="MULTI_INSTANCE_GET" help="Multi Instance Get">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
         </cmd>
-        <cmd key="0x05" name="MULTI_INSTANCE_REPORT" help="Multi Instance Report" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Instances" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="MULTI_INSTANCE_REPORT" help="Multi Instance Report">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Instances" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x0E" name="MULTI_CHANNEL_AGGREGATED_MEMBERS_GET" help="Multi Channel Aggregated Members Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0E" name="MULTI_CHANNEL_AGGREGATED_MEMBERS_GET" help="Multi Channel Aggregated Members Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x0F" name="MULTI_CHANNEL_AGGREGATED_MEMBERS_REPORT" help="Multi Channel Aggregated Members Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x0F" name="MULTI_CHANNEL_AGGREGATED_MEMBERS_REPORT" help="Multi Channel Aggregated Members Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Number of Bit Masks" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Aggregated Members Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="1" lenmask="0xFF" lenoffs="0" />
+            <param key="0x01" name="Number of Bit Masks" type="BYTE" />
+            <param key="0x02" name="Aggregated Members Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="1" lenmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x8F" version="1" name="COMMAND_CLASS_MULTI_CMD" help="Command Class Multi Cmd" read_only="false" comment="">
-        <cmd key="0x01" name="MULTI_CMD_ENCAP" help="Multi Cmd Encap" comment="">
-            <param key="0x00" name="Number of Commands" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x01" name="Encapsulated_Command" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Command Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Command Class" type="BYTE" typehashcode="0x01" encaptype="CMD_CLASS_REF">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x02" name="Command" type="BYTE" typehashcode="0x01" encaptype="CMD_REF">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x03" name="Data" type="VARIANT" typehashcode="0x0C" encaptype="CMD_DATA">
-                    <variant paramoffs="0" showhex="false" signed="true" sizemask="0xFF" sizeoffs="0" sizechange="-2" />
+    <cmd_class key="0x8F" version="1" name="COMMAND_CLASS_MULTI_CMD" help="Command Class Multi Command">
+        <cmd key="0x01" name="MULTI_CMD_ENCAP" help="Multi Cmd Encap" support_mode="RX">
+            <param key="0x00" name="Number of Commands" type="BYTE" />
+            <variant_group key="0x01" name="Encapsulated_Command" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Command Length" type="BYTE" />
+                <param key="0x01" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+                <param key="0x02" name="Command" type="BYTE" encaptype="CMD_REF" />
+                <param key="0x03" name="Data" type="VARIANT" encaptype="CMD_DATA">
+                    <variant paramoffs="0" sizemask="0xFF" sizechange="-2" />
                 </param>
             </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x8E" version="1" name="COMMAND_CLASS_MULTI_INSTANCE_ASSOCIATION" help="Command Class Multi Instance Association" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x02" name="MULTI_INSTANCE_ASSOCIATION_GET" help="Multi Instance Association Get" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x8E" version="1" name="COMMAND_CLASS_MULTI_INSTANCE_ASSOCIATION" help="Command Class Multi Instance Association" comment="[OBSOLETED]">
+        <cmd key="0x02" name="MULTI_INSTANCE_ASSOCIATION_GET" help="Multi Instance Association Get">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="MULTI_INSTANCE_ASSOCIATION_GROUPINGS_GET" help="Multi Instance Association Groupings Get" comment="" />
-        <cmd key="0x06" name="MULTI_INSTANCE_ASSOCIATION_GROUPINGS_REPORT" help="Multi Instance Association Groupings Report" comment="">
-            <param key="0x00" name="Supported Groupings" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="MULTI_INSTANCE_ASSOCIATION_GROUPINGS_GET" help="Multi Instance Association Groupings Get" />
+        <cmd key="0x06" name="MULTI_INSTANCE_ASSOCIATION_GROUPINGS_REPORT" help="Multi Instance Association Groupings Report">
+            <param key="0x00" name="Supported Groupings" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="MULTI_INSTANCE_ASSOCIATION_REMOVE" help="Multi Instance Association Remove" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x04" name="MULTI_INSTANCE_ASSOCIATION_REMOVE" help="Multi Instance Association Remove">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x02" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+            <param key="0x02" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
                 <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Instance Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Instance" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <variant_group key="0x03" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Multi Instance Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Instance" type="BYTE" />
             </variant_group>
         </cmd>
-        <cmd key="0x03" name="MULTI_INSTANCE_ASSOCIATION_REPORT" help="Multi Instance Association Report" comment="">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="MULTI_INSTANCE_ASSOCIATION_REPORT" help="Multi Instance Association Report">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Max Nodes Supported" type="BYTE" />
+            <param key="0x02" name="Reports to Follow" type="BYTE" />
+            <param key="0x03" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x01" name="Max Nodes Supported" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x04" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+            <param key="0x04" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
                 <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <variant_group key="0x05" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Instance Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Instance" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <variant_group key="0x05" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Multi Instance Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Instance" type="BYTE" />
             </variant_group>
         </cmd>
-        <cmd key="0x01" name="MULTI_INSTANCE_ASSOCIATION_SET" help="Multi Instance Association Set" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="VARIANT" typehashcode="0x0C" comment="" encaptype="NODE_NUMBER">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x01" name="MULTI_INSTANCE_ASSOCIATION_SET" help="Multi Instance Association Set">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
+            <param key="0x01" name="Node ID" type="VARIANT" encaptype="NODE_NUMBER">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x02" name="Marker" type="MARKER" typehashcode="0x0E" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
+            <param key="0x02" name="Marker" type="MARKER" comment="This marker identifier is used to separate between nodes without and with end points attached. This field can be omitted in case no Multi Channel node follows.">
                 <const key="0x00" flagname="Marker" flagmask="0x00" />
             </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Multi Instance Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Instance" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <variant_group key="0x03" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Multi Instance Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+                <param key="0x01" name="Instance" type="BYTE" />
             </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x60" version="1" name="COMMAND_CLASS_MULTI_INSTANCE" help="Command Class Multi Instance" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x06" name="MULTI_INSTANCE_CMD_ENCAP" help="Multi Instance Cmd Encap" comment="">
-            <param key="0x00" name="Instance" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Command" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Parameter" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_DATA">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+    <cmd_class key="0x60" version="1" name="COMMAND_CLASS_MULTI_INSTANCE" help="Command Class Multi Instance" comment="[OBSOLETED]">
+        <cmd key="0x06" name="MULTI_INSTANCE_CMD_ENCAP" help="Multi Instance Cmd Encap">
+            <param key="0x00" name="Instance" type="BYTE" />
+            <param key="0x01" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x02" name="Command" type="BYTE" encaptype="CMD_REF" />
+            <param key="0x03" name="Parameter" type="VARIANT" encaptype="CMD_DATA">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x04" name="MULTI_INSTANCE_GET" help="Multi Instance Get" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x04" name="MULTI_INSTANCE_GET" help="Multi Instance Get">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
         </cmd>
-        <cmd key="0x05" name="MULTI_INSTANCE_REPORT" help="Multi Instance Report" comment="">
-            <param key="0x00" name="Command Class" type="BYTE" typehashcode="0x01" comment="" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Instances" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="MULTI_INSTANCE_REPORT" help="Multi Instance Report">
+            <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x01" name="Instances" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x52" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PROXY" help="Command Class Network Management Proxy" read_only="false" comment="">
-        <cmd key="0x03" name="NODE_INFO_CACHED_GET" help="Node Info Cached Get" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Max Age" fieldmask="0x0F" shifter="0" />
+    <cmd_class key="0x52" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PROXY" help="Command Class Network Management Proxy">
+        <cmd key="0x03" name="NODE_INFO_CACHED_GET" help="Node Info Cached Get" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Max Age" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x04" name="NODE_INFO_CACHED_REPORT" help="Node Info Cached Report" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Age" fieldmask="0x0F" shifter="0" />
+        <cmd key="0x04" name="NODE_INFO_CACHED_REPORT" help="Node Info Cached Report" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Age" fieldmask="0x0F" />
                 <fieldenum key="0x01" fieldname="Status" fieldmask="0xF0" shifter="4">
                     <fieldenum value="STATUS_OK" />
                     <fieldenum value="STATUS_NOT_RESPONDING" />
                     <fieldenum value="STATUS_UNKNOWN" />
                 </fieldenum>
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Capability" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Security" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Sensor" fieldmask="0x70" shifter="4" />
-                <bitflag key="0x00" flagname="Opt" flagmask="0x80" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
+            </param>
+            <param key="0x04" name="Reserved" type="BYTE" />
+            <param key="0x05" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x06" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x07" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x08" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x04" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x01" name="NODE_LIST_GET" help="Node List Get" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="NODE_LIST_REPORT" help="Node List Report" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="Latest" flagmask="0x00" />
+                <bitflag key="0x02" flagname="May not be the latest" flagmask="0x01" />
             </param>
-            <param key="0x05" name="Basic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Node List Controller ID" type="BYTE" />
+            <param key="0x03" name="Node List Data" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
             </param>
-            <param key="0x06" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x52" version="2" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PROXY" help="Command Class Network Management Proxy">
+        <cmd key="0x03" name="NODE_INFO_CACHED_GET" help="Node Info Cached Get" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Max Age" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x07" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x04" name="NODE_INFO_CACHED_REPORT" help="Node Info Cached Report" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Age" fieldmask="0x0F" />
+                <fieldenum key="0x01" fieldname="Status" fieldmask="0xF0" shifter="4">
+                    <fieldenum value="STATUS_OK" />
+                    <fieldenum value="STATUS_NOT_RESPONDING" />
+                    <fieldenum value="STATUS_UNKNOWN" />
+                </fieldenum>
             </param>
-            <param key="0x08" name="Non-Secure Command Class" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x09" name="Security Scheme 0 MARK" type="MARKER" typehashcode="0x0E">
-                <const key="0x00" flagname="Security Scheme 0 MARK" flagmask="0xF1" />
-                <const key="0x01" flagname="Security Scheme 0 MARK" flagmask="0x00" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
             </param>
-            <param key="0x0A" name="Security Scheme 0 Command Class" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x04" name="Granted Keys" type="BYTE" />
+            <param key="0x05" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x06" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x07" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x08" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x01" name="NODE_LIST_GET" help="Node List Get" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x01" name="NODE_LIST_GET" help="Node List Get" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="NODE_LIST_REPORT" help="Node List Report" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="false" />
+        <cmd key="0x02" name="NODE_LIST_REPORT" help="Node List Report" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="Latest" flagmask="0x00" />
                 <bitflag key="0x02" flagname="May not be the latest" flagmask="0x01" />
             </param>
-            <param key="0x02" name="Node List Controller ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Node List Controller ID" type="BYTE" />
+            <param key="0x03" name="Node List Data" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
+            </param>
+        </cmd>
+        <cmd key="0x05" name="NM_MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x06" name="NM_MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Individual End Points" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Node List Data" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Points" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
             </param>
         </cmd>
+        <cmd key="0x07" name="NM_MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+        </cmd>
+        <cmd key="0x08" name="NM_MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Command Class Length" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x04" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x05" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x06" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+        </cmd>
+        <cmd key="0x09" name="NM_MULTI_CHANNEL_AGGREGATED_MEMBERS_GET" help="Multi Channel Aggregated Members Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+        </cmd>
+        <cmd key="0x0A" name="NM_MULTI_CHANNEL_AGGREGATED_MEMBERS_REPORT" help="Multi Channel Aggregated Members Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Number of Members" type="BYTE" />
+            <variant_group key="0x04" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Member Endpoint" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
+                </param>
+            </variant_group>
+        </cmd>
     </cmd_class>
-    <cmd_class key="0x52" version="2" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PROXY" help="Command Class Network Management Proxy" read_only="false" comment="">
-        <cmd key="0x03" name="NODE_INFO_CACHED_GET" help="Node Info Cached Get" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Max Age" fieldmask="0x0F" shifter="0" />
+    <cmd_class key="0x52" version="3" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PROXY" help="Command Class Network Management Proxy">
+        <cmd key="0x03" name="NODE_INFO_CACHED_GET" help="Node Info Cached Get" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Max Age" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x04" name="NODE_INFO_CACHED_REPORT" help="Node Info Cached Report" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Age" fieldmask="0x0F" shifter="0" />
+        <cmd key="0x04" name="NODE_INFO_CACHED_REPORT" help="Node Info Cached Report" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Age" fieldmask="0x0F" />
                 <fieldenum key="0x01" fieldname="Status" fieldmask="0xF0" shifter="4">
                     <fieldenum value="STATUS_OK" />
                     <fieldenum value="STATUS_NOT_RESPONDING" />
                     <fieldenum value="STATUS_UNKNOWN" />
                 </fieldenum>
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Capability" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Security" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Sensor" fieldmask="0x70" shifter="4" />
-                <bitflag key="0x00" flagname="Opt" flagmask="0x80" />
-            </param>
-            <param key="0x04" name="Granted Keys" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Basic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x04" name="Granted Keys" type="BYTE" />
+            <param key="0x05" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x06" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x07" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x08" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x06" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x01" name="NODE_LIST_GET" help="Node List Get" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="NODE_LIST_REPORT" help="Node List Report" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="Latest" flagmask="0x00" />
+                <bitflag key="0x02" flagname="May not be the latest" flagmask="0x01" />
             </param>
-            <param key="0x07" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Node List Controller ID" type="BYTE" />
+            <param key="0x03" name="Node List Data" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
             </param>
-            <param key="0x08" name="Non-Secure Command Class" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        </cmd>
+        <cmd key="0x05" name="NM_MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x06" name="NM_MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Individual End Points" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
             </param>
-            <param key="0x09" name="Security MARK" type="MARKER" typehashcode="0x0E">
-                <const key="0x00" flagname="Security MARK" flagmask="0xF1" />
-                <const key="0x01" flagname="Security MARK" flagmask="0x00" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Points" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
             </param>
-            <param key="0x0A" name="Secure Command Class" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        </cmd>
+        <cmd key="0x07" name="NM_MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+        </cmd>
+        <cmd key="0x08" name="NM_MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Command Class Length" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x04" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x05" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x06" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+        </cmd>
+        <cmd key="0x09" name="NM_MULTI_CHANNEL_AGGREGATED_MEMBERS_GET" help="Multi Channel Aggregated Members Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+        </cmd>
+        <cmd key="0x0A" name="NM_MULTI_CHANNEL_AGGREGATED_MEMBERS_REPORT" help="Multi Channel Aggregated Members Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Number of Members" type="BYTE" />
+            <variant_group key="0x04" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Member Endpoint" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x0B" name="FAILED_NODE_LIST_GET" help="Failed Node List Get">
+            <param key="0x00" name="Seq No" type="BYTE" />
+        </cmd>
+        <cmd key="0x0C" name="FAILED_NODE_LIST_REPORT" help="Failed Node List Report">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Failed Node List Data" type="ARRAY">
+                <arrayattrib key="0x00" len="29" />
             </param>
         </cmd>
-        <cmd key="0x01" name="NODE_LIST_GET" help="Node List Get" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x52" version="4" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PROXY" help="Command Class Network Management Proxy">
+        <cmd key="0x03" name="NODE_INFO_CACHED_GET" help="Node Info Cached Get" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Max Age" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Extended NodeID" type="WORD" />
         </cmd>
-        <cmd key="0x02" name="NODE_LIST_REPORT" help="Node List Report" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="NODE_INFO_CACHED_REPORT" help="Node Info Cached Report" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Age" fieldmask="0x0F" />
+                <fieldenum key="0x01" fieldname="Status" fieldmask="0xF0" shifter="4">
+                    <fieldenum value="STATUS_OK" />
+                    <fieldenum value="STATUS_NOT_RESPONDING" />
+                    <fieldenum value="STATUS_UNKNOWN" />
+                </fieldenum>
+            </param>
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
+            </param>
+            <param key="0x04" name="Granted Keys" type="BYTE" />
+            <param key="0x05" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x06" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x07" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x08" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="false" />
+        </cmd>
+        <cmd key="0x01" name="NODE_LIST_GET" help="Node List Get" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="NODE_LIST_REPORT" help="Node List Report" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="Latest" flagmask="0x00" />
                 <bitflag key="0x02" flagname="May not be the latest" flagmask="0x01" />
             </param>
-            <param key="0x02" name="Node List Controller ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Node List Controller ID" type="BYTE" />
+            <param key="0x03" name="Node List Data" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="29" />
             </param>
-            <param key="0x03" name="Node List Data" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+            <param key="0x04" name="Extended Node List Length" type="WORD" />
+            <param key="0x05" name="Extended Node List" type="VARIANT">
+                <variant paramoffs="4" sizemask="0xFF" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x4D" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_BASIC" help="Command Class Network Management Basic" read_only="false" comment="">
-        <cmd key="0x01" name="LEARN_MODE_SET" help="Learn Mode Set" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x05" name="NM_MULTI_CHANNEL_END_POINT_GET" help="Multi Channel End Point Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x06" name="NM_MULTI_CHANNEL_END_POINT_REPORT" help="Multi Channel End Point Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Individual End Points" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Points" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x07" name="NM_MULTI_CHANNEL_CAPABILITY_GET" help="Multi Channel Capability Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x08" name="NM_MULTI_CHANNEL_CAPABILITY_REPORT" help="Multi Channel Capability Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Command Class Length" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x04" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x05" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x06" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+            <param key="0x07" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x09" name="NM_MULTI_CHANNEL_AGGREGATED_MEMBERS_GET" help="Multi Channel Aggregated Members Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x0A" name="NM_MULTI_CHANNEL_AGGREGATED_MEMBERS_REPORT" help="Multi Channel Aggregated Members Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Aggregated End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Res1" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Number of Members" type="BYTE" />
+            <variant_group key="0x04" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Member Endpoint" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Res2" flagmask="0x80" />
+                </param>
+            </variant_group>
+            <param key="0x05" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x0B" name="FAILED_NODE_LIST_GET" help="Failed Node List Get">
+            <param key="0x00" name="Seq No" type="BYTE" />
+        </cmd>
+        <cmd key="0x0C" name="FAILED_NODE_LIST_REPORT" help="Failed Node List Report">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Failed Node List Data" type="ARRAY">
+                <arrayattrib key="0x00" len="29" />
             </param>
-            <param key="0x02" name="Mode" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x02" name="Extended Failed Node List Length" type="WORD" />
+            <param key="0x03" name="Extended Failed Node List" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x4D" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_BASIC" help="Command Class Network Management Basic">
+        <cmd key="0x01" name="LEARN_MODE_SET" help="Learn Mode Set" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
                 <bitflag key="0x01" flagname="LEARN_MODE_SET_CLASSIC" flagmask="0x01" />
                 <bitflag key="0x02" flagname="LEARN_MODE_SET_NWI" flagmask="0x02" />
                 <bitflag key="0x03" flagname="LEARN_MODE_SET_DISABLE" flagmask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x02" name="LEARN_MODE_SET_STATUS" help="Learn Mode Set Status" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x02" name="LEARN_MODE_SET_STATUS" help="Learn Mode Set Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="LEARN_MODE_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="LEARN_MODE_FAILED_TIMEOUT" flagmask="0x01" />
                 <bitflag key="0x03" flagname="LEARN_MODE_FAILED" flagmask="0x07" />
                 <bitflag key="0x04" flagname="LEARN_MODE_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="New Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="New Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x05" name="NODE_INFORMATION_SEND" help="Node Information Send" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Destination Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="tx Options" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+        <cmd key="0x05" name="NODE_INFORMATION_SEND" help="Node Information Send" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Destination Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
@@ -5919,17 +6639,12 @@
                 <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x03" name="NETWORK_UPDATE_REQUEST" help="Network Update Request">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x03" name="NETWORK_UPDATE_REQUEST" help="Network Update Request" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="NETWORK_UPDATE_REQUEST_STATUS" help="Network Update Request Status">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x04" name="NETWORK_UPDATE_REQUEST_STATUS" help="Network Update Request Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="SUC_UPDATE_DONE" flagmask="0x00" />
                 <bitflag key="0x02" flagname="SUC_UPDATE_ABORT" flagmask="0x01" />
                 <bitflag key="0x03" flagname="SUC_UPDATE_WAIT" flagmask="0x02" />
@@ -5937,73 +6652,52 @@
                 <bitflag key="0x05" flagname="SUC_UPDATE_OVERFLOW" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x06" name="DEFAULT_SET" help="Default Set">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x06" name="DEFAULT_SET" help="Default Set" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="DEFAULT_SET_COMPLETE" help="Default Set Complete">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x07" name="DEFAULT_SET_COMPLETE" help="Default Set Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="DEFAULT_SET_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="DEFAULT_SET_BUSY" flagmask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x4D" version="2" name="COMMAND_CLASS_NETWORK_MANAGEMENT_BASIC" help="Command Class Network Management Basic" read_only="false" comment="">
-        <cmd key="0x01" name="LEARN_MODE_SET" help="Learn Mode Set" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x4D" version="2" name="COMMAND_CLASS_NETWORK_MANAGEMENT_BASIC" help="Command Class Network Management Basic">
+        <cmd key="0x01" name="LEARN_MODE_SET" help="Learn Mode Set" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Return interview status" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x02" name="Mode" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x02" name="Mode" type="BYTE">
                 <bitflag key="0x01" flagname="LEARN_MODE_SET_CLASSIC" flagmask="0x01" />
                 <bitflag key="0x02" flagname="LEARN_MODE_SET_NWI" flagmask="0x02" />
                 <bitflag key="0x03" flagname="LEARN_MODE_SET_DISABLE" flagmask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x02" name="LEARN_MODE_SET_STATUS" help="Learn Mode Set Status" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x02" name="LEARN_MODE_SET_STATUS" help="Learn Mode Set Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="LEARN_MODE_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="LEARN_MODE_FAILED_TIMEOUT" flagmask="0x01" />
                 <bitflag key="0x03" flagname="LEARN_MODE_FAILED" flagmask="0x07" />
                 <bitflag key="0x04" flagname="LEARN_MODE_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="New Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Granted Keys" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="DSK" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="New Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Granted Keys" type="BYTE" />
+            <param key="0x05" name="KEX Fail Type" type="BYTE" />
+            <param key="0x06" name="DSK" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
-        <cmd key="0x05" name="NODE_INFORMATION_SEND" help="Node Information Send" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Destination Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="tx Options" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+        <cmd key="0x05" name="NODE_INFORMATION_SEND" help="Node Information Send" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Destination Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
@@ -6014,17 +6708,12 @@
                 <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x03" name="NETWORK_UPDATE_REQUEST" help="Network Update Request">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x03" name="NETWORK_UPDATE_REQUEST" help="Network Update Request" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="NETWORK_UPDATE_REQUEST_STATUS" help="Network Update Request Status">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x04" name="NETWORK_UPDATE_REQUEST_STATUS" help="Network Update Request Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="SUC_UPDATE_DONE" flagmask="0x00" />
                 <bitflag key="0x02" flagname="SUC_UPDATE_ABORT" flagmask="0x01" />
                 <bitflag key="0x03" flagname="SUC_UPDATE_WAIT" flagmask="0x02" />
@@ -6032,67 +6721,52 @@
                 <bitflag key="0x05" flagname="SUC_UPDATE_OVERFLOW" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x06" name="DEFAULT_SET" help="Default Set">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x06" name="DEFAULT_SET" help="Default Set" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="DEFAULT_SET_COMPLETE" help="Default Set Complete">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x07" name="DEFAULT_SET_COMPLETE" help="Default Set Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="DEFAULT_SET_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="DEFAULT_SET_BUSY" flagmask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x08" name="DSK_GET" help="DSK Get">
-            <param key="0x00" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x08" name="DSK_GET" help="DSK Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Add mode" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
         </cmd>
-        <cmd key="0x09" name="DSK_REPORT" help="DSK Report">
-            <param key="0x00" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x09" name="DSK_REPORT" help="DSK Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Add mode" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x01" name="DSK" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x02" name="DSK" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x34" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INCLUSION" help="Command Class Network Management Inclusion" read_only="false" comment="">
-        <cmd key="0x07" name="FAILED_NODE_REMOVE" help="Failed Node Remove" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-        </cmd>
-        <cmd key="0x08" name="FAILED_NODE_REMOVE_STATUS" help="Failed Node Remove Status" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x34" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INCLUSION" help="Command Class Network Management Inclusion">
+        <cmd key="0x07" name="FAILED_NODE_REMOVE" help="Failed Node Remove" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x08" name="FAILED_NODE_REMOVE_STATUS" help="Failed Node Remove Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="DONE" flagmask="0x01" />
                 <bitflag key="0x02" flagname="FAILED_NODE_NOT_FOUND" flagmask="0x00" />
                 <bitflag key="0x03" flagname="FAILED_NODE_REMOVE_FAIL" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x01" name="NODE_ADD" help="Node Add" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Mode" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="NODE_ADD" help="Node Add" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_ADD_ANY" flagmask="0x01" />
                 <bitflag key="0x02" flagname="NODE_ADD_CONTROLLER" flagmask="0x02" />
                 <bitflag key="0x03" flagname="NODE_ADD_SLAVE" flagmask="0x03" />
@@ -6100,8 +6774,8 @@
                 <bitflag key="0x05" flagname="NODE_ADD_STOP" flagmask="0x05" />
                 <bitflag key="0x06" flagname="NODE_ADD_STOP_FAILED" flagmask="0x06" />
             </param>
-            <param key="0x03" name="tx Options" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x03" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
@@ -6112,83 +6786,54 @@
                 <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x02" name="NODE_ADD_STATUS" help="Node Add Status" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x02" name="NODE_ADD_STATUS" help="Node Add Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_ADD_STATUS_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="NODE_ADD_STATUS_FAILED" flagmask="0x07" />
                 <bitflag key="0x03" flagname="NODE_ADD_STATUS_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="New Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Node Info Length" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Capability" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="New Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Node Info Length" type="BYTE" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Security" fieldmask="0x7F" shifter="0" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Basic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Command Class" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x07" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x08" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x09" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x0A" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="4" sizemask="0xFF" sizechange="-6" />
             </param>
         </cmd>
-        <cmd key="0x03" name="NODE_REMOVE" help="Node Remove" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Mode" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x03" name="NODE_REMOVE" help="Node Remove" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_REMOVE_ANY" flagmask="0x01" />
                 <bitflag key="0x02" flagname="NODE_REMOVE_CONTROLLER" flagmask="0x02" />
                 <bitflag key="0x03" flagname="NODE_REMOVE_SLAVE" flagmask="0x03" />
                 <bitflag key="0x04" flagname="NODE_REMOVE_STOP" flagmask="0x05" />
             </param>
         </cmd>
-        <cmd key="0x04" name="NODE_REMOVE_STATUS" help="Node Remove Status" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x04" name="NODE_REMOVE_STATUS" help="Node Remove Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_REMOVE_STATUS_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="NODE_REMOVE_STATUS_FAILED" flagmask="0x07" />
             </param>
-            <param key="0x02" name="NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x09" name="FAILED_NODE_REPLACE" help="Failed Node Replace">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="tx Options" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+        <cmd key="0x09" name="FAILED_NODE_REPLACE" help="Failed Node Replace" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
@@ -6198,116 +6843,76 @@
                 <bitflag key="0x06" flagname="No Retransmission" flagmask="0x40" />
                 <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Mode" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x03" name="Mode" type="BYTE" />
         </cmd>
-        <cmd key="0x0A" name="FAILED_NODE_REPLACE_STATUS" help="Failed Node Replace Status">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x0A" name="FAILED_NODE_REPLACE_STATUS" help="Failed Node Replace Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="DONE" flagmask="0x04" />
                 <bitflag key="0x02" flagname="FAILED_NODE_REPLACE_FAIL" flagmask="0x05" />
                 <bitflag key="0x03" flagname="FAILED_NODE_REPLACE_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x02" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x0B" name="NODE_NEIGHBOR_UPDATE_REQUEST" help="Node Neighbor Update Request">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0B" name="NODE_NEIGHBOR_UPDATE_REQUEST" help="Node Neighbor Update Request" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x0C" name="NODE_NEIGHBOR_UPDATE_STATUS" help="Node Neighbor Update Status">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x0C" name="NODE_NEIGHBOR_UPDATE_STATUS" help="Node Neighbor Update Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="NEIGHBOR_UPDATE_STATUS_DONE" flagmask="0x22" />
                 <bitflag key="0x02" flagname="NEIGHBOR_UPDATE_STATUS_FAIL" flagmask="0x23" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="RETURN_ROUTE_ASSIGN" help="Return Route Assign">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Source Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Destination Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0D" name="RETURN_ROUTE_ASSIGN" help="Return Route Assign" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Source Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Destination Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x0E" name="RETURN_ROUTE_ASSIGN_COMPLETE" help="Return Route Assign Complete">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x0E" name="RETURN_ROUTE_ASSIGN_COMPLETE" help="Return Route Assign Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="TRANSMIT_COMPLETE_OK" flagmask="0x00" />
                 <bitflag key="0x02" flagname="TRANSMIT_COMPLETE_NO_ACK" flagmask="0x01" />
                 <bitflag key="0x03" flagname="TRANSMIT_COMPLETE_FAIL" flagmask="0x02" />
+                <bitflag key="0x04" flagname="N/A" flagmask="0x03" />
+                <bitflag key="0x05" flagname="TRANSMIT_COMPLETE_NOROUTE" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x0F" name="RETURN_ROUTE_DELETE" help="Return Route Delete">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0F" name="RETURN_ROUTE_DELETE" help="Return Route Delete" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x10" name="RETURN_ROUTE_DELETE_COMPLETE" help="Return Route Delete Complete">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x10" name="RETURN_ROUTE_DELETE_COMPLETE" help="Return Route Delete Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="TRANSMIT_COMPLETE_OK" flagmask="0x00" />
                 <bitflag key="0x02" flagname="TRANSMIT_COMPLETE_NO_ACK" flagmask="0x01" />
                 <bitflag key="0x03" flagname="TRANSMIT_COMPLETE_FAIL" flagmask="0x02" />
+                <bitflag key="0x04" flagname="N/A" flagmask="0x03" />
+                <bitflag key="0x05" flagname="TRANSMIT_COMPLETE_NOROUTE" flagmask="0x04" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x34" version="2" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INCLUSION" help="Command Class Network Management Inclusion" read_only="false" comment="">
-        <cmd key="0x07" name="FAILED_NODE_REMOVE" help="Failed Node Remove" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-        </cmd>
-        <cmd key="0x08" name="FAILED_NODE_REMOVE_STATUS" help="Failed Node Remove Status" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x34" version="2" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INCLUSION" help="Command Class Network Management Inclusion">
+        <cmd key="0x07" name="FAILED_NODE_REMOVE" help="Failed Node Remove" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x08" name="FAILED_NODE_REMOVE_STATUS" help="Failed Node Remove Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="DONE" flagmask="0x01" />
                 <bitflag key="0x02" flagname="FAILED_NODE_NOT_FOUND" flagmask="0x00" />
                 <bitflag key="0x03" flagname="FAILED_NODE_REMOVE_FAIL" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x01" name="NODE_ADD" help="Node Add" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Mode" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="NODE_ADD" help="Node Add" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_ADD_ANY" flagmask="0x01" />
                 <bitflag key="0x02" flagname="NODE_ADD_CONTROLLER" flagmask="0x02" />
                 <bitflag key="0x03" flagname="NODE_ADD_SLAVE" flagmask="0x03" />
@@ -6316,8 +6921,8 @@
                 <bitflag key="0x06" flagname="NODE_ADD_STOP_FAILED" flagmask="0x06" />
                 <bitflag key="0x07" flagname="NODE_ADD_ANY_S2" flagmask="0x07" />
             </param>
-            <param key="0x03" name="tx Options" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x03" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
@@ -6328,96 +6933,56 @@
                 <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x02" name="NODE_ADD_STATUS" help="Node Add Status" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x02" name="NODE_ADD_STATUS" help="Node Add Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_ADD_STATUS_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="NODE_ADD_STATUS_FAILED" flagmask="0x07" />
                 <bitflag key="0x03" flagname="NODE_ADD_STATUS_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="New Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Node Info Length" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Capability" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="New Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Node Info Length" type="BYTE" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Security" fieldmask="0x7F" shifter="0" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Basic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Non-Secure Command Class" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x0B" name="Security MARK" type="MARKER" typehashcode="0x0E">
-                <const key="0x00" flagname="Security MARK" flagmask="0xF1" />
-                <const key="0x01" flagname="Security MARK" flagmask="0x00" />
-            </param>
-            <param key="0x0C" name="Secure Command Class" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x0D" name="Granted Keys" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0E" name="KEX Fail Type" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x08" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x09" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x0A" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="4" sizemask="0xFF" sizechange="-6" />
             </param>
+            <param key="0x0B" name="Granted Keys" type="BYTE" />
+            <param key="0x0C" name="KEX Fail Type" type="BYTE" />
         </cmd>
-        <cmd key="0x03" name="NODE_REMOVE" help="Node Remove" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Mode" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x03" name="NODE_REMOVE" help="Node Remove" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_REMOVE_ANY" flagmask="0x01" />
                 <bitflag key="0x02" flagname="NODE_REMOVE_CONTROLLER" flagmask="0x02" />
                 <bitflag key="0x03" flagname="NODE_REMOVE_SLAVE" flagmask="0x03" />
                 <bitflag key="0x04" flagname="NODE_REMOVE_STOP" flagmask="0x05" />
             </param>
         </cmd>
-        <cmd key="0x04" name="NODE_REMOVE_STATUS" help="Node Remove Status" comment="">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x04" name="NODE_REMOVE_STATUS" help="Node Remove Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_REMOVE_STATUS_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="NODE_REMOVE_STATUS_FAILED" flagmask="0x07" />
             </param>
-            <param key="0x02" name="NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x09" name="FAILED_NODE_REPLACE" help="Failed Node Replace">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="tx Options" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+        <cmd key="0x09" name="FAILED_NODE_REPLACE" help="Failed Node Replace" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
@@ -6427,1537 +6992,1448 @@
                 <bitflag key="0x06" flagname="No Retransmission" flagmask="0x40" />
                 <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Mode" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x03" name="Mode" type="BYTE" />
         </cmd>
-        <cmd key="0x0A" name="FAILED_NODE_REPLACE_STATUS" help="Failed Node Replace Status">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x0A" name="FAILED_NODE_REPLACE_STATUS" help="Failed Node Replace Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="DONE" flagmask="0x04" />
                 <bitflag key="0x02" flagname="FAILED_NODE_REPLACE_FAIL" flagmask="0x05" />
                 <bitflag key="0x03" flagname="FAILED_NODE_REPLACE_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x02" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Granted Keys" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="KEX Fail Type" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Granted Keys" type="BYTE" />
+            <param key="0x04" name="KEX Fail Type" type="BYTE" />
         </cmd>
-        <cmd key="0x0B" name="NODE_NEIGHBOR_UPDATE_REQUEST" help="Node Neighbor Update Request">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0B" name="NODE_NEIGHBOR_UPDATE_REQUEST" help="Node Neighbor Update Request" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x0C" name="NODE_NEIGHBOR_UPDATE_STATUS" help="Node Neighbor Update Status">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x0C" name="NODE_NEIGHBOR_UPDATE_STATUS" help="Node Neighbor Update Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="NEIGHBOR_UPDATE_STATUS_DONE" flagmask="0x22" />
                 <bitflag key="0x02" flagname="NEIGHBOR_UPDATE_STATUS_FAIL" flagmask="0x23" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="RETURN_ROUTE_ASSIGN" help="Return Route Assign">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Source Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Destination Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0D" name="RETURN_ROUTE_ASSIGN" help="Return Route Assign" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Source Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Destination Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x0E" name="RETURN_ROUTE_ASSIGN_COMPLETE" help="Return Route Assign Complete">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x0E" name="RETURN_ROUTE_ASSIGN_COMPLETE" help="Return Route Assign Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="TRANSMIT_COMPLETE_OK" flagmask="0x00" />
                 <bitflag key="0x02" flagname="TRANSMIT_COMPLETE_NO_ACK" flagmask="0x01" />
                 <bitflag key="0x03" flagname="TRANSMIT_COMPLETE_FAIL" flagmask="0x02" />
+                <bitflag key="0x04" flagname="N/A" flagmask="0x03" />
+                <bitflag key="0x05" flagname="TRANSMIT_COMPLETE_NOROUTE" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x0F" name="RETURN_ROUTE_DELETE" help="Return Route Delete">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x0F" name="RETURN_ROUTE_DELETE" help="Return Route Delete" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x10" name="RETURN_ROUTE_DELETE_COMPLETE" help="Return Route Delete Complete">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x10" name="RETURN_ROUTE_DELETE_COMPLETE" help="Return Route Delete Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="TRANSMIT_COMPLETE_OK" flagmask="0x00" />
                 <bitflag key="0x02" flagname="TRANSMIT_COMPLETE_NO_ACK" flagmask="0x01" />
                 <bitflag key="0x03" flagname="TRANSMIT_COMPLETE_FAIL" flagmask="0x02" />
+                <bitflag key="0x04" flagname="N/A" flagmask="0x03" />
+                <bitflag key="0x05" flagname="TRANSMIT_COMPLETE_NOROUTE" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x11" name="NODE_ADD_KEYS_REPORT" help="Node Add Keys Report">
-            <param key="0x00" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitflag key="0x00" flagname="Request Client-Side Authentication" flagmask="0x01" />
+        <cmd key="0x11" name="NODE_ADD_KEYS_REPORT" help="Node Add Keys Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Request CSA" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x02" name="Requested Keys" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Requested Keys" type="BYTE" />
         </cmd>
-        <cmd key="0x12" name="NODE_ADD_KEYS_SET" help="Node Add Keys Set">
-            <param key="0x00" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x12" name="NODE_ADD_KEYS_SET" help="Node Add Keys Set" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Accept" flagmask="0x01" />
-                <bitflag key="0x01" flagname="Grant Client-Side Authentication" flagmask="0x02" />
+                <bitflag key="0x01" flagname="Grant CSA" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x02" name="Granted Keys" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Granted Keys" type="BYTE" />
         </cmd>
-        <cmd key="0x13" name="NODE_ADD_DSK_REPORT" help="Node Add DSK Report">
-            <param key="0x00" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Input DSK Length" fieldmask="0x0F" shifter="0" />
+        <cmd key="0x13" name="NODE_ADD_DSK_REPORT" help="Node Add DSK Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Input DSK Length" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="DSK" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x02" name="DSK" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
-        <cmd key="0x14" name="NODE_ADD_DSK_SET" help="Node Add DSK Set">
-            <param key="0x00" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Input DSK Length" fieldmask="0x0F" shifter="0" />
+        <cmd key="0x14" name="NODE_ADD_DSK_SET" help="Node Add DSK Set" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Input DSK Length" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x70" shifter="4" />
                 <bitflag key="0x02" flagname="Accept" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Input DSK" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x0F" sizeoffs="0" />
+            <param key="0x02" name="Input DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x0F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x00" version="1" name="COMMAND_CLASS_NO_OPERATION" help="NOP" read_only="false" comment="" />
-    <cmd_class key="0x77" version="1" name="COMMAND_CLASS_NODE_NAMING" help="Command Class Node Naming" read_only="false" comment="">
-        <cmd key="0x06" name="NODE_NAMING_NODE_LOCATION_REPORT" help="Node Naming Node Location  Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
-            </param>
-            <param key="0x01" name="Node location char" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="16" is_ascii="true" />
+    <cmd_class key="0x34" version="3" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INCLUSION" help="Command Class Network Management Inclusion">
+        <cmd key="0x07" name="FAILED_NODE_REMOVE" help="Failed Node Remove" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x08" name="FAILED_NODE_REMOVE_STATUS" help="Failed Node Remove Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="DONE" flagmask="0x01" />
+                <bitflag key="0x02" flagname="FAILED_NODE_NOT_FOUND" flagmask="0x00" />
+                <bitflag key="0x03" flagname="FAILED_NODE_REMOVE_FAIL" flagmask="0x02" />
             </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x04" name="NODE_NAMING_NODE_LOCATION_SET" help="Node Naming Node Location  Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
+        <cmd key="0x01" name="NODE_ADD" help="Node Add" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
+                <bitflag key="0x01" flagname="NODE_ADD_ANY" flagmask="0x01" />
+                <bitflag key="0x02" flagname="NODE_ADD_CONTROLLER" flagmask="0x02" />
+                <bitflag key="0x03" flagname="NODE_ADD_SLAVE" flagmask="0x03" />
+                <bitflag key="0x04" flagname="NODE_ADD_EXISTING" flagmask="0x04" />
+                <bitflag key="0x05" flagname="NODE_ADD_STOP" flagmask="0x05" />
+                <bitflag key="0x06" flagname="NODE_ADD_STOP_FAILED" flagmask="0x06" />
+                <bitflag key="0x07" flagname="NODE_ADD_ANY_S2" flagmask="0x07" />
             </param>
-            <param key="0x01" name="Node location char" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="16" is_ascii="true" />
+            <param key="0x03" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
+                <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
+                <bitflag key="0x03" flagname="Reserved" flagmask="0x08" />
+                <bitflag key="0x04" flagname="No Route" flagmask="0x10" />
+                <bitflag key="0x05" flagname="Explore" flagmask="0x20" />
+                <bitflag key="0x06" flagname="No Retransmission" flagmask="0x40" />
+                <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x05" name="NODE_NAMING_NODE_LOCATION_GET" help="Node Naming Node Location Get" comment="" />
-        <cmd key="0x02" name="NODE_NAMING_NODE_NAME_GET" help="Node Naming Node Name Get" comment="" />
-        <cmd key="0x03" name="NODE_NAMING_NODE_NAME_REPORT" help="Node Naming Node Name Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
+        <cmd key="0x02" name="NODE_ADD_STATUS" help="Node Add Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="NODE_ADD_STATUS_DONE" flagmask="0x06" />
+                <bitflag key="0x02" flagname="NODE_ADD_STATUS_FAILED" flagmask="0x07" />
+                <bitflag key="0x03" flagname="NODE_ADD_STATUS_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x01" name="Node name char" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="16" is_ascii="true" />
+            <param key="0x02" name="Reserved1" type="BYTE" />
+            <param key="0x03" name="New Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Node Info Length" type="BYTE" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-        </cmd>
-        <cmd key="0x01" name="NODE_NAMING_NODE_NAME_SET" help="Node Naming Node Name Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Node name char" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="16" is_ascii="true" />
+            <param key="0x07" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x08" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x09" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x0A" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="4" sizemask="0xFF" sizechange="-6" />
             </param>
-        </cmd>
-    </cmd_class>
-    <cmd_class key="0xF0" version="1" name="COMMAND_CLASS_NON_INTEROPERABLE" help="Command Class Non Interoperable" read_only="false" comment="" />
-    <cmd_class key="0x73" version="1" name="COMMAND_CLASS_POWERLEVEL" help="Command Class Powerlevel" read_only="false" comment="">
-        <cmd key="0x02" name="POWERLEVEL_GET" help="Powerlevel Get" comment="" />
-        <cmd key="0x03" name="POWERLEVEL_REPORT" help="Powerlevel Report" comment="">
-            <param key="0x00" name="Power level" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="NormalPower" flagmask="0x00" />
-                <const key="0x01" flagname="minus1dBm" flagmask="0x01" />
-                <const key="0x02" flagname="minus2dBm" flagmask="0x02" />
-                <const key="0x03" flagname="minus3dBm" flagmask="0x03" />
-                <const key="0x04" flagname="minus4dBm" flagmask="0x04" />
-                <const key="0x05" flagname="minus5dBm" flagmask="0x05" />
-                <const key="0x06" flagname="minus6dBm" flagmask="0x06" />
-                <const key="0x07" flagname="minus7dBm" flagmask="0x07" />
-                <const key="0x08" flagname="minus8dBm" flagmask="0x08" />
-                <const key="0x09" flagname="minus9dBm" flagmask="0x09" />
+            <param key="0x0B" name="Granted Keys" type="BYTE" />
+            <param key="0x0C" name="KEX Fail Type" type="BYTE" />
+            <param key="0x0D" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Timeout" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x0E" name="DSK" type="VARIANT">
+                <variant paramoffs="13" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x01" name="POWERLEVEL_SET" help="Powerlevel Set" comment="">
-            <param key="0x00" name="Power level" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="NormalPower" flagmask="0x00" />
-                <const key="0x01" flagname="minus1dBm" flagmask="0x01" />
-                <const key="0x02" flagname="minus2dBm" flagmask="0x02" />
-                <const key="0x03" flagname="minus3dBm" flagmask="0x03" />
-                <const key="0x04" flagname="minus4dBm" flagmask="0x04" />
-                <const key="0x05" flagname="minus5dBm" flagmask="0x05" />
-                <const key="0x06" flagname="minus6dBm" flagmask="0x06" />
-                <const key="0x07" flagname="minus7dBm" flagmask="0x07" />
-                <const key="0x08" flagname="minus8dBm" flagmask="0x08" />
-                <const key="0x09" flagname="minus9dBm" flagmask="0x09" />
-            </param>
-            <param key="0x01" name="Timeout" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="NODE_REMOVE" help="Node Remove" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
+                <bitflag key="0x01" flagname="NODE_REMOVE_ANY" flagmask="0x01" />
+                <bitflag key="0x02" flagname="NODE_REMOVE_CONTROLLER" flagmask="0x02" />
+                <bitflag key="0x03" flagname="NODE_REMOVE_SLAVE" flagmask="0x03" />
+                <bitflag key="0x04" flagname="NODE_REMOVE_STOP" flagmask="0x05" />
             </param>
         </cmd>
-        <cmd key="0x05" name="POWERLEVEL_TEST_NODE_GET" help="Powerlevel Test Node Get" comment="" />
-        <cmd key="0x06" name="POWERLEVEL_TEST_NODE_REPORT" help="Powerlevel Test Node Report" comment="">
-            <param key="0x00" name="Test NodeID" type="CONST" typehashcode="0x0B" comment="" encaptype="NODE_NUMBER">
-                <const key="0x00" flagname="ZW_TEST_NOT_A_NODEID" flagmask="0x00" />
-            </param>
-            <param key="0x01" name="Status of operation" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="ZW_TEST_FAILED" flagmask="0x00" />
-                <const key="0x01" flagname="ZW_TEST_SUCCES" flagmask="0x01" />
-                <const key="0x02" flagname="ZW_TEST_INPROGRESS" flagmask="0x02" />
-            </param>
-            <param key="0x02" name="Test Frame Count" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="NODE_REMOVE_STATUS" help="Node Remove Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="NODE_REMOVE_STATUS_DONE" flagmask="0x06" />
+                <bitflag key="0x02" flagname="NODE_REMOVE_STATUS_FAILED" flagmask="0x07" />
             </param>
+            <param key="0x02" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x04" name="POWERLEVEL_TEST_NODE_SET" help="Powerlevel Test Node Set" comment="">
-            <param key="0x00" name="Test NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Power level" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="NormalPower" flagmask="0x00" />
-                <const key="0x01" flagname="minus1dBm" flagmask="0x01" />
-                <const key="0x02" flagname="minus2dBm" flagmask="0x02" />
-                <const key="0x03" flagname="minus3dBm" flagmask="0x03" />
-                <const key="0x04" flagname="minus4dBm" flagmask="0x04" />
-                <const key="0x05" flagname="minus5dBm" flagmask="0x05" />
-                <const key="0x06" flagname="minus6dBm" flagmask="0x06" />
-                <const key="0x07" flagname="minus7dBm" flagmask="0x07" />
-                <const key="0x08" flagname="minus8dBm" flagmask="0x08" />
-                <const key="0x09" flagname="minus9dBm" flagmask="0x09" />
-            </param>
-            <param key="0x02" name="Test frame count" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x09" name="FAILED_NODE_REPLACE" help="Failed Node Replace" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
+                <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
+                <bitflag key="0x03" flagname="Reserved" flagmask="0x08" />
+                <bitflag key="0x04" flagname="No Route" flagmask="0x10" />
+                <bitflag key="0x05" flagname="Explore" flagmask="0x20" />
+                <bitflag key="0x06" flagname="No Retransmission" flagmask="0x40" />
+                <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
+            <param key="0x03" name="Mode" type="BYTE" />
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x41" version="1" name="COMMAND_CLASS_PREPAYMENT_ENCAPSULATION" help="Command Class Prepayment Encapsulation" read_only="false" comment="">
-        <cmd key="0x01" name="CMD_ENCAPSULATION" help="Cmd Encapsulation" comment="">
-            <param key="0x00" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x0A" name="FAILED_NODE_REPLACE_STATUS" help="Failed Node Replace Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="DONE" flagmask="0x04" />
+                <bitflag key="0x02" flagname="FAILED_NODE_REPLACE_FAIL" flagmask="0x05" />
+                <bitflag key="0x03" flagname="FAILED_NODE_REPLACE_SECURITY_FAILED" flagmask="0x09" />
             </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Granted Keys" type="BYTE" />
+            <param key="0x04" name="KEX Fail Type" type="BYTE" />
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x3F" version="1" name="COMMAND_CLASS_PREPAYMENT" help="Command Class Prepayment" read_only="false" comment="">
-        <cmd key="0x01" name="PREPAYMENT_BALANCE_GET" help="Prepayment Balance Get" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" shifter="0" />
-                <fieldenum key="0x01" fieldname="Balance Type" fieldmask="0xC0" shifter="6">
-                    <fieldenum value="Utility" />
-                    <fieldenum value="Monetary" />
-                </fieldenum>
-            </param>
+        <cmd key="0x0B" name="NODE_NEIGHBOR_UPDATE_REQUEST" help="Node Neighbor Update Request" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x02" name="PREPAYMENT_BALANCE_REPORT" help="Prepayment Balance Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Meter type" fieldmask="0x3F" shifter="0" />
-                <bitfield key="0x01" fieldname="Balance Type" fieldmask="0xC0" shifter="6" />
-            </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Balance Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x02" name="Balance Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Debt Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x04" name="Debt" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Emer Credit Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x06" name="Emer Credit" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Currency" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Debt Recovery Percentage" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0C" name="NODE_NEIGHBOR_UPDATE_STATUS" help="Node Neighbor Update Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="NEIGHBOR_UPDATE_STATUS_DONE" flagmask="0x22" />
+                <bitflag key="0x02" flagname="NEIGHBOR_UPDATE_STATUS_FAIL" flagmask="0x23" />
             </param>
         </cmd>
-        <cmd key="0x03" name="PREPAYMENT_SUPPORTED_GET" help="Prepayment Supported Get" comment="" />
-        <cmd key="0x04" name="PREPAYMENT_SUPPORTED_REPORT" help="Prepayment Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Types Supported" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
-            </param>
+        <cmd key="0x0D" name="RETURN_ROUTE_ASSIGN" help="Return Route Assign" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Source Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Destination Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x88" version="1" name="COMMAND_CLASS_PROPRIETARY" help="Command Class Proprietary" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x02" name="PROPRIETARY_GET" help="Proprietary Get" comment="">
-            <param key="0x00" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x0E" name="RETURN_ROUTE_ASSIGN_COMPLETE" help="Return Route Assign Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="TRANSMIT_COMPLETE_OK" flagmask="0x00" />
+                <bitflag key="0x02" flagname="TRANSMIT_COMPLETE_NO_ACK" flagmask="0x01" />
+                <bitflag key="0x03" flagname="TRANSMIT_COMPLETE_FAIL" flagmask="0x02" />
+                <bitflag key="0x04" flagname="N/A" flagmask="0x03" />
+                <bitflag key="0x05" flagname="TRANSMIT_COMPLETE_NOROUTE" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x03" name="PROPRIETARY_REPORT" help="Proprietary Report" comment="">
-            <param key="0x00" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
+        <cmd key="0x0F" name="RETURN_ROUTE_DELETE" help="Return Route Delete" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x01" name="PROPRIETARY_SET" help="Proprietary Set" comment="">
-            <param key="0x00" name="Data" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x10" name="RETURN_ROUTE_DELETE_COMPLETE" help="Return Route Delete Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="TRANSMIT_COMPLETE_OK" flagmask="0x00" />
+                <bitflag key="0x02" flagname="TRANSMIT_COMPLETE_NO_ACK" flagmask="0x01" />
+                <bitflag key="0x03" flagname="TRANSMIT_COMPLETE_FAIL" flagmask="0x02" />
+                <bitflag key="0x04" flagname="N/A" flagmask="0x03" />
+                <bitflag key="0x05" flagname="TRANSMIT_COMPLETE_NOROUTE" flagmask="0x04" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x75" version="1" name="COMMAND_CLASS_PROTECTION" help="Command Class Protection" read_only="false" comment="">
-        <cmd key="0x02" name="PROTECTION_GET" help="Protection Get" comment="" />
-        <cmd key="0x03" name="PROTECTION_REPORT" help="Protection Report" comment="">
-            <param key="0x00" name="Protection State" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="Unprotected" flagmask="0x00" />
-                <const key="0x01" flagname="Protection by sequence" flagmask="0x01" />
-                <const key="0x02" flagname="No operation possible" flagmask="0x02" />
+        <cmd key="0x11" name="NODE_ADD_KEYS_REPORT" help="Node Add Keys Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Request CSA" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
+            <param key="0x02" name="Requested Keys" type="BYTE" />
         </cmd>
-        <cmd key="0x01" name="PROTECTION_SET" help="Protection Set" comment="">
-            <param key="0x00" name="Protection State" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="Unprotected" flagmask="0x00" />
-                <const key="0x01" flagname="Protection by sequence" flagmask="0x01" />
-                <const key="0x02" flagname="No operation possible" flagmask="0x02" />
+        <cmd key="0x12" name="NODE_ADD_KEYS_SET" help="Node Add Keys Set" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Accept" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Grant CSA" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
+            <param key="0x02" name="Granted Keys" type="BYTE" />
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x75" version="2" name="COMMAND_CLASS_PROTECTION" help="Command Class Protection" read_only="false" comment="">
-        <cmd key="0x07" name="PROTECTION_EC_GET" help="Protection Ec Get" comment="" />
-        <cmd key="0x08" name="PROTECTION_EC_REPORT" help="Protection Ec Report" comment="">
-            <param key="0x00" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        <cmd key="0x13" name="NODE_ADD_DSK_REPORT" help="Node Add DSK Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Input DSK Length" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-        </cmd>
-        <cmd key="0x06" name="PROTECTION_EC_SET" help="Protection Ec Set" comment="">
-            <param key="0x00" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+            <param key="0x02" name="DSK" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
-        <cmd key="0x02" name="PROTECTION_GET" help="Protection Get" comment="" />
-        <cmd key="0x03" name="PROTECTION_REPORT" help="Protection Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Local Protection State" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
+        <cmd key="0x14" name="NODE_ADD_DSK_SET" help="Node Add DSK Set" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Input DSK Length" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0x70" shifter="4" />
+                <bitflag key="0x02" flagname="Accept" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="RF Protection State" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xF0" shifter="4" />
+            <param key="0x02" name="Input DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x0F" />
             </param>
         </cmd>
-        <cmd key="0x01" name="PROTECTION_SET" help="Protection Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Local Protection State" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
+        <cmd key="0x15" name="SMART_START_JOIN_STARTED_REPORT" help="Smart Start Join Started" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="RF Protection State" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xF0" shifter="4" />
+            <param key="0x02" name="DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x04" name="PROTECTION_SUPPORTED_GET" help="Protection Supported Get" comment="" />
-        <cmd key="0x05" name="PROTECTION_SUPPORTED_REPORT" help="Protection Supported Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitflag key="0x00" flagname="Timeout" flagmask="0x01" />
-                <bitflag key="0x01" flagname="Exclusive Control" flagmask="0x02" />
-                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
-            </param>
-            <param key="0x01" name="Local Protection State" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x19" name="INCLUDED_NIF_REPORT" help="Included Node Information Frame Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="RF Protection State" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="PROTECTION_TIMEOUT_GET" help="Protection Timeout Get" comment="" />
-        <cmd key="0x0B" name="PROTECTION_TIMEOUT_REPORT" help="Protection Timeout Report" comment="">
-            <param key="0x00" name="Timeout" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="No timer is set" flagmask="0x00" />
-                <bitflag key="0x02" flagname="No Timeout is set" flagmask="0xFF" />
+    </cmd_class>
+    <cmd_class key="0x34" version="4" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INCLUSION" help="Command Class Network Management Inclusion">
+        <cmd key="0x07" name="FAILED_NODE_REMOVE" help="Failed Node Remove" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x08" name="FAILED_NODE_REMOVE_STATUS" help="Failed Node Remove Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="DONE" flagmask="0x01" />
+                <bitflag key="0x02" flagname="FAILED_NODE_NOT_FOUND" flagmask="0x00" />
+                <bitflag key="0x03" flagname="FAILED_NODE_REMOVE_FAIL" flagmask="0x02" />
             </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Extended NodeID" type="WORD" />
         </cmd>
-        <cmd key="0x09" name="PROTECTION_TIMEOUT_SET" help="Protection Timeout Set" comment="">
-            <param key="0x00" name="Timeout" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="No timer is set" flagmask="0x00" />
-                <bitflag key="0x02" flagname="No Timeout " flagmask="0xFF" />
-            </param>
-        </cmd>
-    </cmd_class>
-    <cmd_class key="0x48" version="1" name="COMMAND_CLASS_RATE_TBL_CONFIG" help="Command Class Rate Tbl Config" read_only="false" comment="">
-        <cmd key="0x02" name="RATE_TBL_REMOVE" help="Rate Tbl Remove" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Rate Parameter Set IDs" fieldmask="0x3F" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
+        <cmd key="0x01" name="NODE_ADD" help="Node Add" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
+                <bitflag key="0x01" flagname="NODE_ADD_ANY" flagmask="0x01" />
+                <bitflag key="0x02" flagname="NODE_ADD_CONTROLLER" flagmask="0x02" />
+                <bitflag key="0x03" flagname="NODE_ADD_SLAVE" flagmask="0x03" />
+                <bitflag key="0x04" flagname="NODE_ADD_EXISTING" flagmask="0x04" />
+                <bitflag key="0x05" flagname="NODE_ADD_STOP" flagmask="0x05" />
+                <bitflag key="0x06" flagname="NODE_ADD_STOP_FAILED" flagmask="0x06" />
+                <bitflag key="0x07" flagname="NODE_ADD_ANY_S2" flagmask="0x07" />
             </param>
-            <param key="0x01" name="Rate Parameter Set ID" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x3F" sizeoffs="0" />
+            <param key="0x03" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
+                <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
+                <bitflag key="0x03" flagname="Reserved" flagmask="0x08" />
+                <bitflag key="0x04" flagname="No Route" flagmask="0x10" />
+                <bitflag key="0x05" flagname="Explore" flagmask="0x20" />
+                <bitflag key="0x06" flagname="No Retransmission" flagmask="0x40" />
+                <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x01" name="RATE_TBL_SET" help="Rate Tbl Set" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Rate Char" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5" />
-                <bitflag key="0x02" flagname="Reserved" flagmask="0x80" />
-            </param>
-            <param key="0x02" name="Rate Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-            <param key="0x03" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Duration Minute" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Consumption Scale" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Consumption Precision" fieldmask="0xE0" shifter="5" />
+        <cmd key="0x02" name="NODE_ADD_STATUS" help="Node Add Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="NODE_ADD_STATUS_DONE" flagmask="0x06" />
+                <bitflag key="0x02" flagname="NODE_ADD_STATUS_FAILED" flagmask="0x07" />
+                <bitflag key="0x03" flagname="NODE_ADD_STATUS_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x07" name="Min Consumption Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Reserved1" type="BYTE" />
+            <param key="0x03" name="New Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Node Info Length" type="BYTE" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x08" name="Max Consumption Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
             </param>
-            <param key="0x09" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Max Demand Scale" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Max Demand Precision" fieldmask="0xE0" shifter="5" />
+            <param key="0x07" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x08" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x09" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x0A" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="4" sizemask="0xFF" sizechange="-6" />
             </param>
-            <param key="0x0A" name="Max Demand Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x0B" name="Granted Keys" type="BYTE" />
+            <param key="0x0C" name="KEX Fail Type" type="BYTE" />
+            <param key="0x0D" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x0B" name="DCP Rate ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x0E" name="DSK" type="VARIANT">
+                <variant paramoffs="13" sizemask="0x1F" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x49" version="1" name="COMMAND_CLASS_RATE_TBL_MONITOR" help="Command Class Rate Tbl Monitor" read_only="false" comment="">
-        <cmd key="0x05" name="RATE_TBL_ACTIVE_RATE_GET" help="Rate Tbl Active Rate  Get" comment="" />
-        <cmd key="0x06" name="RATE_TBL_ACTIVE_RATE_REPORT" help="Rate Tbl Active Rate  Report" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="NODE_REMOVE" help="Node Remove" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
+                <bitflag key="0x01" flagname="NODE_REMOVE_ANY" flagmask="0x01" />
+                <bitflag key="0x02" flagname="NODE_REMOVE_CONTROLLER" flagmask="0x02" />
+                <bitflag key="0x03" flagname="NODE_REMOVE_SLAVE" flagmask="0x03" />
+                <bitflag key="0x04" flagname="NODE_REMOVE_STOP" flagmask="0x05" />
             </param>
         </cmd>
-        <cmd key="0x07" name="RATE_TBL_CURRENT_DATA_GET" help="Rate Tbl Current Data Get" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Dataset Requested" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="NODE_REMOVE_STATUS" help="Node Remove Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="NODE_REMOVE_STATUS_DONE" flagmask="0x06" />
+                <bitflag key="0x02" flagname="NODE_REMOVE_STATUS_FAILED" flagmask="0x07" />
             </param>
+            <param key="0x02" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Extended NodeID" type="WORD" />
         </cmd>
-        <cmd key="0x08" name="RATE_TBL_CURRENT_DATA_REPORT" help="Rate Tbl Current Data Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Dataset" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x09" name="FAILED_NODE_REPLACE" help="Failed Node Replace" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
+                <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
+                <bitflag key="0x03" flagname="Reserved" flagmask="0x08" />
+                <bitflag key="0x04" flagname="No Route" flagmask="0x10" />
+                <bitflag key="0x05" flagname="Explore" flagmask="0x20" />
+                <bitflag key="0x06" flagname="No Retransmission" flagmask="0x40" />
+                <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
-            <variant_group key="0x09" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Current Scale" fieldmask="0x1F" shifter="0" />
-                    <bitfield key="0x01" fieldname="Current Precision" fieldmask="0xE0" shifter="5" />
-                </param>
-                <param key="0x01" name="Current Value" type="DWORD" typehashcode="0x03" comment="">
-                    <dword key="0x00" hasdefines="false" showhex="true" />
-                </param>
-            </variant_group>
+            <param key="0x03" name="Mode" type="BYTE" />
         </cmd>
-        <cmd key="0x03" name="RATE_TBL_GET" help="Rate Tbl Get" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0A" name="FAILED_NODE_REPLACE_STATUS" help="Failed Node Replace Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="DONE" flagmask="0x04" />
+                <bitflag key="0x02" flagname="FAILED_NODE_REPLACE_FAIL" flagmask="0x05" />
+                <bitflag key="0x03" flagname="FAILED_NODE_REPLACE_SECURITY_FAILED" flagmask="0x09" />
             </param>
+            <param key="0x02" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Granted Keys" type="BYTE" />
+            <param key="0x04" name="KEX Fail Type" type="BYTE" />
         </cmd>
-        <cmd key="0x09" name="RATE_TBL_HISTORICAL_DATA_GET" help="Rate Tbl Historical Data Get" comment="">
-            <param key="0x00" name="Maximum Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Dataset Requested" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Start Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0C" name="Stop Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0D" name="Stop Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0E" name="Stop Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0B" name="NODE_NEIGHBOR_UPDATE_REQUEST" help="Node Neighbor Update Request" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x0A" name="RATE_TBL_HISTORICAL_DATA_REPORT" help="Rate Tbl Historical Data Report" comment="">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Dataset" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0C" name="NODE_NEIGHBOR_UPDATE_STATUS" help="Node Neighbor Update Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="NEIGHBOR_UPDATE_STATUS_DONE" flagmask="0x22" />
+                <bitflag key="0x02" flagname="NEIGHBOR_UPDATE_STATUS_FAIL" flagmask="0x23" />
             </param>
-            <variant_group key="0x09" name="vg" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Historical Scale" fieldmask="0x1F" shifter="0" />
-                    <bitfield key="0x01" fieldname="Historical Precision" fieldmask="0xE0" shifter="5" />
-                </param>
-                <param key="0x01" name="Historical Value" type="DWORD" typehashcode="0x03" comment="">
-                    <dword key="0x00" hasdefines="false" showhex="true" />
-                </param>
-            </variant_group>
         </cmd>
-        <cmd key="0x04" name="RATE_TBL_REPORT" help="Rate Tbl Report" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Rate Char" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5" />
-                <bitflag key="0x02" flagname="Reserved" flagmask="0x80" />
-            </param>
-            <param key="0x02" name="Rate Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-            <param key="0x03" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Duration Minute" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Consumption Scale" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Consumption Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x07" name="Min Consumption Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Max Consumption Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Max Demand Scale" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Max Demand Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x0A" name="Max Demand Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="DCP Rate ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0D" name="RETURN_ROUTE_ASSIGN" help="Return Route Assign" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Source Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Destination Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x01" name="RATE_TBL_SUPPORTED_GET" help="Rate Tbl Supported Get" comment="" />
-        <cmd key="0x02" name="RATE_TBL_SUPPORTED_REPORT" help="Rate Tbl Supported Report" comment="">
-            <param key="0x00" name="Rates Supported" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Parameter Set Supported Bit Mask" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0E" name="RETURN_ROUTE_ASSIGN_COMPLETE" help="Return Route Assign Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="TRANSMIT_COMPLETE_OK" flagmask="0x00" />
+                <bitflag key="0x02" flagname="TRANSMIT_COMPLETE_NO_ACK" flagmask="0x01" />
+                <bitflag key="0x03" flagname="TRANSMIT_COMPLETE_FAIL" flagmask="0x02" />
+                <bitflag key="0x04" flagname="N/A" flagmask="0x03" />
+                <bitflag key="0x05" flagname="TRANSMIT_COMPLETE_NOROUTE" flagmask="0x04" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x7C" version="1" name="COMMAND_CLASS_REMOTE_ASSOCIATION_ACTIVATE" help="Command Class Remote Association Activate" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x01" name="REMOTE_ASSOCIATION_ACTIVATE" help="Remote Association Activate" comment="">
-            <param key="0x00" name="Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x0F" name="RETURN_ROUTE_DELETE" help="Return Route Delete" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x7D" version="1" name="COMMAND_CLASS_REMOTE_ASSOCIATION" help="Command Class Remote Association" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x02" name="REMOTE_ASSOCIATION_CONFIGURATION_GET" help="Remote Association Configuration Get" comment="">
-            <param key="0x00" name="Local Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x10" name="RETURN_ROUTE_DELETE_COMPLETE" help="Return Route Delete Complete" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
+                <bitflag key="0x01" flagname="TRANSMIT_COMPLETE_OK" flagmask="0x00" />
+                <bitflag key="0x02" flagname="TRANSMIT_COMPLETE_NO_ACK" flagmask="0x01" />
+                <bitflag key="0x03" flagname="TRANSMIT_COMPLETE_FAIL" flagmask="0x02" />
+                <bitflag key="0x04" flagname="N/A" flagmask="0x03" />
+                <bitflag key="0x05" flagname="TRANSMIT_COMPLETE_NOROUTE" flagmask="0x04" />
             </param>
         </cmd>
-        <cmd key="0x03" name="REMOTE_ASSOCIATION_CONFIGURATION_REPORT" help="Remote Association Configuration Report" comment="">
-            <param key="0x00" name="Local Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="erase all lin" flagmask="0x00" />
-            </param>
-            <param key="0x01" name="Remote NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="true" showhex="false" />
-                <bitflag key="0x01" flagname="remove a link" flagmask="0x00" />
-            </param>
-            <param key="0x02" name="Remote Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x11" name="NODE_ADD_KEYS_REPORT" help="Node Add Keys Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Request CSA" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
+            <param key="0x02" name="Requested Keys" type="BYTE" />
         </cmd>
-        <cmd key="0x01" name="REMOTE_ASSOCIATION_CONFIGURATION_SET" help="Remote Association Configuration Set" comment="">
-            <param key="0x00" name="Local Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="erase all lin" flagmask="0x00" />
+        <cmd key="0x12" name="NODE_ADD_KEYS_SET" help="Node Add Keys Set" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Accept" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Grant CSA" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Remote NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="true" showhex="false" />
-                <bitflag key="0x01" flagname="remove a link" flagmask="0x00" />
+            <param key="0x02" name="Granted Keys" type="BYTE" />
+        </cmd>
+        <cmd key="0x13" name="NODE_ADD_DSK_REPORT" help="Node Add DSK Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Input DSK Length" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Remote Grouping identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="DSK" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x2B" version="1" name="COMMAND_CLASS_SCENE_ACTIVATION" help="Command Class Scene Activation" read_only="false" comment="">
-        <cmd key="0x01" name="SCENE_ACTIVATION_SET" help="Scene Activation Set" comment="">
-            <param key="0x00" name="Scene ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x14" name="NODE_ADD_DSK_SET" help="Node Add DSK Set" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Input DSK Length" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0x70" shifter="4" />
+                <bitflag key="0x02" flagname="Accept" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
-                <bitflag key="0x02" flagname="configured dimming duration" flagmask="0xFF" />
+            <param key="0x02" name="Input DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x0F" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x2C" version="1" name="COMMAND_CLASS_SCENE_ACTUATOR_CONF" help="Command Class Scene Actuator Conf" read_only="false" comment="">
-        <cmd key="0x02" name="SCENE_ACTUATOR_CONF_GET" help="Scene Actuator Conf Get" comment="">
-            <param key="0x00" name="Scene ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x15" name="SMART_START_JOIN_STARTED_REPORT" help="Smart Start Join Started" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-        </cmd>
-        <cmd key="0x03" name="SCENE_ACTUATOR_CONF_REPORT" help="Scene Actuator Conf Report" comment="">
-            <param key="0x00" name="Scene ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
-            <param key="0x01" name="Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x19" name="INCLUDED_NIF_REPORT" help="Included Node Information Frame Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
+            <param key="0x02" name="DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SCENE_ACTUATOR_CONF_SET" help="Scene Actuator Conf Set" comment="">
-            <param key="0x00" name="Scene ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Specify Instantly" flagmask="0x00" />
-                <bitflag key="0x02" flagname="factory default" flagmask="0xFF" />
+        <cmd key="0x16" name="EXTENDED_NODE_ADD_STATUS" help="Extended Node Add Status">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE" />
+            <param key="0x02" name="Assigned NodeID" type="WORD" />
+            <param key="0x03" name="Node Info Length" type="BYTE" />
+            <param key="0x04" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Override" flagmask="0x80" />
+            <param key="0x05" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Opt. Func." flagmask="0x80" />
             </param>
-            <param key="0x03" name="Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x06" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x07" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x08" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x09" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x0A" name="Granted Keys" type="BYTE" />
+            <param key="0x0B" name="KEX Fail Type" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x2D" version="1" name="COMMAND_CLASS_SCENE_CONTROLLER_CONF" help="Command Class Scene Controller Conf" read_only="false" comment="">
-        <cmd key="0x02" name="SCENE_CONTROLLER_CONF_GET" help="Scene Controller Conf Get" comment="">
-            <param key="0x00" name="Group ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x00" version="1" name="COMMAND_CLASS_NO_OPERATION" help="NOP" />
+    <cmd_class key="0x77" version="1" name="COMMAND_CLASS_NODE_NAMING" help="Command Class Node Naming and Location">
+        <cmd key="0x06" name="NODE_NAMING_NODE_LOCATION_REPORT" help="Node Naming Node Location  Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-        </cmd>
-        <cmd key="0x03" name="SCENE_CONTROLLER_CONF_REPORT" help="Scene Controller Conf Report" comment="">
-            <param key="0x00" name="Group ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Node location char" type="ARRAY">
+                <arrayattrib key="0x00" len="16" is_ascii="true" />
             </param>
-            <param key="0x01" name="Scene ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x04" name="NODE_NAMING_NODE_LOCATION_SET" help="Node Naming Node Location  Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
+            <param key="0x01" name="Node location char" type="ARRAY">
+                <arrayattrib key="0x00" len="16" is_ascii="true" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SCENE_CONTROLLER_CONF_SET" help="Scene Controller Conf Set" comment="">
-            <param key="0x00" name="Group ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x05" name="NODE_NAMING_NODE_LOCATION_GET" help="Node Naming Node Location Get" support_mode="RX" />
+        <cmd key="0x02" name="NODE_NAMING_NODE_NAME_GET" help="Node Naming Node Name Get" support_mode="RX" />
+        <cmd key="0x03" name="NODE_NAMING_NODE_NAME_REPORT" help="Node Naming Node Name Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Scene ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Node name char" type="ARRAY">
+                <arrayattrib key="0x00" len="16" is_ascii="true" />
             </param>
-            <param key="0x02" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
-                <bitflag key="0x02" flagname="factory default" flagmask="0xFF" />
+        </cmd>
+        <cmd key="0x01" name="NODE_NAMING_NODE_NAME_SET" help="Node Naming Node Name Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
+            </param>
+            <param key="0x01" name="Node name char" type="ARRAY">
+                <arrayattrib key="0x00" len="16" is_ascii="true" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x4E" version="1" name="COMMAND_CLASS_SCHEDULE_ENTRY_LOCK" help="Command Class Schedule Entry Lock" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x02" name="SCHEDULE_ENTRY_LOCK_ENABLE_ALL_SET" help="Schedule Entry Lock Enable All Set" comment="">
-            <param key="0x00" name="Enabled" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
-                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
+    <cmd_class key="0xF0" version="1" name="COMMAND_CLASS_NON_INTEROPERABLE" help="Command Class Non Interoperable" />
+    <cmd_class key="0x73" version="1" name="COMMAND_CLASS_POWERLEVEL" help="Command Class Powerlevel">
+        <cmd key="0x02" name="POWERLEVEL_GET" help="Powerlevel Get" support_mode="RX" />
+        <cmd key="0x03" name="POWERLEVEL_REPORT" help="Powerlevel Report" support_mode="TX">
+            <param key="0x00" name="Power level" type="CONST">
+                <const key="0x00" flagname="NormalPower" flagmask="0x00" />
+                <const key="0x01" flagname="minus1dBm" flagmask="0x01" />
+                <const key="0x02" flagname="minus2dBm" flagmask="0x02" />
+                <const key="0x03" flagname="minus3dBm" flagmask="0x03" />
+                <const key="0x04" flagname="minus4dBm" flagmask="0x04" />
+                <const key="0x05" flagname="minus5dBm" flagmask="0x05" />
+                <const key="0x06" flagname="minus6dBm" flagmask="0x06" />
+                <const key="0x07" flagname="minus7dBm" flagmask="0x07" />
+                <const key="0x08" flagname="minus8dBm" flagmask="0x08" />
+                <const key="0x09" flagname="minus9dBm" flagmask="0x09" />
             </param>
+            <param key="0x01" name="Timeout" type="BYTE" />
         </cmd>
-        <cmd key="0x01" name="SCHEDULE_ENTRY_LOCK_ENABLE_SET" help="Schedule Entry Lock Enable Set" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Enabled" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
-                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
+        <cmd key="0x01" name="POWERLEVEL_SET" help="Powerlevel Set" support_mode="RX">
+            <param key="0x00" name="Power level" type="CONST">
+                <const key="0x00" flagname="NormalPower" flagmask="0x00" />
+                <const key="0x01" flagname="minus1dBm" flagmask="0x01" />
+                <const key="0x02" flagname="minus2dBm" flagmask="0x02" />
+                <const key="0x03" flagname="minus3dBm" flagmask="0x03" />
+                <const key="0x04" flagname="minus4dBm" flagmask="0x04" />
+                <const key="0x05" flagname="minus5dBm" flagmask="0x05" />
+                <const key="0x06" flagname="minus6dBm" flagmask="0x06" />
+                <const key="0x07" flagname="minus7dBm" flagmask="0x07" />
+                <const key="0x08" flagname="minus8dBm" flagmask="0x08" />
+                <const key="0x09" flagname="minus9dBm" flagmask="0x09" />
             </param>
+            <param key="0x01" name="Timeout" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_GET" help="Schedule Entry Lock Week Day Get" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x05" name="POWERLEVEL_TEST_NODE_GET" help="Powerlevel Test Node Get" support_mode="RX" />
+        <cmd key="0x06" name="POWERLEVEL_TEST_NODE_REPORT" help="Powerlevel Test Node Report" support_mode="TX">
+            <param key="0x00" name="Test NodeID" type="CONST" encaptype="NODE_NUMBER">
+                <const key="0x00" flagname="ZW_TEST_NOT_A_NODEID" flagmask="0x00" />
             </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Status of operation" type="CONST">
+                <const key="0x00" flagname="ZW_TEST_FAILED" flagmask="0x00" />
+                <const key="0x01" flagname="ZW_TEST_SUCCES" flagmask="0x01" />
+                <const key="0x02" flagname="ZW_TEST_INPROGRESS" flagmask="0x02" />
             </param>
+            <param key="0x02" name="Test Frame Count" type="WORD" />
         </cmd>
-        <cmd key="0x05" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_REPORT" help="Schedule Entry Lock Week Day Report" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day of Week" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="POWERLEVEL_TEST_NODE_SET" help="Powerlevel Test Node Set" support_mode="RX">
+            <param key="0x00" name="Test NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Power level" type="CONST">
+                <const key="0x00" flagname="NormalPower" flagmask="0x00" />
+                <const key="0x01" flagname="minus1dBm" flagmask="0x01" />
+                <const key="0x02" flagname="minus2dBm" flagmask="0x02" />
+                <const key="0x03" flagname="minus3dBm" flagmask="0x03" />
+                <const key="0x04" flagname="minus4dBm" flagmask="0x04" />
+                <const key="0x05" flagname="minus5dBm" flagmask="0x05" />
+                <const key="0x06" flagname="minus6dBm" flagmask="0x06" />
+                <const key="0x07" flagname="minus7dBm" flagmask="0x07" />
+                <const key="0x08" flagname="minus8dBm" flagmask="0x08" />
+                <const key="0x09" flagname="minus9dBm" flagmask="0x09" />
             </param>
+            <param key="0x02" name="Test frame count" type="WORD" />
         </cmd>
-        <cmd key="0x03" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_SET" help="Schedule Entry Lock Week Day Set" comment="">
-            <param key="0x00" name="Set Action" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
-                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
-            </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Day of Week" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x41" version="1" name="COMMAND_CLASS_PREPAYMENT_ENCAPSULATION" help="Command Class Prepayment Encapsulation">
+        <cmd key="0x01" name="CMD_ENCAPSULATION" help="Cmd Encapsulation" support_mode="RX">
+            <param key="0x00" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x07" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_GET" help="Schedule Entry Lock Year Day Get" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x3F" version="1" name="COMMAND_CLASS_PREPAYMENT" help="Command Class Prepayment">
+        <cmd key="0x01" name="PREPAYMENT_BALANCE_GET" help="Prepayment Balance Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" />
+                <fieldenum key="0x01" fieldname="Balance Type" fieldmask="0xC0" shifter="6">
+                    <fieldenum value="Utility" />
+                    <fieldenum value="Monetary" />
+                </fieldenum>
             </param>
         </cmd>
-        <cmd key="0x08" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_REPORT" help="Schedule Entry Lock Year Day Report" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x02" name="PREPAYMENT_BALANCE_REPORT" help="Prepayment Balance Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Meter type" fieldmask="0x3F" />
+                <bitfield key="0x01" fieldname="Balance Type" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x09" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Balance Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x0A" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Balance Value" type="DWORD" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Debt Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x0B" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x04" name="Debt" type="DWORD" />
+            <param key="0x05" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Emer Credit Precision" fieldmask="0xE0" shifter="5" />
             </param>
+            <param key="0x06" name="Emer Credit" type="DWORD" />
+            <param key="0x07" name="Currency" type="BIT_24" />
+            <param key="0x08" name="Debt Recovery Percentage" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_SET" help="Schedule Entry Lock Year Day Set" comment="">
-            <param key="0x00" name="Set Action" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
-                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
-            </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="PREPAYMENT_SUPPORTED_GET" help="Prepayment Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="PREPAYMENT_SUPPORTED_REPORT" help="Prepayment Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Types Supported" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x0C" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x88" version="1" name="COMMAND_CLASS_PROPRIETARY" help="Command Class Proprietary" comment="[DEPRECATED]">
+        <cmd key="0x02" name="PROPRIETARY_GET" help="Proprietary Get" support_mode="RX">
+            <param key="0x00" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x09" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_GET" help="Schedule Entry Type Supported Get" comment="" />
-        <cmd key="0x0A" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_REPORT" help="Schedule Entry Type Supported Report" comment="">
-            <param key="0x00" name="Number of Slots Week Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="PROPRIETARY_REPORT" help="Proprietary Report" support_mode="TX">
+            <param key="0x00" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x01" name="Number of Slots Year Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x01" name="PROPRIETARY_SET" help="Proprietary Set" support_mode="RX">
+            <param key="0x00" name="Data" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x4E" version="2" name="COMMAND_CLASS_SCHEDULE_ENTRY_LOCK" help="Command Class Schedule Entry Lock" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x02" name="SCHEDULE_ENTRY_LOCK_ENABLE_ALL_SET" help="Schedule Entry Lock Enable All Set" comment="">
-            <param key="0x00" name="Enabled" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
-                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
+    <cmd_class key="0x75" version="1" name="COMMAND_CLASS_PROTECTION" help="Command Class Protection">
+        <cmd key="0x02" name="PROTECTION_GET" help="Protection Get" support_mode="RX" />
+        <cmd key="0x03" name="PROTECTION_REPORT" help="Protection Report" support_mode="TX">
+            <param key="0x00" name="Protection State" type="CONST">
+                <const key="0x00" flagname="Unprotected" flagmask="0x00" />
+                <const key="0x01" flagname="Protection by sequence" flagmask="0x01" />
+                <const key="0x02" flagname="No operation possible" flagmask="0x02" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SCHEDULE_ENTRY_LOCK_ENABLE_SET" help="Schedule Entry Lock Enable Set" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Enabled" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
-                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
+        <cmd key="0x01" name="PROTECTION_SET" help="Protection Set" support_mode="RX">
+            <param key="0x00" name="Protection State" type="CONST">
+                <const key="0x00" flagname="Unprotected" flagmask="0x00" />
+                <const key="0x01" flagname="Protection by sequence" flagmask="0x01" />
+                <const key="0x02" flagname="No operation possible" flagmask="0x02" />
             </param>
         </cmd>
-        <cmd key="0x0B" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_GET" help="Schedule Entry Lock Time Offset Get" comment="" />
-        <cmd key="0x0C" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_REPORT" help="Schedule Entry Lock Time Offset Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
-            </param>
-            <param key="0x01" name="Minute TZO" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x75" version="2" name="COMMAND_CLASS_PROTECTION" help="Command Class Protection">
+        <cmd key="0x07" name="PROTECTION_EC_GET" help="Protection Ec Get" support_mode="RX" />
+        <cmd key="0x08" name="PROTECTION_EC_REPORT" help="Protection Ec Report" support_mode="TX">
+            <param key="0x00" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x06" name="PROTECTION_EC_SET" help="Protection Ec Set" support_mode="RX">
+            <param key="0x00" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x02" name="PROTECTION_GET" help="Protection Get" support_mode="RX" />
+        <cmd key="0x03" name="PROTECTION_REPORT" help="Protection Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Local Protection State" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
+            <param key="0x01" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="RF Protection State" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_SET" help="Schedule Entry Lock Time Offset Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
-            </param>
-            <param key="0x01" name="Minute TZO" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x01" name="PROTECTION_SET" help="Protection Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Local Protection State" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
+            <param key="0x01" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="RF Protection State" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x04" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_GET" help="Schedule Entry Lock Week Day Get" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="PROTECTION_SUPPORTED_GET" help="Protection Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="PROTECTION_SUPPORTED_REPORT" help="Protection Supported Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Timeout" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Exclusive Control" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
+            <param key="0x01" name="Local Protection State" type="WORD" />
+            <param key="0x02" name="RF Protection State" type="WORD" />
         </cmd>
-        <cmd key="0x05" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_REPORT" help="Schedule Entry Lock Week Day Report" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day of Week" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0A" name="PROTECTION_TIMEOUT_GET" help="Protection Timeout Get" support_mode="RX" />
+        <cmd key="0x0B" name="PROTECTION_TIMEOUT_REPORT" help="Protection Timeout Report" support_mode="TX">
+            <param key="0x00" name="Timeout" type="BYTE">
+                <bitflag key="0x01" flagname="No timer is set" flagmask="0x00" />
+                <bitflag key="0x02" flagname="No Timeout is set" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_SET" help="Schedule Entry Lock Week Day Set" comment="">
-            <param key="0x00" name="Set Action" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
-                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
-            </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Day of Week" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x09" name="PROTECTION_TIMEOUT_SET" help="Protection Timeout Set" support_mode="RX">
+            <param key="0x00" name="Timeout" type="BYTE">
+                <bitflag key="0x01" flagname="No timer is set" flagmask="0x00" />
+                <bitflag key="0x02" flagname="No Timeout" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_GET" help="Schedule Entry Lock Year Day Get" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x48" version="1" name="COMMAND_CLASS_RATE_TBL_CONFIG" help="Command Class Rate Table Configuration">
+        <cmd key="0x02" name="RATE_TBL_REMOVE" help="Rate Tbl Remove" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Parameter Set IDs" fieldmask="0x3F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Rate Parameter Set ID" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x3F" />
             </param>
         </cmd>
-        <cmd key="0x08" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_REPORT" help="Schedule Entry Lock Year Day Report" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x01" name="RATE_TBL_SET" help="Rate Tbl Set" support_mode="RX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Rate Char" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="Reserved" flagmask="0x80" />
             </param>
-            <param key="0x09" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Rate Character" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
-            <param key="0x0A" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x04" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x05" name="Duration Minute" type="WORD" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Consumption Scale" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Consumption Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x0B" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Min Consumption Value" type="DWORD" />
+            <param key="0x08" name="Max Consumption Value" type="DWORD" />
+            <param key="0x09" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Max Demand Scale" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Max Demand Precision" fieldmask="0xE0" shifter="5" />
             </param>
+            <param key="0x0A" name="Max Demand Value" type="DWORD" />
+            <param key="0x0B" name="DCP Rate ID" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_SET" help="Schedule Entry Lock Year Day Set" comment="">
-            <param key="0x00" name="Set Action" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
-                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
-            </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x49" version="1" name="COMMAND_CLASS_RATE_TBL_MONITOR" help="Command Class Rate Table Monitor">
+        <cmd key="0x05" name="RATE_TBL_ACTIVE_RATE_GET" help="Rate Tbl Active Rate  Get" support_mode="RX" />
+        <cmd key="0x06" name="RATE_TBL_ACTIVE_RATE_REPORT" help="Rate Tbl Active Rate  Report" support_mode="TX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="RATE_TBL_CURRENT_DATA_GET" help="Rate Tbl Current Data Get" support_mode="RX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x01" name="Dataset Requested" type="BIT_24" />
+        </cmd>
+        <cmd key="0x08" name="RATE_TBL_CURRENT_DATA_REPORT" help="Rate Tbl Current Data Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x02" name="Dataset" type="BIT_24" />
+            <param key="0x03" name="Year" type="WORD" />
+            <param key="0x04" name="Month" type="BYTE" />
+            <param key="0x05" name="Day" type="BYTE" />
+            <param key="0x06" name="Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Second Local Time" type="BYTE" />
+            <variant_group key="0x09" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Current Scale" fieldmask="0x1F" />
+                    <bitfield key="0x01" fieldname="Current Precision" fieldmask="0xE0" shifter="5" />
+                </param>
+                <param key="0x01" name="Current Value" type="DWORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x03" name="RATE_TBL_GET" help="Rate Tbl Get" support_mode="RX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="RATE_TBL_HISTORICAL_DATA_GET" help="Rate Tbl Historical Data Get" support_mode="RX">
+            <param key="0x00" name="Maximum Reports" type="BYTE" />
+            <param key="0x01" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x02" name="Dataset Requested" type="BIT_24" />
+            <param key="0x03" name="Start Year" type="WORD" />
+            <param key="0x04" name="Start Month" type="BYTE" />
+            <param key="0x05" name="Start Day" type="BYTE" />
+            <param key="0x06" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Start Second Local Time" type="BYTE" />
+            <param key="0x09" name="Stop Year" type="WORD" />
+            <param key="0x0A" name="Stop Month" type="BYTE" />
+            <param key="0x0B" name="Stop Day" type="BYTE" />
+            <param key="0x0C" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0D" name="Stop Minute Local Time" type="BYTE" />
+            <param key="0x0E" name="Stop Second Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x0A" name="RATE_TBL_HISTORICAL_DATA_REPORT" help="Rate Tbl Historical Data Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <param key="0x01" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x02" name="Dataset" type="BIT_24" />
+            <param key="0x03" name="Year" type="WORD" />
+            <param key="0x04" name="Month" type="BYTE" />
+            <param key="0x05" name="Day" type="BYTE" />
+            <param key="0x06" name="Hour Local Time" type="BYTE" />
+            <param key="0x07" name="Minute Local Time" type="BYTE" />
+            <param key="0x08" name="Second Local Time" type="BYTE" />
+            <variant_group key="0x09" name="vg" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Historical Scale" fieldmask="0x1F" />
+                    <bitfield key="0x01" fieldname="Historical Precision" fieldmask="0xE0" shifter="5" />
+                </param>
+                <param key="0x01" name="Historical Value" type="DWORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x04" name="RATE_TBL_REPORT" help="Rate Tbl Report" support_mode="TX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Rate Char" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Rate Type" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="Reserved" flagmask="0x80" />
             </param>
-            <param key="0x0A" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Rate Character" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
-            <param key="0x0B" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x04" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x05" name="Duration Minute" type="WORD" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Consumption Scale" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Consumption Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x0C" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Min Consumption Value" type="DWORD" />
+            <param key="0x08" name="Max Consumption Value" type="DWORD" />
+            <param key="0x09" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Max Demand Scale" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Max Demand Precision" fieldmask="0xE0" shifter="5" />
             </param>
+            <param key="0x0A" name="Max Demand Value" type="DWORD" />
+            <param key="0x0B" name="DCP Rate ID" type="BYTE" />
         </cmd>
-        <cmd key="0x09" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_GET" help="Schedule Entry Type Supported Get" comment="" />
-        <cmd key="0x0A" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_REPORT" help="Schedule Entry Type Supported Report" comment="">
-            <param key="0x00" name="Number of Slots Week Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Slots Year Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x01" name="RATE_TBL_SUPPORTED_GET" help="Rate Tbl Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="RATE_TBL_SUPPORTED_REPORT" help="Rate Tbl Supported Report" support_mode="TX">
+            <param key="0x00" name="Rates Supported" type="BYTE" />
+            <param key="0x01" name="Parameter Set Supported Bit Mask" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x4E" version="3" name="COMMAND_CLASS_SCHEDULE_ENTRY_LOCK" help="Command Class Schedule Entry Lock" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x02" name="SCHEDULE_ENTRY_LOCK_ENABLE_ALL_SET" help="Schedule Entry Lock Enable All Set" comment="">
-            <param key="0x00" name="Enabled" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
-                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
-            </param>
+    <cmd_class key="0x7C" version="1" name="COMMAND_CLASS_REMOTE_ASSOCIATION_ACTIVATE" help="Command Class Remote Association Activation" comment="[OBSOLETED]">
+        <cmd key="0x01" name="REMOTE_ASSOCIATION_ACTIVATE" help="Remote Association Activate" support_mode="RX">
+            <param key="0x00" name="Grouping identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x01" name="SCHEDULE_ENTRY_LOCK_ENABLE_SET" help="Schedule Entry Lock Enable Set" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Enabled" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
-                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
-            </param>
+    </cmd_class>
+    <cmd_class key="0x7D" version="1" name="COMMAND_CLASS_REMOTE_ASSOCIATION" help="Command Class Remote Association Configuration" comment="[OBSOLETED]">
+        <cmd key="0x02" name="REMOTE_ASSOCIATION_CONFIGURATION_GET" help="Remote Association Configuration Get" support_mode="RX">
+            <param key="0x00" name="Local Grouping identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x0B" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_GET" help="Schedule Entry Lock Time Offset Get" comment="" />
-        <cmd key="0x0C" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_REPORT" help="Schedule Entry Lock Time Offset Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
-            </param>
-            <param key="0x01" name="Minute TZO" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="REMOTE_ASSOCIATION_CONFIGURATION_REPORT" help="Remote Association Configuration Report" support_mode="TX">
+            <param key="0x00" name="Local Grouping identifier" type="BYTE">
+                <bitflag key="0x01" flagname="erase all lin" flagmask="0x00" />
             </param>
-            <param key="0x02" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
+            <param key="0x01" name="Remote NodeID" type="BYTE" encaptype="NODE_NUMBER">
+                <bitflag key="0x01" flagname="remove a link" flagmask="0x00" />
             </param>
+            <param key="0x02" name="Remote Grouping identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x0D" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_SET" help="Schedule Entry Lock Time Offset Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
-            </param>
-            <param key="0x01" name="Minute TZO" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x01" name="REMOTE_ASSOCIATION_CONFIGURATION_SET" help="Remote Association Configuration Set" support_mode="RX">
+            <param key="0x00" name="Local Grouping identifier" type="BYTE">
+                <bitflag key="0x01" flagname="erase all lin" flagmask="0x00" />
             </param>
-            <param key="0x02" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" shifter="0" />
-                <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
+            <param key="0x01" name="Remote NodeID" type="BYTE" encaptype="NODE_NUMBER">
+                <bitflag key="0x01" flagname="remove a link" flagmask="0x00" />
             </param>
+            <param key="0x02" name="Remote Grouping identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_GET" help="Schedule Entry Lock Week Day Get" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x2B" version="1" name="COMMAND_CLASS_SCENE_ACTIVATION" help="Command Class Scene Activation">
+        <cmd key="0x01" name="SCENE_ACTIVATION_SET" help="Scene Activation Set" support_mode="RX">
+            <param key="0x00" name="Scene ID" type="BYTE" />
+            <param key="0x01" name="Dimming Duration" type="BYTE">
+                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
+                <bitflag key="0x02" flagname="configured dimming duration" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_REPORT" help="Schedule Entry Lock Week Day Report" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day of Week" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x2C" version="1" name="COMMAND_CLASS_SCENE_ACTUATOR_CONF" help="Command Class Scene Actuator Conf">
+        <cmd key="0x02" name="SCENE_ACTUATOR_CONF_GET" help="Scene Actuator Conf Get" support_mode="RX">
+            <param key="0x00" name="Scene ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="SCENE_ACTUATOR_CONF_REPORT" help="Scene Actuator Conf Report" support_mode="TX">
+            <param key="0x00" name="Scene ID" type="BYTE" />
+            <param key="0x01" name="Level" type="BYTE" />
+            <param key="0x02" name="Dimming Duration" type="BYTE">
+                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_SET" help="Schedule Entry Lock Week Day Set" comment="">
-            <param key="0x00" name="Set Action" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
-                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
-                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
-            </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Day of Week" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x01" name="SCENE_ACTUATOR_CONF_SET" help="Scene Actuator Conf Set" support_mode="RX">
+            <param key="0x00" name="Scene ID" type="BYTE" />
+            <param key="0x01" name="Dimming Duration" type="BYTE">
+                <bitflag key="0x01" flagname="Specify Instantly" flagmask="0x00" />
+                <bitflag key="0x02" flagname="factory default" flagmask="0xFF" />
             </param>
-            <param key="0x07" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Override" flagmask="0x80" />
             </param>
+            <param key="0x03" name="Level" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_GET" help="Schedule Entry Lock Year Day Get" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x2D" version="1" name="COMMAND_CLASS_SCENE_CONTROLLER_CONF" help="Command Class Scene Controller Conf">
+        <cmd key="0x02" name="SCENE_CONTROLLER_CONF_GET" help="Scene Controller Conf Get" support_mode="RX">
+            <param key="0x00" name="Group ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="SCENE_CONTROLLER_CONF_REPORT" help="Scene Controller Conf Report" support_mode="TX">
+            <param key="0x00" name="Group ID" type="BYTE" />
+            <param key="0x01" name="Scene ID" type="BYTE" />
+            <param key="0x02" name="Dimming Duration" type="BYTE">
+                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x08" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_REPORT" help="Schedule Entry Lock Year Day Report" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x01" name="SCENE_CONTROLLER_CONF_SET" help="Scene Controller Conf Set" support_mode="RX">
+            <param key="0x00" name="Group ID" type="BYTE" />
+            <param key="0x01" name="Scene ID" type="BYTE" />
+            <param key="0x02" name="Dimming Duration" type="BYTE">
+                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
+                <bitflag key="0x02" flagname="factory default" flagmask="0xFF" />
             </param>
-            <param key="0x0A" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x4E" version="1" name="COMMAND_CLASS_SCHEDULE_ENTRY_LOCK" help="Command Class Schedule Entry Lock" comment="[DEPRECATED]">
+        <cmd key="0x02" name="SCHEDULE_ENTRY_LOCK_ENABLE_ALL_SET" help="Schedule Entry Lock Enable All Set" support_mode="RX">
+            <param key="0x00" name="Enabled" type="BYTE">
+                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
+                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
             </param>
-            <param key="0x0B" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x01" name="SCHEDULE_ENTRY_LOCK_ENABLE_SET" help="Schedule Entry Lock Enable Set" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Enabled" type="BYTE">
+                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
+                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
             </param>
         </cmd>
-        <cmd key="0x06" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_SET" help="Schedule Entry Lock Year Day Set" comment="">
-            <param key="0x00" name="Set Action" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x04" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_GET" help="Schedule Entry Lock Week Day Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_REPORT" help="Schedule Entry Lock Week Day Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x02" name="Day of Week" type="BYTE" />
+            <param key="0x03" name="Start Hour" type="BYTE" />
+            <param key="0x04" name="Start Minute" type="BYTE" />
+            <param key="0x05" name="Stop Hour" type="BYTE" />
+            <param key="0x06" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_SET" help="Schedule Entry Lock Week Day Set" support_mode="RX">
+            <param key="0x00" name="Set Action" type="BYTE">
                 <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
             </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Schedule Slot ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Start Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Year" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x03" name="Day of Week" type="BYTE" />
+            <param key="0x04" name="Start Hour" type="BYTE" />
+            <param key="0x05" name="Start Minute" type="BYTE" />
+            <param key="0x06" name="Stop Hour" type="BYTE" />
+            <param key="0x07" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_GET" help="Schedule Entry Lock Year Day Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x08" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_REPORT" help="Schedule Entry Lock Year Day Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Start Month" type="BYTE" />
+            <param key="0x04" name="Start Day" type="BYTE" />
+            <param key="0x05" name="Start Hour" type="BYTE" />
+            <param key="0x06" name="Start Minute" type="BYTE" />
+            <param key="0x07" name="Stop Year" type="BYTE" />
+            <param key="0x08" name="Stop Month" type="BYTE" />
+            <param key="0x09" name="Stop Day" type="BYTE" />
+            <param key="0x0A" name="Stop Hour" type="BYTE" />
+            <param key="0x0B" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_SET" help="Schedule Entry Lock Year Day Set" support_mode="RX">
+            <param key="0x00" name="Set Action" type="BYTE">
+                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
+                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
             </param>
-            <param key="0x09" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x03" name="Start Year" type="BYTE" />
+            <param key="0x04" name="Start Month" type="BYTE" />
+            <param key="0x05" name="Start Day" type="BYTE" />
+            <param key="0x06" name="Start Hour" type="BYTE" />
+            <param key="0x07" name="Start Minute" type="BYTE" />
+            <param key="0x08" name="Stop Year" type="BYTE" />
+            <param key="0x09" name="Stop Month" type="BYTE" />
+            <param key="0x0A" name="Stop Day" type="BYTE" />
+            <param key="0x0B" name="Stop Hour" type="BYTE" />
+            <param key="0x0C" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_GET" help="Schedule Entry Type Supported Get" support_mode="RX" />
+        <cmd key="0x0A" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_REPORT" help="Schedule Entry Type Supported Report" support_mode="TX">
+            <param key="0x00" name="Number of Slots Week Day" type="BYTE" />
+            <param key="0x01" name="Number of Slots Year Day" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x4E" version="2" name="COMMAND_CLASS_SCHEDULE_ENTRY_LOCK" help="Command Class Schedule Entry Lock" comment="[DEPRECATED]">
+        <cmd key="0x02" name="SCHEDULE_ENTRY_LOCK_ENABLE_ALL_SET" help="Schedule Entry Lock Enable All Set" support_mode="RX">
+            <param key="0x00" name="Enabled" type="BYTE">
+                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
+                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
             </param>
-            <param key="0x0A" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x01" name="SCHEDULE_ENTRY_LOCK_ENABLE_SET" help="Schedule Entry Lock Enable Set" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Enabled" type="BYTE">
+                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
+                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
             </param>
-            <param key="0x0B" name="Stop Hour" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x0B" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_GET" help="Schedule Entry Lock Time Offset Get" support_mode="RX" />
+        <cmd key="0x0C" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_REPORT" help="Schedule Entry Lock Time Offset Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
             </param>
-            <param key="0x0C" name="Stop Minute" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Minute TZO" type="BYTE" />
+            <param key="0x02" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x09" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_GET" help="Schedule Entry Type Supported Get" comment="" />
-        <cmd key="0x0A" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_REPORT" help="Schedule Entry Type Supported Report" comment="">
-            <param key="0x00" name="Number of Slots Week Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Slots Year Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0D" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_SET" help="Schedule Entry Lock Time Offset Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Number of Slots Daily Repeating" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Minute TZO" type="BYTE" />
+            <param key="0x02" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x0E" name="SCHEDULE_ENTRY_LOCK_DAILY_REPEATING_GET" help="Schedule Entry Lock Daily Repeating Get">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_GET" help="Schedule Entry Lock Week Day Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_REPORT" help="Schedule Entry Lock Week Day Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x02" name="Day of Week" type="BYTE" />
+            <param key="0x03" name="Start Hour" type="BYTE" />
+            <param key="0x04" name="Start Minute" type="BYTE" />
+            <param key="0x05" name="Stop Hour" type="BYTE" />
+            <param key="0x06" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_SET" help="Schedule Entry Lock Week Day Set" support_mode="RX">
+            <param key="0x00" name="Set Action" type="BYTE">
+                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
+                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
             </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x03" name="Day of Week" type="BYTE" />
+            <param key="0x04" name="Start Hour" type="BYTE" />
+            <param key="0x05" name="Start Minute" type="BYTE" />
+            <param key="0x06" name="Stop Hour" type="BYTE" />
+            <param key="0x07" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_GET" help="Schedule Entry Lock Year Day Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x08" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_REPORT" help="Schedule Entry Lock Year Day Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Start Month" type="BYTE" />
+            <param key="0x04" name="Start Day" type="BYTE" />
+            <param key="0x05" name="Start Hour" type="BYTE" />
+            <param key="0x06" name="Start Minute" type="BYTE" />
+            <param key="0x07" name="Stop Year" type="BYTE" />
+            <param key="0x08" name="Stop Month" type="BYTE" />
+            <param key="0x09" name="Stop Day" type="BYTE" />
+            <param key="0x0A" name="Stop Hour" type="BYTE" />
+            <param key="0x0B" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_SET" help="Schedule Entry Lock Year Day Set" support_mode="RX">
+            <param key="0x00" name="Set Action" type="BYTE">
+                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
+                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
             </param>
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x03" name="Start Year" type="BYTE" />
+            <param key="0x04" name="Start Month" type="BYTE" />
+            <param key="0x05" name="Start Day" type="BYTE" />
+            <param key="0x06" name="Start Hour" type="BYTE" />
+            <param key="0x07" name="Start Minute" type="BYTE" />
+            <param key="0x08" name="Stop Year" type="BYTE" />
+            <param key="0x09" name="Stop Month" type="BYTE" />
+            <param key="0x0A" name="Stop Day" type="BYTE" />
+            <param key="0x0B" name="Stop Hour" type="BYTE" />
+            <param key="0x0C" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_GET" help="Schedule Entry Type Supported Get" support_mode="RX" />
+        <cmd key="0x0A" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_REPORT" help="Schedule Entry Type Supported Report" support_mode="TX">
+            <param key="0x00" name="Number of Slots Week Day" type="BYTE" />
+            <param key="0x01" name="Number of Slots Year Day" type="BYTE" />
         </cmd>
-        <cmd key="0x0F" name="SCHEDULE_ENTRY_LOCK_DAILY_REPEATING_REPORT" help="Schedule Entry Lock Daily Repeating Report">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule Slot ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x4E" version="3" name="COMMAND_CLASS_SCHEDULE_ENTRY_LOCK" help="Command Class Schedule Entry Lock" comment="[DEPRECATED]">
+        <cmd key="0x02" name="SCHEDULE_ENTRY_LOCK_ENABLE_ALL_SET" help="Schedule Entry Lock Enable All Set" support_mode="RX">
+            <param key="0x00" name="Enabled" type="BYTE">
+                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
+                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
             </param>
-            <param key="0x02" name="Week Day Bitmask" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x01" name="SCHEDULE_ENTRY_LOCK_ENABLE_SET" help="Schedule Entry Lock Enable Set" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Enabled" type="BYTE">
+                <bitflag key="0x01" flagname="disabled" flagmask="0x00" />
+                <bitflag key="0x02" flagname="enabled" flagmask="0x01" />
             </param>
-            <param key="0x03" name="Start Hour" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x0B" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_GET" help="Schedule Entry Lock Time Offset Get" support_mode="RX" />
+        <cmd key="0x0C" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_REPORT" help="Schedule Entry Lock Time Offset Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
             </param>
-            <param key="0x04" name="Start Minute" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Minute TZO" type="BYTE" />
+            <param key="0x02" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Duration Hour" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x0D" name="SCHEDULE_ENTRY_LOCK_TIME_OFFSET_SET" help="Schedule Entry Lock Time Offset Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Duration Minute" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Minute TZO" type="BYTE" />
+            <param key="0x02" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x10" name="SCHEDULE_ENTRY_LOCK_DAILY_REPEATING_SET" help="Schedule Entry Lock Daily Repeating Set">
-            <param key="0x00" name="Set Action" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x04" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_GET" help="Schedule Entry Lock Week Day Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_REPORT" help="Schedule Entry Lock Week Day Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x02" name="Day of Week" type="BYTE" />
+            <param key="0x03" name="Start Hour" type="BYTE" />
+            <param key="0x04" name="Start Minute" type="BYTE" />
+            <param key="0x05" name="Stop Hour" type="BYTE" />
+            <param key="0x06" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="SCHEDULE_ENTRY_LOCK_WEEK_DAY_SET" help="Schedule Entry Lock Week Day Set" support_mode="RX">
+            <param key="0x00" name="Set Action" type="BYTE">
                 <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
             </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Schedule Slot ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Week Day Bitmask" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Hour" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Minute" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Duration Hour" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x03" name="Day of Week" type="BYTE" />
+            <param key="0x04" name="Start Hour" type="BYTE" />
+            <param key="0x05" name="Start Minute" type="BYTE" />
+            <param key="0x06" name="Stop Hour" type="BYTE" />
+            <param key="0x07" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_GET" help="Schedule Entry Lock Year Day Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x08" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_REPORT" help="Schedule Entry Lock Year Day Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Start Month" type="BYTE" />
+            <param key="0x04" name="Start Day" type="BYTE" />
+            <param key="0x05" name="Start Hour" type="BYTE" />
+            <param key="0x06" name="Start Minute" type="BYTE" />
+            <param key="0x07" name="Stop Year" type="BYTE" />
+            <param key="0x08" name="Stop Month" type="BYTE" />
+            <param key="0x09" name="Stop Day" type="BYTE" />
+            <param key="0x0A" name="Stop Hour" type="BYTE" />
+            <param key="0x0B" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="SCHEDULE_ENTRY_LOCK_YEAR_DAY_SET" help="Schedule Entry Lock Year Day Set" support_mode="RX">
+            <param key="0x00" name="Set Action" type="BYTE">
+                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
+                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
             </param>
-            <param key="0x07" name="Duration Minute" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x03" name="Start Year" type="BYTE" />
+            <param key="0x04" name="Start Month" type="BYTE" />
+            <param key="0x05" name="Start Day" type="BYTE" />
+            <param key="0x06" name="Start Hour" type="BYTE" />
+            <param key="0x07" name="Start Minute" type="BYTE" />
+            <param key="0x08" name="Stop Year" type="BYTE" />
+            <param key="0x09" name="Stop Month" type="BYTE" />
+            <param key="0x0A" name="Stop Day" type="BYTE" />
+            <param key="0x0B" name="Stop Hour" type="BYTE" />
+            <param key="0x0C" name="Stop Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_GET" help="Schedule Entry Type Supported Get" support_mode="RX" />
+        <cmd key="0x0A" name="SCHEDULE_ENTRY_TYPE_SUPPORTED_REPORT" help="Schedule Entry Type Supported Report" support_mode="TX">
+            <param key="0x00" name="Number of Slots Week Day" type="BYTE" />
+            <param key="0x01" name="Number of Slots Year Day" type="BYTE" />
+            <param key="0x02" name="Number of Slots Daily Repeating" type="BYTE" />
+        </cmd>
+        <cmd key="0x0E" name="SCHEDULE_ENTRY_LOCK_DAILY_REPEATING_GET" help="Schedule Entry Lock Daily Repeating Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x0F" name="SCHEDULE_ENTRY_LOCK_DAILY_REPEATING_REPORT" help="Schedule Entry Lock Daily Repeating Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x02" name="Week Day Bitmask" type="BYTE" />
+            <param key="0x03" name="Start Hour" type="BYTE" />
+            <param key="0x04" name="Start Minute" type="BYTE" />
+            <param key="0x05" name="Duration Hour" type="BYTE" />
+            <param key="0x06" name="Duration Minute" type="BYTE" />
+        </cmd>
+        <cmd key="0x10" name="SCHEDULE_ENTRY_LOCK_DAILY_REPEATING_SET" help="Schedule Entry Lock Daily Repeating Set" support_mode="RX">
+            <param key="0x00" name="Set Action" type="BYTE">
+                <bitflag key="0x01" flagname="Erase" flagmask="0x00" />
+                <bitflag key="0x02" flagname="Modify" flagmask="0x01" />
             </param>
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Schedule Slot ID" type="BYTE" />
+            <param key="0x03" name="Week Day Bitmask" type="BYTE" />
+            <param key="0x04" name="Start Hour" type="BYTE" />
+            <param key="0x05" name="Start Minute" type="BYTE" />
+            <param key="0x06" name="Duration Hour" type="BYTE" />
+            <param key="0x07" name="Duration Minute" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x93" version="1" name="COMMAND_CLASS_SCREEN_ATTRIBUTES" help="Command Class Screen Attributes" read_only="false" comment="">
-        <cmd key="0x01" name="SCREEN_ATTRIBUTES_GET" help="Screen Attributes Get" comment="" />
-        <cmd key="0x02" name="SCREEN_ATTRIBUTES_REPORT" help="Screen Attributes Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Lines" fieldmask="0x1F" shifter="0" />
+    <cmd_class key="0x93" version="1" name="COMMAND_CLASS_SCREEN_ATTRIBUTES" help="Command Class Screen Attributes">
+        <cmd key="0x01" name="SCREEN_ATTRIBUTES_GET" help="Screen Attributes Get" support_mode="RX" />
+        <cmd key="0x02" name="SCREEN_ATTRIBUTES_REPORT" help="Screen Attributes Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Lines" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Number of Characters per Line" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Size of Line Buffer" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Numerical Presentation of a Character" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Number of Characters per Line" type="BYTE" />
+            <param key="0x02" name="Size of Line Buffer" type="BYTE" />
+            <param key="0x03" name="Numerical Presentation of a Character" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x93" version="2" name="COMMAND_CLASS_SCREEN_ATTRIBUTES" help="Command Class Screen Attributes" read_only="false" comment="">
-        <cmd key="0x01" name="SCREEN_ATTRIBUTES_GET" help="Screen Attributes Get" comment="" />
-        <cmd key="0x03" name="SCREEN_ATTRIBUTES_REPORT" help="Screen Attributes Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Lines" fieldmask="0x1F" shifter="0" />
+    <cmd_class key="0x93" version="2" name="COMMAND_CLASS_SCREEN_ATTRIBUTES" help="Command Class Screen Attributes">
+        <cmd key="0x01" name="SCREEN_ATTRIBUTES_GET" help="Screen Attributes Get" support_mode="RX" />
+        <cmd key="0x02" name="SCREEN_ATTRIBUTES_REPORT" help="Screen Attributes Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Lines" fieldmask="0x1F" />
                 <bitflag key="0x01" flagname="Escape Sequence" flagmask="0x20" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x01" name="Number of Characters per Line" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Size of Line Buffer" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Numerical Presentation of a Character" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Screen Timeout" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Number of Characters per Line" type="BYTE" />
+            <param key="0x02" name="Size of Line Buffer" type="BYTE" />
+            <param key="0x03" name="Numerical Presentation of a Character" type="BYTE" />
+            <param key="0x04" name="Screen Timeout" type="BYTE" />
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x92" version="1" name="COMMAND_CLASS_SCREEN_MD" help="Command Class Screen Md" read_only="false" comment="">
-        <cmd key="0x01" name="SCREEN_MD_GET" help="Screen Md Get" comment="">
-            <param key="0x00" name="Number of Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        <cmd key="0x03" name="SCREEN_ATTRIBUTES_REPORT_LEGACY" help="Screen Attributes Report" comment="added for backward compatibility">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Lines" fieldmask="0x1F" />
+                <bitflag key="0x01" flagname="Escape Sequence" flagmask="0x20" />
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
+            <param key="0x01" name="Number of Characters per Line" type="BYTE" />
+            <param key="0x02" name="Size of Line Buffer" type="BYTE" />
+            <param key="0x03" name="Numerical Presentation of a Character" type="BYTE" />
+            <param key="0x04" name="Screen Timeout" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="SCREEN_MD_REPORT" help="Screen Md Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" shifter="0" />
+    </cmd_class>
+    <cmd_class key="0x92" version="1" name="COMMAND_CLASS_SCREEN_MD" help="Command Class Screen Meta Data">
+        <cmd key="0x01" name="SCREEN_MD_GET" help="Screen Md Get" support_mode="RX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x02" name="SCREEN_MD_REPORT" help="Screen Md Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Screen Settings" fieldmask="0x38" shifter="3" />
                 <bitflag key="0x02" flagname="Reserved" flagmask="0x40" />
                 <bitflag key="0x03" flagname="More Data" flagmask="0x80" />
             </param>
-            <variant_group key="0x01" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Line Number" fieldmask="0x0F" shifter="0" />
+            <variant_group key="0x01" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Line Number" fieldmask="0x0F" />
                     <bitflag key="0x01" flagname="Clear" flagmask="0x10" />
                     <bitfield key="0x02" fieldname="Line Settings" fieldmask="0xE0" shifter="5" />
                 </param>
-                <param key="0x01" name="Character Position" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x02" name="Number of Characters" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x03" name="Character" type="VARIANT" typehashcode="0x0C" comment="">
-                    <variant paramoffs="2" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+                <param key="0x01" name="Character Position" type="BYTE" />
+                <param key="0x02" name="Number of Characters" type="BYTE" />
+                <param key="0x03" name="Character" type="VARIANT">
+                    <variant paramoffs="2" sizemask="0xFF" />
                 </param>
             </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x92" version="2" name="COMMAND_CLASS_SCREEN_MD" help="Command Class Screen Md" read_only="false" comment="">
-        <cmd key="0x01" name="SCREEN_MD_GET" help="Screen Md Get" comment="">
-            <param key="0x00" name="Number of Reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x92" version="2" name="COMMAND_CLASS_SCREEN_MD" help="Command Class Screen Meta Data">
+        <cmd key="0x01" name="SCREEN_MD_GET" help="Screen Md Get" support_mode="RX">
+            <param key="0x00" name="Number of Reports" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x02" name="SCREEN_MD_REPORT" help="Screen Md Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Screen Settings" fieldmask="0x38" shifter="3" />
+                <bitflag key="0x02" flagname="Reserved1" flagmask="0x40" />
+                <bitflag key="0x03" flagname="More Data" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+            <variant_group key="0x01" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Line Number" fieldmask="0x0F" />
+                    <bitflag key="0x01" flagname="Clear" flagmask="0x10" />
+                    <bitfield key="0x02" fieldname="Line Settings" fieldmask="0xE0" shifter="5" />
+                </param>
+                <param key="0x01" name="Character Position" type="BYTE" />
+                <param key="0x02" name="Number of Characters" type="BYTE" />
+                <param key="0x03" name="Character" type="VARIANT">
+                    <variant paramoffs="2" sizemask="0xFF" />
+                </param>
+            </variant_group>
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Screen Timeout" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xFE" shifter="1" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SCREEN_MD_REPORT" help="Screen Md Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" shifter="0" />
+        <cmd key="0x03" name="SCREEN_MD_REPORT_LEGACY" help="Screen Md Report" comment="added for backward compatibility">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Char. Presentation" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Screen Settings" fieldmask="0x38" shifter="3" />
                 <bitflag key="0x02" flagname="Reserved1" flagmask="0x40" />
                 <bitflag key="0x03" flagname="More Data" flagmask="0x80" />
             </param>
-            <variant_group key="0x01" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Line Number" fieldmask="0x0F" shifter="0" />
+            <variant_group key="0x01" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Line Number" fieldmask="0x0F" />
                     <bitflag key="0x01" flagname="Clear" flagmask="0x10" />
                     <bitfield key="0x02" fieldname="Line Settings" fieldmask="0xE0" shifter="5" />
                 </param>
-                <param key="0x01" name="Character Position" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x02" name="Number of Characters" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x03" name="Character" type="VARIANT" typehashcode="0x0C" comment="">
-                    <variant paramoffs="2" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+                <param key="0x01" name="Character Position" type="BYTE" />
+                <param key="0x02" name="Number of Characters" type="BYTE" />
+                <param key="0x03" name="Character" type="VARIANT">
+                    <variant paramoffs="2" sizemask="0xFF" />
                 </param>
             </variant_group>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Screen Timeout" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xFE" shifter="1" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x24" version="1" name="COMMAND_CLASS_SECURITY_PANEL_MODE" help="Command Class Security Panel Mode" read_only="false" comment="">
-        <cmd key="0x03" name="SECURITY_PANEL_MODE_GET" help="Security Panel Mode Get" comment="" />
-        <cmd key="0x04" name="SECURITY_PANEL_MODE_REPORT" help="Security Panel Mode Report" comment="">
-            <param key="0x00" name="MODE" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x24" version="1" name="COMMAND_CLASS_SECURITY_PANEL_MODE" help="Command Class Security Panel Mode">
+        <cmd key="0x03" name="SECURITY_PANEL_MODE_GET" help="Security Panel Mode Get" />
+        <cmd key="0x04" name="SECURITY_PANEL_MODE_REPORT" help="Security Panel Mode Report">
+            <param key="0x00" name="MODE" type="BYTE">
                 <bitflag key="0x01" flagname="Arm Home" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Arm Away, No Delay" flagmask="0x02" />
                 <bitflag key="0x03" flagname="Arm Away, Delayed" flagmask="0x03" />
@@ -7965,9 +8441,8 @@
                 <bitflag key="0x05" flagname="Alarm Trigger" flagmask="0x05" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SECURITY_PANEL_MODE_SET" help="Security Panel Mode Set" comment="">
-            <param key="0x00" name="MODE" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x05" name="SECURITY_PANEL_MODE_SET" help="Security Panel Mode Set">
+            <param key="0x00" name="MODE" type="BYTE">
                 <bitflag key="0x01" flagname="Arm Home" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Arm Away, No Delay" flagmask="0x02" />
                 <bitflag key="0x03" flagname="Arm Away, Delayed" flagmask="0x03" />
@@ -7975,201 +8450,146 @@
                 <bitflag key="0x05" flagname="Alarm Trigger" flagmask="0x05" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SECURITY_PANEL_MODE_SUPPORTED_GET" help="Security Panel Mode Supported Get" comment="" />
-        <cmd key="0x02" name="SECURITY_PANEL_MODE_SUPPORTED_REPORT" help="Security Panel Mode Supported Report" comment="">
-            <param key="0x00" name="Supported Mode Bit Mask" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x01" name="SECURITY_PANEL_MODE_SUPPORTED_GET" help="Security Panel Mode Supported Get" />
+        <cmd key="0x02" name="SECURITY_PANEL_MODE_SUPPORTED_REPORT" help="Security Panel Mode Supported Report">
+            <param key="0x00" name="Supported Mode Bit Mask" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x2F" version="1" name="COMMAND_CLASS_SECURITY_PANEL_ZONE_SENSOR" help="Command Class Security Panel Zone Sensor" read_only="false" comment="">
-        <cmd key="0x02" name="COMMAND_CLASS_SECURITY_PANEL_ZONE_SENSOR_INSTALLED_REPORT" help="Command Class Security Panel Zone Sensor Installed Report" comment="">
-            <param key="0x00" name="Zone number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Number of Sensors" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x03" name="SECURITY_PANEL_ZONE_SENSOR_TYPE_GET" help="Security Panel Zone Sensor Type Get" comment="">
-            <param key="0x00" name="Zone Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Sensor Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x04" name="SECURITY_PANEL_ZONE_SENSOR_TYPE_REPORT" help="Security Panel Zone Sensor Type Report" comment="">
-            <param key="0x00" name="Zone Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Sensor Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="ZWave Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x01" name="SECURITY_PANEL_ZONE_SENSOR_INSTALLED_GET" help="Security Panel Zone Sensor Installed Get" comment="">
-            <param key="0x00" name="Zone number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x05" name="SECURITY_PANEL_ZONE_SENSOR_STATE_GET" help="Security Panel Zone Sensor State Get" comment="">
-            <param key="0x00" name="Zone Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Sensor Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x06" name="SECURITY_PANEL_ZONE_SENSOR_STATE_REPORT" help="Security Panel Zone Sensor State Report" comment="">
-            <param key="0x00" name="Zone Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Sensor Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="ZWave Alarm Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="ZWave Alarm Event" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Event Parameters" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x2F" version="1" name="COMMAND_CLASS_SECURITY_PANEL_ZONE_SENSOR" help="Command Class Security Panel Zone Sensor">
+        <cmd key="0x02" name="COMMAND_CLASS_SECURITY_PANEL_ZONE_SENSOR_INSTALLED_REPORT" help="Command Class Security Panel Zone Sensor Installed Report">
+            <param key="0x00" name="Zone number" type="BYTE" />
+            <param key="0x01" name="Number of Sensors" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="SECURITY_PANEL_ZONE_SENSOR_TYPE_GET" help="Security Panel Zone Sensor Type Get">
+            <param key="0x00" name="Zone Number" type="BYTE" />
+            <param key="0x01" name="Sensor Number" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="SECURITY_PANEL_ZONE_SENSOR_TYPE_REPORT" help="Security Panel Zone Sensor Type Report">
+            <param key="0x00" name="Zone Number" type="BYTE" />
+            <param key="0x01" name="Sensor Number" type="BYTE" />
+            <param key="0x02" name="ZWave Alarm Type" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="SECURITY_PANEL_ZONE_SENSOR_INSTALLED_GET" help="Security Panel Zone Sensor Installed Get">
+            <param key="0x00" name="Zone number" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="SECURITY_PANEL_ZONE_SENSOR_STATE_GET" help="Security Panel Zone Sensor State Get">
+            <param key="0x00" name="Zone Number" type="BYTE" />
+            <param key="0x01" name="Sensor Number" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="SECURITY_PANEL_ZONE_SENSOR_STATE_REPORT" help="Security Panel Zone Sensor State Report">
+            <param key="0x00" name="Zone Number" type="BYTE" />
+            <param key="0x01" name="Sensor Number" type="BYTE" />
+            <param key="0x02" name="ZWave Alarm Type" type="BYTE" />
+            <param key="0x03" name="ZWave Alarm Event" type="BYTE" />
+            <param key="0x04" name="Event Parameters" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x2E" version="1" name="COMMAND_CLASS_SECURITY_PANEL_ZONE" help="Command Class Security Panel Zone" read_only="false" comment="">
-        <cmd key="0x01" name="SECURITY_PANEL_ZONE_NUMBER_SUPPORTED_GET" help="Security Panel Zone Number Supported Get" comment="" />
-        <cmd key="0x05" name="SECURITY_PANEL_ZONE_STATE_GET" help="Security Panel Zone State Get" comment="">
-            <param key="0x00" name="Zone Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x06" name="SECURITY_PANEL_ZONE_STATE_REPORT" help="Security Panel Zone State Report" comment="">
-            <param key="0x00" name="Zone number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Zone State" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x2E" version="1" name="COMMAND_CLASS_SECURITY_PANEL_ZONE" help="Command Class Security Panel Zone">
+        <cmd key="0x01" name="SECURITY_PANEL_ZONE_NUMBER_SUPPORTED_GET" help="Security Panel Zone Number Supported Get" />
+        <cmd key="0x05" name="SECURITY_PANEL_ZONE_STATE_GET" help="Security Panel Zone State Get">
+            <param key="0x00" name="Zone Number" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="SECURITY_PANEL_ZONE_STATE_REPORT" help="Security Panel Zone State Report">
+            <param key="0x00" name="Zone number" type="BYTE" />
+            <param key="0x01" name="Zone State" type="BYTE">
                 <bitflag key="0x01" flagname="Faulted" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Not-Faulted" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Bypass Faulted" flagmask="0x02" />
                 <bitflag key="0x04" flagname="Bypass Not-Faulted" flagmask="0x03" />
             </param>
         </cmd>
-        <cmd key="0x02" name="SECURITY_PANEL_ZONE_SUPPORTED_REPORT" help="Security Panel Zone Supported Report" comment="">
-            <param key="0x00" name="Parameters1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Zones Supported" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x02" name="SECURITY_PANEL_ZONE_SUPPORTED_REPORT" help="Security Panel Zone Supported Report">
+            <param key="0x00" name="Parameters1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Zones Supported" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="ZM" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SECURITY_PANEL_ZONE_TYPE_GET" help="Security Panel Zone Type Get" comment="">
-            <param key="0x00" name="Zone Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x03" name="SECURITY_PANEL_ZONE_TYPE_GET" help="Security Panel Zone Type Get">
+            <param key="0x00" name="Zone Number" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="SECURITY_PANEL_ZONE_TYPE_REPORT" help="Security Panel Zone Type Report" comment="">
-            <param key="0x00" name="Zone Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Zone Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x04" name="SECURITY_PANEL_ZONE_TYPE_REPORT" help="Security Panel Zone Type Report">
+            <param key="0x00" name="Zone Number" type="BYTE" />
+            <param key="0x01" name="Zone Type" type="BYTE">
                 <bitflag key="0x01" flagname="Alarm Zone" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Notification Zone" flagmask="0x02" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x98" version="1" name="COMMAND_CLASS_SECURITY" help="Command Class Security" read_only="false" comment="">
-        <cmd key="0x06" name="NETWORK_KEY_SET" help="Network Key Set" comment="">
-            <param key="0x00" name="Network Key byte" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+    <cmd_class key="0x98" version="1" name="COMMAND_CLASS_SECURITY" help="Command Class Security 0">
+        <cmd key="0x06" name="NETWORK_KEY_SET" help="Network Key Set" support_mode="RX">
+            <param key="0x00" name="Network Key byte" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x07" name="NETWORK_KEY_VERIFY" help="Network Key Verify" comment="" />
-        <cmd key="0x02" name="SECURITY_COMMANDS_SUPPORTED_GET" help="Security Commands Supported Get" comment="" />
-        <cmd key="0x03" name="SECURITY_COMMANDS_SUPPORTED_REPORT" help="Security Commands Supported Report" comment="">
-            <param key="0x00" name="Reports to follow" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Command Class support" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_CLASS_REF">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x07" name="NETWORK_KEY_VERIFY" help="Network Key Verify" support_mode="TX" />
+        <cmd key="0x02" name="SECURITY_COMMANDS_SUPPORTED_GET" help="Security Commands Supported Get" support_mode="RX" />
+        <cmd key="0x03" name="SECURITY_COMMANDS_SUPPORTED_REPORT" help="Security Commands Supported Report" support_mode="TX">
+            <param key="0x00" name="Reports to follow" type="BYTE" />
+            <param key="0x01" name="Command Class support" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x02" name="COMMAND_CLASS_MARK" type="MARKER" typehashcode="0x0E" comment="The COMMAND_CLASS_MARK is used to indicate that all preceding command classes are supported and all following command classes are controlled.">
+            <param key="0x02" name="COMMAND_CLASS_MARK" type="MARKER" comment="The COMMAND_CLASS_MARK is used to indicate that all preceding command classes are supported and all following command classes are controlled.">
                 <const key="0x00" flagname="COMMAND_CLASS_MARK" flagmask="0xEF" />
             </param>
-            <param key="0x03" name="Command Class control" type="VARIANT" typehashcode="0x0C" comment="" encaptype="CMD_CLASS_REF">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x03" name="Command Class control" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x81" name="SECURITY_MESSAGE_ENCAPSULATION" help="Security Message Encapsulation" comment="">
-            <param key="0x00" name="Initialization Vector byte" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="8" is_ascii="false" showhex="true" />
+        <cmd key="0x81" name="SECURITY_MESSAGE_ENCAPSULATION" help="Security Message Encapsulation" support_mode="TX_RX">
+            <param key="0x00" name="Initialization Vector byte" type="ARRAY">
+                <arrayattrib key="0x00" len="8" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Sequence Counter" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Sequence Counter" fieldmask="0x0F" />
                 <bitflag key="0x01" flagname="Sequenced" flagmask="0x10" />
                 <bitflag key="0x02" flagname="Second Frame" flagmask="0x20" />
                 <bitfield key="0x03" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x04" name="Command byte" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Command byte" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x05" name="Receivers nonce Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Message Authentication Code byte" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="8" is_ascii="false" showhex="true" />
+            <param key="0x03" name="Receivers nonce Identifier" type="BYTE" />
+            <param key="0x04" name="Message Authentication Code byte" type="ARRAY">
+                <arrayattrib key="0x00" len="8" />
             </param>
         </cmd>
-        <cmd key="0xC1" name="SECURITY_MESSAGE_ENCAPSULATION_NONCE_GET" help="Security Message Encapsulation Nonce Get" comment="">
-            <param key="0x00" name="Initialization Vector byte" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="8" is_ascii="false" showhex="true" />
+        <cmd key="0xC1" name="SECURITY_MESSAGE_ENCAPSULATION_NONCE_GET" help="Security Message Encapsulation Nonce Get" support_mode="TX_RX">
+            <param key="0x00" name="Initialization Vector byte" type="ARRAY">
+                <arrayattrib key="0x00" len="8" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Sequence Counter" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Sequence Counter" fieldmask="0x0F" />
                 <bitflag key="0x01" flagname="Sequenced" flagmask="0x10" />
                 <bitflag key="0x02" flagname="Second Frame" flagmask="0x20" />
                 <bitfield key="0x03" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x04" name="Command byte" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x05" name="Receivers nonce Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Command byte" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x06" name="Message Authentication Code byte" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="8" is_ascii="false" showhex="true" />
+            <param key="0x03" name="Receivers nonce Identifier" type="BYTE" />
+            <param key="0x04" name="Message Authentication Code byte" type="ARRAY">
+                <arrayattrib key="0x00" len="8" />
             </param>
         </cmd>
-        <cmd key="0x40" name="SECURITY_NONCE_GET" help="Security Nonce Get" comment="" />
-        <cmd key="0x80" name="SECURITY_NONCE_REPORT" help="Security Nonce Report" comment="">
-            <param key="0x00" name="Nonce byte" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="8" is_ascii="false" showhex="true" />
+        <cmd key="0x40" name="SECURITY_NONCE_GET" help="Security Nonce Get" support_mode="TX_RX" />
+        <cmd key="0x80" name="SECURITY_NONCE_REPORT" help="Security Nonce Report" support_mode="TX_RX">
+            <param key="0x00" name="Nonce byte" type="ARRAY">
+                <arrayattrib key="0x00" len="8" />
             </param>
         </cmd>
-        <cmd key="0x04" name="SECURITY_SCHEME_GET" help="Security Scheme Get" comment="">
-            <param key="0x00" name="Supported Security Schemes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x04" name="SECURITY_SCHEME_GET" help="Security Scheme Get" support_mode="RX">
+            <param key="0x00" name="Supported Security Schemes" type="BYTE" />
         </cmd>
-        <cmd key="0x08" name="SECURITY_SCHEME_INHERIT" help="Security Scheme Inherit" comment="">
-            <param key="0x00" name="Supported Security Schemes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x08" name="SECURITY_SCHEME_INHERIT" help="Security Scheme Inherit" support_mode="RX">
+            <param key="0x00" name="Supported Security Schemes" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="SECURITY_SCHEME_REPORT" help="Security Scheme Report" comment="">
-            <param key="0x00" name="Supported Security Schemes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="SECURITY_SCHEME_REPORT" help="Security Scheme Report" support_mode="TX">
+            <param key="0x00" name="Supported Security Schemes" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x9C" version="1" name="COMMAND_CLASS_SENSOR_ALARM" help="Command Class Sensor Alarm" read_only="false" comment="SDS10963-4 The Sensor Alarm command class can be used to realize Sensor Alarms.">
-        <cmd key="0x01" name="SENSOR_ALARM_GET" help="Sensor Alarm Get" comment="">
-            <param key="0x00" name="Sensor Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x9C" version="1" name="COMMAND_CLASS_SENSOR_ALARM" help="Command Class Alarm Sensor" comment="SDS10963-4 The Sensor Alarm command class can be used to realize Sensor Alarms.">
+        <cmd key="0x01" name="SENSOR_ALARM_GET" help="Sensor Alarm Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="BYTE">
                 <bitflag key="0x01" flagname="General Purpose Alarm" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Smoke Alarm" flagmask="0x01" />
                 <bitflag key="0x03" flagname="CO Alarm" flagmask="0x02" />
@@ -8179,12 +8599,9 @@
                 <bitflag key="0x07" flagname="Return first Alarm on supported list" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="SENSOR_ALARM_REPORT" help="Sensor Alarm Report" comment="">
-            <param key="0x00" name="Source Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Sensor Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x02" name="SENSOR_ALARM_REPORT" help="Sensor Alarm Report" support_mode="TX">
+            <param key="0x00" name="Source Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Sensor Type" type="BYTE">
                 <bitflag key="0x01" flagname="General Purpose Alarm" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Smoke Alarm" flagmask="0x01" />
                 <bitflag key="0x03" flagname="CO Alarm" flagmask="0x02" />
@@ -8193,38 +8610,39 @@
                 <bitflag key="0x06" flagname="Water Leak Alarm" flagmask="0x05" />
                 <bitflag key="0x07" flagname="Return first Alarm on supported list" flagmask="0xFF" />
             </param>
-            <param key="0x02" name="Sensor State" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x02" name="Sensor State" type="BYTE">
                 <bitflag key="0x01" flagname="no alarm" flagmask="0x00" />
                 <bitflag key="0x02" flagname="alarm" flagmask="0xFF" />
             </param>
-            <param key="0x03" name="Seconds" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x03" name="Seconds" type="WORD" />
         </cmd>
-        <cmd key="0x03" name="SENSOR_ALARM_SUPPORTED_GET" help="Sensor Alarm Supported Get" comment="" />
-        <cmd key="0x04" name="SENSOR_ALARM_SUPPORTED_REPORT" help="Sensor Alarm Supported Report" comment="">
-            <param key="0x00" name="Number of Bit Masks" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Bit Mask" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+        <cmd key="0x03" name="SENSOR_ALARM_SUPPORTED_GET" help="Sensor Alarm Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="SENSOR_ALARM_SUPPORTED_REPORT" help="Sensor Alarm Supported Report" support_mode="TX">
+            <param key="0x00" name="Number of Bit Masks" type="BYTE" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0xFF" />
+                <bitflag key="0x00" flagname="General Purpose Alarm" flagmask="0x00" />
+                <bitflag key="0x01" flagname="Smoke Alarm" flagmask="0x01" />
+                <bitflag key="0x02" flagname="CO Alarm" flagmask="0x02" />
+                <bitflag key="0x03" flagname="CO2 Alarm" flagmask="0x03" />
+                <bitflag key="0x04" flagname="Heat Alarm" flagmask="0x04" />
+                <bitflag key="0x05" flagname="Water Leak Alarm" flagmask="0x05" />
+                <bitflag key="0x06" flagname="Return first Alarm on supported list" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x30" version="1" name="COMMAND_CLASS_SENSOR_BINARY" help="Command Class Sensor Binary" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x02" name="SENSOR_BINARY_GET" help="Sensor Binary Get" comment="" />
-        <cmd key="0x03" name="SENSOR_BINARY_REPORT" help="Sensor Binary Report" comment="">
-            <param key="0x00" name="Sensor Value" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x30" version="1" name="COMMAND_CLASS_SENSOR_BINARY" help="Command Class Binary Sensor" comment="[DEPRECATED]">
+        <cmd key="0x02" name="SENSOR_BINARY_GET" help="Sensor Binary Get" support_mode="RX" />
+        <cmd key="0x03" name="SENSOR_BINARY_REPORT" help="Sensor Binary Report" support_mode="TX">
+            <param key="0x00" name="Sensor Value" type="CONST">
                 <const key="0x00" flagname="idle" flagmask="0x00" />
                 <const key="0x01" flagname="detected an event" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x30" version="2" name="COMMAND_CLASS_SENSOR_BINARY" help="Command Class Sensor Binary" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x02" name="SENSOR_BINARY_GET" help="Sensor Binary Get" comment="">
-            <param key="0x00" name="Sensor Type" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x30" version="2" name="COMMAND_CLASS_SENSOR_BINARY" help="Command Class Binary Sensor" comment="[DEPRECATED]">
+        <cmd key="0x02" name="SENSOR_BINARY_GET" help="Sensor Binary Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="BYTE">
                 <bitflag key="0x01" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x02" flagname="General" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Smoke" flagmask="0x02" />
@@ -8242,13 +8660,12 @@
                 <bitflag key="0x0F" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SENSOR_BINARY_REPORT" help="Sensor Binary Report" comment="">
-            <param key="0x00" name="Sensor Value" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x03" name="SENSOR_BINARY_REPORT" help="Sensor Binary Report" support_mode="TX">
+            <param key="0x00" name="Sensor Value" type="CONST">
                 <const key="0x00" flagname="idle" flagmask="0x00" />
                 <const key="0x01" flagname="detected an event" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Sensor Type" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x01" name="Sensor Type" type="BYTE">
                 <bitflag key="0x01" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x02" flagname="General" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Smoke" flagmask="0x02" />
@@ -8266,10 +8683,10 @@
                 <bitflag key="0x0F" flagname="First" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SENSOR_BINARY_SUPPORTED_GET_SENSOR" help="Sensor Binary Supported Get Sensor" />
-        <cmd key="0x04" name="SENSOR_BINARY_SUPPORTED_SENSOR_REPORT" help="Sensor Binary Supported Sensor Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x01" name="SENSOR_BINARY_SUPPORTED_GET_SENSOR" help="Sensor Binary Supported Get Sensor" support_mode="RX" />
+        <cmd key="0x04" name="SENSOR_BINARY_SUPPORTED_SENSOR_REPORT" help="Sensor Binary Supported Sensor Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Reserved" flagmask="0x00" />
                 <bitflag key="0x01" flagname="General" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Smoke" flagmask="0x02" />
@@ -8288,11 +8705,10 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x9E" version="1" name="COMMAND_CLASS_SENSOR_CONFIGURATION" help="Command Class Sensor Configuration" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x02" name="SENSOR_TRIGGER_LEVEL_GET" help="Sensor Trigger Level Get" comment="" />
-        <cmd key="0x03" name="SENSOR_TRIGGER_LEVEL_REPORT" help="Sensor Trigger Level Report" comment="">
-            <param key="0x00" name="Sensor Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x9E" version="1" name="COMMAND_CLASS_SENSOR_CONFIGURATION" help="Command Class Sensor Configuration" comment="[OBSOLETED]">
+        <cmd key="0x02" name="SENSOR_TRIGGER_LEVEL_GET" help="Sensor Trigger Level Get" support_mode="RX" />
+        <cmd key="0x03" name="SENSOR_TRIGGER_LEVEL_REPORT" help="Sensor Trigger Level Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="BYTE">
                 <bitflag key="0x01" flagname="Temperature" flagmask="0x01" />
                 <bitflag key="0x02" flagname="General purpose value" flagmask="0x02" />
                 <bitflag key="0x03" flagname="Luminance" flagmask="0x03" />
@@ -8307,23 +8723,22 @@
                 <bitflag key="0x0C" flagname="Rain rate" flagmask="0x0C" />
                 <bitflag key="0x0D" flagname="Tide level" flagmask="0x0D" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Trigger Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Trigger Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SENSOR_TRIGGER_LEVEL_SET" help="Sensor Trigger Level Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x01" name="SENSOR_TRIGGER_LEVEL_SET" help="Sensor Trigger Level Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Current" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Default" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Sensor Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x01" name="Sensor Type" type="BYTE">
                 <bitflag key="0x01" flagname="Temperature" flagmask="0x01" />
                 <bitflag key="0x02" flagname="General purpose value" flagmask="0x02" />
                 <bitflag key="0x03" flagname="Luminance" flagmask="0x03" />
@@ -8338,79 +8753,189 @@
                 <bitflag key="0x0C" flagname="Rain rate" flagmask="0x0C" />
                 <bitflag key="0x0D" flagname="Tide level" flagmask="0x0D" />
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x03" name="Trigger Value" type="VARIANT">
+                <variant paramoffs="2" sizemask="0x07" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x31" version="1" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Sensor Multilevel Get" support_mode="RX" />
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Sensor Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
+                <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
+                <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
+                <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
+            </param>
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x31" version="2" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Sensor Multilevel Get" support_mode="RX" />
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Sensor Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
+                <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
+                <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
+                <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
+                <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
+                <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
+            </param>
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x03" name="Trigger Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="2" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="1" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Sensor Multilevel Get" comment="" />
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Sensor Multilevel Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x31" version="3" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Sensor Multilevel Get" support_mode="RX" />
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Sensor Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
+                <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
+                <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
+                <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
+                <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
+                <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
+                <const key="0x10" flagname="CO2-level (version 3)" flagmask="0x11" />
+                <const key="0x11" flagname="Air flow (version 3)" flagmask="0x12" />
+                <const key="0x12" flagname="Tank capacity (version 3)" flagmask="0x13" />
+                <const key="0x13" flagname="Distance (version 3)" flagmask="0x14" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="2" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Sensor Multilevel Get" comment="" />
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Sensor Multilevel Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x31" version="4" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Sensor Multilevel Get" support_mode="RX" />
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Sensor Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
+                <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
+                <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
+                <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
+                <const key="0x10" flagname="CO2-level (version 3)" flagmask="0x11" />
+                <const key="0x11" flagname="Air flow (version 3)" flagmask="0x12" />
+                <const key="0x12" flagname="Tank capacity (version 3)" flagmask="0x13" />
+                <const key="0x13" flagname="Distance (version 3)" flagmask="0x14" />
+                <const key="0x14" flagname="Angle Position (version 4)" flagmask="0x15" />
+            </param>
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="3" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Sensor Multilevel Get" comment="" />
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Sensor Multilevel Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x31" version="5" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
+                <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
+                <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
+                <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
+                <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
+                <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
+                <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
+                <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
+                <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
+                <const key="0x10" flagname="CO2-level (version 3)" flagmask="0x11" />
+                <const key="0x11" flagname="Air flow (version 3)" flagmask="0x12" />
+                <const key="0x12" flagname="Tank capacity (version 3)" flagmask="0x13" />
+                <const key="0x13" flagname="Distance (version 3)" flagmask="0x14" />
+                <const key="0x14" flagname="Angle Position (version 4)" flagmask="0x15" />
+                <const key="0x15" flagname="Rotation (v5)" flagmask="0x16" />
+                <const key="0x16" flagname="Water temperature (v5)" flagmask="0x17" />
+                <const key="0x17" flagname="Soil temperature (v5)" flagmask="0x18" />
+                <const key="0x18" flagname="Seismic intensity (v5)" flagmask="0x19" />
+                <const key="0x19" flagname="Seismic magnitude (v5)" flagmask="0x1A" />
+                <const key="0x1A" flagname="Ultraviolet (v5)" flagmask="0x1B" />
+                <const key="0x1B" flagname="Electrical resistivity (v5)" flagmask="0x1C" />
+                <const key="0x1C" flagname="Electrical conductivity (v5)" flagmask="0x1D" />
+                <const key="0x1D" flagname="Loudness (v5)" flagmask="0x1E" />
+                <const key="0x1E" flagname="Moisture (v5)" flagmask="0x1F" />
+            </param>
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
+                <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
+            </param>
+        </cmd>
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8418,34 +8943,114 @@
                 <const key="0x11" flagname="Air flow (version 3)" flagmask="0x12" />
                 <const key="0x12" flagname="Tank capacity (version 3)" flagmask="0x13" />
                 <const key="0x13" flagname="Distance (version 3)" flagmask="0x14" />
+                <const key="0x14" flagname="Angle Position (version 4)" flagmask="0x15" />
+                <const key="0x15" flagname="Rotation (v5)" flagmask="0x16" />
+                <const key="0x16" flagname="Water temperature (v5)" flagmask="0x17" />
+                <const key="0x17" flagname="Soil temperature (v5)" flagmask="0x18" />
+                <const key="0x18" flagname="Seismic intensity (v5)" flagmask="0x19" />
+                <const key="0x19" flagname="Seismic magnitude (v5)" flagmask="0x1A" />
+                <const key="0x1A" flagname="Ultraviolet (v5)" flagmask="0x1B" />
+                <const key="0x1B" flagname="Electrical resistivity (v5)" flagmask="0x1C" />
+                <const key="0x1C" flagname="Electrical conductivity (v5)" flagmask="0x1D" />
+                <const key="0x1D" flagname="Loudness (v5)" flagmask="0x1E" />
+                <const key="0x1E" flagname="Moisture (v5)" flagmask="0x1F" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
+            </param>
+        </cmd>
+        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" support_mode="RX" />
+        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
+                <bitflag key="0x00" flagname="Air temperature" flagmask="0x01" />
+                <bitflag key="0x01" flagname="General purpose value" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Luminance" flagmask="0x03" />
+                <bitflag key="0x03" flagname="Power" flagmask="0x04" />
+                <bitflag key="0x04" flagname="Humidity" flagmask="0x05" />
+                <bitflag key="0x05" flagname="Velocity" flagmask="0x06" />
+                <bitflag key="0x06" flagname="Direction" flagmask="0x07" />
+                <bitflag key="0x07" flagname="Atmospheric pressure" flagmask="0x08" />
+                <bitflag key="0x08" flagname="Barometric pressure" flagmask="0x09" />
+                <bitflag key="0x09" flagname="Solar radiation" flagmask="0x0A" />
+                <bitflag key="0x0A" flagname="Dew point" flagmask="0x0B" />
+                <bitflag key="0x0B" flagname="Rain rate" flagmask="0x0C" />
+                <bitflag key="0x0C" flagname="Tide level" flagmask="0x0D" />
+                <bitflag key="0x0D" flagname="Weight" flagmask="0x0E" />
+                <bitflag key="0x0E" flagname="Voltage" flagmask="0x0F" />
+                <bitflag key="0x0F" flagname="Current" flagmask="0x10" />
+                <bitflag key="0x10" flagname="CO2-level" flagmask="0x11" />
+                <bitflag key="0x11" flagname="Air flow" flagmask="0x12" />
+                <bitflag key="0x12" flagname="Tank capacity" flagmask="0x13" />
+                <bitflag key="0x13" flagname="Distance" flagmask="0x14" />
+                <bitflag key="0x14" flagname="Angle Position" flagmask="0x15" />
+                <bitflag key="0x15" flagname="Rotation" flagmask="0x16" />
+                <bitflag key="0x16" flagname="Water temperature" flagmask="0x17" />
+                <bitflag key="0x17" flagname="Soil temperature" flagmask="0x18" />
+                <bitflag key="0x18" flagname="Seismic intensity" flagmask="0x19" />
+                <bitflag key="0x19" flagname="Seismic magnitude" flagmask="0x1A" />
+                <bitflag key="0x1A" flagname="Ultraviolet" flagmask="0x1B" />
+                <bitflag key="0x1B" flagname="Electrical resistivity" flagmask="0x1C" />
+                <bitflag key="0x1C" flagname="Electrical conductivity" flagmask="0x1D" />
+                <bitflag key="0x1D" flagname="Loudness" flagmask="0x1E" />
+                <bitflag key="0x1E" flagname="Moisture" flagmask="0x1F" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
+                <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
+                <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
+                <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
+                <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
+                <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
+                <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
+                <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
+                <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
+                <const key="0x10" flagname="CO2-level (version 3)" flagmask="0x11" />
+                <const key="0x11" flagname="Air flow (version 3)" flagmask="0x12" />
+                <const key="0x12" flagname="Tank capacity (version 3)" flagmask="0x13" />
+                <const key="0x13" flagname="Distance (version 3)" flagmask="0x14" />
+                <const key="0x14" flagname="Angle Position (version 4)" flagmask="0x15" />
+                <const key="0x15" flagname="Rotation (v5)" flagmask="0x16" />
+                <const key="0x16" flagname="Water temperature (v5)" flagmask="0x17" />
+                <const key="0x17" flagname="Soil temperature (v5)" flagmask="0x18" />
+                <const key="0x18" flagname="Seismic intensity (v5)" flagmask="0x19" />
+                <const key="0x19" flagname="Seismic magnitude (v5)" flagmask="0x1A" />
+                <const key="0x1A" flagname="Ultraviolet (v5)" flagmask="0x1B" />
+                <const key="0x1B" flagname="Electrical resistivity (v5)" flagmask="0x1C" />
+                <const key="0x1C" flagname="Electrical conductivity (v5)" flagmask="0x1D" />
+                <const key="0x1D" flagname="Loudness (v5)" flagmask="0x1E" />
+                <const key="0x1E" flagname="Moisture (v5)" flagmask="0x1F" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x31" version="4" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Sensor Multilevel Get" comment="" />
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Sensor Multilevel Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8454,33 +9059,39 @@
                 <const key="0x12" flagname="Tank capacity (version 3)" flagmask="0x13" />
                 <const key="0x13" flagname="Distance (version 3)" flagmask="0x14" />
                 <const key="0x14" flagname="Angle Position (version 4)" flagmask="0x15" />
+                <const key="0x15" flagname="Rotation (v5)" flagmask="0x16" />
+                <const key="0x16" flagname="Water temperature (v5)" flagmask="0x17" />
+                <const key="0x17" flagname="Soil temperature (v5)" flagmask="0x18" />
+                <const key="0x18" flagname="Seismic intensity (v5)" flagmask="0x19" />
+                <const key="0x19" flagname="Seismic magnitude (v5)" flagmask="0x1A" />
+                <const key="0x1A" flagname="Ultraviolet (v5)" flagmask="0x1B" />
+                <const key="0x1B" flagname="Electrical resistivity (v5)" flagmask="0x1C" />
+                <const key="0x1C" flagname="Electrical conductivity (v5)" flagmask="0x1D" />
+                <const key="0x1D" flagname="Loudness (v5)" flagmask="0x1E" />
+                <const key="0x1E" flagname="Moisture (v5)" flagmask="0x1F" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
-                <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
-                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="5" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x31" version="6" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8499,28 +9110,31 @@
                 <const key="0x1C" flagname="Electrical conductivity (v5)" flagmask="0x1D" />
                 <const key="0x1D" flagname="Loudness (v5)" flagmask="0x1E" />
                 <const key="0x1E" flagname="Moisture (v5)" flagmask="0x1F" />
+                <const key="0x1F" flagname="Frequency (v6)" flagmask="0x20" />
+                <const key="0x20" flagname="Time (v6)" flagmask="0x21" />
+                <const key="0x21" flagname="Target Temperature (v6)" flagmask="0x22" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8539,20 +9153,23 @@
                 <const key="0x1C" flagname="Electrical conductivity (v5)" flagmask="0x1D" />
                 <const key="0x1D" flagname="Loudness (v5)" flagmask="0x1E" />
                 <const key="0x1E" flagname="Moisture (v5)" flagmask="0x1F" />
+                <const key="0x1F" flagname="Frequency (v6)" flagmask="0x20" />
+                <const key="0x20" flagname="Time (v6)" flagmask="0x21" />
+                <const key="0x21" flagname="Target Temperature (v6)" flagmask="0x22" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" />
-        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" support_mode="RX" />
+        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Air temperature" flagmask="0x01" />
                 <bitflag key="0x01" flagname="General purpose value" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Luminance" flagmask="0x03" />
@@ -8584,23 +9201,26 @@
                 <bitflag key="0x1C" flagname="Electrical conductivity" flagmask="0x1D" />
                 <bitflag key="0x1D" flagname="Loudness" flagmask="0x1E" />
                 <bitflag key="0x1E" flagname="Moisture" flagmask="0x1F" />
+                <bitflag key="0x1F" flagname="Frequency" flagmask="0x20" />
+                <bitflag key="0x20" flagname="Time" flagmask="0x21" />
+                <bitflag key="0x21" flagname="Target Temperature" flagmask="0x22" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8619,23 +9239,26 @@
                 <const key="0x1C" flagname="Electrical conductivity (v5)" flagmask="0x1D" />
                 <const key="0x1D" flagname="Loudness (v5)" flagmask="0x1E" />
                 <const key="0x1E" flagname="Moisture (v5)" flagmask="0x1F" />
+                <const key="0x1F" flagname="Frequency (v6)" flagmask="0x20" />
+                <const key="0x20" flagname="Time (v6)" flagmask="0x21" />
+                <const key="0x21" flagname="Target Temperature (v6)" flagmask="0x22" />
             </param>
         </cmd>
-        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8654,29 +9277,32 @@
                 <const key="0x1C" flagname="Electrical conductivity (v5)" flagmask="0x1D" />
                 <const key="0x1D" flagname="Loudness (v5)" flagmask="0x1E" />
                 <const key="0x1E" flagname="Moisture (v5)" flagmask="0x1F" />
+                <const key="0x1F" flagname="Frequency (v6)" flagmask="0x20" />
+                <const key="0x20" flagname="Time (v6)" flagmask="0x21" />
+                <const key="0x21" flagname="Target Temperature (v6)" flagmask="0x22" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="6" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x31" version="7" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8698,28 +9324,45 @@
                 <const key="0x1F" flagname="Frequency (v6)" flagmask="0x20" />
                 <const key="0x20" flagname="Time (v6)" flagmask="0x21" />
                 <const key="0x21" flagname="Target Temperature (v6)" flagmask="0x22" />
+                <const key="0x22" flagname="Particulate Matter 2.5 (v7)" flagmask="0x23" />
+                <const key="0x23" flagname="Formaldehyde CH2O-level (v7)" flagmask="0x24" />
+                <const key="0x24" flagname="Radon Concentration (v7)" flagmask="0x25" />
+                <const key="0x25" flagname="Methane Density CH4 (v7)" flagmask="0x26" />
+                <const key="0x26" flagname="Volatile Organic Compound (v7)" flagmask="0x27" />
+                <const key="0x27" flagname="Carbon Monoxide CO-level (v7)" flagmask="0x28" />
+                <const key="0x28" flagname="Soil Humidity (v7)" flagmask="0x29" />
+                <const key="0x29" flagname="Soil Reactivity (v7)" flagmask="0x2A" />
+                <const key="0x2A" flagname="Soil Salinity (v7)" flagmask="0x2B" />
+                <const key="0x2B" flagname="Heart Rate (v7)" flagmask="0x2C" />
+                <const key="0x2C" flagname="Blood Pressure (v7)" flagmask="0x2D" />
+                <const key="0x2D" flagname="Muscle Mass (v7)" flagmask="0x2E" />
+                <const key="0x2E" flagname="Fat Mass (v7)" flagmask="0x2F" />
+                <const key="0x2F" flagname="Bone Mass (v7)" flagmask="0x30" />
+                <const key="0x30" flagname="Total Body Water, TBW (v7)" flagmask="0x31" />
+                <const key="0x31" flagname="Basic Metabolic Rate, BMR (v7)" flagmask="0x32" />
+                <const key="0x32" flagname="Body Mass Index, BMI (v7)" flagmask="0x33" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8741,20 +9384,37 @@
                 <const key="0x1F" flagname="Frequency (v6)" flagmask="0x20" />
                 <const key="0x20" flagname="Time (v6)" flagmask="0x21" />
                 <const key="0x21" flagname="Target Temperature (v6)" flagmask="0x22" />
+                <const key="0x22" flagname="Particulate Matter 2.5 (v7)" flagmask="0x23" />
+                <const key="0x23" flagname="Formaldehyde CH2O-level (v7)" flagmask="0x24" />
+                <const key="0x24" flagname="Radon Concentration (v7)" flagmask="0x25" />
+                <const key="0x25" flagname="Methane Density CH4 (v7)" flagmask="0x26" />
+                <const key="0x26" flagname="Volatile Organic Compound (v7)" flagmask="0x27" />
+                <const key="0x27" flagname="Carbon Monoxide CO-level (v7)" flagmask="0x28" />
+                <const key="0x28" flagname="Soil Humidity (v7)" flagmask="0x29" />
+                <const key="0x29" flagname="Soil Reactivity (v7)" flagmask="0x2A" />
+                <const key="0x2A" flagname="Soil Salinity (v7)" flagmask="0x2B" />
+                <const key="0x2B" flagname="Heart Rate (v7)" flagmask="0x2C" />
+                <const key="0x2C" flagname="Blood Pressure (v7)" flagmask="0x2D" />
+                <const key="0x2D" flagname="Muscle Mass (v7)" flagmask="0x2E" />
+                <const key="0x2E" flagname="Fat Mass (v7)" flagmask="0x2F" />
+                <const key="0x2F" flagname="Bone Mass (v7)" flagmask="0x30" />
+                <const key="0x30" flagname="Total Body Water, TBW (v7)" flagmask="0x31" />
+                <const key="0x31" flagname="Basic Metabolic Rate, BMR (v7)" flagmask="0x32" />
+                <const key="0x32" flagname="Body Mass Index, BMI (v7)" flagmask="0x33" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" />
-        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" support_mode="RX" />
+        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Air temperature" flagmask="0x01" />
                 <bitflag key="0x01" flagname="General purpose value" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Luminance" flagmask="0x03" />
@@ -8789,23 +9449,40 @@
                 <bitflag key="0x1F" flagname="Frequency" flagmask="0x20" />
                 <bitflag key="0x20" flagname="Time" flagmask="0x21" />
                 <bitflag key="0x21" flagname="Target Temperature" flagmask="0x22" />
+                <bitflag key="0x22" flagname="Particulate Matter 2.5" flagmask="0x23" />
+                <bitflag key="0x23" flagname="Formaldehyde CH2O-level" flagmask="0x24" />
+                <bitflag key="0x24" flagname="Radon Concentration" flagmask="0x25" />
+                <bitflag key="0x25" flagname="Methane Density CH4" flagmask="0x26" />
+                <bitflag key="0x26" flagname="Volatile Organic Compound" flagmask="0x27" />
+                <bitflag key="0x27" flagname="Carbon Monoxide CO-level" flagmask="0x28" />
+                <bitflag key="0x28" flagname="Soil Humidity" flagmask="0x29" />
+                <bitflag key="0x29" flagname="Soil Reactivity" flagmask="0x2A" />
+                <bitflag key="0x2A" flagname="Soil Salinity" flagmask="0x2B" />
+                <bitflag key="0x2B" flagname="Heart Rate" flagmask="0x2C" />
+                <bitflag key="0x2C" flagname="Blood Pressure" flagmask="0x2D" />
+                <bitflag key="0x2D" flagname="Muscle Mass" flagmask="0x2E" />
+                <bitflag key="0x2E" flagname="Fat Mass" flagmask="0x2F" />
+                <bitflag key="0x2F" flagname="Bone Mass" flagmask="0x30" />
+                <bitflag key="0x30" flagname="Total Body Water, TBW" flagmask="0x31" />
+                <bitflag key="0x31" flagname="Basic Metabolic Rate, BMR" flagmask="0x32" />
+                <bitflag key="0x32" flagname="Body Mass Index, BMI" flagmask="0x33" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8827,23 +9504,40 @@
                 <const key="0x1F" flagname="Frequency (v6)" flagmask="0x20" />
                 <const key="0x20" flagname="Time (v6)" flagmask="0x21" />
                 <const key="0x21" flagname="Target Temperature (v6)" flagmask="0x22" />
+                <const key="0x22" flagname="Particulate Matter 2.5 (v7)" flagmask="0x23" />
+                <const key="0x23" flagname="Formaldehyde CH2O-level (v7)" flagmask="0x24" />
+                <const key="0x24" flagname="Radon Concentration (v7)" flagmask="0x25" />
+                <const key="0x25" flagname="Methane Density CH4 (v7)" flagmask="0x26" />
+                <const key="0x26" flagname="Volatile Organic Compound (v7)" flagmask="0x27" />
+                <const key="0x27" flagname="Carbon Monoxide CO-level (v7)" flagmask="0x28" />
+                <const key="0x28" flagname="Soil Humidity (v7)" flagmask="0x29" />
+                <const key="0x29" flagname="Soil Reactivity (v7)" flagmask="0x2A" />
+                <const key="0x2A" flagname="Soil Salinity (v7)" flagmask="0x2B" />
+                <const key="0x2B" flagname="Heart Rate (v7)" flagmask="0x2C" />
+                <const key="0x2C" flagname="Blood Pressure (v7)" flagmask="0x2D" />
+                <const key="0x2D" flagname="Muscle Mass (v7)" flagmask="0x2E" />
+                <const key="0x2E" flagname="Fat Mass (v7)" flagmask="0x2F" />
+                <const key="0x2F" flagname="Bone Mass (v7)" flagmask="0x30" />
+                <const key="0x30" flagname="Total Body Water, TBW (v7)" flagmask="0x31" />
+                <const key="0x31" flagname="Basic Metabolic Rate, BMR (v7)" flagmask="0x32" />
+                <const key="0x32" flagname="Body Mass Index, BMI (v7)" flagmask="0x33" />
             </param>
         </cmd>
-        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8865,29 +9559,46 @@
                 <const key="0x1F" flagname="Frequency (v6)" flagmask="0x20" />
                 <const key="0x20" flagname="Time (v6)" flagmask="0x21" />
                 <const key="0x21" flagname="Target Temperature (v6)" flagmask="0x22" />
+                <const key="0x22" flagname="Particulate Matter 2.5 (v7)" flagmask="0x23" />
+                <const key="0x23" flagname="Formaldehyde CH2O-level (v7)" flagmask="0x24" />
+                <const key="0x24" flagname="Radon Concentration (v7)" flagmask="0x25" />
+                <const key="0x25" flagname="Methane Density CH4 (v7)" flagmask="0x26" />
+                <const key="0x26" flagname="Volatile Organic Compound (v7)" flagmask="0x27" />
+                <const key="0x27" flagname="Carbon Monoxide CO-level (v7)" flagmask="0x28" />
+                <const key="0x28" flagname="Soil Humidity (v7)" flagmask="0x29" />
+                <const key="0x29" flagname="Soil Reactivity (v7)" flagmask="0x2A" />
+                <const key="0x2A" flagname="Soil Salinity (v7)" flagmask="0x2B" />
+                <const key="0x2B" flagname="Heart Rate (v7)" flagmask="0x2C" />
+                <const key="0x2C" flagname="Blood Pressure (v7)" flagmask="0x2D" />
+                <const key="0x2D" flagname="Muscle Mass (v7)" flagmask="0x2E" />
+                <const key="0x2E" flagname="Fat Mass (v7)" flagmask="0x2F" />
+                <const key="0x2F" flagname="Bone Mass (v7)" flagmask="0x30" />
+                <const key="0x30" flagname="Total Body Water, TBW (v7)" flagmask="0x31" />
+                <const key="0x31" flagname="Basic Metabolic Rate, BMR (v7)" flagmask="0x32" />
+                <const key="0x32" flagname="Body Mass Index, BMI (v7)" flagmask="0x33" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="7" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x31" version="8" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8926,28 +9637,32 @@
                 <const key="0x30" flagname="Total Body Water, TBW (v7)" flagmask="0x31" />
                 <const key="0x31" flagname="Basic Metabolic Rate, BMR (v7)" flagmask="0x32" />
                 <const key="0x32" flagname="Body Mass Index, BMI (v7)" flagmask="0x33" />
+                <const key="0x33" flagname="Acceleration X-axis (v8)" flagmask="0x34" />
+                <const key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
+                <const key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
+                <const key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -8986,20 +9701,24 @@
                 <const key="0x30" flagname="Total Body Water, TBW (v7)" flagmask="0x31" />
                 <const key="0x31" flagname="Basic Metabolic Rate, BMR (v7)" flagmask="0x32" />
                 <const key="0x32" flagname="Body Mass Index, BMI (v7)" flagmask="0x33" />
+                <const key="0x33" flagname="Acceleration X-axis (v8)" flagmask="0x34" />
+                <const key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
+                <const key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
+                <const key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" />
-        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" support_mode="RX" />
+        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Air temperature" flagmask="0x01" />
                 <bitflag key="0x01" flagname="General purpose value" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Luminance" flagmask="0x03" />
@@ -9051,23 +9770,27 @@
                 <bitflag key="0x30" flagname="Total Body Water, TBW" flagmask="0x31" />
                 <bitflag key="0x31" flagname="Basic Metabolic Rate, BMR" flagmask="0x32" />
                 <bitflag key="0x32" flagname="Body Mass Index, BMI" flagmask="0x33" />
+                <bitflag key="0x33" flagname="Acceleration X-axis (v8)" flagmask="0x34" />
+                <bitflag key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
+                <bitflag key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
+                <bitflag key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9106,23 +9829,27 @@
                 <const key="0x30" flagname="Total Body Water, TBW (v7)" flagmask="0x31" />
                 <const key="0x31" flagname="Basic Metabolic Rate, BMR (v7)" flagmask="0x32" />
                 <const key="0x32" flagname="Body Mass Index, BMI (v7)" flagmask="0x33" />
+                <const key="0x33" flagname="Acceleration X-axis (v8)" flagmask="0x34" />
+                <const key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
+                <const key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
+                <const key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
             </param>
         </cmd>
-        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9161,29 +9888,33 @@
                 <const key="0x30" flagname="Total Body Water, TBW (v7)" flagmask="0x31" />
                 <const key="0x31" flagname="Basic Metabolic Rate, BMR (v7)" flagmask="0x32" />
                 <const key="0x32" flagname="Body Mass Index, BMI (v7)" flagmask="0x33" />
+                <const key="0x33" flagname="Acceleration X-axis (v8)" flagmask="0x34" />
+                <const key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
+                <const key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
+                <const key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="8" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x31" version="9" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9226,28 +9957,31 @@
                 <const key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
                 <const key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
                 <const key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
+                <const key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
+                <const key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
+                <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9290,20 +10024,23 @@
                 <const key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
                 <const key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
                 <const key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
+                <const key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
+                <const key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
+                <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" />
-        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" support_mode="RX" />
+        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Air temperature" flagmask="0x01" />
                 <bitflag key="0x01" flagname="General purpose value" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Luminance" flagmask="0x03" />
@@ -9359,23 +10096,26 @@
                 <bitflag key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
                 <bitflag key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
                 <bitflag key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
+                <bitflag key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
+                <bitflag key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
+                <bitflag key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9418,23 +10158,26 @@
                 <const key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
                 <const key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
                 <const key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
+                <const key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
+                <const key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
+                <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
             </param>
         </cmd>
-        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9477,29 +10220,32 @@
                 <const key="0x34" flagname="Acceleration Y-axis (v8)" flagmask="0x35" />
                 <const key="0x35" flagname="Acceleration Z-axis (v8)" flagmask="0x36" />
                 <const key="0x36" flagname="Smoke Density (v8)" flagmask="0x37" />
+                <const key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
+                <const key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
+                <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="9" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x31" version="10" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9545,28 +10291,30 @@
                 <const key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
                 <const key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
                 <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
+                <const key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
+                <const key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9612,20 +10360,22 @@
                 <const key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
                 <const key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
                 <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
+                <const key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
+                <const key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
             </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" />
-        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" support_mode="RX" />
+        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Air temperature" flagmask="0x01" />
                 <bitflag key="0x01" flagname="General purpose value" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Luminance" flagmask="0x03" />
@@ -9684,23 +10434,25 @@
                 <bitflag key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
                 <bitflag key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
                 <bitflag key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
+                <bitflag key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
+                <bitflag key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9746,23 +10498,25 @@
                 <const key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
                 <const key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
                 <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
+                <const key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
+                <const key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
             </param>
         </cmd>
-        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9808,29 +10562,31 @@
                 <const key="0x37" flagname="Water Flow (v9)" flagmask="0x38" />
                 <const key="0x38" flagname="Water Pressure (v9)" flagmask="0x39" />
                 <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
+                <const key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
+                <const key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x31" version="10" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Sensor Multilevel" read_only="false" comment="">
-        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x31" version="11" name="COMMAND_CLASS_SENSOR_MULTILEVEL" help="Command Class Multilevel Sensor">
+        <cmd key="0x04" name="SENSOR_MULTILEVEL_GET" help="Multilevel Sensor Get" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9878,28 +10634,48 @@
                 <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
                 <const key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
                 <const key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" shifter="0" />
+                <const key="0x3C" flagname="Relative Modulation level" flagmask="0x3D" />
+                <const key="0x3D" flagname="Boiler water temperature" flagmask="0x3E" />
+                <const key="0x3E" flagname="Domestic Hot Water temperature" flagmask="0x3F" />
+                <const key="0x3F" flagname="Outside temperature" flagmask="0x40" />
+                <const key="0x40" flagname="Exhaust temperature" flagmask="0x41" />
+                <const key="0x41" flagname="Water Chlorine level" flagmask="0x42" />
+                <const key="0x42" flagname="Water acidity" flagmask="0x43" />
+                <const key="0x43" flagname="Water Oxidation reduction potential" flagmask="0x44" />
+                <const key="0x44" flagname="Heart Rate LF/HF ratio" flagmask="0x45" />
+                <const key="0x45" flagname="Motion Direction" flagmask="0x46" />
+                <const key="0x46" flagname="Applied force on the sensor" flagmask="0x47" />
+                <const key="0x47" flagname="Return Air temperature" flagmask="0x48" />
+                <const key="0x48" flagname="Supply Air temperature" flagmask="0x49" />
+                <const key="0x49" flagname="Condenser Coil temperature" flagmask="0x4A" />
+                <const key="0x4A" flagname="Evaporator Coil temperature" flagmask="0x4B" />
+                <const key="0x4B" flagname="Liquid Line temperature" flagmask="0x4C" />
+                <const key="0x4C" flagname="Discharge Line temperature" flagmask="0x4D" />
+                <const key="0x4D" flagname="Suction Pressure" flagmask="0x4E" />
+                <const key="0x4E" flagname="Discharge Pressure" flagmask="0x4F" />
+                <const key="0x4F" flagname="Defrost temperature" flagmask="0x50" />
+            </param>
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" comment="">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x05" name="SENSOR_MULTILEVEL_REPORT" help="Multilevel Sensor Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -9947,20 +10723,40 @@
                 <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
                 <const key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
                 <const key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
-            </param>
-            <param key="0x01" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+                <const key="0x3C" flagname="Relative Modulation level" flagmask="0x3D" />
+                <const key="0x3D" flagname="Boiler water temperature" flagmask="0x3E" />
+                <const key="0x3E" flagname="Domestic Hot Water temperature" flagmask="0x3F" />
+                <const key="0x3F" flagname="Outside temperature" flagmask="0x40" />
+                <const key="0x40" flagname="Exhaust temperature" flagmask="0x41" />
+                <const key="0x41" flagname="Water Chlorine level" flagmask="0x42" />
+                <const key="0x42" flagname="Water acidity" flagmask="0x43" />
+                <const key="0x43" flagname="Water Oxidation reduction potential" flagmask="0x44" />
+                <const key="0x44" flagname="Heart Rate LF/HF ratio" flagmask="0x45" />
+                <const key="0x45" flagname="Motion Direction" flagmask="0x46" />
+                <const key="0x46" flagname="Applied force on the sensor" flagmask="0x47" />
+                <const key="0x47" flagname="Return Air temperature" flagmask="0x48" />
+                <const key="0x48" flagname="Supply Air temperature" flagmask="0x49" />
+                <const key="0x49" flagname="Condenser Coil temperature" flagmask="0x4A" />
+                <const key="0x4A" flagname="Evaporator Coil temperature" flagmask="0x4B" />
+                <const key="0x4B" flagname="Liquid Line temperature" flagmask="0x4C" />
+                <const key="0x4C" flagname="Discharge Line temperature" flagmask="0x4D" />
+                <const key="0x4D" flagname="Suction Pressure" flagmask="0x4E" />
+                <const key="0x4E" flagname="Discharge Pressure" flagmask="0x4F" />
+                <const key="0x4F" flagname="Defrost temperature" flagmask="0x50" />
+            </param>
+            <param key="0x01" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Sensor Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Sensor Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" />
-        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x01" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SENSOR" help="Multilevel Sensor Get Supported Sensor" support_mode="RX" />
+        <cmd key="0x02" name="SENSOR_MULTILEVEL_SUPPORTED_SENSOR_REPORT" help="Multilevel Sensor Supported Sensor Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Air temperature" flagmask="0x01" />
                 <bitflag key="0x01" flagname="General purpose value" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Luminance" flagmask="0x03" />
@@ -10021,23 +10817,28 @@
                 <bitflag key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
                 <bitflag key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
                 <bitflag key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
+                <bitflag key="0x3C" flagname="Relative Modulation level" flagmask="0x3D" />
+                <bitflag key="0x3D" flagname="Boiler water temperature" flagmask="0x3E" />
+                <bitflag key="0x3E" flagname="Domestic Hot Water temperature" flagmask="0x3F" />
+                <bitflag key="0x3F" flagname="Outside temperature" flagmask="0x40" />
+                <bitflag key="0x40" flagname="Exhaust temperature" flagmask="0x41" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x03" name="SENSOR_MULTILEVEL_SUPPORTED_GET_SCALE" help="Multilevel Sensor Get Supported Scale" support_mode="RX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -10085,23 +10886,43 @@
                 <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
                 <const key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
                 <const key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
-            </param>
-        </cmd>
-        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report">
-            <param key="0x00" name="Sensor Type" type="CONST" typehashcode="0x0B">
+                <const key="0x3C" flagname="Relative Modulation level" flagmask="0x3D" />
+                <const key="0x3D" flagname="Boiler water temperature" flagmask="0x3E" />
+                <const key="0x3E" flagname="Domestic Hot Water temperature" flagmask="0x3F" />
+                <const key="0x3F" flagname="Outside temperature" flagmask="0x40" />
+                <const key="0x40" flagname="Exhaust temperature" flagmask="0x41" />
+                <const key="0x41" flagname="Water Chlorine level" flagmask="0x42" />
+                <const key="0x42" flagname="Water acidity" flagmask="0x43" />
+                <const key="0x43" flagname="Water Oxidation reduction potential" flagmask="0x44" />
+                <const key="0x44" flagname="Heart Rate LF/HF ratio" flagmask="0x45" />
+                <const key="0x45" flagname="Motion Direction" flagmask="0x46" />
+                <const key="0x46" flagname="Applied force on the sensor" flagmask="0x47" />
+                <const key="0x47" flagname="Return Air temperature" flagmask="0x48" />
+                <const key="0x48" flagname="Supply Air temperature" flagmask="0x49" />
+                <const key="0x49" flagname="Condenser Coil temperature" flagmask="0x4A" />
+                <const key="0x4A" flagname="Evaporator Coil temperature" flagmask="0x4B" />
+                <const key="0x4B" flagname="Liquid Line temperature" flagmask="0x4C" />
+                <const key="0x4C" flagname="Discharge Line temperature" flagmask="0x4D" />
+                <const key="0x4D" flagname="Suction Pressure" flagmask="0x4E" />
+                <const key="0x4E" flagname="Discharge Pressure" flagmask="0x4F" />
+                <const key="0x4F" flagname="Defrost temperature" flagmask="0x50" />
+            </param>
+        </cmd>
+        <cmd key="0x06" name="SENSOR_MULTILEVEL_SUPPORTED_SCALE_REPORT" help="Multilevel Sensor Supported Scale Report" support_mode="TX">
+            <param key="0x00" name="Sensor Type" type="CONST">
                 <const key="0x00" flagname="Temperature (version 1)" flagmask="0x01" />
                 <const key="0x01" flagname="General purpose value (version 1)" flagmask="0x02" />
                 <const key="0x02" flagname="Luminance (version 1)" flagmask="0x03" />
                 <const key="0x03" flagname="Power (version 2)" flagmask="0x04" />
                 <const key="0x04" flagname="Relative humidity (version 2)" flagmask="0x05" />
-                <const key="0x05" flagname="Velocity (version 2) " flagmask="0x06" />
-                <const key="0x06" flagname="Direction (version 2) " flagmask="0x07" />
-                <const key="0x07" flagname="Atmospheric pressure (version 2) " flagmask="0x08" />
-                <const key="0x08" flagname="Barometric pressure (version 2) " flagmask="0x09" />
-                <const key="0x09" flagname="Solar radiation (version 2) " flagmask="0x0A" />
-                <const key="0x0A" flagname="Dew point (version 2) " flagmask="0x0B" />
-                <const key="0x0B" flagname="Rain rate (version 2) " flagmask="0x0C" />
-                <const key="0x0C" flagname="Tide level (version 2) " flagmask="0x0D" />
+                <const key="0x05" flagname="Velocity (version 2)" flagmask="0x06" />
+                <const key="0x06" flagname="Direction (version 2)" flagmask="0x07" />
+                <const key="0x07" flagname="Atmospheric pressure (version 2)" flagmask="0x08" />
+                <const key="0x08" flagname="Barometric pressure (version 2)" flagmask="0x09" />
+                <const key="0x09" flagname="Solar radiation (version 2)" flagmask="0x0A" />
+                <const key="0x0A" flagname="Dew point (version 2)" flagmask="0x0B" />
+                <const key="0x0B" flagname="Rain rate (version 2)" flagmask="0x0C" />
+                <const key="0x0C" flagname="Tide level (version 2)" flagmask="0x0D" />
                 <const key="0x0D" flagname="Weight (version 3)" flagmask="0x0E" />
                 <const key="0x0E" flagname="Voltage (version 3)" flagmask="0x0F" />
                 <const key="0x0F" flagname="Current (version 3)" flagmask="0x10" />
@@ -10149,85 +10970,166 @@
                 <const key="0x39" flagname="RF Signal Strength (v9)" flagmask="0x3A" />
                 <const key="0x3A" flagname="Particulate Matter (v10)" flagmask="0x3B" />
                 <const key="0x3B" flagname="Respiratory Rate (v10)" flagmask="0x3C" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" shifter="0" />
+                <const key="0x3C" flagname="Relative Modulation level" flagmask="0x3D" />
+                <const key="0x3D" flagname="Boiler water temperature" flagmask="0x3E" />
+                <const key="0x3E" flagname="Domestic Hot Water temperature" flagmask="0x3F" />
+                <const key="0x3F" flagname="Outside temperature" flagmask="0x40" />
+                <const key="0x40" flagname="Exhaust temperature" flagmask="0x41" />
+                <const key="0x41" flagname="Water Chlorine level" flagmask="0x42" />
+                <const key="0x42" flagname="Water acidity" flagmask="0x43" />
+                <const key="0x43" flagname="Water Oxidation reduction potential" flagmask="0x44" />
+                <const key="0x44" flagname="Heart Rate LF/HF ratio" flagmask="0x45" />
+                <const key="0x45" flagname="Motion Direction" flagmask="0x46" />
+                <const key="0x46" flagname="Applied force on the sensor" flagmask="0x47" />
+                <const key="0x47" flagname="Return Air temperature" flagmask="0x48" />
+                <const key="0x48" flagname="Supply Air temperature" flagmask="0x49" />
+                <const key="0x49" flagname="Condenser Coil temperature" flagmask="0x4A" />
+                <const key="0x4A" flagname="Evaporator Coil temperature" flagmask="0x4B" />
+                <const key="0x4B" flagname="Liquid Line temperature" flagmask="0x4C" />
+                <const key="0x4C" flagname="Discharge Line temperature" flagmask="0x4D" />
+                <const key="0x4D" flagname="Suction Pressure" flagmask="0x4E" />
+                <const key="0x4E" flagname="Discharge Pressure" flagmask="0x4F" />
+                <const key="0x4F" flagname="Defrost temperature" flagmask="0x50" />
+            </param>
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x9D" version="1" name="COMMAND_CLASS_SILENCE_ALARM" help="Command Class Silence Alarm" read_only="false" comment="SDS10963-4 The Alarm Silence command class can be used to nuisance silence to temporarily disable the sounding">
-        <cmd key="0x01" name="SENSOR_ALARM_SET" help="Sensor Alarm Set" comment="">
-            <param key="0x00" name="Mode" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x9D" version="1" name="COMMAND_CLASS_SILENCE_ALARM" help="Command Class Alarm Silence" comment="SDS10963-4 The Alarm Silence command class can be used to nuisance silence to temporarily disable the sounding">
+        <cmd key="0x01" name="SENSOR_ALARM_SET" help="Sensor Alarm Set" support_mode="RX">
+            <param key="0x00" name="Mode" type="BYTE">
                 <bitflag key="0x01" flagname="Disable sounding of all sensor alarms" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Disable sounding of all sensor alarms independent of bit mask which have received the alarm" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Disable sounding of all sensor alarms according to bit mask" flagmask="0x02" />
                 <bitflag key="0x04" flagname="Disable sounding of all sensor alarms according to bit mask which have received the alarm" flagmask="0x03" />
             </param>
-            <param key="0x01" name="Seconds" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Seconds" type="WORD" />
+            <param key="0x02" name="Number of Bit Masks" type="BYTE" />
+            <param key="0x03" name="Bit Mask" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
             </param>
-            <param key="0x02" name="Number of Bit Masks" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x94" version="1" name="COMMAND_CLASS_SIMPLE_AV_CONTROL" help="Command Class Simple AV Control">
+        <cmd key="0x02" name="SIMPLE_AV_CONTROL_GET" help="Simple Av Control Get" support_mode="RX" />
+        <cmd key="0x03" name="SIMPLE_AV_CONTROL_REPORT" help="Simple Av Control Report" support_mode="TX">
+            <param key="0x00" name="Number of reports" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="SIMPLE_AV_CONTROL_SET" help="Simple Av Control Set" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Key Attributes" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x03" name="Bit Mask" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="2" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x02" name="Reserved2" type="WORD" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Command" type="WORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x04" name="SIMPLE_AV_CONTROL_SUPPORTED_GET" help="Simple Av Control Supported Get" support_mode="RX">
+            <param key="0x00" name="Report No" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="SIMPLE_AV_CONTROL_SUPPORTED_REPORT" help="Simple Av Control Supported Report" support_mode="TX">
+            <param key="0x00" name="Report No" type="BYTE" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x94" version="1" name="COMMAND_CLASS_SIMPLE_AV_CONTROL" help="Command Class Simple Av Control" read_only="false" comment="">
-        <cmd key="0x02" name="SIMPLE_AV_CONTROL_GET" help="Simple Av Control Get" comment="" />
-        <cmd key="0x03" name="SIMPLE_AV_CONTROL_REPORT" help="Simple Av Control Report" comment="">
-            <param key="0x00" name="Number of reports" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x94" version="2" name="COMMAND_CLASS_SIMPLE_AV_CONTROL" help="Command Class Simple AV Control">
+        <cmd key="0x02" name="SIMPLE_AV_CONTROL_GET" help="Simple Av Control Get" support_mode="RX" />
+        <cmd key="0x03" name="SIMPLE_AV_CONTROL_REPORT" help="Simple Av Control Report" support_mode="TX">
+            <param key="0x00" name="Number of reports" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="SIMPLE_AV_CONTROL_SET" help="Simple Av Control Set" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Key Attributes" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
+            <param key="0x02" name="Reserved2" type="WORD" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Command" type="WORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x04" name="SIMPLE_AV_CONTROL_SUPPORTED_GET" help="Simple Av Control Supported Get" support_mode="RX">
+            <param key="0x00" name="Report No" type="BYTE" />
         </cmd>
-        <cmd key="0x01" name="SIMPLE_AV_CONTROL_SET" help="Simple Av Control Set" comment="">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x05" name="SIMPLE_AV_CONTROL_SUPPORTED_REPORT" help="Simple Av Control Supported Report" support_mode="TX">
+            <param key="0x00" name="Report No" type="BYTE" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Key Attributes" fieldmask="0x07" shifter="0" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x94" version="3" name="COMMAND_CLASS_SIMPLE_AV_CONTROL" help="Command Class Simple AV Control">
+        <cmd key="0x02" name="SIMPLE_AV_CONTROL_GET" help="Simple Av Control Get" support_mode="RX" />
+        <cmd key="0x03" name="SIMPLE_AV_CONTROL_REPORT" help="Simple Av Control Report" support_mode="TX">
+            <param key="0x00" name="Number of reports" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="SIMPLE_AV_CONTROL_SET" help="Simple Av Control Set" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Key Attributes" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Item ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x03" name="vg" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Command" type="WORD" typehashcode="0x02" comment="">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <param key="0x02" name="Reserved2" type="WORD" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Command" type="WORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x04" name="SIMPLE_AV_CONTROL_SUPPORTED_GET" help="Simple Av Control Supported Get" comment="">
-            <param key="0x00" name="Report No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="SIMPLE_AV_CONTROL_SUPPORTED_GET" help="Simple Av Control Supported Get" support_mode="RX">
+            <param key="0x00" name="Report No" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="SIMPLE_AV_CONTROL_SUPPORTED_REPORT" help="Simple Av Control Supported Report" support_mode="TX">
+            <param key="0x00" name="Report No" type="BYTE" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SIMPLE_AV_CONTROL_SUPPORTED_REPORT" help="Simple Av Control Supported Report" comment="">
-            <param key="0x00" name="Report No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x94" version="4" name="COMMAND_CLASS_SIMPLE_AV_CONTROL" help="Command Class Simple AV Control">
+        <cmd key="0x02" name="SIMPLE_AV_CONTROL_GET" help="Simple Av Control Get" support_mode="RX" />
+        <cmd key="0x03" name="SIMPLE_AV_CONTROL_REPORT" help="Simple Av Control Report" support_mode="TX">
+            <param key="0x00" name="Number of reports" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="SIMPLE_AV_CONTROL_SET" help="Simple Av Control Set" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Key Attributes" fieldmask="0x07" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+            <param key="0x02" name="Reserved2" type="WORD" />
+            <variant_group key="0x03" name="vg" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Command" type="WORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x04" name="SIMPLE_AV_CONTROL_SUPPORTED_GET" help="Simple Av Control Supported Get" support_mode="RX">
+            <param key="0x00" name="Report No" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="SIMPLE_AV_CONTROL_SUPPORTED_REPORT" help="Simple Av Control Supported Report" support_mode="TX">
+            <param key="0x00" name="Report No" type="BYTE" />
+            <param key="0x01" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x27" version="1" name="COMMAND_CLASS_SWITCH_ALL" help="Command Class Switch All" read_only="false" comment="">
-        <cmd key="0x02" name="SWITCH_ALL_GET" help="Switch All Get" comment="" />
-        <cmd key="0x05" name="SWITCH_ALL_OFF" help="Switch All Off" comment="" />
-        <cmd key="0x04" name="SWITCH_ALL_ON" help="Switch All On" comment="" />
-        <cmd key="0x03" name="SWITCH_ALL_REPORT" help="Switch All Report" comment="">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x27" version="1" name="COMMAND_CLASS_SWITCH_ALL" help="Command Class All Switch">
+        <cmd key="0x02" name="SWITCH_ALL_GET" help="Switch All Get" support_mode="RX" />
+        <cmd key="0x05" name="SWITCH_ALL_OFF" help="Switch All Off" support_mode="RX" />
+        <cmd key="0x04" name="SWITCH_ALL_ON" help="Switch All On" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_ALL_REPORT" help="Switch All Report" support_mode="TX">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="excluded from the all on/all off functionality" flagmask="0x00" />
                 <const key="0x01" flagname="excluded from the all on functionality but not all off" flagmask="0x01" />
                 <const key="0x02" flagname="excluded from the all off functionality but not all on" flagmask="0x02" />
                 <const key="0x03" flagname="included in the all on/all off functionality" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SWITCH_ALL_SET" help="Switch All Set" comment="">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="SWITCH_ALL_SET" help="Switch All Set" support_mode="RX">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="excluded from the all on/all off functionality" flagmask="0x00" />
                 <const key="0x01" flagname="excluded from the all on functionality but not all off" flagmask="0x01" />
                 <const key="0x02" flagname="excluded from the all off functionality but not all on" flagmask="0x02" />
@@ -10235,141 +11137,125 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x25" version="1" name="COMMAND_CLASS_SWITCH_BINARY" help="Command Class Switch Binary" read_only="false" comment="">
-        <cmd key="0x02" name="SWITCH_BINARY_GET" help="Switch Binary Get" comment="" />
-        <cmd key="0x03" name="SWITCH_BINARY_REPORT" help="Switch Binary Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x25" version="1" name="COMMAND_CLASS_SWITCH_BINARY" help="Command Class Binary Switch">
+        <cmd key="0x02" name="SWITCH_BINARY_GET" help="Switch Binary Get" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_BINARY_REPORT" help="Switch Binary Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SWITCH_BINARY_SET" help="Switch Binary Set" comment="">
-            <param key="0x00" name="Switch Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="SWITCH_BINARY_SET" help="Switch Binary Set" support_mode="RX">
+            <param key="0x00" name="Switch Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x25" version="2" name="COMMAND_CLASS_SWITCH_BINARY" help="Command Class Switch Binary" read_only="false" comment="">
-        <cmd key="0x02" name="SWITCH_BINARY_GET" help="Switch Binary Get" comment="" />
-        <cmd key="0x03" name="SWITCH_BINARY_REPORT" help="Switch Binary Report" comment="">
-            <param key="0x00" name="Current Value" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x25" version="2" name="COMMAND_CLASS_SWITCH_BINARY" help="Command Class Binary Switch">
+        <cmd key="0x02" name="SWITCH_BINARY_GET" help="Switch Binary Get" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_BINARY_REPORT" help="Switch Binary Report" support_mode="TX">
+            <param key="0x00" name="Current Value" type="CONST">
                 <const key="0x00" flagname="off/disable" flagmask="0x00" />
                 <const key="0x01" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Target Value" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="Target Value" type="CONST">
                 <const key="0x00" flagname="off/disable" flagmask="0x00" />
                 <const key="0x01" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x02" name="Duration" type="CONST" typehashcode="0x0B">
+            <param key="0x02" name="Duration" type="CONST">
                 <const key="0x00" flagname="Already at the Target Value" flagmask="0x00" />
                 <const key="0x01" flagname="Unknown duration" flagmask="0xFE" />
                 <const key="0x02" flagname="Reserved" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SWITCH_BINARY_SET" help="Switch Binary Set" comment="">
-            <param key="0x00" name="Target Value" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="SWITCH_BINARY_SET" help="Switch Binary Set" support_mode="RX">
+            <param key="0x00" name="Target Value" type="CONST">
                 <const key="0x00" flagname="off/disable" flagmask="0x00" />
                 <const key="0x01" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Duration" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="Duration" type="CONST">
                 <const key="0x00" flagname="Instantly" flagmask="0x00" />
                 <const key="0x01" flagname="Default" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x26" version="1" name="COMMAND_CLASS_SWITCH_MULTILEVEL" help="Command Class Switch Multilevel" read_only="false" comment="">
-        <cmd key="0x02" name="SWITCH_MULTILEVEL_GET" help="Switch Multilevel Get" comment="" />
-        <cmd key="0x03" name="SWITCH_MULTILEVEL_REPORT" help="Switch Multilevel Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x26" version="1" name="COMMAND_CLASS_SWITCH_MULTILEVEL" help="Command Class Multilevel Switch">
+        <cmd key="0x02" name="SWITCH_MULTILEVEL_GET" help="Switch Multilevel Get" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_MULTILEVEL_REPORT" help="Switch Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SWITCH_MULTILEVEL_SET" help="Switch Multilevel Set" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="SWITCH_MULTILEVEL_SET" help="Switch Multilevel Set" support_mode="RX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x04" name="SWITCH_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Multilevel Start Level Change" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x04" name="SWITCH_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Multilevel Start Level Change" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x1F" />
                 <bitflag key="0x01" flagname="Ignore Start Level" flagmask="0x20" />
                 <bitflag key="0x02" flagname="Up/ Down" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Reserved2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Start Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Start Level" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Multilevel Stop Level Change" comment="" />
+        <cmd key="0x05" name="SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Multilevel Stop Level Change" support_mode="RX" />
     </cmd_class>
-    <cmd_class key="0x26" version="2" name="COMMAND_CLASS_SWITCH_MULTILEVEL" help="Command Class Switch Multilevel" read_only="false" comment="">
-        <cmd key="0x02" name="SWITCH_MULTILEVEL_GET" help="Switch Multilevel Get" comment="" />
-        <cmd key="0x03" name="SWITCH_MULTILEVEL_REPORT" help="Switch Multilevel Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x26" version="2" name="COMMAND_CLASS_SWITCH_MULTILEVEL" help="Command Class Multilevel Switch">
+        <cmd key="0x02" name="SWITCH_MULTILEVEL_GET" help="Switch Multilevel Get" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_MULTILEVEL_REPORT" help="Switch Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SWITCH_MULTILEVEL_SET" help="Switch Multilevel Set" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="SWITCH_MULTILEVEL_SET" help="Switch Multilevel Set" support_mode="RX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x01" name="Duration" type="BYTE">
                 <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Factory default" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x04" name="SWITCH_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Multilevel Start Level Change" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x04" name="SWITCH_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Multilevel Start Level Change" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x1F" />
                 <bitflag key="0x01" flagname="Ignore Start Level" flagmask="0x20" />
                 <bitflag key="0x02" flagname="Up/ Down" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Reserved2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Start Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Start Level" type="BYTE" />
+            <param key="0x02" name="Dimming Duration" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Multilevel Stop Level Change" comment="" />
+        <cmd key="0x05" name="SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Multilevel Stop Level Change" support_mode="RX" />
     </cmd_class>
-    <cmd_class key="0x26" version="3" name="COMMAND_CLASS_SWITCH_MULTILEVEL" help="Command Class Switch Multilevel" read_only="false" comment="">
-        <cmd key="0x02" name="SWITCH_MULTILEVEL_GET" help="Switch Multilevel Get" comment="" />
-        <cmd key="0x03" name="SWITCH_MULTILEVEL_REPORT" help="Switch Multilevel Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x26" version="3" name="COMMAND_CLASS_SWITCH_MULTILEVEL" help="Command Class Multilevel Switch">
+        <cmd key="0x02" name="SWITCH_MULTILEVEL_GET" help="Switch Multilevel Get" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_MULTILEVEL_REPORT" help="Switch Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SWITCH_MULTILEVEL_SET" help="Switch Multilevel Set" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="SWITCH_MULTILEVEL_SET" help="Switch Multilevel Set" support_mode="RX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x01" name="Duration" type="BYTE">
                 <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Factory default" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x04" name="SWITCH_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Multilevel Start Level Change" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" shifter="0" />
+        <cmd key="0x04" name="SWITCH_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Multilevel Start Level Change" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" />
                 <fieldenum key="0x01" fieldname="Inc Dec" fieldmask="0x18" shifter="3">
                     <fieldenum value="Increment" />
                     <fieldenum value="Decrement" />
@@ -10384,60 +11270,50 @@
                     <fieldenum value="None" />
                 </fieldenum>
             </param>
-            <param key="0x01" name="Start Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Step Size" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Start Level" type="BYTE" />
+            <param key="0x02" name="Dimming Duration" type="BYTE" />
+            <param key="0x03" name="Step Size" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Multilevel Stop Level Change" comment="" />
-        <cmd key="0x06" name="SWITCH_MULTILEVEL_SUPPORTED_GET" help="Switch Multilevel Supported Get" comment="" />
-        <cmd key="0x07" name="SWITCH_MULTILEVEL_SUPPORTED_REPORT" help="Switch Multilevel Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Primary Switch Type" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Multilevel Stop Level Change" support_mode="RX" />
+        <cmd key="0x06" name="SWITCH_MULTILEVEL_SUPPORTED_GET" help="Switch Multilevel Supported Get" support_mode="RX" />
+        <cmd key="0x07" name="SWITCH_MULTILEVEL_SUPPORTED_REPORT" help="Switch Multilevel Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Primary Switch Type" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Secondary Switch Type" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Secondary Switch Type" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x26" version="4" name="COMMAND_CLASS_SWITCH_MULTILEVEL" help="Command Class Switch Multilevel" read_only="false" comment="">
-        <cmd key="0x02" name="SWITCH_MULTILEVEL_GET" help="Switch Multilevel Get" comment="" />
-        <cmd key="0x03" name="SWITCH_MULTILEVEL_REPORT" help="Switch Multilevel Report" comment="">
-            <param key="0x00" name="Current Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x26" version="4" name="COMMAND_CLASS_SWITCH_MULTILEVEL" help="Command Class Multilevel Switch">
+        <cmd key="0x02" name="SWITCH_MULTILEVEL_GET" help="Switch Multilevel Get" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_MULTILEVEL_REPORT" help="Switch Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Current Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Target Value" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Duration" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="Target Value" type="BYTE" />
+            <param key="0x02" name="Duration" type="CONST">
                 <const key="0x00" flagname="Already at the Target Value" flagmask="0x00" />
                 <const key="0x01" flagname="Unknown duration" flagmask="0xFE" />
                 <const key="0x02" flagname="Reserved" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x01" name="SWITCH_MULTILEVEL_SET" help="Switch Multilevel Set" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x01" name="SWITCH_MULTILEVEL_SET" help="Switch Multilevel Set" support_mode="RX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
-            <param key="0x01" name="Dimming Duration" type="CONST" typehashcode="0x0B" comment="">
-                <const key="0x00" flagname="Instantly" flagmask="0x00" />
-                <const key="0x01" flagname="Default" flagmask="0xFF" />
+            <param key="0x01" name="Duration" type="BYTE">
+                <bitflag key="0x01" flagname="Instantly" flagmask="0x00" />
+                <bitflag key="0x02" flagname="Factory default" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x04" name="SWITCH_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Multilevel Start Level Change" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" shifter="0" />
+        <cmd key="0x04" name="SWITCH_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Multilevel Start Level Change" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" />
                 <fieldenum key="0x01" fieldname="Inc Dec" fieldmask="0x18" shifter="3">
                     <fieldenum value="Increment" />
                     <fieldenum value="Decrement" />
@@ -10452,269 +11328,169 @@
                     <fieldenum value="None" />
                 </fieldenum>
             </param>
-            <param key="0x01" name="Start Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Dimming Duration" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Step Size" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Start Level" type="BYTE" />
+            <param key="0x02" name="Dimming Duration" type="BYTE" />
+            <param key="0x03" name="Step Size" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Multilevel Stop Level Change" comment="" />
-        <cmd key="0x06" name="SWITCH_MULTILEVEL_SUPPORTED_GET" help="Switch Multilevel Supported Get" comment="" />
-        <cmd key="0x07" name="SWITCH_MULTILEVEL_SUPPORTED_REPORT" help="Switch Multilevel Supported Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Primary Switch Type" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="SWITCH_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Multilevel Stop Level Change" support_mode="RX" />
+        <cmd key="0x06" name="SWITCH_MULTILEVEL_SUPPORTED_GET" help="Switch Multilevel Supported Get" support_mode="RX" />
+        <cmd key="0x07" name="SWITCH_MULTILEVEL_SUPPORTED_REPORT" help="Switch Multilevel Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Primary Switch Type" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Secondary Switch Type" fieldmask="0x1F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Secondary Switch Type" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x28" version="1" name="COMMAND_CLASS_SWITCH_TOGGLE_BINARY" help="Command Class Switch Toggle Binary" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x01" name="SWITCH_TOGGLE_BINARY_SET" help="Switch Toggle Binary Set" comment="SWITCH_TOGGLE_BINARY_SET" />
-        <cmd key="0x02" name="SWITCH_TOGGLE_BINARY_GET" help="Switch Toggle Binary Get" comment="" />
-        <cmd key="0x03" name="SWITCH_TOGGLE_BINARY_REPORT" help="Switch Toggle Binary Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x28" version="1" name="COMMAND_CLASS_SWITCH_TOGGLE_BINARY" help="Command Class Binary Toggle Switch" comment="[DEPRECATED]">
+        <cmd key="0x01" name="SWITCH_TOGGLE_BINARY_SET" help="Switch Toggle Binary Set" support_mode="RX" comment="SWITCH_TOGGLE_BINARY_SET" />
+        <cmd key="0x02" name="SWITCH_TOGGLE_BINARY_GET" help="Switch Toggle Binary Get" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_TOGGLE_BINARY_REPORT" help="Switch Toggle Binary Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x29" version="1" name="COMMAND_CLASS_SWITCH_TOGGLE_MULTILEVEL" help="Command Class Switch Toggle Multilevel" read_only="false" comment="[DEPRECATED]">
-        <cmd key="0x01" name="SWITCH_TOGGLE_MULTILEVEL_SET" help="Switch Toggle Multilevel Set" comment="SWITCH_TOGGLE_MULTILEVEL_SET" />
-        <cmd key="0x02" name="SWITCH_TOGGLE_MULTILEVEL_GET" help="Switch Toggle Multilevel Get" comment="" />
-        <cmd key="0x03" name="SWITCH_TOGGLE_MULTILEVEL_REPORT" help="Switch Toggle Multilevel Report" comment="">
-            <param key="0x00" name="Value" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x29" version="1" name="COMMAND_CLASS_SWITCH_TOGGLE_MULTILEVEL" help="Command Class Multilevel Toggle Switch" comment="[DEPRECATED]">
+        <cmd key="0x01" name="SWITCH_TOGGLE_MULTILEVEL_SET" help="Switch Toggle Multilevel Set" support_mode="RX" comment="SWITCH_TOGGLE_MULTILEVEL_SET" />
+        <cmd key="0x02" name="SWITCH_TOGGLE_MULTILEVEL_GET" help="Switch Toggle Multilevel Get" support_mode="RX" />
+        <cmd key="0x03" name="SWITCH_TOGGLE_MULTILEVEL_REPORT" help="Switch Toggle Multilevel Report" support_mode="TX">
+            <param key="0x00" name="Value" type="BYTE">
                 <bitflag key="0x01" flagname="off/disable" flagmask="0x00" />
                 <bitflag key="0x02" flagname="on/enable" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x04" name="SWITCH_TOGGLE_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Toggle Multilevel Start Level Change" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x04" name="SWITCH_TOGGLE_MULTILEVEL_START_LEVEL_CHANGE" help="Switch Toggle Multilevel Start Level Change" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x1F" />
                 <bitflag key="0x01" flagname="Ignore Start Level" flagmask="0x20" />
                 <bitflag key="0x02" flagname="Reserved2" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Roll Over" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Start Level" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Start Level" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="SWITCH_TOGGLE_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Toggle Multilevel Stop Level Change" comment="" />
+        <cmd key="0x05" name="SWITCH_TOGGLE_MULTILEVEL_STOP_LEVEL_CHANGE" help="Switch Toggle Multilevel Stop Level Change" support_mode="RX" />
     </cmd_class>
-    <cmd_class key="0x4A" version="1" name="COMMAND_CLASS_TARIFF_CONFIG" help="Command Class Tariff Config" read_only="false" comment="">
-        <cmd key="0x03" name="TARIFF_TBL_REMOVE" help="Tariff Tbl Remove" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Rate Parameter Set IDs" fieldmask="0x3F" shifter="0" />
+    <cmd_class key="0x4A" version="1" name="COMMAND_CLASS_TARIFF_CONFIG" help="Command Class Tariff Table Configuration">
+        <cmd key="0x03" name="TARIFF_TBL_REMOVE" help="Tariff Tbl Remove" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Parameter Set IDs" fieldmask="0x3F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x01" name="Rate Parameter Set ID" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x3F" sizeoffs="0" />
-            </param>
-        </cmd>
-        <cmd key="0x02" name="TARIFF_TBL_SET" help="Tariff Tbl Set" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Tariff Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x02" name="Tariff Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x01" name="TARIFF_TBL_SUPPLIER_SET" help="Tariff Tbl Supplier Set" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Currency" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Standing Charge Period" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Standing Charge Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x08" name="Standing Charge Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Supplier Characters" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x0A" name="Supplier Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="9" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
-            </param>
-        </cmd>
-    </cmd_class>
-    <cmd_class key="0x4B" version="1" name="COMMAND_CLASS_TARIFF_TBL_MONITOR" help="Command Class Tariff Tbl Monitor" read_only="false" comment="">
-        <cmd key="0x05" name="TARIFF_TBL_COST_GET" help="Tariff Tbl Cost Get" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Stop Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Stop Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x06" name="TARIFF_TBL_COST_REPORT" help="Tariff Tbl Cost Report" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" shifter="0" />
-                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xFC" shifter="2" />
-            </param>
-            <param key="0x02" name="Start Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Start Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Start Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Start Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Start Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Stop Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Stop Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Stop Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Stop Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0B" name="Stop Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0C" name="Currency" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0D" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Cost Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x0E" name="Cost Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x03" name="TARIFF_TBL_GET" help="Tariff Tbl Get" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x04" name="TARIFF_TBL_REPORT" help="Tariff Tbl Report" comment="">
-            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x01" fieldname="Tariff Precision" fieldmask="0xE0" shifter="5" />
-            </param>
-            <param key="0x02" name="Tariff Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Rate Parameter Set ID" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x3F" />
             </param>
         </cmd>
-        <cmd key="0x01" name="TARIFF_TBL_SUPPLIER_GET" help="Tariff Tbl Supplier Get" comment="" />
-        <cmd key="0x02" name="TARIFF_TBL_SUPPLIER_REPORT" help="Tariff Tbl Supplier Report" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x02" name="TARIFF_TBL_SET" help="Tariff Tbl Set" support_mode="RX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Tariff Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Tariff Value" type="DWORD" />
+        </cmd>
+        <cmd key="0x01" name="TARIFF_TBL_SUPPLIER_SET" help="Tariff Tbl Supplier Set" support_mode="RX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+            <param key="0x03" name="Hour Local Time" type="BYTE" />
+            <param key="0x04" name="Minute Local Time" type="BYTE" />
+            <param key="0x05" name="Second Local Time" type="BYTE" />
+            <param key="0x06" name="Currency" type="BIT_24" />
+            <param key="0x07" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Standing Charge Period" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Standing Charge Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x08" name="Standing Charge Value" type="DWORD" />
+            <param key="0x09" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Supplier Characters" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x03" name="Hour Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x0A" name="Supplier Character" type="VARIANT">
+                <variant paramoffs="9" sizemask="0x1F" />
             </param>
-            <param key="0x04" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x4B" version="1" name="COMMAND_CLASS_TARIFF_TBL_MONITOR" help="Command Class Tariff Table Monitor">
+        <cmd key="0x05" name="TARIFF_TBL_COST_GET" help="Tariff Tbl Cost Get" support_mode="RX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x01" name="Start Year" type="WORD" />
+            <param key="0x02" name="Start Month" type="BYTE" />
+            <param key="0x03" name="Start Day" type="BYTE" />
+            <param key="0x04" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x05" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x06" name="Stop Year" type="WORD" />
+            <param key="0x07" name="Stop Month" type="BYTE" />
+            <param key="0x08" name="Stop Day" type="BYTE" />
+            <param key="0x09" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0A" name="Stop Minute Local Time" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="TARIFF_TBL_COST_REPORT" help="Tariff Tbl Cost Report" support_mode="TX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Rate Type" fieldmask="0x03" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x05" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Start Year" type="WORD" />
+            <param key="0x03" name="Start Month" type="BYTE" />
+            <param key="0x04" name="Start Day" type="BYTE" />
+            <param key="0x05" name="Start Hour Local Time" type="BYTE" />
+            <param key="0x06" name="Start Minute Local Time" type="BYTE" />
+            <param key="0x07" name="Stop Year" type="WORD" />
+            <param key="0x08" name="Stop Month" type="BYTE" />
+            <param key="0x09" name="Stop Day" type="BYTE" />
+            <param key="0x0A" name="Stop Hour Local Time" type="BYTE" />
+            <param key="0x0B" name="Stop Minute Local Time" type="BYTE" />
+            <param key="0x0C" name="Currency" type="BIT_24" />
+            <param key="0x0D" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Cost Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x06" name="Currency" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x0E" name="Cost Value" type="DWORD" />
+        </cmd>
+        <cmd key="0x03" name="TARIFF_TBL_GET" help="Tariff Tbl Get" support_mode="RX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="TARIFF_TBL_REPORT" help="Tariff Tbl Report" support_mode="TX">
+            <param key="0x00" name="Rate Parameter Set ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Tariff Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Standing Charge Period" fieldmask="0x1F" shifter="0" />
+            <param key="0x02" name="Tariff Value" type="DWORD" />
+        </cmd>
+        <cmd key="0x01" name="TARIFF_TBL_SUPPLIER_GET" help="Tariff Tbl Supplier Get" support_mode="RX" />
+        <cmd key="0x02" name="TARIFF_TBL_SUPPLIER_REPORT" help="Tariff Tbl Supplier Report" support_mode="TX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+            <param key="0x03" name="Hour Local Time" type="BYTE" />
+            <param key="0x04" name="Minute Local Time" type="BYTE" />
+            <param key="0x05" name="Second Local Time" type="BYTE" />
+            <param key="0x06" name="Currency" type="BIT_24" />
+            <param key="0x07" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Standing Charge Period" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Standing Charge Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x08" name="Standing Charge Value" type="DWORD" typehashcode="0x03" comment="">
-                <dword key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Supplier Characters" fieldmask="0x1F" shifter="0" />
+            <param key="0x08" name="Standing Charge Value" type="DWORD" />
+            <param key="0x09" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Supplier Characters" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x0A" name="Supplier Character" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="9" showhex="true" signed="true" sizemask="0x1F" sizeoffs="0" />
+            <param key="0x0A" name="Supplier Character" type="VARIANT">
+                <variant paramoffs="9" sizemask="0x1F" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x44" version="1" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x44" version="1" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode">
+        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
                     <fieldenum value="Auto Low" />
                     <fieldenum value="Low" />
                     <fieldenum value="Auto High" />
@@ -10723,9 +11499,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
                     <fieldenum value="Auto Low" />
                     <fieldenum value="Low" />
                     <fieldenum value="Auto High" />
@@ -10734,10 +11510,10 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Auto" flagmask="0x00" />
                 <bitflag key="0x01" flagname="On" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Auto High" flagmask="0x02" />
@@ -10745,11 +11521,11 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x44" version="2" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x44" version="2" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode">
+        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
                     <fieldenum value="Auto Low" />
                     <fieldenum value="Low" />
                     <fieldenum value="Auto High" />
@@ -10760,9 +11536,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
                     <fieldenum value="Auto Low" />
                     <fieldenum value="Low" />
                     <fieldenum value="Auto High" />
@@ -10774,10 +11550,10 @@
                 <bitflag key="0x02" flagname="Off" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Auto" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Low" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Auto High" flagmask="0x02" />
@@ -10787,11 +11563,11 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x44" version="3" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x44" version="3" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode">
+        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
                     <fieldenum value="Auto Low" />
                     <fieldenum value="Low" />
                     <fieldenum value="Auto High" />
@@ -10805,9 +11581,9 @@
                 <bitflag key="0x02" flagname="Off" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
                     <fieldenum value="Auto Low" />
                     <fieldenum value="Low" />
                     <fieldenum value="Auto High" />
@@ -10821,10 +11597,10 @@
                 <bitflag key="0x02" flagname="Off" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Auto" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Low" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Auto High" flagmask="0x02" />
@@ -10836,11 +11612,11 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x44" version="4" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x44" version="4" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode">
+        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
                     <fieldenum value="Auto Low" />
                     <fieldenum value="Low" />
                     <fieldenum value="Auto High" />
@@ -10862,9 +11638,9 @@
                 <bitflag key="0x02" flagname="Off" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
                     <fieldenum value="Auto Low" />
                     <fieldenum value="Low" />
                     <fieldenum value="Auto High" />
@@ -10886,10 +11662,83 @@
                 <bitflag key="0x02" flagname="Off" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
+                <bitflag key="0x00" flagname="Auto" flagmask="0x00" />
+                <bitflag key="0x01" flagname="Low" flagmask="0x01" />
+                <bitflag key="0x02" flagname="Auto High" flagmask="0x02" />
+                <bitflag key="0x03" flagname="High" flagmask="0x03" />
+                <bitflag key="0x04" flagname="Auto Medium" flagmask="0x04" />
+                <bitflag key="0x05" flagname="Medium" flagmask="0x05" />
+                <bitflag key="0x06" flagname="Circulation" flagmask="0x06" />
+                <bitflag key="0x07" flagname="Humidity Circulation" flagmask="0x07" />
+                <bitflag key="0x08" flagname="Left Right" flagmask="0x08" />
+                <bitflag key="0x09" flagname="Up Down" flagmask="0x09" />
+                <bitflag key="0x0A" flagname="Quiet" flagmask="0x0A" />
+                <bitflag key="0x0B" flagname="ReservedB" flagmask="0x0B" />
+                <bitflag key="0x0C" flagname="ReservedC" flagmask="0x0C" />
+                <bitflag key="0x0D" flagname="ReservedD" flagmask="0x0D" />
+                <bitflag key="0x0E" flagname="ReservedE" flagmask="0x0E" />
+                <bitflag key="0x0F" flagname="ReservedF" flagmask="0x0F" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x44" version="5" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" help="Command Class Thermostat Fan Mode">
+        <cmd key="0x02" name="THERMOSTAT_FAN_MODE_GET" help="Thermostat Fan Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_FAN_MODE_REPORT" help="Thermostat Fan Mode Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
+                    <fieldenum value="Auto Low" />
+                    <fieldenum value="Low" />
+                    <fieldenum value="Auto High" />
+                    <fieldenum value="High" />
+                    <fieldenum value="Auto Medium" />
+                    <fieldenum value="Medium" />
+                    <fieldenum value="Circulation" />
+                    <fieldenum value="Humidity" />
+                    <fieldenum value="Left Right" />
+                    <fieldenum value="Up Down" />
+                    <fieldenum value="Quiet" />
+                    <fieldenum value="External Circulation" />
+                    <fieldenum value="ReservedC" />
+                    <fieldenum value="ReservedD" />
+                    <fieldenum value="ReservedE" />
+                    <fieldenum value="ReservedF" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0x70" shifter="4" />
+                <bitflag key="0x02" flagname="Off" flagmask="0x80" />
+            </param>
+        </cmd>
+        <cmd key="0x01" name="THERMOSTAT_FAN_MODE_SET" help="Thermostat Fan Mode Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Mode" fieldmask="0x0F">
+                    <fieldenum value="Auto Low" />
+                    <fieldenum value="Low" />
+                    <fieldenum value="Auto High" />
+                    <fieldenum value="High" />
+                    <fieldenum value="Auto Medium" />
+                    <fieldenum value="Medium" />
+                    <fieldenum value="Circulation" />
+                    <fieldenum value="Humidity" />
+                    <fieldenum value="Left Right" />
+                    <fieldenum value="Up Down" />
+                    <fieldenum value="Quiet" />
+                    <fieldenum value="External Circulation" />
+                    <fieldenum value="ReservedC" />
+                    <fieldenum value="ReservedD" />
+                    <fieldenum value="ReservedE" />
+                    <fieldenum value="ReservedF" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0x70" shifter="4" />
+                <bitflag key="0x02" flagname="Off" flagmask="0x80" />
+            </param>
+        </cmd>
+        <cmd key="0x04" name="THERMOSTAT_FAN_MODE_SUPPORTED_GET" help="Thermostat Fan Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_FAN_MODE_SUPPORTED_REPORT" help="Thermostat Fan Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Auto" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Low" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Auto High" flagmask="0x02" />
@@ -10909,23 +11758,24 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x45" version="1" name="COMMAND_CLASS_THERMOSTAT_FAN_STATE" help="Command Class Thermostat Fan State" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_FAN_STATE_GET" help="Thermostat Fan State Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_FAN_STATE_REPORT" help="Thermostat Fan State Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Operating State" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x45" version="1" name="COMMAND_CLASS_THERMOSTAT_FAN_STATE" help="Command Class Thermostat Fan State">
+        <cmd key="0x02" name="THERMOSTAT_FAN_STATE_GET" help="Thermostat Fan State Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_FAN_STATE_REPORT" help="Thermostat Fan State Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Operating State" fieldmask="0x0F">
                     <fieldenum value="Idle" />
                     <fieldenum value="Running" />
+                    <fieldenum value="Running High" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x45" version="2" name="COMMAND_CLASS_THERMOSTAT_FAN_STATE" help="Command Class Thermostat Fan State" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_FAN_STATE_GET" help="Thermostat Fan State Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_FAN_STATE_REPORT" help="Thermostat Fan State Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Fan Operating State" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x45" version="2" name="COMMAND_CLASS_THERMOSTAT_FAN_STATE" help="Command Class Thermostat Fan State">
+        <cmd key="0x02" name="THERMOSTAT_FAN_STATE_GET" help="Thermostat Fan State Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_FAN_STATE_REPORT" help="Thermostat Fan State Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Fan Operating State" fieldmask="0x0F">
                     <fieldenum value="Idle" />
                     <fieldenum value="Running" />
                     <fieldenum value="Running High" />
@@ -10940,16 +11790,16 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x38" version="1" name="COMMAND_CLASS_THERMOSTAT_HEATING" help="Command Class Thermostat Heating" read_only="false" comment="">
-        <cmd key="0x0D" name="THERMOSTAT_HEATING_STATUS_REPORT" help="Thermostat Heating Heating Status Report" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x38" version="1" name="COMMAND_CLASS_THERMOSTAT_HEATING" help="Command Class Thermostat Heating">
+        <cmd key="0x0D" name="THERMOSTAT_HEATING_STATUS_REPORT" help="Thermostat Heating Heating Status Report">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="Heating" flagmask="0x00" />
                 <const key="0x01" flagname="Cooling" flagmask="0x01" />
             </param>
         </cmd>
-        <cmd key="0x02" name="THERMOSTAT_HEATING_MODE_GET" help="Thermostat Heating Mode Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_HEATING_MODE_REPORT" help="Thermostat Heating Mode Report" comment="">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="THERMOSTAT_HEATING_MODE_GET" help="Thermostat Heating Mode Get" />
+        <cmd key="0x03" name="THERMOSTAT_HEATING_MODE_REPORT" help="Thermostat Heating Mode Report">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="Off timed" flagmask="0x01" />
                 <const key="0x02" flagname="Off 3 hours" flagmask="0x02" />
@@ -10960,8 +11810,8 @@
                 <const key="0x07" flagname="Manual timed" flagmask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_HEATING_MODE_SET" help="Thermostat Heating Mode Set" comment="">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="THERMOSTAT_HEATING_MODE_SET" help="Thermostat Heating Mode Set">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="Off" flagmask="0x00" />
                 <const key="0x01" flagname="Off timed" flagmask="0x01" />
                 <const key="0x02" flagname="Off 3 hours" flagmask="0x02" />
@@ -10972,65 +11822,55 @@
                 <const key="0x07" flagname="Manual timed" flagmask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x09" name="THERMOSTAT_HEATING_RELAY_STATUS_GET" help="Thermostat Heating Relay Status Get" comment="" />
-        <cmd key="0x0A" name="THERMOSTAT_HEATING_RELAY_STATUS_REPORT" help="Thermostat Heating Relay Status Report" comment="">
-            <param key="0x00" name="Relay Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x09" name="THERMOSTAT_HEATING_RELAY_STATUS_GET" help="Thermostat Heating Relay Status Get" />
+        <cmd key="0x0A" name="THERMOSTAT_HEATING_RELAY_STATUS_REPORT" help="Thermostat Heating Relay Status Report">
+            <param key="0x00" name="Relay Status" type="CONST">
                 <const key="0x00" flagname="off" flagmask="0x00" />
                 <const key="0x01" flagname="on" flagmask="0x01" />
             </param>
         </cmd>
-        <cmd key="0x05" name="THERMOSTAT_HEATING_SETPOINT_GET" help="Thermostat Heating Setpoint Get" comment="">
-            <param key="0x00" name="Setpoint Nr" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="THERMOSTAT_HEATING_SETPOINT_GET" help="Thermostat Heating Setpoint Get">
+            <param key="0x00" name="Setpoint Nr" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="THERMOSTAT_HEATING_SETPOINT_REPORT" help="Thermostat Heating Setpoint Report" comment="">
-            <param key="0x00" name="Setpoint Nr" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x06" name="THERMOSTAT_HEATING_SETPOINT_REPORT" help="Thermostat Heating Setpoint Report">
+            <param key="0x00" name="Setpoint Nr" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_HEATING_SETPOINT_SET" help="Thermostat Heating Setpoint Set" comment="">
-            <param key="0x00" name="Setpoint Nr" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x04" name="THERMOSTAT_HEATING_SETPOINT_SET" help="Thermostat Heating Setpoint Set">
+            <param key="0x00" name="Setpoint Nr" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x0C" name="THERMOSTAT_HEATING_STATUS_GET" help="Thermostat Heating Status Get" comment="" />
-        <cmd key="0x0B" name="THERMOSTAT_HEATING_STATUS_SET" help="Thermostat Heating Status Set" comment="">
-            <param key="0x00" name="Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x0C" name="THERMOSTAT_HEATING_STATUS_GET" help="Thermostat Heating Status Get" />
+        <cmd key="0x0B" name="THERMOSTAT_HEATING_STATUS_SET" help="Thermostat Heating Status Set">
+            <param key="0x00" name="Status" type="CONST">
                 <const key="0x00" flagname="Heating" flagmask="0x00" />
                 <const key="0x01" flagname="Cooling" flagmask="0x01" />
             </param>
         </cmd>
-        <cmd key="0x11" name="THERMOSTAT_HEATING_TIMED_OFF_SET" help="Thermostat Heating Timed Off Set" comment="">
-            <param key="0x00" name="Minutes" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Hours" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x11" name="THERMOSTAT_HEATING_TIMED_OFF_SET" help="Thermostat Heating Timed Off Set">
+            <param key="0x00" name="Minutes" type="BYTE" />
+            <param key="0x01" name="Hours" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x40" version="1" name="COMMAND_CLASS_THERMOSTAT_MODE" help="Command Class Thermostat Mode" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_MODE_GET" help="Thermostat Mode Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_MODE_REPORT" help="Thermostat Mode Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F" shifter="0">
+    <cmd_class key="0x40" version="1" name="COMMAND_CLASS_THERMOSTAT_MODE" help="Command Class Thermostat Mode">
+        <cmd key="0x02" name="THERMOSTAT_MODE_GET" help="Thermostat Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_MODE_REPORT" help="Thermostat Mode Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F">
                     <fieldenum value="Off" />
                     <fieldenum value="Heat" />
                     <fieldenum value="Cool" />
@@ -11046,9 +11886,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_MODE_SET" help="Thermostat Mode Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_MODE_SET" help="Thermostat Mode Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F">
                     <fieldenum value="Off" />
                     <fieldenum value="Heat" />
                     <fieldenum value="Cool" />
@@ -11064,10 +11904,10 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_MODE_SUPPORTED_GET" help="Thermostat Mode Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_MODE_SUPPORTED_REPORT" help="Thermostat Mode Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_MODE_SUPPORTED_GET" help="Thermostat Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_MODE_SUPPORTED_REPORT" help="Thermostat Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Heat" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Cool" flagmask="0x02" />
@@ -11082,11 +11922,11 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x40" version="2" name="COMMAND_CLASS_THERMOSTAT_MODE" help="Command Class Thermostat Mode" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_MODE_GET" help="Thermostat Mode Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_MODE_REPORT" help="Thermostat Mode Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F" shifter="0">
+    <cmd_class key="0x40" version="2" name="COMMAND_CLASS_THERMOSTAT_MODE" help="Command Class Thermostat Mode">
+        <cmd key="0x02" name="THERMOSTAT_MODE_GET" help="Thermostat Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_MODE_REPORT" help="Thermostat Mode Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F">
                     <fieldenum value="Off" />
                     <fieldenum value="Heat" />
                     <fieldenum value="Cool" />
@@ -11105,9 +11945,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_MODE_SET" help="Thermostat Mode Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_MODE_SET" help="Thermostat Mode Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F">
                     <fieldenum value="Off" />
                     <fieldenum value="Heat" />
                     <fieldenum value="Cool" />
@@ -11126,10 +11966,10 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_MODE_SUPPORTED_GET" help="Thermostat Mode Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_MODE_SUPPORTED_REPORT" help="Thermostat Mode Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_MODE_SUPPORTED_GET" help="Thermostat Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_MODE_SUPPORTED_REPORT" help="Thermostat Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Heat" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Cool" flagmask="0x02" />
@@ -11147,11 +11987,11 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x40" version="3" name="COMMAND_CLASS_THERMOSTAT_MODE" help="Command Class Thermostat Mode" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_MODE_GET" help="Thermostat Mode Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_MODE_REPORT" help="Thermostat Mode Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F" shifter="0">
+    <cmd_class key="0x40" version="3" name="COMMAND_CLASS_THERMOSTAT_MODE" help="Command Class Thermostat Mode">
+        <cmd key="0x02" name="THERMOSTAT_MODE_GET" help="Thermostat Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_MODE_REPORT" help="Thermostat Mode Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F">
                     <fieldenum value="Off" />
                     <fieldenum value="Heat" />
                     <fieldenum value="Cool" />
@@ -11187,13 +12027,13 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="No of Manufacturer Data fields" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Manufacturer Data" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0xE0" sizeoffs="5" />
+            <param key="0x01" name="Manufacturer Data" type="VARIANT">
+                <variant paramoffs="0" sizemask="0xE0" sizeoffs="5" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_MODE_SET" help="Thermostat Mode Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_MODE_SET" help="Thermostat Mode Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x1F">
                     <fieldenum value="Off" />
                     <fieldenum value="Heat" />
                     <fieldenum value="Cool" />
@@ -11229,14 +12069,14 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="No of Manufacturer Data fields" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Manufacturer Data" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0xE0" sizeoffs="5" />
+            <param key="0x01" name="Manufacturer Data" type="VARIANT">
+                <variant paramoffs="0" sizemask="0xE0" sizeoffs="5" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_MODE_SUPPORTED_GET" help="Thermostat Mode Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_MODE_SUPPORTED_REPORT" help="Thermostat Mode Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_MODE_SUPPORTED_GET" help="Thermostat Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_MODE_SUPPORTED_REPORT" help="Thermostat Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Heat" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Cool" flagmask="0x02" />
@@ -11253,30 +12093,15 @@
                 <bitflag key="0x0D" flagname="AWAY" flagmask="0x0D" />
                 <bitflag key="0x0E" flagname="Reserved" flagmask="0x0E" />
                 <bitflag key="0x0F" flagname="FULL POWER" flagmask="0x0F" />
-                <bitflag key="0x10" flagname="Reserved0" flagmask="0x10" />
-                <bitflag key="0x11" flagname="Reserved1" flagmask="0x11" />
-                <bitflag key="0x12" flagname="Reserved2" flagmask="0x12" />
-                <bitflag key="0x13" flagname="Reserved3" flagmask="0x13" />
-                <bitflag key="0x14" flagname="Reserved4" flagmask="0x14" />
-                <bitflag key="0x15" flagname="Reserved5" flagmask="0x15" />
-                <bitflag key="0x16" flagname="Reserved6" flagmask="0x16" />
-                <bitflag key="0x17" flagname="Reserved7" flagmask="0x17" />
-                <bitflag key="0x18" flagname="Reserved8" flagmask="0x18" />
-                <bitflag key="0x19" flagname="Reserved9" flagmask="0x19" />
-                <bitflag key="0x1A" flagname="ReservedA" flagmask="0x1A" />
-                <bitflag key="0x1B" flagname="ReservedB" flagmask="0x1B" />
-                <bitflag key="0x1C" flagname="ReservedC" flagmask="0x1C" />
-                <bitflag key="0x1D" flagname="ReservedD" flagmask="0x1D" />
-                <bitflag key="0x1E" flagname="ReservedE" flagmask="0x1E" />
-                <bitflag key="0x1F" flagname="MANUFACTURER SPECIFC" flagmask="0x1F" />
-            </param>
-        </cmd>
-    </cmd_class>
-    <cmd_class key="0x42" version="1" name="COMMAND_CLASS_THERMOSTAT_OPERATING_STATE" help="Command Class Thermostat Operating State" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_OPERATING_STATE_GET" help="Thermostat Operating State Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_OPERATING_STATE_REPORT" help="Thermostat Operating State Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Operating State" fieldmask="0x0F" shifter="0">
+                <bitflag key="0x10" flagname="MANUFACTURER SPECIFC" flagmask="0x1F" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x42" version="1" name="COMMAND_CLASS_THERMOSTAT_OPERATING_STATE" help="Command Class Thermostat Operating State">
+        <cmd key="0x02" name="THERMOSTAT_OPERATING_STATE_GET" help="Thermostat Operating State Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_OPERATING_STATE_REPORT" help="Thermostat Operating State Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Operating State" fieldmask="0x0F">
                     <fieldenum value="Idle" />
                     <fieldenum value="Heating" />
                     <fieldenum value="Cooling" />
@@ -11289,11 +12114,11 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x42" version="2" name="COMMAND_CLASS_THERMOSTAT_OPERATING_STATE" help="Command Class Thermostat Operating State" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_OPERATING_STATE_GET" help="Thermostat Operating State Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_OPERATING_STATE_REPORT" help="Thermostat Operating State Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Operating State" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x42" version="2" name="COMMAND_CLASS_THERMOSTAT_OPERATING_STATE" help="Command Class Thermostat Operating State">
+        <cmd key="0x02" name="THERMOSTAT_OPERATING_STATE_GET" help="Thermostat Operating State Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_OPERATING_STATE_REPORT" help="Thermostat Operating State Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Operating State" fieldmask="0x0F">
                     <fieldenum value="Idle" />
                     <fieldenum value="Heating" />
                     <fieldenum value="Cooling" />
@@ -11310,10 +12135,10 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_OPERATING_STATE_LOGGING_SUPPORTED_GET" help="Thermostat Operating State Logging Supported Get" />
-        <cmd key="0x04" name="THERMOSTAT_OPERATING_LOGGING_SUPPORTED_REPORT" help="Thermostat Operating State Logging Supported Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x01" name="THERMOSTAT_OPERATING_STATE_LOGGING_SUPPORTED_GET" help="Thermostat Operating State Logging Supported Get" support_mode="RX" />
+        <cmd key="0x04" name="THERMOSTAT_OPERATING_LOGGING_SUPPORTED_REPORT" help="Thermostat Operating State Logging Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Idle" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Heating" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Cooling" flagmask="0x02" />
@@ -11328,9 +12153,9 @@
                 <bitflag key="0x0B" flagname="3rd Stage Aux Heat" flagmask="0x0B" />
             </param>
         </cmd>
-        <cmd key="0x05" name="THERMOSTAT_OPERATING_STATE_LOGGING_GET" help="Thermostat Operating State Logging Get">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x05" name="THERMOSTAT_OPERATING_STATE_LOGGING_GET" help="Thermostat Operating State Logging Get" support_mode="RX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="Idle" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Heating" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Cooling" flagmask="0x02" />
@@ -11345,35 +12170,25 @@
                 <bitflag key="0x0B" flagname="3rd Stage Aux Heat" flagmask="0x0B" />
             </param>
         </cmd>
-        <cmd key="0x06" name="THERMOSTAT_OPERATING_STATE_LOGGING_REPORT" help="Thermostat Operating State Logging Report">
-            <param key="0x00" name="Reports to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Operating State Log Type" fieldmask="0x0F" shifter="0" />
+        <cmd key="0x06" name="THERMOSTAT_OPERATING_STATE_LOGGING_REPORT" help="Thermostat Operating State Logging Report" support_mode="TX">
+            <param key="0x00" name="Reports to Follow" type="BYTE" />
+            <variant_group key="0x01" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Operating State Log Type" fieldmask="0x0F" />
                     <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
                 </param>
-                <param key="0x01" name="Usage Today (Hours)" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x02" name="Usage Today (Minutes)" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x03" name="Usage Yesterday (Hours)" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x04" name="Usage Yesterday (Minutes)" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x01" name="Usage Today (Hours)" type="BYTE" />
+                <param key="0x02" name="Usage Today (Minutes)" type="BYTE" />
+                <param key="0x03" name="Usage Yesterday (Hours)" type="BYTE" />
+                <param key="0x04" name="Usage Yesterday (Minutes)" type="BYTE" />
             </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x47" version="1" name="COMMAND_CLASS_THERMOSTAT_SETBACK" help="Command Class Thermostat Setback" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_SETBACK_GET" help="Thermostat Setback Get" comment="" />
-        <cmd key="0x03" name="THERMOSTAT_SETBACK_REPORT" help="Thermostat Setback Report" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setback Type" fieldmask="0x03" shifter="0">
+    <cmd_class key="0x47" version="1" name="COMMAND_CLASS_THERMOSTAT_SETBACK" help="Command Class Thermostat Setback">
+        <cmd key="0x02" name="THERMOSTAT_SETBACK_GET" help="Thermostat Setback Get" support_mode="RX" />
+        <cmd key="0x03" name="THERMOSTAT_SETBACK_REPORT" help="Thermostat Setback Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setback Type" fieldmask="0x03">
                     <fieldenum value="No override" />
                     <fieldenum value="Temporary override" />
                     <fieldenum value="Permanent override" />
@@ -11381,8 +12196,7 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Setback State" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x01" name="Setback State" type="BYTE">
                 <bitflag key="0x01" flagname="Frost Protection" flagmask="0x79" />
                 <bitflag key="0x02" flagname="Energy Saving Mode" flagmask="0x7A" />
                 <bitflag key="0x03" flagname="Reserved" flagmask="0x7B" />
@@ -11392,9 +12206,9 @@
                 <bitflag key="0x07" flagname="Unused State" flagmask="0x7F" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_SETBACK_SET" help="Thermostat Setback Set" comment="">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setback Type" fieldmask="0x03" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_SETBACK_SET" help="Thermostat Setback Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setback Type" fieldmask="0x03">
                     <fieldenum value="No override" />
                     <fieldenum value="Temporary override" />
                     <fieldenum value="Permanent override" />
@@ -11402,8 +12216,7 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Setback State" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+            <param key="0x01" name="Setback State" type="BYTE">
                 <bitflag key="0x01" flagname="Frost Protection" flagmask="0x79" />
                 <bitflag key="0x02" flagname="Energy Saving Mode" flagmask="0x7A" />
                 <bitflag key="0x03" flagname="Reserved" flagmask="0x7B" />
@@ -11414,10 +12227,10 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x43" version="1" name="COMMAND_CLASS_THERMOSTAT_SETPOINT" help="Command Class Thermostat Setpoint" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_SETPOINT_GET" help="Thermostat Setpoint Get" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x43" version="1" name="COMMAND_CLASS_THERMOSTAT_SETPOINT" help="Command Class Thermostat Setpoint">
+        <cmd key="0x02" name="THERMOSTAT_SETPOINT_GET" help="Thermostat Setpoint Get" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11433,9 +12246,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x03" name="THERMOSTAT_SETPOINT_REPORT" help="Thermostat Setpoint Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x03" name="THERMOSTAT_SETPOINT_REPORT" help="Thermostat Setpoint Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11450,18 +12263,18 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_SETPOINT_SET" help="Thermostat Setpoint Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_SETPOINT_SET" help="Thermostat Setpoint Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11476,19 +12289,19 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_SETPOINT_SUPPORTED_GET" help="Thermostat Setpoint Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_SETPOINT_SUPPORTED_REPORT" help="Thermostat Setpoint Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_SETPOINT_SUPPORTED_GET" help="Thermostat Setpoint Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_SETPOINT_SUPPORTED_REPORT" help="Thermostat Setpoint Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="None" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Heating" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Cooling" flagmask="0x02" />
@@ -11499,10 +12312,10 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x43" version="2" name="COMMAND_CLASS_THERMOSTAT_SETPOINT" help="Command Class Thermostat Setpoint" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_SETPOINT_GET" help="Thermostat Setpoint Get" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x43" version="2" name="COMMAND_CLASS_THERMOSTAT_SETPOINT" help="Command Class Thermostat Setpoint">
+        <cmd key="0x02" name="THERMOSTAT_SETPOINT_GET" help="Thermostat Setpoint Get" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11521,9 +12334,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x03" name="THERMOSTAT_SETPOINT_REPORT" help="Thermostat Setpoint Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x03" name="THERMOSTAT_SETPOINT_REPORT" help="Thermostat Setpoint Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11541,18 +12354,18 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_SETPOINT_SET" help="Thermostat Setpoint Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_SETPOINT_SET" help="Thermostat Setpoint Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11570,19 +12383,19 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_SETPOINT_SUPPORTED_GET" help="Thermostat Setpoint Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_SETPOINT_SUPPORTED_REPORT" help="Thermostat Setpoint Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_SETPOINT_SUPPORTED_GET" help="Thermostat Setpoint Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_SETPOINT_SUPPORTED_REPORT" help="Thermostat Setpoint Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="None" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Heating" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Cooling" flagmask="0x02" />
@@ -11596,10 +12409,10 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x43" version="3" name="COMMAND_CLASS_THERMOSTAT_SETPOINT" help="Command Class Thermostat Setpoint" read_only="false" comment="">
-        <cmd key="0x02" name="THERMOSTAT_SETPOINT_GET" help="Thermostat Setpoint Get" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x43" version="3" name="COMMAND_CLASS_THERMOSTAT_SETPOINT" help="Command Class Thermostat Setpoint">
+        <cmd key="0x02" name="THERMOSTAT_SETPOINT_GET" help="Thermostat Setpoint Get" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11620,9 +12433,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x03" name="THERMOSTAT_SETPOINT_REPORT" help="Thermostat Setpoint Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x03" name="THERMOSTAT_SETPOINT_REPORT" help="Thermostat Setpoint Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11642,18 +12455,18 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x01" name="THERMOSTAT_SETPOINT_SET" help="Thermostat Setpoint Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x01" name="THERMOSTAT_SETPOINT_SET" help="Thermostat Setpoint Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11673,19 +12486,19 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="THERMOSTAT_SETPOINT_SUPPORTED_GET" help="Thermostat Setpoint Supported Get" comment="" />
-        <cmd key="0x05" name="THERMOSTAT_SETPOINT_SUPPORTED_REPORT" help="Thermostat Setpoint Supported Report" comment="">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
+        <cmd key="0x04" name="THERMOSTAT_SETPOINT_SUPPORTED_GET" help="Thermostat Setpoint Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="THERMOSTAT_SETPOINT_SUPPORTED_REPORT" help="Thermostat Setpoint Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
                 <bitflag key="0x00" flagname="None" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Heating" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Cooling" flagmask="0x02" />
@@ -11700,9 +12513,9 @@
                 <bitflag key="0x0B" flagname="Full Power" flagmask="0x0F" />
             </param>
         </cmd>
-        <cmd key="0x09" name="THERMOSTAT_SETPOINT_CAPABILITIES_GET" help="Thermostat Setpoint Capabilities Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x09" name="THERMOSTAT_SETPOINT_CAPABILITIES_GET" help="Thermostat Setpoint Capabilities Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11723,9 +12536,9 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="THERMOSTAT_SETPOINT_CAPABILITIES_REPORT" help="Thermostat Setpoint Capabilities Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x0A" name="THERMOSTAT_SETPOINT_CAPABILITIES_REPORT" help="Thermostat Setpoint Capabilities Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum value="not supported" />
                     <fieldenum value="Heating 1" />
                     <fieldenum value="Cooling 1" />
@@ -11745,663 +12558,820 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale1" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Min Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Min Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size2" fieldmask="0x07" shifter="0" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size2" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Scale2" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Precision2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x04" name="MaxValue" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="3" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x04" name="MaxValue" type="VARIANT">
+                <variant paramoffs="3" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x8B" version="1" name="COMMAND_CLASS_TIME_PARAMETERS" help="Command Class Time Parameters" read_only="false" comment="">
-        <cmd key="0x02" name="TIME_PARAMETERS_GET" help="Time Parameters Get" comment="" />
-        <cmd key="0x03" name="TIME_PARAMETERS_REPORT" help="Time Parameters Report" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Hour UTC" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Minute UTC" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Second UTC" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x01" name="TIME_PARAMETERS_SET" help="Time Parameters Set" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Hour UTC" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Minute UTC" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Second UTC" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x8B" version="1" name="COMMAND_CLASS_TIME_PARAMETERS" help="Command Class Time Parameters">
+        <cmd key="0x02" name="TIME_PARAMETERS_GET" help="Time Parameters Get" support_mode="RX" />
+        <cmd key="0x03" name="TIME_PARAMETERS_REPORT" help="Time Parameters Report" support_mode="TX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+            <param key="0x03" name="Hour UTC" type="BYTE" />
+            <param key="0x04" name="Minute UTC" type="BYTE" />
+            <param key="0x05" name="Second UTC" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="TIME_PARAMETERS_SET" help="Time Parameters Set" support_mode="RX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+            <param key="0x03" name="Hour UTC" type="BYTE" />
+            <param key="0x04" name="Minute UTC" type="BYTE" />
+            <param key="0x05" name="Second UTC" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x8A" version="1" name="COMMAND_CLASS_TIME" help="Command Class Time" read_only="false" comment="">
-        <cmd key="0x03" name="DATE_GET" help="Date Get" comment="" />
-        <cmd key="0x04" name="DATE_REPORT" help="Date Report" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x01" name="TIME_GET" help="Time Get" comment="" />
-        <cmd key="0x02" name="TIME_REPORT" help="Time Report" comment="">
-            <param key="0x00" name="Hour Local Time" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour Local Time" fieldmask="0x1F" shifter="0" />
+    <cmd_class key="0x8A" version="1" name="COMMAND_CLASS_TIME" help="Command Class Time">
+        <cmd key="0x03" name="DATE_GET" help="Date Get" support_mode="RX" />
+        <cmd key="0x04" name="DATE_REPORT" help="Date Report" support_mode="TX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="TIME_GET" help="Time Get" support_mode="RX" />
+        <cmd key="0x02" name="TIME_REPORT" help="Time Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour Local Time" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="RTC failure" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Minute Local Time" type="BYTE" />
+            <param key="0x02" name="Second Local Time" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x8A" version="2" name="COMMAND_CLASS_TIME" help="Command Class Time" read_only="false" comment="">
-        <cmd key="0x03" name="DATE_GET" help="Date Get" comment="" />
-        <cmd key="0x04" name="DATE_REPORT" help="Date Report" comment="">
-            <param key="0x00" name="Year" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Month" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Day" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x01" name="TIME_GET" help="Time Get" comment="" />
-        <cmd key="0x06" name="TIME_OFFSET_GET" help="Time Offset Get" comment="" />
-        <cmd key="0x07" name="TIME_OFFSET_REPORT" help="Time Offset Report" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" shifter="0" />
+    <cmd_class key="0x8A" version="2" name="COMMAND_CLASS_TIME" help="Command Class Time">
+        <cmd key="0x03" name="DATE_GET" help="Date Get" support_mode="RX" />
+        <cmd key="0x04" name="DATE_REPORT" help="Date Report" support_mode="TX">
+            <param key="0x00" name="Year" type="WORD" />
+            <param key="0x01" name="Month" type="BYTE" />
+            <param key="0x02" name="Day" type="BYTE" />
+        </cmd>
+        <cmd key="0x01" name="TIME_GET" help="Time Get" support_mode="RX" />
+        <cmd key="0x06" name="TIME_OFFSET_GET" help="Time Offset Get" support_mode="RX" />
+        <cmd key="0x07" name="TIME_OFFSET_REPORT" help="Time Offset Report" support_mode="TX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Minute TZO" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Minute TZO" type="BYTE" />
+            <param key="0x02" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Month Start DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Day Start DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Hour Start DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Month End DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Day End DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Hour End DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x03" name="Month Start DST" type="BYTE" />
+            <param key="0x04" name="Day Start DST" type="BYTE" />
+            <param key="0x05" name="Hour Start DST" type="BYTE" />
+            <param key="0x06" name="Month End DST" type="BYTE" />
+            <param key="0x07" name="Day End DST" type="BYTE" />
+            <param key="0x08" name="Hour End DST" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="TIME_OFFSET_SET" help="Time Offset Set" comment="">
-            <param key="0x00" name="Level" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="TIME_OFFSET_SET" help="Time Offset Set" support_mode="RX">
+            <param key="0x00" name="Level" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour TZO" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Sign TZO" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Minute TZO" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Level2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" shifter="0" />
+            <param key="0x01" name="Minute TZO" type="BYTE" />
+            <param key="0x02" name="Level2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Minute Offset DST" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Sign Offset DST" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Month Start DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Day Start DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Hour Start DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Month End DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="Day End DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Hour End DST" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x03" name="Month Start DST" type="BYTE" />
+            <param key="0x04" name="Day Start DST" type="BYTE" />
+            <param key="0x05" name="Hour Start DST" type="BYTE" />
+            <param key="0x06" name="Month End DST" type="BYTE" />
+            <param key="0x07" name="Day End DST" type="BYTE" />
+            <param key="0x08" name="Hour End DST" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="TIME_REPORT" help="Time Report" comment="">
-            <param key="0x00" name="Hour Local Time" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Hour Local Time" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x02" name="TIME_REPORT" help="Time Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Hour Local Time" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x60" shifter="5" />
                 <bitflag key="0x02" flagname="RTC failure" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Minute Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Second Local Time" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Minute Local Time" type="BYTE" />
+            <param key="0x02" name="Second Local Time" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x55" version="2" name="COMMAND_CLASS_TRANSPORT_SERVICE" help="Command Class Transport Service" read_only="false" comment="">
-        <cmd key="0xC0" name="COMMAND_FIRST_SEGMENT" help="First Segment" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="datagram_size_1 " fieldmask="0x07" shifter="0" />
-            </param>
-            <param key="0x01" name="datagram_size_2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x55" version="2" name="COMMAND_CLASS_TRANSPORT_SERVICE" help="Command Class Transport Service">
+        <cmd key="0xC0" name="COMMAND_FIRST_SEGMENT" help="First Segment" cmd_mask="0xF8">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="datagram_size_1" fieldmask="0x07" />
+            </param>
+            <param key="0x01" name="datagram_size_2" type="BYTE" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x07" />
                 <bitflag key="0x01" flagname="Ext" flagmask="0x08" />
                 <bitfield key="0x02" fieldname="Session ID" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x03" name="Header Extension Length" type="BYTE" typehashcode="0x01" optionaloffs="0x02" optionalmask="0x08">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Header Extension" type="VARIANT" typehashcode="0x0C" optionaloffs="0x02" optionalmask="0x08">
-                <variant paramoffs="3" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x03" name="Header Extension Length" type="BYTE" optionaloffs="0x02" optionalmask="0x08" />
+            <param key="0x04" name="Header Extension" type="VARIANT" optionaloffs="0x02" optionalmask="0x08">
+                <variant paramoffs="3" sizemask="0xFF" />
             </param>
-            <param key="0x05" name="Payload" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x06" name="Frame Check Sequence" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Payload" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x06" name="Frame Check Sequence" type="WORD" />
         </cmd>
-        <cmd key="0xE8" name="COMMAND_SEGMENT_COMPLETE" help="Segment Complete" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="reserved" fieldmask="0x07" shifter="0" />
+        <cmd key="0xE8" name="COMMAND_SEGMENT_COMPLETE" help="Segment Complete" cmd_mask="0xF8">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="reserved" fieldmask="0x07" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="reserved2" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="reserved2" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Session ID" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0xC8" name="COMMAND_SEGMENT_REQUEST" help="Segment Request" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="reserved" fieldmask="0x07" shifter="0" />
+        <cmd key="0xC8" name="COMMAND_SEGMENT_REQUEST" help="Segment Request" cmd_mask="0xF8">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="reserved" fieldmask="0x07" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="datagram_offset_1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="datagram_offset_1" fieldmask="0x07" />
                 <bitflag key="0x01" flagname="reserved2" flagmask="0x08" />
                 <bitfield key="0x02" fieldname="Session ID" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="datagram_offset_2" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="datagram_offset_2" type="BYTE" />
         </cmd>
-        <cmd key="0xF0" name="COMMAND_SEGMENT_WAIT" help="Segment Wait" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="reserved" fieldmask="0x07" shifter="0" />
-            </param>
-            <param key="0x01" name="pending_fragments" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0xF0" name="COMMAND_SEGMENT_WAIT" help="Segment Wait" cmd_mask="0xF8">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="reserved" fieldmask="0x07" />
             </param>
+            <param key="0x01" name="pending_fragments" type="BYTE" />
         </cmd>
-        <cmd key="0xE0" name="COMMAND_SUBSEQUENT_SEGMENT" help="Subsequent Segment" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="datagram_size_1" fieldmask="0x07" shifter="0" />
-            </param>
-            <param key="0x01" name="datagram_size_2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0xE0" name="COMMAND_SUBSEQUENT_SEGMENT" help="Subsequent Segment" cmd_mask="0xF8">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="datagram_size_1" fieldmask="0x07" />
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="datagram_offset_1" fieldmask="0x07" shifter="0" />
-                <bitflag key="0xFF" flagname="Ext" flagmask="0x08" />
+            <param key="0x01" name="datagram_size_2" type="BYTE" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="datagram_offset_1" fieldmask="0x07" />
+                <bitflag key="0x01" flagname="Ext" flagmask="0x08" />
                 <bitfield key="0x02" fieldname="Session ID" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x03" name="datagram_offset_2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Header Extension Length" type="BYTE" typehashcode="0x01" comment="" optionaloffs="0x02" optionalmask="0x08">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+            <param key="0x03" name="datagram_offset_2" type="BYTE" />
+            <param key="0x04" name="Header Extension Length" type="BYTE" optionaloffs="0x02" optionalmask="0x08" />
+            <param key="0x05" name="Header Extension" type="VARIANT" optionaloffs="0x02" optionalmask="0x08">
+                <variant paramoffs="4" sizemask="0xFF" />
             </param>
-            <param key="0x05" name="Header Extension" type="VARIANT" typehashcode="0x0C" comment="" optionaloffs="0x02" optionalmask="0x08">
-                <variant paramoffs="4" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
-            </param>
-            <param key="0x06" name="Payload" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x07" name="Frame Check Sequence" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x06" name="Payload" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x07" name="Frame Check Sequence" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x55" version="1" name="COMMAND_CLASS_TRANSPORT_SERVICE" help="Command Class Transport Service" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0xC0" name="COMMAND_FIRST_FRAGMENT" help="First Fragment" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="datagram_size_1 " fieldmask="0x07" shifter="0" />
-            </param>
-            <param key="0x01" name="datagram_size_2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Sequence No" fieldmask="0x0F" shifter="0" />
+    <cmd_class key="0x55" version="1" name="COMMAND_CLASS_TRANSPORT_SERVICE" help="Command Class Transport Service" comment="[OBSOLETED]">
+        <cmd key="0xC0" name="COMMAND_FIRST_FRAGMENT" help="First Fragment" cmd_mask="0xF8" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="datagram_size_1" fieldmask="0x07" />
+            </param>
+            <param key="0x01" name="datagram_size_2" type="BYTE" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Sequence No" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x03" name="Payload" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x04" name="Checksum" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Payload" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x04" name="Checksum" type="WORD" />
         </cmd>
-        <cmd key="0xE0" name="COMMAND_SUBSEQUENT_FRAGMENT" help="Subsequent Fragment" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="datagram_size_1" fieldmask="0x07" shifter="0" />
-            </param>
-            <param key="0x01" name="datagram_size_2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0xE0" name="COMMAND_SUBSEQUENT_FRAGMENT" help="Subsequent Fragment" cmd_mask="0xF8" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="datagram_size_1" fieldmask="0x07" />
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="datagram_offset_1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="datagram_size_2" type="BYTE" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="datagram_offset_1" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Sequence No" fieldmask="0x78" shifter="3" />
                 <bitflag key="0x02" flagname="Reserved" flagmask="0x80" />
             </param>
-            <param key="0x03" name="datagram_offset_2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Payload" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-            <param key="0x05" name="Checksum" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="datagram_offset_2" type="BYTE" />
+            <param key="0x04" name="Payload" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
+            <param key="0x05" name="Checksum" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x63" version="1" name="COMMAND_CLASS_USER_CODE" help="Command Class User Code" read_only="false" comment="">
-        <cmd key="0x02" name="USER_CODE_GET" help="User Code Get" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x63" version="1" name="COMMAND_CLASS_USER_CODE" help="Command Class User Code">
+        <cmd key="0x02" name="USER_CODE_GET" help="User Code Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x03" name="USER_CODE_REPORT" help="User Code Report" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="User ID Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x03" name="USER_CODE_REPORT" help="User Code Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="User ID Status" type="CONST">
                 <const key="0x00" flagname="Available (not set)" flagmask="0x00" />
                 <const key="0x01" flagname="Occupied" flagmask="0x01" />
                 <const key="0x02" flagname="Reserved by administrator" flagmask="0x02" />
                 <const key="0x03" flagname="Status not available" flagmask="0xFE" />
             </param>
-            <param key="0x02" name="USER_CODE" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="10" is_ascii="true" />
+            <param key="0x02" name="USER_CODE" type="VARIANT">
+                <variant paramoffs="255" is_ascii="true" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x01" name="USER_CODE_SET" help="User Code Set" comment="">
-            <param key="0x00" name="User Identifier" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="User ID Status" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x01" name="USER_CODE_SET" help="User Code Set" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="User ID Status" type="CONST">
                 <const key="0x00" flagname="Available (not set)" flagmask="0x00" />
                 <const key="0x01" flagname="Occupied" flagmask="0x01" />
                 <const key="0x02" flagname="Reserved by administrator" flagmask="0x02" />
                 <const key="0x03" flagname="Status not available" flagmask="0xFE" />
             </param>
-            <param key="0x02" name="USER_CODE" type="ARRAY" typehashcode="0x05" comment="">
-                <arrayattrib key="0x00" len="10" is_ascii="true" />
+            <param key="0x02" name="USER_CODE" type="VARIANT">
+                <variant paramoffs="255" is_ascii="true" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x04" name="USERS_NUMBER_GET" help="Users Number Get" comment="" />
-        <cmd key="0x05" name="USERS_NUMBER_REPORT" help="Users Number Report" comment="">
-            <param key="0x00" name="Supported Users" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x04" name="USERS_NUMBER_GET" help="Users Number Get" support_mode="RX" />
+        <cmd key="0x05" name="USERS_NUMBER_REPORT" help="Users Number Report" support_mode="TX">
+            <param key="0x00" name="Supported Users" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x86" version="1" name="COMMAND_CLASS_VERSION" help="Command Class Version" read_only="false" comment="">
-        <cmd key="0x13" name="VERSION_COMMAND_CLASS_GET" help="Version Command Class Get" comment="">
-            <param key="0x00" name="Requested Command Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x63" version="2" name="COMMAND_CLASS_USER_CODE" help="Command Class User Code">
+        <cmd key="0x02" name="USER_CODE_GET" help="User Code Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="USER_CODE_REPORT" help="User Code Report" support_mode="TX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="User ID Status" type="CONST">
+                <const key="0x00" flagname="Available" flagmask="0x00" />
+                <const key="0x01" flagname="Enabled / Grant Access" flagmask="0x01" />
+                <const key="0x02" flagname="Disabled" flagmask="0x02" />
+                <const key="0x03" flagname="Messaging" flagmask="0x03" />
+                <const key="0x04" flagname="Passage Mode" flagmask="0x04" />
+                <const key="0x05" flagname="Status not available" flagmask="0xFE" />
+            </param>
+            <param key="0x02" name="USER_CODE" type="VARIANT">
+                <variant paramoffs="255" is_ascii="true" sizemask="0x00" />
+            </param>
+        </cmd>
+        <cmd key="0x01" name="USER_CODE_SET" help="User Code Set" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="BYTE" />
+            <param key="0x01" name="User ID Status" type="CONST">
+                <const key="0x00" flagname="Available" flagmask="0x00" />
+                <const key="0x01" flagname="Enabled / Grant Access" flagmask="0x01" />
+                <const key="0x02" flagname="Disabled" flagmask="0x02" />
+                <const key="0x03" flagname="Messaging" flagmask="0x03" />
+                <const key="0x04" flagname="Passage Mode" flagmask="0x04" />
+                <const key="0x05" flagname="Status not available" flagmask="0xFE" />
+            </param>
+            <param key="0x02" name="USER_CODE" type="VARIANT">
+                <variant paramoffs="255" is_ascii="true" sizemask="0x00" />
+            </param>
+        </cmd>
+        <cmd key="0x04" name="USERS_NUMBER_GET" help="Users Number Get" support_mode="RX" />
+        <cmd key="0x05" name="USERS_NUMBER_REPORT" help="Users Number Report" support_mode="TX">
+            <param key="0x00" name="Supported Users" type="BYTE" />
+            <param key="0x01" name="Extended Supported Users" type="WORD" />
+        </cmd>
+        <cmd key="0x0B" name="EXTENDED_USER_CODE_SET" help="Extended User Code Set" support_mode="RX">
+            <param key="0x00" name="Number of User Codes" type="BYTE" />
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="User Identifier" type="WORD" />
+                <param key="0x01" name="User ID Status" type="CONST">
+                    <const key="0x00" flagname="Available" flagmask="0x00" />
+                    <const key="0x01" flagname="Enabled / Grant Access" flagmask="0x01" />
+                    <const key="0x02" flagname="Disabled" flagmask="0x02" />
+                    <const key="0x03" flagname="Messaging" flagmask="0x03" />
+                    <const key="0x04" flagname="Passage Mode" flagmask="0x04" />
+                    <const key="0x05" flagname="Status not available" flagmask="0xFE" />
+                </param>
+                <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="User Code Length" fieldmask="0x0F" />
+                    <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
+                </param>
+                <param key="0x03" name="User Code" type="VARIANT">
+                    <variant paramoffs="2" sizemask="0x0F" />
+                </param>
+            </variant_group>
         </cmd>
-        <cmd key="0x14" name="VERSION_COMMAND_CLASS_REPORT" help="Version Command Class Report" comment="">
-            <param key="0x00" name="Requested Command Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Command Class Version" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0C" name="EXTENDED_USER_CODE_GET" help="Extended User Code Get" support_mode="RX">
+            <param key="0x00" name="User Identifier" type="WORD" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Report more" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
         </cmd>
-        <cmd key="0x11" name="VERSION_GET" help="Version Get" comment="" />
-        <cmd key="0x12" name="VERSION_REPORT" help="Version Report" comment="">
-            <param key="0x00" name="Z-Wave Library Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Z-Wave Protocol Version" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Z-Wave Protocol Sub Version" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Application Version" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0D" name="EXTENDED_USER_CODE_REPORT" help="Extended User Code Report" support_mode="TX">
+            <param key="0x00" name="Number of User Codes" type="BYTE" />
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" optionaloffs="0x00" optionalmask="0xFF">
+                <param key="0x00" name="User Identifier" type="WORD" />
+                <param key="0x01" name="User ID Status" type="CONST">
+                    <const key="0x00" flagname="Available" flagmask="0x00" />
+                    <const key="0x01" flagname="Enabled / Grant Access" flagmask="0x01" />
+                    <const key="0x02" flagname="Disabled" flagmask="0x02" />
+                    <const key="0x03" flagname="Messaging" flagmask="0x03" />
+                    <const key="0x04" flagname="Passage Mode" flagmask="0x04" />
+                    <const key="0x05" flagname="Status not available" flagmask="0xFE" />
+                </param>
+                <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="User Code Length" fieldmask="0x0F" />
+                    <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
+                </param>
+                <param key="0x03" name="User Code" type="VARIANT">
+                    <variant paramoffs="2" sizemask="0x0F" />
+                </param>
+            </variant_group>
+            <param key="0x02" name="Next User Identifier" type="WORD" />
+        </cmd>
+        <cmd key="0x06" name="USER_CODE_CAPABILITIES_GET" help="User Code Capabilities Get" support_mode="RX" />
+        <cmd key="0x07" name="USER_CODE_CAPABILITIES_REPORT" help="User Code Capabilities Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported User ID Status Bit Mask Length" fieldmask="0x1F" />
+                <bitflag key="0x01" flagname="Reserved1" flagmask="0x20" />
+                <bitflag key="0x02" flagname="MCD Support" flagmask="0x40" />
+                <bitflag key="0x03" flagname="MC Support" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Supported User ID Status Bit Mask" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x1F" />
+            </param>
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Keypad Modes Bit Mask Length" fieldmask="0x1F" />
+                <bitflag key="0x01" flagname="MUCS Support" flagmask="0x20" />
+                <bitflag key="0x02" flagname="MUCR Support" flagmask="0x40" />
+                <bitflag key="0x03" flagname="UCC Support" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Supported Keypad Modes Bit Mask" type="VARIANT">
+                <variant paramoffs="2" sizemask="0x1F" />
+            </param>
+            <param key="0x04" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Keys Bit Mask Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x04" name="Application Sub Version" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Supported Keys Bit Mask" type="VARIANT">
+                <variant paramoffs="4" sizemask="0x1F" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x86" version="2" name="COMMAND_CLASS_VERSION" help="Command Class Version" read_only="false" comment="">
-        <cmd key="0x13" name="VERSION_COMMAND_CLASS_GET" help="Version Command Class Get" comment="">
-            <param key="0x00" name="Requested Command Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x08" name="USER_CODE_KEYPAD_MODE_SET" help="User Code Keypad Mode Set" support_mode="RX">
+            <param key="0x00" name="Keypad Mode" type="CONST">
+                <const key="0x00" flagname="Normal mode" flagmask="0x00" />
+                <const key="0x01" flagname="Vacation mode" flagmask="0x01" />
+                <const key="0x02" flagname="Privacy mode" flagmask="0x02" />
+                <const key="0x03" flagname="Locked Out mode" flagmask="0x03" />
             </param>
         </cmd>
-        <cmd key="0x14" name="VERSION_COMMAND_CLASS_REPORT" help="Version Command Class Report" comment="">
-            <param key="0x00" name="Requested Command Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Command Class Version" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x09" name="USER_CODE_KEYPAD_MODE_GET" help="User Code Keypad Mode Get" support_mode="RX" />
+        <cmd key="0x0A" name="USER_CODE_KEYPAD_MODE_REPORT" help="User Code Keypad Mode Report" support_mode="TX">
+            <param key="0x00" name="Keypad Mode" type="CONST">
+                <const key="0x00" flagname="Normal mode" flagmask="0x00" />
+                <const key="0x01" flagname="Vacation mode" flagmask="0x01" />
+                <const key="0x02" flagname="Privacy mode" flagmask="0x02" />
+                <const key="0x03" flagname="Locked Out mode" flagmask="0x03" />
             </param>
         </cmd>
-        <cmd key="0x11" name="VERSION_GET" help="Version Get" comment="" />
-        <cmd key="0x12" name="VERSION_REPORT" help="Version Report" comment="">
-            <param key="0x00" name="Z-Wave Library Type" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Z-Wave Protocol Version" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Z-Wave Protocol Sub Version" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Firmware 0 Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0E" name="MASTER_CODE_SET" help="Master Code Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Master Code Length" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x04" name="Firmware 0 Sub Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Master Code" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x0F" />
             </param>
-            <param key="0x05" name="Hardware Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x0F" name="MASTER_CODE_GET" help="Master Code Get" support_mode="RX" />
+        <cmd key="0x10" name="MASTER_CODE_REPORT" help="Master Code Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Master Code Length" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x06" name="Number of firmware targets" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Master Code" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x0F" />
             </param>
-            <variant_group key="0x07" name="vg" variantKey="0x00" paramOffs="0x06" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D" comment="">
-                <param key="0x00" name="Firmware Version" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Firmware Sub Version" type="BYTE" typehashcode="0x01" comment="">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+        </cmd>
+        <cmd key="0x11" name="USER_CODE_CHECKSUM_GET" help="User Code Checksum Get" support_mode="RX" />
+        <cmd key="0x12" name="USER_CODE_CHECKSUM_REPORT" help="User Code Checksum Report" support_mode="TX">
+            <param key="0x00" name="User Code Checksum" type="WORD" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x86" version="1" name="COMMAND_CLASS_VERSION" help="Command Class Version">
+        <cmd key="0x13" name="VERSION_COMMAND_CLASS_GET" help="Version Command Class Get" support_mode="RX">
+            <param key="0x00" name="Requested Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+        </cmd>
+        <cmd key="0x14" name="VERSION_COMMAND_CLASS_REPORT" help="Version Command Class Report" support_mode="TX">
+            <param key="0x00" name="Requested Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x01" name="Command Class Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x11" name="VERSION_GET" help="Version Get" support_mode="RX" />
+        <cmd key="0x12" name="VERSION_REPORT" help="Version Report" support_mode="TX">
+            <param key="0x00" name="Z-Wave Library Type" type="BYTE" />
+            <param key="0x01" name="Z-Wave Protocol Version" type="BYTE" />
+            <param key="0x02" name="Z-Wave Protocol Sub Version" type="BYTE" />
+            <param key="0x03" name="Application Version" type="BYTE" />
+            <param key="0x04" name="Application Sub Version" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x86" version="2" name="COMMAND_CLASS_VERSION" help="Command Class Version">
+        <cmd key="0x13" name="VERSION_COMMAND_CLASS_GET" help="Version Command Class Get" support_mode="RX">
+            <param key="0x00" name="Requested Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+        </cmd>
+        <cmd key="0x14" name="VERSION_COMMAND_CLASS_REPORT" help="Version Command Class Report" support_mode="TX">
+            <param key="0x00" name="Requested Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x01" name="Command Class Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x11" name="VERSION_GET" help="Version Get" support_mode="RX" />
+        <cmd key="0x12" name="VERSION_REPORT" help="Version Report" support_mode="TX">
+            <param key="0x00" name="Z-Wave Library Type" type="BYTE" />
+            <param key="0x01" name="Z-Wave Protocol Version" type="BYTE" />
+            <param key="0x02" name="Z-Wave Protocol Sub Version" type="BYTE" />
+            <param key="0x03" name="Firmware 0 Version" type="BYTE" />
+            <param key="0x04" name="Firmware 0 Sub Version" type="BYTE" />
+            <param key="0x05" name="Hardware Version" type="BYTE" />
+            <param key="0x06" name="Number of firmware targets" type="BYTE" />
+            <variant_group key="0x07" name="vg" paramOffs="0x06" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Firmware Version" type="BYTE" />
+                <param key="0x01" name="Firmware Sub Version" type="BYTE" />
             </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x84" version="1" name="COMMAND_CLASS_WAKE_UP" help="Command Class Wake Up" read_only="false" comment="">
-        <cmd key="0x05" name="WAKE_UP_INTERVAL_GET" help="Wake Up Interval Get" comment="" />
-        <cmd key="0x06" name="WAKE_UP_INTERVAL_REPORT" help="Wake Up Interval Report" comment="">
-            <param key="0x00" name="Seconds" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+    <cmd_class key="0x86" version="3" name="COMMAND_CLASS_VERSION" help="Command Class Version">
+        <cmd key="0x13" name="VERSION_COMMAND_CLASS_GET" help="Version Command Class Get" support_mode="RX">
+            <param key="0x00" name="Requested Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+        </cmd>
+        <cmd key="0x14" name="VERSION_COMMAND_CLASS_REPORT" help="Version Command Class Report" support_mode="TX">
+            <param key="0x00" name="Requested Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x01" name="Command Class Version" type="BYTE" />
+        </cmd>
+        <cmd key="0x11" name="VERSION_GET" help="Version Get" support_mode="RX" />
+        <cmd key="0x12" name="VERSION_REPORT" help="Version Report" support_mode="TX">
+            <param key="0x00" name="Z-Wave Library Type" type="BYTE" />
+            <param key="0x01" name="Z-Wave Protocol Version" type="BYTE" />
+            <param key="0x02" name="Z-Wave Protocol Sub Version" type="BYTE" />
+            <param key="0x03" name="Firmware 0 Version" type="BYTE" />
+            <param key="0x04" name="Firmware 0 Sub Version" type="BYTE" />
+            <param key="0x05" name="Hardware Version" type="BYTE" />
+            <param key="0x06" name="Number of firmware targets" type="BYTE" />
+            <variant_group key="0x07" name="vg" paramOffs="0x06" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Firmware Version" type="BYTE" />
+                <param key="0x01" name="Firmware Sub Version" type="BYTE" />
+            </variant_group>
         </cmd>
-        <cmd key="0x04" name="WAKE_UP_INTERVAL_SET" help="Wake Up Interval Set" comment="">
-            <param key="0x00" name="Seconds" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x15" name="VERSION_CAPABILITIES_GET" help="Version Capabilities Get" support_mode="RX" />
+        <cmd key="0x16" name="VERSION_CAPABILITIES_REPORT" help="Version Capabilities Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Version" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Command Class" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Z-Wave Software" flagmask="0x04" />
+                <bitfield key="0x03" fieldname="Reserved1" fieldmask="0xF8" shifter="3" />
+            </param>
+        </cmd>
+        <cmd key="0x17" name="VERSION_ZWAVE_SOFTWARE_GET" help="Version Z-Wave Software Get" support_mode="RX" />
+        <cmd key="0x18" name="VERSION_ZWAVE_SOFTWARE_REPORT" help="Version Z-Wave Software Report" support_mode="TX">
+            <param key="0x00" name="SDK version" type="BIT_24" />
+            <param key="0x01" name="Application Framework API Version" type="BIT_24" />
+            <param key="0x02" name="Application Framework Build Number" type="WORD" />
+            <param key="0x03" name="Host Interface Version" type="BIT_24" />
+            <param key="0x04" name="Host Interface Build Number" type="WORD" />
+            <param key="0x05" name="Z-Wave Protocol Version" type="BIT_24" />
+            <param key="0x06" name="Z-Wave Protocol Build Number" type="WORD" />
+            <param key="0x07" name="Application Version" type="BIT_24" />
+            <param key="0x08" name="Application Build Number" type="WORD" />
         </cmd>
-        <cmd key="0x08" name="WAKE_UP_NO_MORE_INFORMATION" help="Wake Up No More Information" comment="" />
-        <cmd key="0x07" name="WAKE_UP_NOTIFICATION" help="Wake Up Notification" comment="" />
     </cmd_class>
-    <cmd_class key="0x84" version="2" name="COMMAND_CLASS_WAKE_UP" help="Command Class Wake Up" read_only="false" comment="">
-        <cmd key="0x09" name="WAKE_UP_INTERVAL_CAPABILITIES_GET" help="Wake Up Interval Capabilities Get" comment="" />
-        <cmd key="0x0A" name="WAKE_UP_INTERVAL_CAPABILITIES_REPORT" help="Wake Up Interval Capabilities Report" comment="">
-            <param key="0x00" name="Minimum Wake Up Interval Seconds" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Maximum Wake Up Interval Seconds" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Default Wake Up Interval Seconds" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Wake Up Interval Step Seconds" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="false" />
+    <cmd_class key="0x84" version="1" name="COMMAND_CLASS_WAKE_UP" help="Command Class Wake Up">
+        <cmd key="0x05" name="WAKE_UP_INTERVAL_GET" help="Wake Up Interval Get" support_mode="RX" />
+        <cmd key="0x06" name="WAKE_UP_INTERVAL_REPORT" help="Wake Up Interval Report" support_mode="TX">
+            <param key="0x00" name="Seconds" type="BIT_24" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x04" name="WAKE_UP_INTERVAL_SET" help="Wake Up Interval Set" support_mode="RX">
+            <param key="0x00" name="Seconds" type="BIT_24" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x08" name="WAKE_UP_NO_MORE_INFORMATION" help="Wake Up No More Information" support_mode="RX" />
+        <cmd key="0x07" name="WAKE_UP_NOTIFICATION" help="Wake Up Notification" support_mode="TX" />
+    </cmd_class>
+    <cmd_class key="0x84" version="2" name="COMMAND_CLASS_WAKE_UP" help="Command Class Wake Up">
+        <cmd key="0x09" name="WAKE_UP_INTERVAL_CAPABILITIES_GET" help="Wake Up Interval Capabilities Get" support_mode="RX" />
+        <cmd key="0x0A" name="WAKE_UP_INTERVAL_CAPABILITIES_REPORT" help="Wake Up Interval Capabilities Report" support_mode="TX">
+            <param key="0x00" name="Minimum Wake Up Interval Seconds" type="BIT_24" />
+            <param key="0x01" name="Maximum Wake Up Interval Seconds" type="BIT_24" />
+            <param key="0x02" name="Default Wake Up Interval Seconds" type="BIT_24" />
+            <param key="0x03" name="Wake Up Interval Step Seconds" type="BIT_24" />
+        </cmd>
+        <cmd key="0x05" name="WAKE_UP_INTERVAL_GET" help="Wake Up Interval Get" support_mode="RX" />
+        <cmd key="0x06" name="WAKE_UP_INTERVAL_REPORT" help="Wake Up Interval Report" support_mode="TX">
+            <param key="0x00" name="Seconds" type="BIT_24" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x04" name="WAKE_UP_INTERVAL_SET" help="Wake Up Interval Set" support_mode="RX">
+            <param key="0x00" name="Seconds" type="BIT_24" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x08" name="WAKE_UP_NO_MORE_INFORMATION" help="Wake Up No More Information" support_mode="RX" />
+        <cmd key="0x07" name="WAKE_UP_NOTIFICATION" help="Wake Up Notification" support_mode="TX" />
+    </cmd_class>
+    <cmd_class key="0x84" version="3" name="COMMAND_CLASS_WAKE_UP" help="Command Class Wake Up">
+        <cmd key="0x09" name="WAKE_UP_INTERVAL_CAPABILITIES_GET" help="Wake Up Interval Capabilities Get" support_mode="RX" />
+        <cmd key="0x0A" name="WAKE_UP_INTERVAL_CAPABILITIES_REPORT" help="Wake Up Interval Capabilities Report" support_mode="TX">
+            <param key="0x00" name="Minimum Wake Up Interval Seconds" type="BIT_24" />
+            <param key="0x01" name="Maximum Wake Up Interval Seconds" type="BIT_24" />
+            <param key="0x02" name="Default Wake Up Interval Seconds" type="BIT_24" />
+            <param key="0x03" name="Wake Up Interval Step Seconds" type="BIT_24" />
+            <param key="0x04" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Wake Up On Demand" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
         </cmd>
-        <cmd key="0x05" name="WAKE_UP_INTERVAL_GET" help="Wake Up Interval Get" comment="" />
-        <cmd key="0x06" name="WAKE_UP_INTERVAL_REPORT" help="Wake Up Interval Report" comment="">
-            <param key="0x00" name="Seconds" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x05" name="WAKE_UP_INTERVAL_GET" help="Wake Up Interval Get" support_mode="RX" />
+        <cmd key="0x06" name="WAKE_UP_INTERVAL_REPORT" help="Wake Up Interval Report" support_mode="TX">
+            <param key="0x00" name="Seconds" type="BIT_24" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x04" name="WAKE_UP_INTERVAL_SET" help="Wake Up Interval Set" comment="">
-            <param key="0x00" name="Seconds" type="BIT_24" typehashcode="0x04" comment="">
-                <bit_24 key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="NodeID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x04" name="WAKE_UP_INTERVAL_SET" help="Wake Up Interval Set" support_mode="RX">
+            <param key="0x00" name="Seconds" type="BIT_24" />
+            <param key="0x01" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x08" name="WAKE_UP_NO_MORE_INFORMATION" help="Wake Up No More Information" comment="" />
-        <cmd key="0x07" name="WAKE_UP_NOTIFICATION" help="Wake Up Notification" comment="" />
+        <cmd key="0x08" name="WAKE_UP_NO_MORE_INFORMATION" help="Wake Up No More Information" support_mode="RX" />
+        <cmd key="0x07" name="WAKE_UP_NOTIFICATION" help="Wake Up Notification" support_mode="TX" />
     </cmd_class>
-    <cmd_class key="0x02" version="1" name="COMMAND_CLASS_ZENSOR_NET" help="Command Class Zensor Net" read_only="false" comment="">
-        <cmd key="0x02" name="BIND_ACCEPT" help="Bind Accept" comment="" />
-        <cmd key="0x03" name="BIND_COMPLETE" help="Bind Complete" comment="" />
-        <cmd key="0x01" name="BIND_REQUEST" help="Bind Request" comment="" />
+    <cmd_class key="0x02" version="1" name="COMMAND_CLASS_ZENSOR_NET" help="Command Class Zensor Net">
+        <cmd key="0x02" name="BIND_ACCEPT" help="Bind Accept" />
+        <cmd key="0x03" name="BIND_COMPLETE" help="Bind Complete" />
+        <cmd key="0x01" name="BIND_REQUEST" help="Bind Request" />
     </cmd_class>
-    <cmd_class key="0x4F" version="1" name="COMMAND_CLASS_ZIP_6LOWPAN" help="Command Class Z/IP 6lowpan" read_only="false" comment="">
-        <cmd key="0xC0" name="LOWPAN_FIRST_FRAGMENT" help="Lowpan First Fragment" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="Datagram Size 1" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x4F" version="1" name="COMMAND_CLASS_ZIP_6LOWPAN" help="Command Class Z/IP 6lowpan">
+        <cmd key="0xC0" name="LOWPAN_FIRST_FRAGMENT" help="Lowpan First Fragment" cmd_mask="0xF8">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="Datagram Size 1" fieldmask="0x07" />
             </param>
-            <param key="0x01" name="Datagram Size 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Datagram Size 2" type="BYTE" />
+            <param key="0x02" name="Datagram Tag" type="BYTE" />
+            <param key="0x03" name="Payload" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x02" name="Datagram Tag" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0xE0" name="LOWPAN_SUBSEQUENT_FRAGMENT" help="Lowpan Subsequent Fragment" cmd_mask="0xF8">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE" cmd_mask="0x07">
+                <bitfield key="0x00" fieldname="Datagram Size 1" fieldmask="0x07" />
             </param>
-            <param key="0x03" name="Payload" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="Datagram Size 2" type="BYTE" />
+            <param key="0x02" name="Datagram Tag" type="BYTE" />
+            <param key="0x03" name="Datagram Offset" type="BYTE" />
+            <param key="0x04" name="Payload" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0xE0" name="LOWPAN_SUBSEQUENT_FRAGMENT" help="Lowpan Subsequent Fragment" comment="" cmd_mask="0xF8">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="" cmd_mask="0x07">
-                <bitfield key="0x00" fieldname="Datagram Size 1" fieldmask="0x07" shifter="0" />
+    </cmd_class>
+    <cmd_class key="0x23" version="1" name="COMMAND_CLASS_ZIP" help="Command Class Z/IP" comment="[OBSOLETED]">
+        <cmd key="0x02" name="COMMAND_ZIP_PACKET" help="Zip Packet" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" />
+                <bitflag key="0x01" flagname="NAck - Option Error" flagmask="0x04" />
+                <bitflag key="0x02" flagname="NAck - Queue Full" flagmask="0x08" />
+                <bitflag key="0x03" flagname="NAck - Waiting" flagmask="0x10" />
+                <bitflag key="0x04" flagname="NAck Response" flagmask="0x20" />
+                <bitflag key="0x05" flagname="Ack Response" flagmask="0x40" />
+                <bitflag key="0x06" flagname="Ack Request" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x1F" />
+                <bitflag key="0x01" flagname="More Information" flagmask="0x20" />
+                <bitflag key="0x02" flagname="Z-Wave Cmd Included" flagmask="0x40" />
+                <bitflag key="0x03" flagname="Header ext. included" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Datagram Size 2" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Seq No" type="BYTE" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved3" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Datagram Tag" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x04" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Bit Address" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Datagram Offset" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Header extension" type="VARIANT" optionaloffs="0x01" optionalmask="0x80">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x04" name="Payload" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x06" name="Z-Wave command" type="VARIANT" optionaloffs="0x01" optionalmask="0x40">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x23" version="1" name="COMMAND_CLASS_ZIP" help="Command Class Z/IP" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x02" name="COMMAND_ZIP_PACKET" help="Zip Packet">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" shifter="0" />
+    <cmd_class key="0x23" version="2" name="COMMAND_CLASS_ZIP" help="Command Class Z/IP">
+        <cmd key="0x02" name="COMMAND_ZIP_PACKET" help="Zip Packet" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" />
                 <bitflag key="0x01" flagname="NAck - Option Error" flagmask="0x04" />
                 <bitflag key="0x02" flagname="NAck - Queue Full" flagmask="0x08" />
                 <bitflag key="0x03" flagname="NAck - Waiting" flagmask="0x10" />
                 <bitflag key="0x04" flagname="NAck Response" flagmask="0x20" />
                 <bitflag key="0x05" flagname="Ack Response" flagmask="0x40" />
-                <bitflag key="0x00" flagname="Ack Request" flagmask="0x80" />
-            </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x1F" shifter="0" />
-                <bitflag key="0x01" flagname="More Information" flagmask="0x20" />
-                <bitflag key="0x02" flagname="Z-Wave Cmd Included" flagmask="0x40" />
-                <bitflag key="0x03" flagname="Header ext. included" flagmask="0x80" />
+                <bitflag key="0x06" flagname="Ack Request" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x0F" />
+                <bitflag key="0x01" flagname="Secure Origin" flagmask="0x10" />
+                <bitflag key="0x02" flagname="More Information" flagmask="0x20" />
+                <bitflag key="0x03" flagname="Z-Wave Cmd Included" flagmask="0x40" />
+                <bitflag key="0x04" flagname="Header ext. included" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Seq No" type="BYTE" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Reserved3" flagmask="0x80" />
             </param>
-            <param key="0x04" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x04" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Bit Address" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Header extension" type="VARIANT" typehashcode="0x0C" optionaloffs="0x01" optionalmask="0x80">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x05" name="Header Length" type="BYTE" optionaloffs="0x01" optionalmask="0x80" />
+            <param key="0x06" name="Header extension" type="VARIANT" optionaloffs="0x01" optionalmask="0x80">
+                <variant paramoffs="5" sizemask="0xFF" sizechange="-1" />
             </param>
-            <param key="0x06" name="Z-Wave command" type="VARIANT" typehashcode="0x0C" optionaloffs="0x01" optionalmask="0x40">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x07" name="Z-Wave command" type="VARIANT" optionaloffs="0x01" optionalmask="0x40">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x23" version="2" name="COMMAND_CLASS_ZIP" help="Command Class Z/IP" read_only="false" comment="">
-        <cmd key="0x02" name="COMMAND_ZIP_PACKET" help="Zip Packet">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" shifter="0" />
+    <cmd_class key="0x23" version="3" name="COMMAND_CLASS_ZIP" help="Command Class Z/IP">
+        <cmd key="0x02" name="COMMAND_ZIP_PACKET" help="Zip Packet" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" />
                 <bitflag key="0x01" flagname="NAck - Option Error" flagmask="0x04" />
                 <bitflag key="0x02" flagname="NAck - Queue Full" flagmask="0x08" />
                 <bitflag key="0x03" flagname="NAck - Waiting" flagmask="0x10" />
                 <bitflag key="0x04" flagname="NAck Response" flagmask="0x20" />
                 <bitflag key="0x05" flagname="Ack Response" flagmask="0x40" />
-                <bitflag key="0x00" flagname="Ack Request" flagmask="0x80" />
+                <bitflag key="0x06" flagname="Ack Request" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x0F" />
                 <bitflag key="0x01" flagname="Secure Origin" flagmask="0x10" />
                 <bitflag key="0x02" flagname="More Information" flagmask="0x20" />
                 <bitflag key="0x03" flagname="Z-Wave Cmd Included" flagmask="0x40" />
                 <bitflag key="0x04" flagname="Header ext. included" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Seq No" type="BYTE" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Reserved3" flagmask="0x80" />
             </param>
-            <param key="0x04" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x04" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Bit Address" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Header Length" type="BYTE" typehashcode="0x01" optionaloffs="0x01" optionalmask="0x80">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Header extension" type="VARIANT" typehashcode="0x0C" optionaloffs="0x01" optionalmask="0x80">
-                <variant paramoffs="5" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" sizechange="-1" />
+            <param key="0x05" name="Header Length" type="BYTE" optionaloffs="0x01" optionalmask="0x80" />
+            <param key="0x06" name="Header extension" type="VARIANT" optionaloffs="0x01" optionalmask="0x80">
+                <variant paramoffs="5" sizemask="0xFF" sizechange="-1" />
             </param>
-            <param key="0x07" name="Z-Wave command" type="VARIANT" typehashcode="0x0C" optionaloffs="0x01" optionalmask="0x40">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x07" name="Z-Wave command" type="VARIANT" optionaloffs="0x01" optionalmask="0x40">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x23" version="3" name="COMMAND_CLASS_ZIP" help="Command Class Z/IP" read_only="false" comment="">
-        <cmd key="0x02" name="COMMAND_ZIP_PACKET" help="Zip Packet">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" shifter="0" />
+    <cmd_class key="0x23" version="4" name="COMMAND_CLASS_ZIP" help="Command Class Z/IP">
+        <cmd key="0x02" name="COMMAND_ZIP_PACKET" help="Zip Packet" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" />
                 <bitflag key="0x01" flagname="NAck - Option Error" flagmask="0x04" />
                 <bitflag key="0x02" flagname="NAck - Queue Full" flagmask="0x08" />
                 <bitflag key="0x03" flagname="NAck - Waiting" flagmask="0x10" />
                 <bitflag key="0x04" flagname="NAck Response" flagmask="0x20" />
                 <bitflag key="0x05" flagname="Ack Response" flagmask="0x40" />
-                <bitflag key="0x00" flagname="Ack Request" flagmask="0x80" />
+                <bitflag key="0x06" flagname="Ack Request" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved2" fieldmask="0x0F" />
                 <bitflag key="0x01" flagname="Secure Origin" flagmask="0x10" />
                 <bitflag key="0x02" flagname="More Information" flagmask="0x20" />
                 <bitflag key="0x03" flagname="Z-Wave Cmd Included" flagmask="0x40" />
                 <bitflag key="0x04" flagname="Header ext. included" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Seq No" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Seq No" type="BYTE" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Source End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Reserved3" flagmask="0x80" />
             </param>
-            <param key="0x04" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" shifter="0" />
+            <param key="0x04" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Destination End Point" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Bit Address" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Header Length" type="BYTE" typehashcode="0x01" optionaloffs="0x01" optionalmask="0x80">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Header Length" type="BYTE" optionaloffs="0x01" optionalmask="0x80" />
+            <param key="0x06" name="Header extension" type="VARIANT" optionaloffs="0x01" optionalmask="0x80">
+                <variant paramoffs="5" sizemask="0xFF" sizechange="-1" />
+            </param>
+            <param key="0x07" name="Z-Wave command" type="VARIANT" optionaloffs="0x01" optionalmask="0x40">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="COMMAND_ZIP_KEEP_ALIVE" help="Zip Keep Alive" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Ack Responce" flagmask="0x40" />
+                <bitflag key="0x02" flagname="Ack Request" flagmask="0x80" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x01" version="1" name="ZWAVE_CMD_CLASS" help="Z-Wave protocol Command Class">
+        <cmd key="0x17" name="ACCEPT_LOST" help="Accept Lost" comment="SDS10264-2" />
+        <cmd key="0x03" name="ASSIGN_ID" help="Assign Id" comment="SDS10264-2" />
+        <cmd key="0x0C" name="ASSIGN_RETURN_ROUTE" help="Assign Return Route" comment="SDS10264-2" />
+        <cmd key="0x14" name="CMD_ASSIGN_SUC_RETURN_ROUTE" help="Assign SUC Return Route" />
+        <cmd key="0x10" name="CMD_AUTOMATIC_CONTROLLER_UPDATE_START" help="Automatic Controller Update Start" />
+        <cmd key="0x1F" name="CMD_NODES_EXIST" help="Cmd Nodes Exist" />
+        <cmd key="0x20" name="CMD_NODES_EXIST_REPLY" help="Cmd Nodes Exist Reply" />
+        <cmd key="0x22" name="CMD_SET_NWI_MODE" help="Cmd Set Nwi Mode" />
+        <cmd key="0x07" name="COMMAND_COMPLETE" help="Command Complete" comment="SDS10264-2" />
+        <cmd key="0x04" name="FIND_NODES_IN_RANGE" help="Find Nodes In Range" comment="SDS10264-2" />
+        <cmd key="0x05" name="GET_NODES_IN_RANGE" help="Get Nodes In Range" comment="SDS10264-2" />
+        <cmd key="0x16" name="LOST" help="Lost" comment="SDS10264-2" />
+        <cmd key="0x0D" name="NEW_NODE_REGISTERED" help="New Node Registered" comment="SDS10264-2" />
+        <cmd key="0x0E" name="NEW_RANGE_REGISTERED" help="New Range Registered" comment="SDS10264-2" />
+        <cmd key="0x01" name="NODE_INFO" help="Node Info" support_mode="RX" comment="SDS10264-2">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Protocol Version" fieldmask="0x07">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Z-Wave Version 2.0" />
+                    <fieldenum value="Z-Wave version ZDK 5.0x, ZDK 4.2x" />
+                    <fieldenum value="Z-Wave version ZDK 4.5x and ZDK 6.0x" />
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="Reserved" />
+                </fieldenum>
+                <fieldenum key="0x01" fieldname="Max baud rate" fieldmask="0x38" shifter="3">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="9.6 kbps" />
+                    <fieldenum value="40 kbps" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="Routing" flagmask="0x40" />
+                <bitflag key="0x03" flagname="Listening" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Security" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Controller" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Specific Device" flagmask="0x04" />
+                <bitflag key="0x03" flagname="Routing Slave" flagmask="0x08" />
+                <bitflag key="0x04" flagname="Beam capability" flagmask="0x10" />
+                <bitflag key="0x05" flagname="Sensor 250ms" flagmask="0x20" />
+                <bitflag key="0x06" flagname="Sensor 1000ms" flagmask="0x40" />
+                <bitflag key="0x07" flagname="Optional Functionality" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Header extension" type="VARIANT" typehashcode="0x0C" optionaloffs="0x01" optionalmask="0x80">
-                <variant paramoffs="5" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" sizechange="-1" />
+            <param key="0x02" name="Properties3" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Speed Extension" fieldmask="0x07">
+                    <fieldenum value="Reserved" />
+                    <fieldenum value="100 kbps" />
+                    <fieldenum value="200 kbps" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x07" name="Z-Wave command" type="VARIANT" typehashcode="0x0C" optionaloffs="0x01" optionalmask="0x40">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x03" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" optionaloffs="0x01" optionalmask="0x02" />
+            <param key="0x04" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x05" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x06" name="Command Classes" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
+        <cmd key="0x06" name="NODE_RANGE_INFO" help="Node Range Info" comment="SDS10264-2" />
+        <cmd key="0x00" name="ZWAVE_CMD_NOP" help="NOP" />
+        <cmd key="0x18" name="CMD_NOP_POWER" help="NOP Power" />
+        <cmd key="0x02" name="REQUEST_NODE_INFO" help="Request Node Info" comment="SDS10264-2" />
+        <cmd key="0x19" name="ZWAVE_CMD_RESERVE_NODE_IDS" help="Reserve Node ID" />
+        <cmd key="0x1A" name="CMD_RESERVED_IDS" help="Reserved ID" />
+        <cmd key="0x12" name="CMD_SET_SUC" help="Set SUC" />
+        <cmd key="0x13" name="CMD_SET_SUC_ACK" help="Set SUC ACK" />
+        <cmd key="0x15" name="CMD_STATIC_ROUTE_REQUEST" help="Static Route Request" />
+        <cmd key="0x11" name="CMD_SUC_NODE_ID" help="SUC Node ID" />
+        <cmd key="0x0B" name="TRANSFER_END" help="Transfer End" support_mode="TX_RX" comment="SDS10264-2" />
+        <cmd key="0x0F" name="TRANSFER_NEW_PRIMARY_COMPLETE" help="Transfer New Primary Complete" comment="SDS10264-2" />
+        <cmd key="0x09" name="TRANSFER_NODE_INFO" help="Transfer Node Info" comment="SDS10264-2" />
+        <cmd key="0x08" name="TRANSFER_PRESENTATION" help="Transfer Presentation" comment="SDS10264-2" />
+        <cmd key="0x0A" name="TRANSFER_RANGE_INFO" help="Transfer Range Info" comment="SDS10264-2" />
+        <cmd key="0x23" name="EXCLUDE_REQUEST" help="Exclude Request" comment="INS13044" />
+        <cmd key="0x24" name="ASSIGN_RETURN_ROUTE_PRIORITY" help="Assign Return Route Priority" />
+        <cmd key="0x25" name="ASSIGN_SUC_RETURN_ROUTE_PRIORITY" help="Assign SUC Return Route Priority" />
+        <cmd key="0x26" name="INCLUDED_NODE_INFO" help="Included Node Info" comment="INS10264" />
+        <cmd key="0x27" name="SMART_START_PRIME" help="Smart Start Prime" comment="INS10264" />
+        <cmd key="0x28" name="SMART_START_INCLUDE" help="Smart Start Include" comment="INS10264" />
     </cmd_class>
-    <cmd_class key="0x01" version="1" name="ZWAVE_CMD_CLASS" help="Z-Wave protocol Command Class" read_only="false" comment="">
+    <cmd_class key="0x04" version="1" name="ZWAVE_CMD_CLASS_LR" help="Z-Wave protocol Command Class (LR)">
         <cmd key="0x17" name="ACCEPT_LOST" help="Accept Lost" comment="SDS10264-2" />
         <cmd key="0x03" name="ASSIGN_ID" help="Assign Id" comment="SDS10264-2" />
         <cmd key="0x0C" name="ASSIGN_RETURN_ROUTE" help="Assign Return Route" comment="SDS10264-2" />
-        <cmd key="0x14" name="CMD_ASSIGN_SUC_RETURN_ROUTE" help="Assign SUC Return Route" comment="" />
-        <cmd key="0x10" name="CMD_AUTOMATIC_CONTROLLER_UPDATE_START" help="Automatic Controller Update Start" comment="" />
-        <cmd key="0x1F" name="CMD_NODES_EXIST" help="Cmd Nodes Exist" comment="" />
-        <cmd key="0x20" name="CMD_NODES_EXIST_REPLY" help="Cmd Nodes Exist Reply" comment="" />
-        <cmd key="0x22" name="CMD_SET_NWI_MODE" help="Cmd Set Nwi Mode" comment="" />
+        <cmd key="0x14" name="CMD_ASSIGN_SUC_RETURN_ROUTE" help="Assign SUC Return Route" />
+        <cmd key="0x10" name="CMD_AUTOMATIC_CONTROLLER_UPDATE_START" help="Automatic Controller Update Start" />
+        <cmd key="0x1F" name="CMD_NODES_EXIST" help="Cmd Nodes Exist" />
+        <cmd key="0x20" name="CMD_NODES_EXIST_REPLY" help="Cmd Nodes Exist Reply" />
+        <cmd key="0x22" name="CMD_SET_NWI_MODE" help="Cmd Set Nwi Mode" />
         <cmd key="0x07" name="COMMAND_COMPLETE" help="Command Complete" comment="SDS10264-2" />
         <cmd key="0x04" name="FIND_NODES_IN_RANGE" help="Find Nodes In Range" comment="SDS10264-2" />
         <cmd key="0x05" name="GET_NODES_IN_RANGE" help="Get Nodes In Range" comment="SDS10264-2" />
         <cmd key="0x16" name="LOST" help="Lost" comment="SDS10264-2" />
         <cmd key="0x0D" name="NEW_NODE_REGISTERED" help="New Node Registered" comment="SDS10264-2" />
         <cmd key="0x0E" name="NEW_RANGE_REGISTERED" help="New Range Registered" comment="SDS10264-2" />
-        <cmd key="0x01" name="NODE_INFO" help="Node Info" comment="SDS10264-2">
-            <param key="0x00" name="Capability" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Protocol Version" fieldmask="0x07" shifter="0">
+        <cmd key="0x01" name="NODE_INFO" help="Node Info" support_mode="RX" comment="SDS10264-2">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Protocol Version" fieldmask="0x07">
                     <fieldenum value="Reserved" />
                     <fieldenum value="Z-Wave Version 2.0" />
                     <fieldenum value="Z-Wave version ZDK 5.0x, ZDK 4.2x" />
@@ -12419,7 +13389,7 @@
                 <bitflag key="0x02" flagname="Routing" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Security" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Security" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Controller" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Specific Device" flagmask="0x04" />
@@ -12429,357 +13399,32 @@
                 <bitflag key="0x06" flagname="Sensor 1000ms" flagmask="0x40" />
                 <bitflag key="0x07" flagname="Optional Functionality" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Speed Extension" fieldmask="0x07" shifter="0">
+            <param key="0x02" name="Properties3" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Speed Extension" fieldmask="0x07">
                     <fieldenum value="Reserved" />
                     <fieldenum value="100 kbps" />
                     <fieldenum value="200 kbps" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x03" name="Basic Device Class" type="ENUM" typehashcode="0x08" comment="" optionaloffs="0x01" optionalmask="0x02">
-                <enum key="0x01" name="BASIC_TYPE_CONTROLLER" />
-                <enum key="0x04" name="BASIC_TYPE_ROUTING_SLAVE" />
-                <enum key="0x03" name="BASIC_TYPE_SLAVE" />
-                <enum key="0x02" name="BASIC_TYPE_STATIC_CONTROLLER" />
-            </param>
-            <param key="0x04" name="Generic Device Class" type="ENUM" typehashcode="0x08" comment="" encaptype="GEN_DEV_REF">
-                <enum key="0x03" name="GENERIC_TYPE_AV_CONTROL_POINT" />
-                <enum key="0x04" name="GENERIC_TYPE_DISPLAY" />
-                <enum key="0x40" name="GENERIC_TYPE_ENTRY_CONTROL" />
-                <enum key="0x01" name="GENERIC_TYPE_GENERIC_CONTROLLER" />
-                <enum key="0x31" name="GENERIC_TYPE_METER" />
-                <enum key="0x30" name="GENERIC_TYPE_METER_PULSE" />
-                <enum key="0xFF" name="GENERIC_TYPE_NON_INTEROPERABLE" />
-                <enum key="0x0F" name="GENERIC_TYPE_REPEATER_SLAVE" />
-                <enum key="0x17" name="GENERIC_TYPE_SECURITY_PANEL" />
-                <enum key="0x50" name="GENERIC_TYPE_SEMI_INTEROPERABLE" />
-                <enum key="0xA1" name="GENERIC_TYPE_SENSOR_ALARM" />
-                <enum key="0x20" name="GENERIC_TYPE_SENSOR_BINARY" />
-                <enum key="0x21" name="GENERIC_TYPE_SENSOR_MULTILEVEL" />
-                <enum key="0x02" name="GENERIC_TYPE_STATIC_CONTROLLER" />
-                <enum key="0x10" name="GENERIC_TYPE_SWITCH_BINARY" />
-                <enum key="0x11" name="GENERIC_TYPE_SWITCH_MULTILEVEL" />
-                <enum key="0x12" name="GENERIC_TYPE_SWITCH_REMOTE" />
-                <enum key="0x13" name="GENERIC_TYPE_SWITCH_TOGGLE" />
-                <enum key="0x08" name="GENERIC_TYPE_THERMOSTAT" />
-                <enum key="0x16" name="GENERIC_TYPE_VENTILATION" />
-                <enum key="0x09" name="GENERIC_TYPE_WINDOW_COVERING" />
-                <enum key="0x15" name="GENERIC_TYPE_ZIP_NODE" />
-                <enum key="0x18" name="GENERIC_TYPE_WALL_CONTROLLER" />
-                <enum key="0x05" name="GENERIC_TYPE_NETWORK_EXTENDER" />
-                <enum key="0x06" name="GENERIC_TYPE_APPLIANCE" />
-                <enum key="0x07" name="GENERIC_TYPE_SENSOR_NOTIFICATION" />
-            </param>
-            <param key="0x05" name="Specific Device Class" type="MULTI_ARRAY" typehashcode="0x0A" comment="" encaptype="SPEC_DEV_REF">
-                <multi_array>
-                    <paramdescloc key="0x00" param="4" paramdesc="255" paramstart="4" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x04" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x04" flagname="SPECIFIC_TYPE_DOORBELL" flagmask="0x12" />
-                    <bitflag key="0x04" flagname="SPECIFIC_TYPE_SATELLITE_RECEIVER" flagmask="0x04" />
-                    <bitflag key="0x04" flagname="SPECIFIC_TYPE_SATELLITE_RECEIVER_V2" flagmask="0x11" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x05" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x05" flagname="SPECIFIC_TYPE_SIMPLE_DISPLAY" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_DOOR_LOCK" flagmask="0x01" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_ADVANCED_DOOR_LOCK" flagmask="0x02" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_KEYPAD_DOOR_LOCK" flagmask="0x03" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_KEYPAD_DOOR_LOCK_DEADBOLT" flagmask="0x04" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_DOOR" flagmask="0x05" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_GATE" flagmask="0x06" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_BARRIER_ADDON" flagmask="0x07" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_BARRIER_OPEN_ONLY" flagmask="0x08" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_BARRIER_CLOSE_ONLY" flagmask="0x09" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_LOCKBOX" flagmask="0x0A" />
-                    <bitflag key="0x41" flagname="SPECIFIC_TYPE_SECURE_KEYPAD" flagmask="0x0B" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x02" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x02" flagname="SPECIFIC_TYPE_PORTABLE_REMOTE_CONTROLLER" flagmask="0x01" />
-                    <bitflag key="0x02" flagname="SPECIFIC_TYPE_PORTABLE_SCENE_CONTROLLER" flagmask="0x02" />
-                    <bitflag key="0x02" flagname="SPECIFIC_TYPE_PORTABLE_INSTALLER_TOOL" flagmask="0x03" />
-                    <bitflag key="0x02" flagname="SPECIFIC_TYPE_REMOTE_CONTROL_AV" flagmask="0x04" />
-                    <bitflag key="0x02" flagname="SPECIFIC_TYPE_REMOTE_CONTROL_SIMPLE" flagmask="0x06" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x32" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x32" flagname="SPECIFIC_TYPE_SIMPLE_METER" flagmask="0x01" />
-                    <bitflag key="0x32" flagname="SPECIFIC_TYPE_ADV_ENERGY_CONTROL" flagmask="0x02" />
-                    <bitflag key="0x32" flagname="SPECIFIC_TYPE_WHOLE_HOME_METER_SIMPLE" flagmask="0x03" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x31" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x00" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x10" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x10" flagname="SPECIFIC_TYPE_REPEATER_SLAVE" flagmask="0x01" />
-                    <bitflag key="0x10" flagname="SPECIFIC_TYPE_VIRTUAL_NODE" flagmask="0x02" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x18" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x18" flagname="SPECIFIC_TYPE_ZONED_SECURITY_PANEL" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x51" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x51" flagname="SPECIFIC_TYPE_ENERGY_PRODUCTION" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_ADV_ZENSOR_NET_ALARM_SENSOR" flagmask="0x05" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_ADV_ZENSOR_NET_SMOKE_SENSOR" flagmask="0x0A" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_BASIC_ROUTING_ALARM_SENSOR" flagmask="0x01" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_BASIC_ROUTING_SMOKE_SENSOR" flagmask="0x06" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_BASIC_ZENSOR_NET_ALARM_SENSOR" flagmask="0x03" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_BASIC_ZENSOR_NET_SMOKE_SENSOR" flagmask="0x08" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_ROUTING_ALARM_SENSOR" flagmask="0x02" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_ROUTING_SMOKE_SENSOR" flagmask="0x07" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_ZENSOR_NET_ALARM_SENSOR" flagmask="0x04" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_ZENSOR_NET_SMOKE_SENSOR" flagmask="0x09" />
-                    <bitflag key="0xA2" flagname="SPECIFIC_TYPE_ALARM_SENSOR" flagmask="0x0B" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x21" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x21" flagname="SPECIFIC_TYPE_ROUTING_SENSOR_BINARY" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x22" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x22" flagname="SPECIFIC_TYPE_ROUTING_SENSOR_MULTILEVEL" flagmask="0x01" />
-                    <bitflag key="0x22" flagname="SPECIFIC_TYPE_CHIMNEY_FAN" flagmask="0x02" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x03" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x03" flagname="SPECIFIC_TYPE_PC_CONTROLLER" flagmask="0x01" />
-                    <bitflag key="0x03" flagname="SPECIFIC_TYPE_SCENE_CONTROLLER" flagmask="0x02" />
-                    <bitflag key="0x03" flagname="SPECIFIC_TYPE_STATIC_INSTALLER_TOOL" flagmask="0x03" />
-                    <bitflag key="0x03" flagname="SPECIFIC_TYPE_SET_TOP_BOX" flagmask="0x04" />
-                    <bitflag key="0x03" flagname="SPECIFIC_TYPE_SUB_SYSTEM_CONTROLLER" flagmask="0x05" />
-                    <bitflag key="0x03" flagname="SPECIFIC_TYPE_TV" flagmask="0x06" />
-                    <bitflag key="0x03" flagname="SPECIFIC_TYPE_GATEWAY" flagmask="0x07" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x11" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x11" flagname="SPECIFIC_TYPE_POWER_SWITCH_BINARY" flagmask="0x01" />
-                    <bitflag key="0x11" flagname="SPECIFIC_TYPE_SCENE_SWITCH_BINARY" flagmask="0x03" />
-                    <bitflag key="0x11" flagname="SPECIFIC_TYPE_POWER_STRIP" flagmask="0x04" />
-                    <bitflag key="0x11" flagname="SPECIFIC_TYPE_SIREN" flagmask="0x05" />
-                    <bitflag key="0x11" flagname="SPECIFIC_TYPE_VALVE_OPEN_CLOSE" flagmask="0x06" />
-                    <bitflag key="0x11" flagname="SPECIFIC_TYPE_COLOR_TUNABLE_BINARY" flagmask="0x02" />
-                    <bitflag key="0x11" flagname="SPECIFIC_TYPE_IRRIGATION_CONTROLLER" flagmask="0x07" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_CLASS_A_MOTOR_CONTROL" flagmask="0x05" />
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_CLASS_B_MOTOR_CONTROL" flagmask="0x06" />
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_CLASS_C_MOTOR_CONTROL" flagmask="0x07" />
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_MOTOR_MULTIPOSITION" flagmask="0x03" />
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_POWER_SWITCH_MULTILEVEL" flagmask="0x01" />
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_SCENE_SWITCH_MULTILEVEL" flagmask="0x04" />
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_FAN_SWITCH" flagmask="0x08" />
-                    <bitflag key="0x12" flagname="SPECIFIC_TYPE_COLOR_TUNABLE_MULTILEVEL" flagmask="0x02" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x13" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x13" flagname="SPECIFIC_TYPE_SWITCH_REMOTE_BINARY" flagmask="0x01" />
-                    <bitflag key="0x13" flagname="SPECIFIC_TYPE_SWITCH_REMOTE_MULTILEVEL" flagmask="0x02" />
-                    <bitflag key="0x13" flagname="SPECIFIC_TYPE_SWITCH_REMOTE_TOGGLE_BINARY" flagmask="0x03" />
-                    <bitflag key="0x13" flagname="SPECIFIC_TYPE_SWITCH_REMOTE_TOGGLE_MULTILEVEL" flagmask="0x04" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x14" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x14" flagname="SPECIFIC_TYPE_SWITCH_TOGGLE_BINARY" flagmask="0x01" />
-                    <bitflag key="0x14" flagname="SPECIFIC_TYPE_SWITCH_TOGGLE_MULTILEVEL" flagmask="0x02" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x09" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x09" flagname="SPECIFIC_TYPE_SETBACK_SCHEDULE_THERMOSTAT" flagmask="0x03" />
-                    <bitflag key="0x09" flagname="SPECIFIC_TYPE_SETBACK_THERMOSTAT" flagmask="0x05" />
-                    <bitflag key="0x09" flagname="SPECIFIC_TYPE_SETPOINT_THERMOSTAT" flagmask="0x04" />
-                    <bitflag key="0x09" flagname="SPECIFIC_TYPE_THERMOSTAT_GENERAL" flagmask="0x02" />
-                    <bitflag key="0x09" flagname="SPECIFIC_TYPE_THERMOSTAT_GENERAL_V2" flagmask="0x06" />
-                    <bitflag key="0x09" flagname="SPECIFIC_TYPE_THERMOSTAT_HEATING" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x17" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x17" flagname="SPECIFIC_TYPE_RESIDENTIAL_HRV" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x0A" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x0A" flagname="SPECIFIC_TYPE_SIMPLE_WINDOW_COVERING" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x16" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x16" flagname="SPECIFIC_TYPE_ZIP_ADV_NODE" flagmask="0x02" />
-                    <bitflag key="0x16" flagname="SPECIFIC_TYPE_ZIP_TUN_NODE" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x19" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x19" flagname="SPECIFIC_TYPE_BASIC_WALL_CONTROLLER" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x06" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x06" flagname="SPECIFIC_TYPE_SECURE_EXTENDER" flagmask="0x01" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x07" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x07" flagname="SPECIFIC_TYPE_GENERAL_APPLIANCE" flagmask="0x01" />
-                    <bitflag key="0x07" flagname="SPECIFIC_TYPE_KITCHEN_APPLIANCE" flagmask="0x02" />
-                    <bitflag key="0x07" flagname="SPECIFIC_TYPE_LAUNDRY_APPLIANCE" flagmask="0x03" />
-                </multi_array>
-                <multi_array>
-                    <bitflag key="0x08" flagname="SPECIFIC_TYPE_NOT_USED" flagmask="0x00" />
-                    <bitflag key="0x08" flagname="SPECIFIC_TYPE_NOTIFICATION_SENSOR" flagmask="0x01" />
-                </multi_array>
-            </param>
-            <param key="0x06" name="Command Classes" type="ENUM_ARRAY" typehashcode="0x09" comment="" encaptype="CMD_CLASS_REF">
-                <enum key="0x71" name="COMMAND_CLASS_ALARM" />
-                <enum key="0x22" name="COMMAND_CLASS_APPLICATION_STATUS" />
-                <enum key="0x9B" name="COMMAND_CLASS_ASSOCIATION_COMMAND_CONFIGURATION" />
-                <enum key="0x85" name="COMMAND_CLASS_ASSOCIATION" />
-                <enum key="0x95" name="COMMAND_CLASS_AV_CONTENT_DIRECTORY_MD" />
-                <enum key="0x97" name="COMMAND_CLASS_AV_CONTENT_SEARCH_MD" />
-                <enum key="0x96" name="COMMAND_CLASS_AV_RENDERER_STATUS" />
-                <enum key="0x99" name="COMMAND_CLASS_AV_TAGGING_MD" />
-                <enum key="0x36" name="COMMAND_CLASS_BASIC_TARIFF_INFO" />
-                <enum key="0x50" name="COMMAND_CLASS_BASIC_WINDOW_COVERING" />
-                <enum key="0x20" name="COMMAND_CLASS_BASIC" />
-                <enum key="0x80" name="COMMAND_CLASS_BATTERY" />
-                <enum key="0x2A" name="COMMAND_CLASS_CHIMNEY_FAN" />
-                <enum key="0x46" name="COMMAND_CLASS_CLIMATE_CONTROL_SCHEDULE" />
-                <enum key="0x81" name="COMMAND_CLASS_CLOCK" />
-                <enum key="0x70" name="COMMAND_CLASS_CONFIGURATION" />
-                <enum key="0x21" name="COMMAND_CLASS_CONTROLLER_REPLICATION" />
-                <enum key="0x56" name="COMMAND_CLASS_CRC_16_ENCAP" />
-                <enum key="0x3A" name="COMMAND_CLASS_DCP_CONFIG" />
-                <enum key="0x3B" name="COMMAND_CLASS_DCP_MONITOR" />
-                <enum key="0x4C" name="COMMAND_CLASS_DOOR_LOCK_LOGGING" />
-                <enum key="0x62" name="COMMAND_CLASS_DOOR_LOCK" />
-                <enum key="0x90" name="COMMAND_CLASS_ENERGY_PRODUCTION" />
-                <enum key="0x7A" name="COMMAND_CLASS_FIRMWARE_UPDATE_MD" />
-                <enum key="0x8C" name="COMMAND_CLASS_GEOGRAPHIC_LOCATION" />
-                <enum key="0x7B" name="COMMAND_CLASS_GROUPING_NAME" />
-                <enum key="0x82" name="COMMAND_CLASS_HAIL" />
-                <enum key="0x39" name="COMMAND_CLASS_HRV_CONTROL" />
-                <enum key="0x37" name="COMMAND_CLASS_HRV_STATUS" />
-                <enum key="0x87" name="COMMAND_CLASS_INDICATOR" />
-                <enum key="0x9A" name="COMMAND_CLASS_IP_CONFIGURATION" />
-                <enum key="0x89" name="COMMAND_CLASS_LANGUAGE" />
-                <enum key="0x76" name="COMMAND_CLASS_LOCK" />
-                <enum key="0x91" name="COMMAND_CLASS_MANUFACTURER_PROPRIETARY" />
-                <enum key="0x72" name="COMMAND_CLASS_MANUFACTURER_SPECIFIC" />
-                <enum key="0xEF" name="COMMAND_CLASS_MARK" />
-                <enum key="0x35" name="COMMAND_CLASS_METER_PULSE" />
-                <enum key="0x3C" name="COMMAND_CLASS_METER_TBL_CONFIG" />
-                <enum key="0x3D" name="COMMAND_CLASS_METER_TBL_MONITOR" />
-                <enum key="0x3E" name="COMMAND_CLASS_METER_TBL_PUSH" />
-                <enum key="0x32" name="COMMAND_CLASS_METER" />
-                <enum key="0x51" name="COMMAND_CLASS_MTP_WINDOW_COVERING" />
-                <enum key="0x8E" name="COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION" />
-                <enum key="0x60" name="COMMAND_CLASS_MULTI_CHANNEL" />
-                <enum key="0x8F" name="COMMAND_CLASS_MULTI_CMD" />
-                <enum key="0x52" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PROXY" />
-                <enum key="0x4D" name="COMMAND_CLASS_NETWORK_MANAGEMENT_BASIC" />
-                <enum key="0x34" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INCLUSION" />
-                <enum key="0x00" name="COMMAND_CLASS_NO_OPERATION" />
-                <enum key="0x77" name="COMMAND_CLASS_NODE_NAMING" />
-                <enum key="0xF0" name="COMMAND_CLASS_NON_INTEROPERABLE" />
-                <enum key="0x73" name="COMMAND_CLASS_POWERLEVEL" />
-                <enum key="0x41" name="COMMAND_CLASS_PREPAYMENT_ENCAPSULATION" />
-                <enum key="0x3F" name="COMMAND_CLASS_PREPAYMENT" />
-                <enum key="0x88" name="COMMAND_CLASS_PROPRIETARY" />
-                <enum key="0x75" name="COMMAND_CLASS_PROTECTION" />
-                <enum key="0x48" name="COMMAND_CLASS_RATE_TBL_CONFIG" />
-                <enum key="0x49" name="COMMAND_CLASS_RATE_TBL_MONITOR" />
-                <enum key="0x7C" name="COMMAND_CLASS_REMOTE_ASSOCIATION_ACTIVATE" />
-                <enum key="0x7D" name="COMMAND_CLASS_REMOTE_ASSOCIATION" />
-                <enum key="0x2B" name="COMMAND_CLASS_SCENE_ACTIVATION" />
-                <enum key="0x2C" name="COMMAND_CLASS_SCENE_ACTUATOR_CONF" />
-                <enum key="0x2D" name="COMMAND_CLASS_SCENE_CONTROLLER_CONF" />
-                <enum key="0x4E" name="COMMAND_CLASS_SCHEDULE_ENTRY_LOCK" />
-                <enum key="0x93" name="COMMAND_CLASS_SCREEN_ATTRIBUTES" />
-                <enum key="0x92" name="COMMAND_CLASS_SCREEN_MD" />
-                <enum key="0x24" name="COMMAND_CLASS_SECURITY_PANEL_MODE" />
-                <enum key="0x2F" name="COMMAND_CLASS_SECURITY_PANEL_ZONE_SENSOR" />
-                <enum key="0x2E" name="COMMAND_CLASS_SECURITY_PANEL_ZONE" />
-                <enum key="0x98" name="COMMAND_CLASS_SECURITY" />
-                <enum key="0x9C" name="COMMAND_CLASS_SENSOR_ALARM" />
-                <enum key="0x30" name="COMMAND_CLASS_SENSOR_BINARY" />
-                <enum key="0x9E" name="COMMAND_CLASS_SENSOR_CONFIGURATION" />
-                <enum key="0x31" name="COMMAND_CLASS_SENSOR_MULTILEVEL" />
-                <enum key="0x9D" name="COMMAND_CLASS_SILENCE_ALARM" />
-                <enum key="0x94" name="COMMAND_CLASS_SIMPLE_AV_CONTROL" />
-                <enum key="0x27" name="COMMAND_CLASS_SWITCH_ALL" />
-                <enum key="0x25" name="COMMAND_CLASS_SWITCH_BINARY" />
-                <enum key="0x26" name="COMMAND_CLASS_SWITCH_MULTILEVEL" />
-                <enum key="0x28" name="COMMAND_CLASS_SWITCH_TOGGLE_BINARY" />
-                <enum key="0x29" name="COMMAND_CLASS_SWITCH_TOGGLE_MULTILEVEL" />
-                <enum key="0x4A" name="COMMAND_CLASS_TARIFF_CONFIG" />
-                <enum key="0x4B" name="COMMAND_CLASS_TARIFF_TBL_MONITOR" />
-                <enum key="0x44" name="COMMAND_CLASS_THERMOSTAT_FAN_MODE" />
-                <enum key="0x45" name="COMMAND_CLASS_THERMOSTAT_FAN_STATE" />
-                <enum key="0x38" name="COMMAND_CLASS_THERMOSTAT_HEATING" />
-                <enum key="0x40" name="COMMAND_CLASS_THERMOSTAT_MODE" />
-                <enum key="0x42" name="COMMAND_CLASS_THERMOSTAT_OPERATING_STATE" />
-                <enum key="0x47" name="COMMAND_CLASS_THERMOSTAT_SETBACK" />
-                <enum key="0x43" name="COMMAND_CLASS_THERMOSTAT_SETPOINT" />
-                <enum key="0x8B" name="COMMAND_CLASS_TIME_PARAMETERS" />
-                <enum key="0x8A" name="COMMAND_CLASS_TIME" />
-                <enum key="0x55" name="COMMAND_CLASS_TRANSPORT_SERVICE" />
-                <enum key="0x63" name="COMMAND_CLASS_USER_CODE" />
-                <enum key="0x86" name="COMMAND_CLASS_VERSION" />
-                <enum key="0x84" name="COMMAND_CLASS_WAKE_UP" />
-                <enum key="0x02" name="COMMAND_CLASS_ZENSOR_NET" />
-                <enum key="0x4F" name="COMMAND_CLASS_ZIP_6LOWPAN" />
-                <enum key="0x23" name="COMMAND_CLASS_ZIP" />
-                <enum key="0x01" name="ZWAVE_CMD_CLASS" />
-                <enum key="0x57" name="COMMAND_CLASS_APPLICATION_CAPABILITY" />
-                <enum key="0x33" name="COMMAND_CLASS_SWITCH_COLOR" />
-                <enum key="0x53" name="COMMAND_CLASS_SCHEDULE" />
-                <enum key="0x54" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PRIMARY" />
-                <enum key="0x58" name="COMMAND_CLASS_ZIP_ND" />
-                <enum key="0x59" name="COMMAND_CLASS_ASSOCIATION_GRP_INFO" />
-                <enum key="0x5A" name="COMMAND_CLASS_DEVICE_RESET_LOCALLY" />
-                <enum key="0x5B" name="COMMAND_CLASS_CENTRAL_SCENE" />
-                <enum key="0x5C" name="COMMAND_CLASS_IP_ASSOCIATION" />
-                <enum key="0x5D" name="COMMAND_CLASS_ANTITHEFT" />
-                <enum key="0x5E" name="COMMAND_CLASS_ZWAVEPLUS_INFO" />
-                <enum key="0x5F" name="COMMAND_CLASS_ZIP_GATEWAY" />
-                <enum key="0x61" name="COMMAND_CLASS_ZIP_PORTAL" />
-                <enum key="0x65" name="COMMAND_CLASS_DMX" />
-                <enum key="0x66" name="COMMAND_CLASS_BARRIER_OPERATOR" />
-                <enum key="0x67" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INSTALLATION_MAINTENANCE" />
-                <enum key="0x68" name="COMMAND_CLASS_ZIP_NAMING" />
-                <enum key="0x69" name="COMMAND_CLASS_MAILBOX" />
-                <enum key="0x6A" name="COMMAND_CLASS_WINDOW_COVERING" />
-                <enum key="0x9F" name="COMMAND_CLASS_SECURITY_2" />
-                <enum key="0x6B" name="COMMAND_CLASS_IRRIGATION" />
-                <enum key="0x6C" name="COMMAND_CLASS_SUPERVISION" />
-                <enum key="0x64" name="COMMAND_CLASS_HUMIDITY_CONTROL_SETPOINT" />
-                <enum key="0x6D" name="COMMAND_CLASS_HUMIDITY_CONTROL_MODE" />
-                <enum key="0x6E" name="COMMAND_CLASS_HUMIDITY_CONTROL_OPERATING_STATE" />
-                <enum key="0x6F" name="COMMAND_CLASS_ENTRY_CONTROL" />
-                <enum key="0x74" name="COMMAND_CLASS_INCLUSION_CONTROLLER" />
+            <param key="0x03" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" optionaloffs="0x01" optionalmask="0x02" />
+            <param key="0x04" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x05" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x06" name="Command Classes" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
         <cmd key="0x06" name="NODE_RANGE_INFO" help="Node Range Info" comment="SDS10264-2" />
-        <cmd key="0x00" name="ZWAVE_CMD_NOP" help="NOP" comment="" />
-        <cmd key="0x18" name="CMD_NOP_POWER" help="NOP Power" comment="" />
+        <cmd key="0x00" name="ZWAVE_CMD_NOP" help="NOP" />
+        <cmd key="0x18" name="CMD_NOP_POWER" help="NOP Power" />
         <cmd key="0x02" name="REQUEST_NODE_INFO" help="Request Node Info" comment="SDS10264-2" />
-        <cmd key="0x19" name="ZWAVE_CMD_RESERVE_NODE_IDS" help="Reserve Node ID" comment="" />
-        <cmd key="0x1A" name="CMD_RESERVED_IDS" help="Reserved ID" comment="" />
-        <cmd key="0x12" name="CMD_SET_SUC" help="Set SUC" comment="" />
-        <cmd key="0x13" name="CMD_SET_SUC_ACK" help="Set SUC ACK" comment="" />
-        <cmd key="0x15" name="CMD_STATIC_ROUTE_REQUEST" help="Static Route Request" comment="" />
-        <cmd key="0x11" name="CMD_SUC_NODE_ID" help="SUC Node ID" comment="" />
-        <cmd key="0x0B" name="TRANSFER_END" help="Transfer End" comment="SDS10264-2" />
+        <cmd key="0x19" name="ZWAVE_CMD_RESERVE_NODE_IDS" help="Reserve Node ID" />
+        <cmd key="0x1A" name="CMD_RESERVED_IDS" help="Reserved ID" />
+        <cmd key="0x12" name="CMD_SET_SUC" help="Set SUC" />
+        <cmd key="0x13" name="CMD_SET_SUC_ACK" help="Set SUC ACK" />
+        <cmd key="0x15" name="CMD_STATIC_ROUTE_REQUEST" help="Static Route Request" />
+        <cmd key="0x11" name="CMD_SUC_NODE_ID" help="SUC Node ID" />
+        <cmd key="0x0B" name="TRANSFER_END" help="Transfer End" support_mode="TX_RX" comment="SDS10264-2" />
         <cmd key="0x0F" name="TRANSFER_NEW_PRIMARY_COMPLETE" help="Transfer New Primary Complete" comment="SDS10264-2" />
         <cmd key="0x09" name="TRANSFER_NODE_INFO" help="Transfer Node Info" comment="SDS10264-2" />
         <cmd key="0x08" name="TRANSFER_PRESENTATION" help="Transfer Presentation" comment="SDS10264-2" />
@@ -12787,608 +13432,564 @@
         <cmd key="0x23" name="EXCLUDE_REQUEST" help="Exclude Request" comment="INS13044" />
         <cmd key="0x24" name="ASSIGN_RETURN_ROUTE_PRIORITY" help="Assign Return Route Priority" />
         <cmd key="0x25" name="ASSIGN_SUC_RETURN_ROUTE_PRIORITY" help="Assign SUC Return Route Priority" />
+        <cmd key="0x26" name="INCLUDED_NODE_INFO" help="Included Node Info" comment="INS10264" />
+        <cmd key="0x27" name="SMART_START_PRIME" help="Smart Start Prime" comment="INS10264" />
+        <cmd key="0x28" name="SMART_START_INCLUDE" help="Smart Start Include" comment="INS10264" />
     </cmd_class>
-    <cmd_class key="0x57" version="1" name="COMMAND_CLASS_APPLICATION_CAPABILITY" help="Command Class Application Capability" read_only="false">
-        <cmd key="0x01" name="COMMAND_COMMAND_CLASS_NOT_SUPPORTED" help="Command Command Class Not Supported">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" shifter="0" />
+    <cmd_class key="0x57" version="1" name="COMMAND_CLASS_APPLICATION_CAPABILITY" help="Command Class Application Capability" comment="[OBSOLETED]">
+        <cmd key="0x01" name="COMMAND_COMMAND_CLASS_NOT_SUPPORTED" help="Command Command Class Not Supported" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Dynamic" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Offending Command Class" type="BYTE" typehashcode="0x01" encaptype="CMD_CLASS_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Offending Command" type="BYTE" typehashcode="0x01" encaptype="CMD_REF">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x01" name="Offending Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+            <param key="0x02" name="Offending Command" type="BYTE" encaptype="CMD_REF" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x33" version="1" name="COMMAND_CLASS_SWITCH_COLOR" help="Command Class Switch Color" read_only="false">
-        <cmd key="0x01" name="SWITCH_COLOR_SUPPORTED_GET" help="Color Switch Supported Get" />
-        <cmd key="0x02" name="SWITCH_COLOR_SUPPORTED_REPORT" help="Color Switch Supported Report">
-            <param key="0x00" name="Color Component mask" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x33" version="1" name="COMMAND_CLASS_SWITCH_COLOR" help="Command Class Color Switch">
+        <cmd key="0x01" name="SWITCH_COLOR_SUPPORTED_GET" help="Color Switch Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="SWITCH_COLOR_SUPPORTED_REPORT" help="Color Switch Supported Report" support_mode="TX">
+            <param key="0x00" name="Color Component mask" type="WORD" />
         </cmd>
-        <cmd key="0x03" name="SWITCH_COLOR_GET" help="Color Switch Get">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x03" name="SWITCH_COLOR_GET" help="Color Switch Get" support_mode="RX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="SWITCH_COLOR_REPORT" help="Color Switch Report">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Value" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x04" name="SWITCH_COLOR_REPORT" help="Color Switch Report" support_mode="TX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
+            <param key="0x01" name="Value" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="SWITCH_COLOR_SET" help="Color Switch Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Color Component Count" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="SWITCH_COLOR_SET" help="Color Switch Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Color Component Count" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0x1F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Value" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Color Component ID" type="BYTE" />
+                <param key="0x01" name="Value" type="BYTE" />
             </variant_group>
         </cmd>
-        <cmd key="0x06" name="SWITCH_COLOR_START_LEVEL_CHANGE" help="Color Switch Start Level Change">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Res1" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x06" name="SWITCH_COLOR_START_LEVEL_CHANGE" help="Color Switch Start Level Change" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Res1" fieldmask="0x1F" />
                 <bitflag key="0x01" flagname="Ignore Start State" flagmask="0x20" />
                 <bitflag key="0x02" flagname="Up/Down" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Res2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Level" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Color Component ID" type="BYTE" />
+            <param key="0x02" name="Start Level" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="SWITCH_COLOR_STOP_LEVEL_CHANGE" help="Color Switch Stop Level Change">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x07" name="SWITCH_COLOR_STOP_LEVEL_CHANGE" help="Color Switch Stop Level Change" support_mode="RX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x33" version="2" name="COMMAND_CLASS_SWITCH_COLOR" help="Command Class Switch Color" read_only="false">
-        <cmd key="0x01" name="SWITCH_COLOR_SUPPORTED_GET" help="Color Switch Supported Get" />
-        <cmd key="0x02" name="SWITCH_COLOR_SUPPORTED_REPORT" help="Color Switch Supported Report">
-            <param key="0x00" name="Color Component mask" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x33" version="2" name="COMMAND_CLASS_SWITCH_COLOR" help="Command Class Color Switch">
+        <cmd key="0x01" name="SWITCH_COLOR_SUPPORTED_GET" help="Color Switch Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="SWITCH_COLOR_SUPPORTED_REPORT" help="Color Switch Supported Report" support_mode="TX">
+            <param key="0x00" name="Color Component mask" type="WORD" />
         </cmd>
-        <cmd key="0x03" name="SWITCH_COLOR_GET" help="Color Switch Get">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x03" name="SWITCH_COLOR_GET" help="Color Switch Get" support_mode="RX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="SWITCH_COLOR_REPORT" help="Color Switch Report">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Value" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x04" name="SWITCH_COLOR_REPORT" help="Color Switch Report" support_mode="TX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
+            <param key="0x01" name="Value" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="SWITCH_COLOR_SET" help="Color Switch Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Color Component Count" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="SWITCH_COLOR_SET" help="Color Switch Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Color Component Count" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0x1F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Value" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Color Component ID" type="BYTE" />
+                <param key="0x01" name="Value" type="BYTE" />
             </variant_group>
-            <param key="0x02" name="Duration" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Duration" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="SWITCH_COLOR_START_LEVEL_CHANGE" help="Color Switch Start Level Change">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Res1" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x06" name="SWITCH_COLOR_START_LEVEL_CHANGE" help="Color Switch Start Level Change" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Res1" fieldmask="0x1F" />
                 <bitflag key="0x01" flagname="Ignore Start State" flagmask="0x20" />
                 <bitflag key="0x02" flagname="Up/Down" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Res2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Level" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Color Component ID" type="BYTE" />
+            <param key="0x02" name="Start Level" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="SWITCH_COLOR_STOP_LEVEL_CHANGE" help="Color Switch Stop Level Change">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x07" name="SWITCH_COLOR_STOP_LEVEL_CHANGE" help="Color Switch Stop Level Change" support_mode="RX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x33" version="3" name="COMMAND_CLASS_SWITCH_COLOR" help="Command Class Switch Color" read_only="false">
-        <cmd key="0x01" name="SWITCH_COLOR_SUPPORTED_GET" help="Color Switch Supported Get" />
-        <cmd key="0x02" name="SWITCH_COLOR_SUPPORTED_REPORT" help="Color Switch Supported Report">
-            <param key="0x00" name="Color Component mask" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x03" name="SWITCH_COLOR_GET" help="Color Switch Get">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x04" name="SWITCH_COLOR_REPORT" help="Color Switch Report">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Current Value" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Target Value" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Duration" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x33" version="3" name="COMMAND_CLASS_SWITCH_COLOR" help="Command Class Color Switch">
+        <cmd key="0x01" name="SWITCH_COLOR_SUPPORTED_GET" help="Color Switch Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="SWITCH_COLOR_SUPPORTED_REPORT" help="Color Switch Supported Report" support_mode="TX">
+            <param key="0x00" name="Color Component mask" type="WORD" />
+        </cmd>
+        <cmd key="0x03" name="SWITCH_COLOR_GET" help="Color Switch Get" support_mode="RX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="SWITCH_COLOR_REPORT" help="Color Switch Report" support_mode="TX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
+            <param key="0x01" name="Current Value" type="BYTE" />
+            <param key="0x02" name="Target Value" type="BYTE" />
+            <param key="0x03" name="Duration" type="CONST">
                 <const key="0x00" flagname="Already at the Target Value" flagmask="0x00" />
                 <const key="0x01" flagname="Unknown duration" flagmask="0xFE" />
                 <const key="0x02" flagname="Reserved" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x05" name="SWITCH_COLOR_SET" help="Color Switch Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Color Component Count" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x05" name="SWITCH_COLOR_SET" help="Color Switch Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Color Component Count" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0x1F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Value" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Color Component ID" type="BYTE" />
+                <param key="0x01" name="Value" type="BYTE" />
             </variant_group>
-            <param key="0x02" name="Duration" type="CONST" typehashcode="0x0B">
+            <param key="0x02" name="Duration" type="CONST">
                 <const key="0x00" flagname="Instantly" flagmask="0x00" />
                 <const key="0x01" flagname="Default" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x06" name="SWITCH_COLOR_START_LEVEL_CHANGE" help="Color Switch Start Level Change">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Res1" fieldmask="0x1F" shifter="0" />
+        <cmd key="0x06" name="SWITCH_COLOR_START_LEVEL_CHANGE" help="Color Switch Start Level Change" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Res1" fieldmask="0x1F" />
                 <bitflag key="0x01" flagname="Ignore Start State" flagmask="0x20" />
                 <bitflag key="0x02" flagname="Up/Down" flagmask="0x40" />
                 <bitflag key="0x03" flagname="Res2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Level" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Duration" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="Color Component ID" type="BYTE" />
+            <param key="0x02" name="Start Level" type="BYTE" />
+            <param key="0x03" name="Duration" type="CONST">
                 <const key="0x00" flagname="Instantly" flagmask="0x00" />
                 <const key="0x01" flagname="Default" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="SWITCH_COLOR_STOP_LEVEL_CHANGE" help="Color Switch Stop Level Change">
-            <param key="0x00" name="Color Component ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x07" name="SWITCH_COLOR_STOP_LEVEL_CHANGE" help="Color Switch Stop Level Change" support_mode="RX">
+            <param key="0x00" name="Color Component ID" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x53" version="1" name="COMMAND_CLASS_SCHEDULE" help="Command Class Schedule" read_only="false">
-        <cmd key="0x01" name="SCHEDULE_SUPPORTED_GET" help="Schedule Support Get" />
-        <cmd key="0x02" name="SCHEDULE_SUPPORTED_REPORT" help="Schedule Support Report">
-            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Time Support" fieldmask="0x3F" shifter="0" />
+    <cmd_class key="0x53" version="1" name="COMMAND_CLASS_SCHEDULE" help="Command Class Schedule">
+        <cmd key="0x01" name="SCHEDULE_SUPPORTED_GET" help="Schedule Support Get" support_mode="RX" />
+        <cmd key="0x02" name="SCHEDULE_SUPPORTED_REPORT" help="Schedule Support Report" support_mode="TX">
+            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Time Support" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Fallback Support" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Support Enable/Disable" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Number of supported CC" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x03" name="vg1" variantKey="0x00" paramOffs="0x02" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Supported CC" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x03" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Supported Command" fieldmask="0x03" shifter="0" />
+            <param key="0x02" name="Number of supported CC" type="BYTE" />
+            <variant_group key="0x03" name="vg1" paramOffs="0x02" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Supported CC" type="BYTE" />
+                <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Supported Command" fieldmask="0x03" />
                     <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
                 </param>
             </variant_group>
-            <param key="0x04" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Supported Override Types" fieldmask="0x7F" shifter="0" />
+            <param key="0x04" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Override Types" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Override Support" flagmask="0x80" />
             </param>
         </cmd>
         <cmd key="0x03" name="COMMAND_SCHEDULE_SET" help="Schedule Set">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" shifter="0" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" shifter="0" />
+            <param key="0x05" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res." flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" shifter="0" />
+            <param key="0x06" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Duration Type" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Properties5" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" shifter="0" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
                 <bitfield key="0x01" fieldname="Reserved3" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x08" name="Duration Byte" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Reports to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x0B" name="vg1" variantKey="0x00" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Cmd Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Cmd Byte" type="VARIANT" typehashcode="0x0C">
-                    <variant paramoffs="0" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x08" name="Duration Byte" type="WORD" />
+            <param key="0x09" name="Reports to Follow" type="BYTE" />
+            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" />
+            <variant_group key="0x0B" name="vg1" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Cmd Length" type="BYTE" />
+                <param key="0x01" name="Cmd Byte" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
                 </param>
             </variant_group>
         </cmd>
         <cmd key="0x04" name="COMMAND_SCHEDULE_GET" help="Schedule Get">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x00" name="Schedule ID" type="BYTE" />
         </cmd>
         <cmd key="0x05" name="COMMAND_SCHEDULE_REPORT" help="Schedule Report">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="User Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="User Identifier" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Active_ID" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" shifter="0" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" shifter="0" />
+            <param key="0x05" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Res." flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" shifter="0" />
+            <param key="0x06" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Duration Type" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Properties5" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" shifter="0" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
                 <bitfield key="0x01" fieldname="Reserved3" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x08" name="Duration Byte" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Reports to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x0B" name="vg1" variantKey="0x00" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Cmd Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Cmd Byte" type="VARIANT" typehashcode="0x0C">
-                    <variant paramoffs="0" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x08" name="Duration Byte" type="WORD" />
+            <param key="0x09" name="Reports to Follow" type="BYTE" />
+            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" />
+            <variant_group key="0x0B" name="vg1" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Cmd Length" type="BYTE" />
+                <param key="0x01" name="Cmd Byte" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x06" name="SCHEDULE_REMOVE" help="Schedule Remove">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x06" name="SCHEDULE_REMOVE" help="Schedule Remove" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="SCHEDULE_STATE_SET" help="Schedule State Set">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule State" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x07" name="SCHEDULE_STATE_SET" help="Schedule State Set" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule State" type="BYTE" />
         </cmd>
-        <cmd key="0x08" name="SCHEDULE_STATE_GET" help="Schedule State Get" />
-        <cmd key="0x09" name="SCHEDULE_STATE_REPORT" help="Schedule State Report">
-            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x08" name="SCHEDULE_STATE_GET" help="Schedule State Get" support_mode="RX" />
+        <cmd key="0x09" name="SCHEDULE_STATE_REPORT" help="Schedule State Report" support_mode="TX">
+            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Override" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reports to Follow" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Active_ID 1" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Active_ID 2" fieldmask="0xF0" shifter="4" />
-            </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Active_ID 3" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Active_ID N" fieldmask="0xF0" shifter="4" />
-            </param>
+            <variant_group key="0x02" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties2" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Active_ID 1" fieldmask="0x0F" />
+                    <bitfield key="0x01" fieldname="Active_ID 2" fieldmask="0xF0" shifter="4" />
+                </param>
+            </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x53" version="2" name="COMMAND_CLASS_SCHEDULE" help="Command Class Schedule" read_only="false">
-        <cmd key="0x01" name="SCHEDULE_SUPPORTED_GET" help="Schedule Support Get">
-            <param key="0x00" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x02" name="SCHEDULE_SUPPORTED_REPORT" help="Schedule Support Report">
-            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Time Support" fieldmask="0x3F" shifter="0" />
+    <cmd_class key="0x53" version="2" name="COMMAND_CLASS_SCHEDULE" help="Command Class Schedule">
+        <cmd key="0x01" name="SCHEDULE_SUPPORTED_GET" help="Schedule Support Get" support_mode="RX">
+            <param key="0x00" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="SCHEDULE_SUPPORTED_REPORT" help="Schedule Support Report" support_mode="TX">
+            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Time Support" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Fallback Support" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Support Enable/Disable" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Number of supported CC" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x03" name="vg1" variantKey="0x00" paramOffs="0x02" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Supported CC" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x03" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Supported Command" fieldmask="0x03" shifter="0" />
+            <param key="0x02" name="Number of supported CC" type="BYTE" />
+            <variant_group key="0x03" name="vg1" paramOffs="0x02" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Supported CC" type="BYTE" />
+                <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Supported Command" fieldmask="0x03" />
                     <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
                 </param>
             </variant_group>
-            <param key="0x04" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Supported Override Types" fieldmask="0x7F" shifter="0" />
+            <param key="0x04" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Override Types" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Override Support" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Number of Supported Schedule Blocks" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x05" name="Schedule ID Block" type="BYTE" />
+            <param key="0x06" name="Number of Supported Schedule Blocks" type="BYTE" />
         </cmd>
         <cmd key="0x03" name="COMMAND_SCHEDULE_SET" help="Schedule Set">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved0" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" shifter="0" />
-                <bitfield key="0x02" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" shifter="0" />
+            <param key="0x05" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Reserved2" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" shifter="0" />
+            <param key="0x06" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Duration Type" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Properties5" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" shifter="0" />
-                <bitfield key="0x02" fieldname="Reserved3" fieldmask="0xC0" shifter="6" />
-            </param>
-            <param key="0x08" name="Duration Byte" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Reports to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
+                <bitfield key="0x01" fieldname="Reserved3" fieldmask="0xC0" shifter="6" />
             </param>
-            <variant_group key="0x0B" name="vg1" variantKey="0x00" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Cmd Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Cmd Byte" type="VARIANT" typehashcode="0x0C">
-                    <variant paramoffs="0" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x08" name="Duration Byte" type="WORD" />
+            <param key="0x09" name="Reports to Follow" type="BYTE" />
+            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" />
+            <variant_group key="0x0B" name="vg1" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Cmd Length" type="BYTE" />
+                <param key="0x01" name="Cmd Byte" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
                 </param>
             </variant_group>
         </cmd>
         <cmd key="0x04" name="COMMAND_SCHEDULE_GET" help="Schedule Get">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
         </cmd>
         <cmd key="0x05" name="COMMAND_SCHEDULE_REPORT" help="Schedule Report">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Active_ID" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" shifter="0" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" />
                 <fieldenum key="0x01" fieldname="Reserved0" fieldmask="0xE0" shifter="5">
                     <fieldenum value="Repeat every n hours" />
                     <fieldenum value="Repeat every n days" />
                     <fieldenum value="Repeat every n weeks" />
                 </fieldenum>
             </param>
-            <param key="0x05" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" shifter="0" />
+            <param key="0x05" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Reserved1" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" shifter="0" />
+            <param key="0x06" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Duration Type" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Properties5" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" shifter="0" />
-                <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xC0" shifter="6" />
-            </param>
-            <param key="0x08" name="Duration Byte" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Reports to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x0B" name="vg1" variantKey="0x00" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Cmd Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xC0" shifter="6" />
+            </param>
+            <param key="0x08" name="Duration Byte" type="WORD" />
+            <param key="0x09" name="Reports to Follow" type="BYTE" />
+            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" />
+            <variant_group key="0x0B" name="vg1" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Cmd Length" type="BYTE" />
+                <param key="0x01" name="Cmd Byte" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
                 </param>
-                <param key="0x01" name="Cmd Byte" type="VARIANT" typehashcode="0x0C">
-                    <variant paramoffs="0" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x06" name="SCHEDULE_REMOVE" help="Schedule Remove" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="SCHEDULE_STATE_SET" help="Schedule State Set" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule State" type="BYTE" />
+            <param key="0x02" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x08" name="SCHEDULE_STATE_GET" help="Schedule State Get" support_mode="RX">
+            <param key="0x00" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="SCHEDULE_STATE_REPORT" help="Schedule State Report" support_mode="TX">
+            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Override" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reports to Follow" fieldmask="0xFE" shifter="1" />
+            </param>
+            <variant_group key="0x02" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties2" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Active_ID 1" fieldmask="0x0F" />
+                    <bitfield key="0x01" fieldname="Active_ID 2" fieldmask="0xF0" shifter="4" />
                 </param>
             </variant_group>
+            <param key="0x03" name="Schedule ID Block" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="SCHEDULE_REMOVE" help="Schedule Remove">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x53" version="3" name="COMMAND_CLASS_SCHEDULE" help="Command Class Schedule">
+        <cmd key="0x01" name="SCHEDULE_SUPPORTED_GET" help="Schedule Support Get" support_mode="RX">
+            <param key="0x00" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="SCHEDULE_SUPPORTED_REPORT" help="Schedule Support Report" support_mode="TX">
+            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Time Support" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Fallback Support" flagmask="0x40" />
+                <bitflag key="0x02" flagname="Support Enable/Disable" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Number of supported CC" type="BYTE" />
+            <variant_group key="0x03" name="vg1" paramOffs="0x02" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Supported CC" type="BYTE" />
+                <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Supported Command" fieldmask="0x03" />
+                    <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
+                </param>
+            </variant_group>
+            <param key="0x04" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Override Types" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Override Support" flagmask="0x80" />
             </param>
+            <param key="0x05" name="Schedule ID Block" type="BYTE" />
+            <param key="0x06" name="Number of Supported Schedule Blocks" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="SCHEDULE_STATE_SET" help="Schedule State Set">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="COMMAND_SCHEDULE_SET" help="Schedule Set">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Recurrence Offset" fieldmask="0xF0" shifter="4" />
+            </param>
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" />
+                <fieldenum key="0x01" fieldname="Recurrence Mode" fieldmask="0x60" shifter="5">
+                    <fieldenum value="Repeat every n hours" />
+                    <fieldenum value="Repeat every n days" />
+                    <fieldenum value="Repeat every n weeks" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="Reserved1" flagmask="0x80" />
+            </param>
+            <param key="0x05" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Schedule State" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x06" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Duration Type" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Relative" flagmask="0x40" />
+                <bitflag key="0x02" flagname="Reserved3" flagmask="0x80" />
             </param>
+            <param key="0x08" name="Duration Byte" type="WORD" />
+            <param key="0x09" name="Reports to Follow" type="BYTE" />
+            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" />
+            <variant_group key="0x0B" name="vg1" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Cmd Length" type="BYTE" />
+                <param key="0x01" name="Cmd Byte" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
+                </param>
+            </variant_group>
         </cmd>
-        <cmd key="0x08" name="SCHEDULE_STATE_GET" help="Schedule State Get">
-            <param key="0x00" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="COMMAND_SCHEDULE_GET" help="Schedule Get">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="AID_RO_CTL" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x09" name="SCHEDULE_STATE_REPORT" help="Schedule State Report">
-            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x05" name="COMMAND_SCHEDULE_REPORT" help="Schedule Report">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="AID_RO" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitflag key="0x00" flagname="Override" flagmask="0x01" />
-                <bitfield key="0x01" fieldname="Reports to Follow" fieldmask="0xFE" shifter="1" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" />
+                <fieldenum key="0x01" fieldname="Recurrence Mode" fieldmask="0x60" shifter="5">
+                    <fieldenum value="Repeat every n hours" />
+                    <fieldenum value="Repeat every n days" />
+                    <fieldenum value="Repeat every n weeks" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="AID_RO_CTL" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Active_ID 1" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Active_ID 2" fieldmask="0xF0" shifter="4" />
+            <param key="0x05" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved1" flagmask="0x80" />
             </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Active_ID 3" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Active_ID N" fieldmask="0xF0" shifter="4" />
+            <param key="0x06" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Duration Type" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x04" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Relative" flagmask="0x40" />
+                <bitflag key="0x02" flagname="Reserved2" flagmask="0x80" />
             </param>
+            <param key="0x08" name="Duration Byte" type="WORD" />
+            <param key="0x09" name="Reports to Follow" type="BYTE" />
+            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" />
+            <variant_group key="0x0B" name="vg1" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Cmd Length" type="BYTE" />
+                <param key="0x01" name="Cmd Byte" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
+                </param>
+            </variant_group>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x53" version="3" name="COMMAND_CLASS_SCHEDULE" help="Command Class Schedule" read_only="false">
-        <cmd key="0x01" name="SCHEDULE_SUPPORTED_GET" help="Schedule Support Get">
-            <param key="0x00" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x06" name="SCHEDULE_REMOVE" help="Schedule Remove" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="SCHEDULE_STATE_SET" help="Schedule State Set" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule State" type="BYTE" />
+            <param key="0x02" name="Schedule ID Block" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="SCHEDULE_SUPPORTED_REPORT" help="Schedule Support Report">
-            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x08" name="SCHEDULE_STATE_GET" help="Schedule State Get" support_mode="RX">
+            <param key="0x00" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="SCHEDULE_STATE_REPORT" help="Schedule State Report" support_mode="TX">
+            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Override" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reports to Follow" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Time Support" fieldmask="0x3F" shifter="0" />
+            <variant_group key="0x02" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties2" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Active_ID 1" fieldmask="0x0F" />
+                    <bitfield key="0x01" fieldname="Active_ID 2" fieldmask="0xF0" shifter="4" />
+                </param>
+            </variant_group>
+            <param key="0x03" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x53" version="4" name="COMMAND_CLASS_SCHEDULE" help="Command Class Schedule">
+        <cmd key="0x01" name="SCHEDULE_SUPPORTED_GET" help="Schedule Support Get" support_mode="RX">
+            <param key="0x00" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="SCHEDULE_SUPPORTED_REPORT" help="Schedule Support Report" support_mode="TX">
+            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Time Support" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Fallback Support" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Support Enable/Disable" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Number of supported CC" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x03" name="vg1" variantKey="0x00" paramOffs="0x02" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Supported CC" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x03" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Supported Command" fieldmask="0x03" shifter="0" />
+            <param key="0x02" name="Number of supported CC" type="BYTE" />
+            <variant_group key="0x03" name="vg1" paramOffs="0x02" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Supported CC" type="BYTE" />
+                <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Supported Command" fieldmask="0x03" />
                     <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
                 </param>
             </variant_group>
-            <param key="0x04" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Supported Override Types" fieldmask="0x7F" shifter="0" />
+            <param key="0x04" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Override Types" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Override Support" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x06" name="Number of Supported Schedule Blocks" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x05" name="Schedule ID Block" type="BYTE" />
+            <param key="0x06" name="Number of Supported Schedule Blocks" type="BYTE" />
         </cmd>
         <cmd key="0x03" name="COMMAND_SCHEDULE_SET" help="Schedule Set">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Recurrence Offset" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" shifter="0" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" />
                 <fieldenum key="0x01" fieldname="Recurrence Mode" fieldmask="0x60" shifter="5">
                     <fieldenum value="Repeat every n hours" />
                     <fieldenum value="Repeat every n days" />
@@ -13396,65 +13997,47 @@
                 </fieldenum>
                 <bitflag key="0x02" flagname="Reserved1" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" shifter="0" />
+            <param key="0x05" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Reserved2" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" shifter="0" />
+            <param key="0x06" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Duration Type" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Properties5" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" shifter="0" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Relative" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Reserved3" flagmask="0x80" />
             </param>
-            <param key="0x08" name="Duration Byte" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Reports to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x0B" name="vg1" variantKey="0x00" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Cmd Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Cmd Byte" type="VARIANT" typehashcode="0x0C">
-                    <variant paramoffs="0" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x08" name="Duration Byte" type="WORD" />
+            <param key="0x09" name="Reports to Follow" type="BYTE" />
+            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" />
+            <variant_group key="0x0B" name="vg1" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Cmd Length" type="BYTE" />
+                <param key="0x01" name="Cmd Byte" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
                 </param>
             </variant_group>
         </cmd>
         <cmd key="0x04" name="COMMAND_SCHEDULE_GET" help="Schedule Get">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" shifter="0" />
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="AID_RO_CTL" flagmask="0x80" />
             </param>
         </cmd>
         <cmd key="0x05" name="COMMAND_SCHEDULE_REPORT" help="Schedule Report">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Start Year" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
+            <param key="0x02" name="Start Year" type="BYTE" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="AID_RO" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" shifter="0" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day of Month" fieldmask="0x1F" />
                 <fieldenum key="0x01" fieldname="Recurrence Mode" fieldmask="0x60" shifter="5">
                     <fieldenum value="Repeat every n hours" />
                     <fieldenum value="Repeat every n days" />
@@ -13462,97 +14045,80 @@
                 </fieldenum>
                 <bitflag key="0x02" flagname="AID_RO_CTL" flagmask="0x80" />
             </param>
-            <param key="0x05" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" shifter="0" />
+            <param key="0x05" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Weekday" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Reserved1" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" shifter="0" />
+            <param key="0x06" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Duration Type" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Properties5" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" shifter="0" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Relative" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Reserved2" flagmask="0x80" />
             </param>
-            <param key="0x08" name="Duration Byte" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Reports to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <variant_group key="0x0B" name="vg1" variantKey="0x00" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Cmd Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Cmd Byte" type="VARIANT" typehashcode="0x0C">
-                    <variant paramoffs="0" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x08" name="Duration Byte" type="WORD" />
+            <param key="0x09" name="Reports to Follow" type="BYTE" />
+            <param key="0x0A" name="Number of Cmd to Follow" type="BYTE" />
+            <variant_group key="0x0B" name="vg1" paramOffs="0x0A" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Cmd Length" type="BYTE" />
+                <param key="0x01" name="Cmd Byte" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x06" name="SCHEDULE_REMOVE" help="Schedule Remove">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x06" name="SCHEDULE_REMOVE" help="Schedule Remove" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule ID Block" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="SCHEDULE_STATE_SET" help="Schedule State Set">
-            <param key="0x00" name="Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Schedule State" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x07" name="SCHEDULE_STATE_SET" help="Schedule State Set" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="BYTE" />
+            <param key="0x01" name="Schedule State" type="BYTE" />
+            <param key="0x02" name="Schedule ID Block" type="BYTE" />
         </cmd>
-        <cmd key="0x08" name="SCHEDULE_STATE_GET" help="Schedule State Get">
-            <param key="0x00" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x08" name="SCHEDULE_STATE_GET" help="Schedule State Get" support_mode="RX">
+            <param key="0x00" name="Schedule ID Block" type="BYTE" />
         </cmd>
-        <cmd key="0x09" name="SCHEDULE_STATE_REPORT" help="Schedule State Report">
-            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x09" name="SCHEDULE_STATE_REPORT" help="Schedule State Report" support_mode="TX">
+            <param key="0x00" name="Number of Supported Schedule ID" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Override" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reports to Follow" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Active_ID 1" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Active_ID 2" fieldmask="0xF0" shifter="4" />
-            </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Active_ID 3" fieldmask="0x0F" shifter="0" />
-                <bitfield key="0x01" fieldname="Active_ID N" fieldmask="0xF0" shifter="4" />
-            </param>
-            <param key="0x04" name="Schedule ID Block" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <variant_group key="0x02" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties2" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Active_ID 1" fieldmask="0x0F" />
+                    <bitfield key="0x01" fieldname="Active_ID 2" fieldmask="0xF0" shifter="4" />
+                </param>
+            </variant_group>
+            <param key="0x03" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x0A" name="SCHEDULE_SUPPORTED_COMMANDS_GET" help="Schedule Supported Commands Get" support_mode="RX">
+            <param key="0x00" name="Schedule ID Block" type="BYTE" />
+        </cmd>
+        <cmd key="0x0B" name="SCHEDULE_SUPPORTED_COMMANDS_REPORT" help="Schedule Supported Commands Report" support_mode="TX">
+            <param key="0x00" name="Schedule ID Block" type="BYTE" />
+            <param key="0x01" name="Command Class List Length" type="BYTE" />
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Command Class" type="BYTE" encaptype="CMD_CLASS_REF" />
+                <param key="0x01" name="Supported Command List Length" type="BYTE" />
+                <param key="0x02" name="Supported Command" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
+                </param>
+            </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x54" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PRIMARY" help="Command Class Network Management Primary" read_only="false">
-        <cmd key="0x01" name="CONTROLLER_CHANGE" help="Controller Change">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Mode" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+    <cmd_class key="0x54" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_PRIMARY" help="Command Class Network Management Primary">
+        <cmd key="0x01" name="CONTROLLER_CHANGE" help="Controller Change" support_mode="RX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Reserved" type="BYTE" />
+            <param key="0x02" name="Mode" type="BYTE">
                 <bitflag key="0x01" flagname="CONTROLLER_CHANGE_START" flagmask="0x02" />
                 <bitflag key="0x02" flagname="CONTROLLER_CHANGE_STOP" flagmask="0x05" />
             </param>
-            <param key="0x03" name="tx Options" type="BITMASK" typehashcode="0x06" comment="">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x03" name="tx Options" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Ack" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Low Power" flagmask="0x02" />
                 <bitflag key="0x02" flagname="Auto Route" flagmask="0x04" />
@@ -13563,72 +14129,51 @@
                 <bitflag key="0x07" flagname="High Power" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x02" name="CONTROLLER_CHANGE_STATUS" help="Controller Change Status">
-            <param key="0x00" name="Seq. No" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Status" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x02" name="CONTROLLER_CHANGE_STATUS" help="Controller Change Status" support_mode="TX">
+            <param key="0x00" name="Seq. No" type="BYTE" />
+            <param key="0x01" name="Status" type="BYTE">
                 <bitflag key="0x01" flagname="NODE_ADD_STATUS_DONE" flagmask="0x06" />
                 <bitflag key="0x02" flagname="NODE_ADD_STATUS_FAILED" flagmask="0x07" />
                 <bitflag key="0x03" flagname="NODE_ADD_STATUS_SECURITY_FAILED" flagmask="0x09" />
             </param>
-            <param key="0x02" name="Reserved" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="New Node ID" type="BYTE" typehashcode="0x01" comment="" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Node Info Length" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x05" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Capability" fieldmask="0x7F" shifter="0" />
+            <param key="0x02" name="Reserved" type="BYTE" />
+            <param key="0x03" name="New Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Node Info Length" type="BYTE" />
+            <param key="0x05" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 1" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Listening" flagmask="0x80" />
             </param>
-            <param key="0x06" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Security" fieldmask="0x7F" shifter="0" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Z-Wave Protocol Specific Part 2" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Opt" flagmask="0x80" />
             </param>
-            <param key="0x07" name="Basic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x08" name="Generic Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x09" name="Specific Device Class" type="BYTE" typehashcode="0x01" comment="">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x0A" name="Command Class" type="VARIANT" typehashcode="0x0C" comment="">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x07" name="Basic Device Class" type="BYTE" encaptype="BAS_DEV_REF" />
+            <param key="0x08" name="Generic Device Class" type="BYTE" encaptype="GEN_DEV_REF" />
+            <param key="0x09" name="Specific Device Class" type="BYTE" encaptype="SPEC_DEV_REF" />
+            <param key="0x0A" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x58" version="1" name="COMMAND_CLASS_ZIP_ND" help="Command Class Z/IP-ND" read_only="false">
-        <cmd key="0x03" name="ZIP_NODE_SOLICITATION" help="Zip Node Solicitation">
-            <param key="0x00" name="Reserved" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+    <cmd_class key="0x58" version="1" name="COMMAND_CLASS_ZIP_ND" help="Command Class Z/IP-ND">
+        <cmd key="0x03" name="ZIP_NODE_SOLICITATION" help="Zip Node Solicitation" support_mode="RX">
+            <param key="0x00" name="Reserved" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
-        <cmd key="0x04" name="ZIP_INV_NODE_SOLICITATION" help="Zip Inverse Node Solicitation">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" shifter="0" />
+        <cmd key="0x04" name="ZIP_INV_NODE_SOLICITATION" help="Zip Inverse Node Solicitation" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" />
                 <bitflag key="0x01" flagname="Local" flagmask="0x04" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x01" name="ZIP_NODE_ADVERTISEMENT" help="Zip Node Advertisement">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Validity" fieldmask="0x03" shifter="0">
+        <cmd key="0x01" name="ZIP_NODE_ADVERTISEMENT" help="Zip Node Advertisement" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Validity" fieldmask="0x03">
                     <fieldenum value="INFORMATION_OK" />
                     <fieldenum value="INFORMATION_OBSOLETE" />
                     <fieldenum value="INFORMATION_NOT_FOUND" />
@@ -13636,64 +14181,87 @@
                 <bitflag key="0x01" flagname="Local" flagmask="0x04" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x03" name="Home ID" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="4" is_ascii="false" showhex="true" />
+            <param key="0x03" name="Home ID" type="ARRAY">
+                <arrayattrib key="0x00" len="4" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x59" version="1" name="COMMAND_CLASS_ASSOCIATION_GRP_INFO" help="Command Class Association Group Info" read_only="false">
-        <cmd key="0x01" name="ASSOCIATION_GROUP_NAME_GET" help="Association Group Name Get">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    <cmd_class key="0x58" version="2" name="COMMAND_CLASS_ZIP_ND" help="Command Class Z/IP-ND">
+        <cmd key="0x03" name="ZIP_NODE_SOLICITATION" help="Zip Node Solicitation" support_mode="RX">
+            <param key="0x00" name="Reserved" type="BYTE" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
+            </param>
+        </cmd>
+        <cmd key="0x04" name="ZIP_INV_NODE_SOLICITATION" help="Zip Inverse Node Solicitation" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x03" />
+                <bitflag key="0x01" flagname="Local" flagmask="0x04" />
+                <bitfield key="0x02" fieldname="Reserved2" fieldmask="0xF8" shifter="3" />
             </param>
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Extended NodeID" type="WORD" />
         </cmd>
-        <cmd key="0x02" name="ASSOCIATION_GROUP_NAME_REPORT" help="Association Group Name Report">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x01" name="ZIP_NODE_ADVERTISEMENT" help="Zip Node Advertisement" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Validity" fieldmask="0x03">
+                    <fieldenum value="INFORMATION_OK" />
+                    <fieldenum value="INFORMATION_OBSOLETE" />
+                    <fieldenum value="INFORMATION_NOT_FOUND" />
+                </fieldenum>
+                <bitflag key="0x01" flagname="Local" flagmask="0x04" />
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Length of Name" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x02" name="Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" is_ascii="true" showhex="false" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x03" name="Home ID" type="ARRAY">
+                <arrayattrib key="0x00" len="4" />
+            </param>
+            <param key="0x04" name="Extended NodeID" type="WORD" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x59" version="1" name="COMMAND_CLASS_ASSOCIATION_GRP_INFO" help="Command Class Association Group Info">
+        <cmd key="0x01" name="ASSOCIATION_GROUP_NAME_GET" help="Association Group Name Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x02" name="ASSOCIATION_GROUP_NAME_REPORT" help="Association Group Name Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Length of Name" type="BYTE" />
+            <param key="0x02" name="Name" type="VARIANT">
+                <variant paramoffs="1" is_ascii="true" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x03" name="ASSOCIATION_GROUP_INFO_GET" help="Association Group Info Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x03" name="ASSOCIATION_GROUP_INFO_GET" help="Association Group Info Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="List Mode" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Refresh cache" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="ASSOCIATION_GROUP_INFO_REPORT" help="Association Group Info Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Group Count" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x04" name="ASSOCIATION_GROUP_INFO_REPORT" help="Association Group Info Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Group Count" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Dynamic Info" flagmask="0x40" />
                 <bitflag key="0x02" flagname="List mode" flagmask="0x80" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0x3F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Mode" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x02" name="Profile1" type="CONST" typehashcode="0x0B">
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0x3F" sizeoffs="0x00">
+                <param key="0x00" name="Grouping Identifier" type="BYTE" />
+                <param key="0x01" name="Mode" type="BYTE" />
+                <param key="0x02" name="Profile1" type="CONST">
                     <const key="0x00" flagname="Profile General" flagmask="0x00" />
                     <const key="0x01" flagname="Profile Control" flagmask="0x20" />
                     <const key="0x02" flagname="Profile Sensor" flagmask="0x31" />
                     <const key="0x03" flagname="Profile Notification" flagmask="0x71" />
                 </param>
-                <param key="0x03" name="Profile2" type="MULTI_ARRAY" typehashcode="0x0A">
+                <param key="0x03" name="Profile2" type="MULTI_ARRAY">
                     <multi_array>
                         <paramdescloc key="0x00" param="2" paramdesc="255" paramstart="2" />
                     </multi_array>
@@ -13736,83 +14304,61 @@
                         <bitflag key="0x20" flagname="Profile Control KEY32" flagmask="0x20" />
                     </multi_array>
                 </param>
-                <param key="0x04" name="Reserved" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x05" name="Event Code" type="WORD" typehashcode="0x02">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x04" name="Reserved" type="BYTE" />
+                <param key="0x05" name="Event Code" type="WORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x05" name="ASSOCIATION_GROUP_COMMAND_LIST_GET" help="Association Group Command List Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="ASSOCIATION_GROUP_COMMAND_LIST_GET" help="Association Group Command List Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Allow cache" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="ASSOCIATION_GROUP_COMMAND_LIST_REPORT" help="Association Group Command List Report">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="List Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Command" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+        <cmd key="0x06" name="ASSOCIATION_GROUP_COMMAND_LIST_REPORT" help="Association Group Command List Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="List Length" type="BYTE" />
+            <param key="0x02" name="Command" type="VARIANT">
+                <variant paramoffs="1" sizemask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x59" version="2" name="COMMAND_CLASS_ASSOCIATION_GRP_INFO" help="Command Class Association Group Info" read_only="false">
-        <cmd key="0x01" name="ASSOCIATION_GROUP_NAME_GET" help="Association Group Name Get">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x59" version="2" name="COMMAND_CLASS_ASSOCIATION_GRP_INFO" help="Command Class Association Group Info">
+        <cmd key="0x01" name="ASSOCIATION_GROUP_NAME_GET" help="Association Group Name Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="ASSOCIATION_GROUP_NAME_REPORT" help="Association Group Name Report">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Length of Name" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" is_ascii="true" showhex="false" signed="true" sizemask="0xFF" sizeoffs="0" />
+        <cmd key="0x02" name="ASSOCIATION_GROUP_NAME_REPORT" help="Association Group Name Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Length of Name" type="BYTE" />
+            <param key="0x02" name="Name" type="VARIANT">
+                <variant paramoffs="1" is_ascii="true" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x03" name="ASSOCIATION_GROUP_INFO_GET" help="Association Group Info Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x03" name="ASSOCIATION_GROUP_INFO_GET" help="Association Group Info Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="List Mode" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Refresh cache" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="ASSOCIATION_GROUP_INFO_REPORT" help="Association Group Info Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Group Count" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x04" name="ASSOCIATION_GROUP_INFO_REPORT" help="Association Group Info Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Group Count" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Dynamic Info" flagmask="0x40" />
                 <bitflag key="0x02" flagname="List mode" flagmask="0x80" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0x3F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Mode" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x02" name="Profile1" type="CONST" typehashcode="0x0B">
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0x3F" sizeoffs="0x00">
+                <param key="0x00" name="Grouping Identifier" type="BYTE" />
+                <param key="0x01" name="Mode" type="BYTE" />
+                <param key="0x02" name="Profile1" type="CONST">
                     <const key="0x00" flagname="Profile General" flagmask="0x00" />
                     <const key="0x01" flagname="Profile Control" flagmask="0x20" />
                     <const key="0x02" flagname="Profile Sensor" flagmask="0x31" />
                     <const key="0x03" flagname="Profile Notification" flagmask="0x71" />
                     <const key="0x04" flagname="Profile Meter" flagmask="0x32" />
                 </param>
-                <param key="0x03" name="Profile2" type="MULTI_ARRAY" typehashcode="0x0A">
+                <param key="0x03" name="Profile2" type="MULTI_ARRAY">
                     <multi_array>
                         <paramdescloc key="0x00" param="2" paramdesc="255" paramstart="2" />
                     </multi_array>
@@ -13868,76 +14414,54 @@
                         <bitflag key="0x32" flagname="Profile METER_TYPE_WATER" flagmask="0x03" />
                     </multi_array>
                 </param>
-                <param key="0x04" name="Reserved" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x05" name="Event Code" type="WORD" typehashcode="0x02">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x04" name="Reserved" type="BYTE" />
+                <param key="0x05" name="Event Code" type="WORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x05" name="ASSOCIATION_GROUP_COMMAND_LIST_GET" help="Association Group Command List Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="ASSOCIATION_GROUP_COMMAND_LIST_GET" help="Association Group Command List Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Allow cache" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="ASSOCIATION_GROUP_COMMAND_LIST_REPORT" help="Association Group Command List Report">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="List Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Command" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+        <cmd key="0x06" name="ASSOCIATION_GROUP_COMMAND_LIST_REPORT" help="Association Group Command List Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="List Length" type="BYTE" />
+            <param key="0x02" name="Command" type="VARIANT">
+                <variant paramoffs="1" sizemask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x59" version="3" name="COMMAND_CLASS_ASSOCIATION_GRP_INFO" help="Command Class Association Group Info" read_only="false">
-        <cmd key="0x01" name="ASSOCIATION_GROUP_NAME_GET" help="Association Group Name Get">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x59" version="3" name="COMMAND_CLASS_ASSOCIATION_GRP_INFO" help="Command Class Association Group Info">
+        <cmd key="0x01" name="ASSOCIATION_GROUP_NAME_GET" help="Association Group Name Get" support_mode="RX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="ASSOCIATION_GROUP_NAME_REPORT" help="Association Group Name Report">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Length of Name" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" is_ascii="true" showhex="false" signed="true" sizemask="0xFF" sizeoffs="0" />
+        <cmd key="0x02" name="ASSOCIATION_GROUP_NAME_REPORT" help="Association Group Name Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Length of Name" type="BYTE" />
+            <param key="0x02" name="Name" type="VARIANT">
+                <variant paramoffs="1" is_ascii="true" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x03" name="ASSOCIATION_GROUP_INFO_GET" help="Association Group Info Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x03" name="ASSOCIATION_GROUP_INFO_GET" help="Association Group Info Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="List Mode" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Refresh cache" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="ASSOCIATION_GROUP_INFO_REPORT" help="Association Group Info Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Group Count" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x04" name="ASSOCIATION_GROUP_INFO_REPORT" help="Association Group Info Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Group Count" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Dynamic Info" flagmask="0x40" />
                 <bitflag key="0x02" flagname="List mode" flagmask="0x80" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0x3F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Mode" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x02" name="Profile1" type="CONST" typehashcode="0x0B">
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0x3F" sizeoffs="0x00">
+                <param key="0x00" name="Grouping Identifier" type="BYTE" />
+                <param key="0x01" name="Mode" type="BYTE" />
+                <param key="0x02" name="Profile1" type="CONST">
                     <const key="0x00" flagname="Profile General" flagmask="0x00" />
                     <const key="0x01" flagname="Profile Control" flagmask="0x20" />
                     <const key="0x02" flagname="Profile Sensor" flagmask="0x31" />
@@ -13945,7 +14469,7 @@
                     <const key="0x04" flagname="Profile Meter" flagmask="0x32" />
                     <const key="0x05" flagname="Profile Irrigation" flagmask="0x6B" />
                 </param>
-                <param key="0x03" name="Profile2" type="MULTI_ARRAY" typehashcode="0x0A">
+                <param key="0x03" name="Profile2" type="MULTI_ARRAY">
                     <multi_array>
                         <paramdescloc key="0x00" param="2" paramdesc="255" paramstart="2" />
                     </multi_array>
@@ -14035,71 +14559,53 @@
                         <bitflag key="0x6B" flagname="Irrigation Channel 32" flagmask="0x20" />
                     </multi_array>
                 </param>
-                <param key="0x04" name="Reserved" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x05" name="Event Code" type="WORD" typehashcode="0x02">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
+                <param key="0x04" name="Reserved" type="BYTE" />
+                <param key="0x05" name="Event Code" type="WORD" />
             </variant_group>
         </cmd>
-        <cmd key="0x05" name="ASSOCIATION_GROUP_COMMAND_LIST_GET" help="Association Group Command List Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="ASSOCIATION_GROUP_COMMAND_LIST_GET" help="Association Group Command List Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Allow cache" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Grouping Identifier" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="ASSOCIATION_GROUP_COMMAND_LIST_REPORT" help="Association Group Command List Report">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="List Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Command" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+        <cmd key="0x06" name="ASSOCIATION_GROUP_COMMAND_LIST_REPORT" help="Association Group Command List Report" support_mode="TX">
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="List Length" type="BYTE" />
+            <param key="0x02" name="Command" type="VARIANT">
+                <variant paramoffs="1" sizemask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5A" version="1" name="COMMAND_CLASS_DEVICE_RESET_LOCALLY" help="Command Class Device Reset Locally" read_only="false">
-        <cmd key="0x01" name="DEVICE_RESET_LOCALLY_NOTIFICATION" help="Device Reset Locally Notification" />
+    <cmd_class key="0x5A" version="1" name="COMMAND_CLASS_DEVICE_RESET_LOCALLY" help="Command Class Device Reset Locally">
+        <cmd key="0x01" name="DEVICE_RESET_LOCALLY_NOTIFICATION" help="Device Reset Locally Notification" support_mode="TX" />
     </cmd_class>
-    <cmd_class key="0x5B" version="1" name="COMMAND_CLASS_CENTRAL_SCENE" help="Command Class Central Scene" read_only="false">
-        <cmd key="0x01" name="CENTRAL_SCENE_SUPPORTED_GET" help="Central Scene Supported Get" />
-        <cmd key="0x02" name="CENTRAL_SCENE_SUPPORTED_REPORT" help="Central Scene Supported Report">
-            <param key="0x00" name="Supported Scenes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-        </cmd>
-        <cmd key="0x03" name="CENTRAL_SCENE_NOTIFICATION" help="Central Scene Notification">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Key Attributes" fieldmask="0x07" shifter="0" />
+    <cmd_class key="0x5B" version="1" name="COMMAND_CLASS_CENTRAL_SCENE" help="Command Class Central Scene" comment="[OBSOLETED]">
+        <cmd key="0x01" name="CENTRAL_SCENE_SUPPORTED_GET" help="Central Scene Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="CENTRAL_SCENE_SUPPORTED_REPORT" help="Central Scene Supported Report" support_mode="TX">
+            <param key="0x00" name="Supported Scenes" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="CENTRAL_SCENE_NOTIFICATION" help="Central Scene Notification" support_mode="TX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Key Attributes" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Scene Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Scene Number" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5B" version="2" name="COMMAND_CLASS_CENTRAL_SCENE" help="Command Class Central Scene" read_only="false">
-        <cmd key="0x01" name="CENTRAL_SCENE_SUPPORTED_GET" help="Central Scene Supported Get" />
-        <cmd key="0x02" name="CENTRAL_SCENE_SUPPORTED_REPORT" help="Central Scene Supported Report">
-            <param key="0x00" name="Supported Scenes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+    <cmd_class key="0x5B" version="2" name="COMMAND_CLASS_CENTRAL_SCENE" help="Command Class Central Scene" comment="[OBSOLETED]">
+        <cmd key="0x01" name="CENTRAL_SCENE_SUPPORTED_GET" help="Central Scene Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="CENTRAL_SCENE_SUPPORTED_REPORT" help="Central Scene Supported Report" support_mode="TX">
+            <param key="0x00" name="Supported Scenes" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Identical" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Number of Bit Mask Bytes" fieldmask="0x06" shifter="1" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <variant_group key="0x02" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Supported Key Attributes for Scene" type="BITMASK" typehashcode="0x06">
+            <variant_group key="0x02" name="vg1" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Supported Key Attributes for Scene" type="BITMASK">
                     <bitmask key="0x00" paramoffs="129" lenmask="0x06" lenoffs="1" />
                     <bitflag key="0x00" flagname="Key Pressed 1 time" flagmask="0x00" />
                     <bitflag key="0x01" flagname="Key Released" flagmask="0x01" />
@@ -14111,12 +14617,10 @@
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x03" name="CENTRAL_SCENE_NOTIFICATION" help="Central Scene Notification">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Key Attributes" fieldmask="0x07" shifter="0">
+        <cmd key="0x03" name="CENTRAL_SCENE_NOTIFICATION" help="Central Scene Notification" support_mode="TX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Key Attributes" fieldmask="0x07">
                     <fieldenum value="Key Pressed 1 time" />
                     <fieldenum value="Key Released" />
                     <fieldenum value="Key Held Down" />
@@ -14127,25 +14631,21 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Scene Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Scene Number" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5B" version="3" name="COMMAND_CLASS_CENTRAL_SCENE" help="Command Class Central Scene" read_only="false">
-        <cmd key="0x01" name="CENTRAL_SCENE_SUPPORTED_GET" help="Central Scene Supported Get" />
-        <cmd key="0x02" name="CENTRAL_SCENE_SUPPORTED_REPORT" help="Central Scene Supported Report">
-            <param key="0x00" name="Supported Scenes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+    <cmd_class key="0x5B" version="3" name="COMMAND_CLASS_CENTRAL_SCENE" help="Command Class Central Scene">
+        <cmd key="0x01" name="CENTRAL_SCENE_SUPPORTED_GET" help="Central Scene Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="CENTRAL_SCENE_SUPPORTED_REPORT" help="Central Scene Supported Report" support_mode="TX">
+            <param key="0x00" name="Supported Scenes" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Identical" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Number of Bit Mask Bytes" fieldmask="0x06" shifter="1" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0x78" shifter="3" />
                 <bitflag key="0x03" flagname="Slow Refresh Support" flagmask="0x80" />
             </param>
-            <variant_group key="0x02" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Supported Key Attributes for Scene" type="BITMASK" typehashcode="0x06">
+            <variant_group key="0x02" name="vg1" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Supported Key Attributes for Scene" type="BITMASK">
                     <bitmask key="0x00" paramoffs="129" lenmask="0x06" lenoffs="1" />
                     <bitflag key="0x00" flagname="Key Pressed 1 time" flagmask="0x00" />
                     <bitflag key="0x01" flagname="Key Released" flagmask="0x01" />
@@ -14157,12 +14657,10 @@
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x03" name="CENTRAL_SCENE_NOTIFICATION" help="Central Scene Notification">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Key Attributes" fieldmask="0x07" shifter="0">
+        <cmd key="0x03" name="CENTRAL_SCENE_NOTIFICATION" help="Central Scene Notification" support_mode="TX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Key Attributes" fieldmask="0x07">
                     <fieldenum value="Key Pressed 1 time" />
                     <fieldenum value="Key Released" />
                     <fieldenum value="Key Held Down" />
@@ -14174,150 +14672,143 @@
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0x78" shifter="3" />
                 <bitflag key="0x02" flagname="Slow Refresh" flagmask="0x80" />
             </param>
-            <param key="0x02" name="Scene Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+            <param key="0x02" name="Scene Number" type="BYTE" />
         </cmd>
-        <cmd key="0x04" name="CENTRAL_SCENE_CONFIGURATION_SET" help="Central Scene Configuration Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x04" name="CENTRAL_SCENE_CONFIGURATION_SET" help="Central Scene Configuration Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Slow Refresh" flagmask="0x80" />
             </param>
         </cmd>
-        <cmd key="0x05" name="CENTRAL_SCENE_CONFIGURATION_GET" help="Central Scene Configuration Get" />
-        <cmd key="0x06" name="CENTRAL_SCENE_CONFIGURATION_REPORT" help="Central Scene Configuration Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" shifter="0" />
+        <cmd key="0x05" name="CENTRAL_SCENE_CONFIGURATION_GET" help="Central Scene Configuration Get" support_mode="RX" />
+        <cmd key="0x06" name="CENTRAL_SCENE_CONFIGURATION_REPORT" help="Central Scene Configuration Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Slow Refresh" flagmask="0x80" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5C" version="1" name="COMMAND_CLASS_IP_ASSOCIATION" help="Command Class Ip Association" read_only="false">
+    <cmd_class key="0x5C" version="1" name="COMMAND_CLASS_IP_ASSOCIATION" help="Command Class IP Association">
         <cmd key="0x01" name="IP_ASSOCIATION_SET" help="IP Association Set">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x02" name="End Point" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
+            <param key="0x02" name="End Point" type="BYTE" />
         </cmd>
         <cmd key="0x02" name="IP_ASSOCIATION_GET" help="IP Association Get">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Index" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Index" type="BYTE" />
         </cmd>
         <cmd key="0x03" name="IP_ASSOCIATION_REPORT" help="IP Association Report">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Index" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Actual Nodes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x04" name="End Point" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="Index" type="BYTE" />
+            <param key="0x02" name="Actual Nodes" type="BYTE" />
+            <param key="0x03" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
+            <param key="0x04" name="End Point" type="BYTE" />
         </cmd>
         <cmd key="0x04" name="IP_ASSOCIATION_REMOVE" help="IP Association Remove">
-            <param key="0x00" name="Grouping Identifier" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x02" name="End Point" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x00" name="Grouping Identifier" type="BYTE" />
+            <param key="0x01" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
+            <param key="0x02" name="End Point" type="BYTE" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5D" version="1" name="COMMAND_CLASS_ANTITHEFT" help="Command Class Anti-theft" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x01" name="ANTITHEFT_SET" help="Anti-theft Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Magic Code bytes" fieldmask="0x7F" shifter="0" />
+    <cmd_class key="0x5D" version="1" name="COMMAND_CLASS_ANTITHEFT" help="Command Class Anti-theft" comment="[OBSOLETED]">
+        <cmd key="0x01" name="ANTITHEFT_SET" help="Anti-theft Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Magic Code bytes" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Enable" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Magic Code" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x7F" sizeoffs="0" />
+            <param key="0x01" name="Magic Code" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x7F" />
             </param>
-            <param key="0x02" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Anti-theft Hint Number Bytes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Anti-theft Hint Byte" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="3" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x02" name="Manufacturer ID" type="WORD" />
+            <param key="0x03" name="Anti-theft Hint Number Bytes" type="BYTE" />
+            <param key="0x04" name="Anti-theft Hint Byte" type="VARIANT">
+                <variant paramoffs="3" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="ANTITHEFT_GET" help="Anti-theft Get" />
-        <cmd key="0x03" name="ANTITHEFT_REPORT" help="Anti-theft Report">
-            <param key="0x00" name="Anti-theft Protection Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Anti-theft Hint Number Bytes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Anti-theft Hint Byte" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="2" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+        <cmd key="0x02" name="ANTITHEFT_GET" help="Anti-theft Get" support_mode="RX" />
+        <cmd key="0x03" name="ANTITHEFT_REPORT" help="Anti-theft Report" support_mode="TX">
+            <param key="0x00" name="Anti-theft Protection Status" type="BYTE" />
+            <param key="0x01" name="Manufacturer ID" type="WORD" />
+            <param key="0x02" name="Anti-theft Hint Number Bytes" type="BYTE" />
+            <param key="0x03" name="Anti-theft Hint Byte" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5D" version="2" name="COMMAND_CLASS_ANTITHEFT" help="Command Class Anti-theft" read_only="false">
-        <cmd key="0x01" name="ANTITHEFT_SET" help="Anti-theft Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Magic Code bytes" fieldmask="0x7F" shifter="0" />
+    <cmd_class key="0x5D" version="2" name="COMMAND_CLASS_ANTITHEFT" help="Command Class Anti-theft" comment="[DEPRECATED]">
+        <cmd key="0x01" name="ANTITHEFT_SET" help="Anti-theft Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Magic Code bytes" fieldmask="0x7F" />
                 <bitflag key="0x01" flagname="Enable" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Magic Code" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="0" showhex="true" signed="true" sizemask="0x7F" sizeoffs="0" />
+            <param key="0x01" name="Magic Code" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x7F" />
             </param>
-            <param key="0x02" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Manufacturer ID" type="WORD" />
+            <param key="0x03" name="Anti-theft Hint Number Bytes" type="BYTE" />
+            <param key="0x04" name="Anti-theft Hint Byte" type="VARIANT">
+                <variant paramoffs="3" sizemask="0xFF" />
             </param>
-            <param key="0x03" name="Anti-theft Hint Number Bytes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x02" name="ANTITHEFT_GET" help="Anti-theft Get" support_mode="RX" />
+        <cmd key="0x03" name="ANTITHEFT_REPORT" help="Anti-theft Report" support_mode="TX">
+            <param key="0x00" name="Anti-theft Protection Status" type="CONST">
+                <const key="0x00" flagname="Reserved" flagmask="0x00" />
+                <const key="0x01" flagname="DISABLED" flagmask="0x01" />
+                <const key="0x02" flagname="ENABLED" flagmask="0x02" />
+                <const key="0x03" flagname="NOT FULLY ENABLED" flagmask="0x03" />
             </param>
-            <param key="0x04" name="Anti-theft Hint Byte" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="3" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x01" name="Manufacturer ID" type="WORD" />
+            <param key="0x02" name="Anti-theft Hint Number Bytes" type="BYTE" />
+            <param key="0x03" name="Anti-theft Hint Byte" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="ANTITHEFT_GET" help="Anti-theft Get" />
-        <cmd key="0x03" name="ANTITHEFT_REPORT" help="Anti-theft Report">
-            <param key="0x00" name="Anti-theft Protection Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+    </cmd_class>
+    <cmd_class key="0x5D" version="3" name="COMMAND_CLASS_ANTITHEFT" help="Command Class Anti-theft" comment="[DEPRECATED]">
+        <cmd key="0x01" name="ANTITHEFT_SET" help="Anti-theft Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Magic Code bytes" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Enable" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Magic Code" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x7F" />
             </param>
-            <param key="0x01" name="Manufacturer ID" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Manufacturer ID" type="WORD" />
+            <param key="0x03" name="Anti-theft Hint Number Bytes" type="BYTE" />
+            <param key="0x04" name="Anti-theft Hint Byte" type="VARIANT">
+                <variant paramoffs="3" sizemask="0xFF" />
             </param>
-            <param key="0x02" name="Anti-theft Hint Number Bytes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x05" name="Z-Wave Alliance locking entity ID" type="WORD" />
+        </cmd>
+        <cmd key="0x02" name="ANTITHEFT_GET" help="Anti-theft Get" support_mode="RX" />
+        <cmd key="0x03" name="ANTITHEFT_REPORT" help="Anti-theft Report" support_mode="TX">
+            <param key="0x00" name="Anti-theft Protection Status" type="CONST">
+                <const key="0x00" flagname="Reserved" flagmask="0x00" />
+                <const key="0x01" flagname="DISABLED" flagmask="0x01" />
+                <const key="0x02" flagname="ENABLED" flagmask="0x02" />
+                <const key="0x03" flagname="NOT FULLY ENABLED" flagmask="0x03" />
             </param>
-            <param key="0x03" name="Anti-theft Hint Byte" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="2" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x01" name="Manufacturer ID" type="WORD" />
+            <param key="0x02" name="Anti-theft Hint Number Bytes" type="BYTE" />
+            <param key="0x03" name="Anti-theft Hint Byte" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
             </param>
+            <param key="0x04" name="Z-Wave Alliance locking entity ID" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5E" version="1" name="COMMAND_CLASS_ZWAVEPLUS_INFO" help="Command Class Z-Wave+ Info" read_only="false" comment="[OBSOLETED]">
-        <cmd key="0x01" name="ZWAVEPLUS_INFO_GET" help="Z-Wave+ Info Get" />
-        <cmd key="0x02" name="ZWAVEPLUS_INFO_REPORT" help="Z-Wave+ Info Report">
-            <param key="0x00" name="Z-Wave+ Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Role Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x5E" version="1" name="COMMAND_CLASS_ZWAVEPLUS_INFO" help="Command Class Z-Wave Plus Info" comment="[OBSOLETED]">
+        <cmd key="0x01" name="ZWAVEPLUS_INFO_GET" help="Z-Wave+ Info Get" support_mode="RX" />
+        <cmd key="0x02" name="ZWAVEPLUS_INFO_REPORT" help="Z-Wave+ Info Report" support_mode="TX">
+            <param key="0x00" name="Z-Wave+ Version" type="BYTE" />
+            <param key="0x01" name="Role Type" type="CONST">
                 <const key="0x00" flagname="ROLE_TYPE_CONTROLLER_CENTRAL_STATIC" flagmask="0x00" />
                 <const key="0x01" flagname="ROLE_TYPE_CONTROLLER_SUB_STATIC" flagmask="0x01" />
                 <const key="0x02" flagname="ROLE_TYPE_CONTROLLER_PORTABLE" flagmask="0x02" />
@@ -14327,7 +14818,7 @@
                 <const key="0x06" flagname="ROLE_TYPE_SLAVE_SLEEPING_REPORTING" flagmask="0x06" />
                 <const key="0x07" flagname="ROLE_TYPE_SLAVE_SLEEPING_LISTENING" flagmask="0x07" />
             </param>
-            <param key="0x02" name="Node Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x02" name="Node Type" type="CONST">
                 <const key="0x00" flagname="NODE_TYPE_ZWAVEPLUS_NODE" flagmask="0x00" />
                 <const key="0x01" flagname="NODE_TYPE_ZWAVEPLUS_FOR_IP_ROUTER" flagmask="0x01" />
                 <const key="0x02" flagname="NODE_TYPE_ZWAVEPLUS_FOR_IP_GATEWAY" flagmask="0x02" />
@@ -14336,13 +14827,11 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5E" version="2" name="COMMAND_CLASS_ZWAVEPLUS_INFO" help="Command Class Z-Wave+ Info" read_only="false" comment="SDS11907-3">
-        <cmd key="0x01" name="ZWAVEPLUS_INFO_GET" help="Z-Wave+ Info Get" />
-        <cmd key="0x02" name="ZWAVEPLUS_INFO_REPORT" help="Z-Wave+ Info Report">
-            <param key="0x00" name="Z-Wave+ Version" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Role Type" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x5E" version="2" name="COMMAND_CLASS_ZWAVEPLUS_INFO" help="Command Class Z-Wave Plus Info" comment="SDS11907-3">
+        <cmd key="0x01" name="ZWAVEPLUS_INFO_GET" help="Z-Wave Plus Info Get" support_mode="RX" />
+        <cmd key="0x02" name="ZWAVEPLUS_INFO_REPORT" help="Z-Wave Plus Info Report" support_mode="TX">
+            <param key="0x00" name="Z-Wave+ Version" type="BYTE" />
+            <param key="0x01" name="Role Type" type="CONST">
                 <const key="0x00" flagname="ROLE_TYPE_CONTROLLER_CENTRAL_STATIC" flagmask="0x00" />
                 <const key="0x01" flagname="ROLE_TYPE_CONTROLLER_SUB_STATIC" flagmask="0x01" />
                 <const key="0x02" flagname="ROLE_TYPE_CONTROLLER_PORTABLE" flagmask="0x02" />
@@ -14352,237 +14841,191 @@
                 <const key="0x06" flagname="ROLE_TYPE_SLAVE_SLEEPING_REPORTING" flagmask="0x06" />
                 <const key="0x07" flagname="ROLE_TYPE_SLAVE_SLEEPING_LISTENING" flagmask="0x07" />
             </param>
-            <param key="0x02" name="Node Type" type="CONST" typehashcode="0x0B" comment="">
+            <param key="0x02" name="Node Type" type="CONST">
                 <const key="0x00" flagname="NODE_TYPE_ZWAVEPLUS_NODE" flagmask="0x00" />
                 <const key="0x01" flagname="NODE_TYPE_ZWAVEPLUS_FOR_IP_GATEWAY" flagmask="0x02" />
             </param>
-            <param key="0x03" name="Installer Icon Type" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="User Icon Type" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x03" name="Installer Icon Type" type="WORD" />
+            <param key="0x04" name="User Icon Type" type="WORD" />
         </cmd>
     </cmd_class>
-    <cmd_class key="0x5F" version="1" name="COMMAND_CLASS_ZIP_GATEWAY" help="Command Class Z/IP Gateway" read_only="false">
-        <cmd key="0x01" name="GATEWAY_MODE_SET" help="Gateway Mode Set">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+    <cmd_class key="0x5F" version="1" name="COMMAND_CLASS_ZIP_GATEWAY" help="Command Class Z/IP Gateway">
+        <cmd key="0x01" name="GATEWAY_MODE_SET" help="Gateway Mode Set" support_mode="RX">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="Stand-alone" flagmask="0x01" />
                 <const key="0x01" flagname="Portal" flagmask="0x02" />
             </param>
         </cmd>
-        <cmd key="0x02" name="GATEWAY_MODE_GET" help="Gateway Mode Get" />
-        <cmd key="0x03" name="GATEWAY_MODE_REPORT" help="Gateway Mode Report">
-            <param key="0x00" name="Mode" type="CONST" typehashcode="0x0B" comment="">
+        <cmd key="0x02" name="GATEWAY_MODE_GET" help="Gateway Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="GATEWAY_MODE_REPORT" help="Gateway Mode Report" support_mode="TX">
+            <param key="0x00" name="Mode" type="CONST">
                 <const key="0x00" flagname="Stand-alone" flagmask="0x01" />
                 <const key="0x01" flagname="Portal" flagmask="0x02" />
             </param>
         </cmd>
-        <cmd key="0x04" name="GATEWAY_PEER_SET" help="Gateway Peer Set">
-            <param key="0x00" name="Peer Profile" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="GATEWAY_PEER_SET" help="Gateway Peer Set" support_mode="RX">
+            <param key="0x00" name="Peer Profile" type="BYTE" />
+            <param key="0x01" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x01" name="IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Port" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Peer Name Length" fieldmask="0x3F" shifter="0" />
+            <param key="0x02" name="Port" type="WORD" />
+            <param key="0x03" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Peer Name Length" fieldmask="0x3F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x04" name="Peer Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="3" showhex="false" signed="true" sizemask="0x3F" sizeoffs="0" />
+            <param key="0x04" name="Peer Name" type="VARIANT">
+                <variant paramoffs="3" sizemask="0x3F" />
             </param>
         </cmd>
-        <cmd key="0x05" name="GATEWAY_PEER_GET" help="Gateway Peer Get">
-            <param key="0x00" name="Peer Profile" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x05" name="GATEWAY_PEER_GET" help="Gateway Peer Get" support_mode="RX">
+            <param key="0x00" name="Peer Profile" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="GATEWAY_PEER_REPORT" help="Gateway Peer Report">
-            <param key="0x00" name="Peer Profile" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Peer Count" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x06" name="GATEWAY_PEER_REPORT" help="Gateway Peer Report" support_mode="TX">
+            <param key="0x00" name="Peer Profile" type="BYTE" />
+            <param key="0x01" name="Peer Count" type="BYTE" />
+            <param key="0x02" name="IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x02" name="IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Port" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Peer Name Length" fieldmask="0x3F" shifter="0" />
+            <param key="0x03" name="Port" type="WORD" />
+            <param key="0x04" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Peer Name Length" fieldmask="0x3F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x05" name="Peer Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="4" showhex="false" signed="true" sizemask="0x3F" sizeoffs="0" />
+            <param key="0x05" name="Peer Name" type="VARIANT">
+                <variant paramoffs="4" sizemask="0x3F" />
             </param>
         </cmd>
-        <cmd key="0x07" name="GATEWAY_LOCK_SET" help="Gateway Lock Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x07" name="GATEWAY_LOCK_SET" help="Gateway Lock Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Lock" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Show" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
         </cmd>
-        <cmd key="0x08" name="UNSOLICITED_DESTINATION_SET" help="Unsolicited Destination Set ">
-            <param key="0x00" name="Unsolicited IPv6 Destination" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Unsolicited Destination Port" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x08" name="UNSOLICITED_DESTINATION_SET" help="Unsolicited Destination Set" support_mode="RX">
+            <param key="0x00" name="Unsolicited IPv6 Destination" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
+            <param key="0x01" name="Unsolicited Destination Port" type="WORD" />
         </cmd>
-        <cmd key="0x09" name="UNSOLICITED_DESTINATION_GET" help="Unsolicited Destination Get" />
-        <cmd key="0x0A" name="UNSOLICITED_DESTINATION_REPORT" help="Unsolicited Destination Report">
-            <param key="0x00" name="Unsolicited IPv6 Destination" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Unsolicited Destination Port" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x09" name="UNSOLICITED_DESTINATION_GET" help="Unsolicited Destination Get" support_mode="RX" />
+        <cmd key="0x0A" name="UNSOLICITED_DESTINATION_REPORT" help="Unsolicited Destination Report" support_mode="TX">
+            <param key="0x00" name="Unsolicited IPv6 Destination" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
+            <param key="0x01" name="Unsolicited Destination Port" type="WORD" />
         </cmd>
-        <cmd key="0x0B" name="COMMAND_APPLICATION_NODE_INFO_SET" help="Application Node Info Set">
-            <param key="0x00" name="Non-Secure Command Class" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x0B" name="COMMAND_APPLICATION_NODE_INFO_SET" help="Application Node Info Set" support_mode="RX">
+            <param key="0x00" name="Non-Secure Command Class" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x01" name="Security Scheme 0 MARK" type="MARKER" typehashcode="0x0E">
+            <param key="0x01" name="Security Scheme 0 MARK" type="MARKER">
                 <const key="0x00" flagname="Security Scheme 0 MARK" flagmask="0xF1" />
                 <const key="0x01" flagname="Security Scheme 0 MARK" flagmask="0x00" />
             </param>
-            <param key="0x02" name="Security Scheme 0 Command Class" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Security Scheme 0 Command Class" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x0C" name="COMMAND_APPLICATION_NODE_INFO_GET" help="Application Node Info Get" />
-        <cmd key="0x0D" name="COMMAND_APPLICATION_NODE_INFO_REPORT" help="Application Node Info Report">
-            <param key="0x00" name="Non-Secure Command Class" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x0C" name="COMMAND_APPLICATION_NODE_INFO_GET" help="Application Node Info Get" support_mode="RX" />
+        <cmd key="0x0D" name="COMMAND_APPLICATION_NODE_INFO_REPORT" help="Application Node Info Report" support_mode="TX">
+            <param key="0x00" name="Non-Secure Command Class" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
-            <param key="0x01" name="Security Scheme 0 MARK" type="MARKER" typehashcode="0x0E">
+            <param key="0x01" name="Security Scheme 0 MARK" type="MARKER">
                 <const key="0x00" flagname="Security Scheme 0 MARK" flagmask="0xF1" />
                 <const key="0x01" flagname="Security Scheme 0 MARK" flagmask="0x00" />
             </param>
-            <param key="0x02" name="Security Scheme 0 Command Class" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="Security Scheme 0 Command Class" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x61" version="1" name="COMMAND_CLASS_ZIP_PORTAL" help="Command Class Z/IP Portal" read_only="false">
-        <cmd key="0x01" name="GATEWAY_CONFIGURATION_SET" help="Gateway Configuration Set">
-            <param key="0x00" name="LAN IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+    <cmd_class key="0x61" version="1" name="COMMAND_CLASS_ZIP_PORTAL" help="Command Class Z/IP Portal">
+        <cmd key="0x01" name="GATEWAY_CONFIGURATION_SET" help="Gateway Configuration Set" support_mode="RX">
+            <param key="0x00" name="LAN IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x01" name="LAN IPv6 Prefix Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="LAN IPv6 Prefix Length" type="BYTE" />
+            <param key="0x02" name="Portal IPv6 Prefix" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x02" name="Portal IPv6 Prefix" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x03" name="Portal IPv6 Prefix Length" type="BYTE" />
+            <param key="0x04" name="Default Gateway IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x03" name="Portal IPv6 Prefix Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Default Gateway IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x05" name="PAN IPv6 Prefix" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x05" name="PAN IPv6 Prefix" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
-        <cmd key="0x02" name="GATEWAY_CONFIGURATION_STATUS" help="Gateway Configuration Status">
-            <param key="0x00" name="Status" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+        <cmd key="0x02" name="GATEWAY_CONFIGURATION_STATUS" help="Gateway Configuration Status" support_mode="TX">
+            <param key="0x00" name="Status" type="BYTE" />
         </cmd>
-        <cmd key="0x03" name="GATEWAY_CONFIGURATION_GET" help="Gateway Configuration Get" />
-        <cmd key="0x04" name="GATEWAY_CONFIGURATION_REPORT" help="Gateway Configuration Report">
-            <param key="0x00" name="LAN IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x01" name="LAN IPv6 Prefix Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="GATEWAY_CONFIGURATION_GET" help="Gateway Configuration Get" support_mode="RX" />
+        <cmd key="0x04" name="GATEWAY_CONFIGURATION_REPORT" help="Gateway Configuration Report" support_mode="TX">
+            <param key="0x00" name="LAN IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x02" name="Portal IPv6 Prefix" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x01" name="LAN IPv6 Prefix Length" type="BYTE" />
+            <param key="0x02" name="Portal IPv6 Prefix" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x03" name="Portal IPv6 Prefix Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="Portal IPv6 Prefix Length" type="BYTE" />
+            <param key="0x04" name="Default Gateway IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
-            <param key="0x04" name="Default Gateway IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x05" name="PAN IPv6 Prefix" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x05" name="PAN IPv6 Prefix" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x65" version="1" name="COMMAND_CLASS_DMX" help="Command Class DMX" read_only="false">
+    <cmd_class key="0x65" version="1" name="COMMAND_CLASS_DMX" help="Command Class DMX">
         <cmd key="0x01" name="DMX_ADDRESS_SET" help="DMX Address Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Page ID" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Page ID" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Channel ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Channel ID" type="BYTE" />
         </cmd>
         <cmd key="0x02" name="DMX_ADDRESS_GET" help="DMX Address Get" />
         <cmd key="0x03" name="DMX_ADDRESS_REPORT" help="DMX Address Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Page ID" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Page ID" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Channel ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Channel ID" type="BYTE" />
         </cmd>
         <cmd key="0x04" name="DMX_CAPABILITY_GET" help="DMX Capability Get">
-            <param key="0x00" name="Channel ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x00" name="Channel ID" type="BYTE" />
         </cmd>
         <cmd key="0x05" name="DMX_CAPABILITY_REPORT" help="DMX Capability Report">
-            <param key="0x00" name="Channel ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Property ID" type="WORD" typehashcode="0x02" comment="">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Device Channels" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Max Channels" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x00" name="Channel ID" type="BYTE" />
+            <param key="0x01" name="Property ID" type="WORD" />
+            <param key="0x02" name="Device Channels" type="BYTE" />
+            <param key="0x03" name="Max Channels" type="BYTE" />
         </cmd>
         <cmd key="0x06" name="DMX_DATA" help="DMX Data">
-            <param key="0x00" name="Source" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Page" fieldmask="0x0F" shifter="0" />
+            <param key="0x00" name="Source" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Page" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Sequence No" fieldmask="0x30" shifter="4" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
             </param>
-            <param key="0x02" name="DMX channel" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x02" name="DMX channel" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x66" version="1" name="COMMAND_CLASS_BARRIER_OPERATOR" help="Command Class Barrier Operator" read_only="false">
-        <cmd key="0x01" name="BARRIER_OPERATOR_SET" help="Barrier Operator Set">
-            <param key="0x00" name="Target Value" type="CONST" typehashcode="0x0B">
+    <cmd_class key="0x66" version="1" name="COMMAND_CLASS_BARRIER_OPERATOR" help="Command Class Barrier Operator">
+        <cmd key="0x01" name="BARRIER_OPERATOR_SET" help="Barrier Operator Set" support_mode="RX">
+            <param key="0x00" name="Target Value" type="CONST">
                 <const key="0x00" flagname="CLOSE" flagmask="0x00" />
                 <const key="0x01" flagname="OPEN" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="BARRIER_OPERATOR_GET" help="Barrier Operator Get" />
-        <cmd key="0x03" name="BARRIER_OPERATOR_REPORT" help="Barrier Operator Report">
-            <param key="0x00" name="State" type="CONST" typehashcode="0x0B">
+        <cmd key="0x02" name="BARRIER_OPERATOR_GET" help="Barrier Operator Get" support_mode="RX" />
+        <cmd key="0x03" name="BARRIER_OPERATOR_REPORT" help="Barrier Operator Report" support_mode="TX">
+            <param key="0x00" name="State" type="CONST">
                 <const key="0x00" flagname="Closed" flagmask="0x00" />
                 <const key="0x01" flagname="Closing" flagmask="0xFC" />
                 <const key="0x02" flagname="Stopped" flagmask="0xFD" />
@@ -14590,109 +15033,285 @@
                 <const key="0x04" flagname="Open" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x04" name="BARRIER_OPERATOR_SIGNAL_SUPPORTED_GET" help="Barrier Operator Signal Supported Get" />
-        <cmd key="0x05" name="BARRIER_OPERATOR_SIGNAL_SUPPORTED_REPORT" help="Barrier Operator Signal Supported Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" />
-                <bitflag key="0x00" flagname="NOT SUPPORTED" flagmask="0x00" />
-                <bitflag key="0x01" flagname="Audible Notification" flagmask="0x01" />
-                <bitflag key="0x02" flagname="Visual Notification" flagmask="0x02" />
+        <cmd key="0x04" name="BARRIER_OPERATOR_SIGNAL_SUPPORTED_GET" help="Barrier Operator Signal Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="BARRIER_OPERATOR_SIGNAL_SUPPORTED_REPORT" help="Barrier Operator Signal Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" />
+                <bitflag key="0x00" flagname="Audible Notification" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Visual Notification" flagmask="0x02" />
             </param>
         </cmd>
-        <cmd key="0x06" name="BARRIER_OPERATOR_SIGNAL_SET" help="Barrier Operator Signal Set">
-            <param key="0x00" name="Subsystem Type" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x06" name="BARRIER_OPERATOR_SIGNAL_SET" help="Barrier Operator Signal Set" support_mode="RX">
+            <param key="0x00" name="Subsystem Type" type="BYTE">
                 <bitflag key="0x01" flagname="NOT SUPPORTED" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Audible Notification" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Visual Notification" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Subsystem State" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="Subsystem State" type="CONST">
                 <const key="0x00" flagname="OFF" flagmask="0x00" />
                 <const key="0x01" flagname="ON" flagmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x07" name="BARRIER_OPERATOR_SIGNAL_GET" help="Barrier Operator Signal Get">
-            <param key="0x00" name="Subsystem Type" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x07" name="BARRIER_OPERATOR_SIGNAL_GET" help="Barrier Operator Signal Get" support_mode="RX">
+            <param key="0x00" name="Subsystem Type" type="BYTE">
                 <bitflag key="0x01" flagname="NOT SUPPORTED" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Audible Notification" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Visual Notification" flagmask="0x02" />
             </param>
         </cmd>
-        <cmd key="0x08" name="BARRIER_OPERATOR_SIGNAL_REPORT" help="Barrier Operator Signal Report">
-            <param key="0x00" name="Subsystem Type" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x08" name="BARRIER_OPERATOR_SIGNAL_REPORT" help="Barrier Operator Signal Report" support_mode="TX">
+            <param key="0x00" name="Subsystem Type" type="BYTE">
                 <bitflag key="0x01" flagname="NOT SUPPORTED" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Audible Notification" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Visual Notification" flagmask="0x02" />
             </param>
-            <param key="0x01" name="Subsystem State" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="Subsystem State" type="CONST">
                 <const key="0x00" flagname="OFF" flagmask="0x00" />
                 <const key="0x01" flagname="ON" flagmask="0xFF" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x67" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INSTALLATION_MAINTENANCE" help="Command Class Network Management Installation and Maintenance" read_only="false">
-        <cmd key="0x01" name="LAST_WORKING_ROUTE_SET" help="Last Working Route Set">
-            <param key="0x00" name="NodeID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+    <cmd_class key="0x67" version="1" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INSTALLATION_MAINTENANCE" help="Command Class Network Management Installation and Maintenance">
+        <cmd key="0x01" name="PRIORITY_ROUTE_SET" help="Priority Route Set">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Repeater 1" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Repeater 2" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Repeater 3" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Repeater 4" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x05" name="Speed" type="CONST">
+                <const key="0x00" flagname="9.6 kbit/sec" flagmask="0x01" />
+                <const key="0x01" flagname="40 kbit/sec" flagmask="0x02" />
+                <const key="0x02" flagname="100 kbit/sec" flagmask="0x03" />
             </param>
-            <param key="0x01" name="Repeater 1" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        </cmd>
+        <cmd key="0x02" name="PRIORITY_ROUTE_GET" help="Priority Route Get">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x03" name="PRIORITY_ROUTE_REPORT" help="Priority Route Report">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Type" type="CONST">
+                <const key="0x00" flagname="None" flagmask="0x00" />
+                <const key="0x01" flagname="ZW_PRIORITY_ROUTE_ZW_LWR" flagmask="0x01" />
+                <const key="0x02" flagname="ZW_PRIORITY_ROUTE_ZW_NLWR" flagmask="0x02" />
+                <const key="0x03" flagname="ZW_PRIORITY_ROUTE_APP_PR" flagmask="0x10" />
             </param>
-            <param key="0x02" name="Repeater 2" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+            <param key="0x02" name="Repeater 1" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Repeater 2" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Repeater 3" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x05" name="Repeater 4" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x06" name="Speed" type="CONST">
+                <const key="0x00" flagname="9.6 kbit/sec" flagmask="0x01" />
+                <const key="0x01" flagname="40 kbit/sec" flagmask="0x02" />
+                <const key="0x02" flagname="100 kbit/sec" flagmask="0x03" />
             </param>
-            <param key="0x03" name="Repeater 3" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        </cmd>
+        <cmd key="0x04" name="STATISTICS_GET" help="Statistics Get" support_mode="RX">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x05" name="STATISTICS_REPORT" help="Statistics Report" support_mode="TX">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <variant_group key="0x01" name="Statistics" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Type" type="CONST">
+                    <const key="0x00" flagname="Route Changes (RC)" flagmask="0x00" />
+                    <const key="0x01" flagname="Transmission Count (TC)" flagmask="0x01" />
+                    <const key="0x02" flagname="Neighbors (NB)" flagmask="0x02" />
+                    <const key="0x03" flagname="Packet Error Count (PEC)" flagmask="0x03" />
+                    <const key="0x04" flagname="Sum of transmission times (TS)" flagmask="0x04" />
+                    <const key="0x05" flagname="Sum of transmission times squrared (TS2)" flagmask="0x05" />
+                </param>
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x06" name="STATISTICS_CLEAR" help="Statistics Clear" support_mode="RX" />
+    </cmd_class>
+    <cmd_class key="0x67" version="2" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INSTALLATION_MAINTENANCE" help="Command Class Network Management Installation and Maintenance">
+        <cmd key="0x01" name="PRIORITY_ROUTE_SET" help="Priority Route Set">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Repeater 1" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Repeater 2" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Repeater 3" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Repeater 4" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x05" name="Speed" type="CONST">
+                <const key="0x00" flagname="9.6 kbit/sec" flagmask="0x01" />
+                <const key="0x01" flagname="40 kbit/sec" flagmask="0x02" />
+                <const key="0x02" flagname="100 kbit/sec" flagmask="0x03" />
             </param>
-            <param key="0x04" name="Repeater 4" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        </cmd>
+        <cmd key="0x02" name="PRIORITY_ROUTE_GET" help="Priority Route Get">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x03" name="PRIORITY_ROUTE_REPORT" help="Priority Route Report">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Type" type="CONST">
+                <const key="0x00" flagname="None" flagmask="0x00" />
+                <const key="0x01" flagname="ZW_PRIORITY_ROUTE_ZW_LWR" flagmask="0x01" />
+                <const key="0x02" flagname="ZW_PRIORITY_ROUTE_ZW_NLWR" flagmask="0x02" />
+                <const key="0x03" flagname="ZW_PRIORITY_ROUTE_APP_PR" flagmask="0x10" />
             </param>
-            <param key="0x05" name="Speed" type="CONST" typehashcode="0x0B">
+            <param key="0x02" name="Repeater 1" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Repeater 2" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Repeater 3" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x05" name="Repeater 4" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x06" name="Speed" type="CONST">
                 <const key="0x00" flagname="9.6 kbit/sec" flagmask="0x01" />
                 <const key="0x01" flagname="40 kbit/sec" flagmask="0x02" />
                 <const key="0x02" flagname="100 kbit/sec" flagmask="0x03" />
             </param>
         </cmd>
-        <cmd key="0x02" name="LAST_WORKING_ROUTE_GET" help="Last Working Route Get">
-            <param key="0x00" name="NodeID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x04" name="STATISTICS_GET" help="Statistics Get" support_mode="RX">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x05" name="STATISTICS_REPORT" help="Statistics Report" support_mode="TX">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <variant_group key="0x01" name="Statistics" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Type" type="CONST">
+                    <const key="0x00" flagname="Route Changes (RC)" flagmask="0x00" />
+                    <const key="0x01" flagname="Transmission Count (TC)" flagmask="0x01" />
+                    <const key="0x02" flagname="Neighbors (NB)" flagmask="0x02" />
+                    <const key="0x03" flagname="Packet Error Count (PEC)" flagmask="0x03" />
+                    <const key="0x04" flagname="Sum of transmission times (TS)" flagmask="0x04" />
+                    <const key="0x05" flagname="Sum of transmission times squrared (TS2)" flagmask="0x05" />
+                </param>
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
+                </param>
+            </variant_group>
         </cmd>
-        <cmd key="0x03" name="LAST_WORKING_ROUTE_REPORT" help="Last Working Route Report">
-            <param key="0x00" name="NodeID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        <cmd key="0x06" name="STATISTICS_CLEAR" help="Statistics Clear" support_mode="RX" />
+        <cmd key="0x07" name="RSSI_GET" help="RSSI Get" support_mode="RX" />
+        <cmd key="0x08" name="RSSI_REPORT" help="RSSI Report" support_mode="TX">
+            <param key="0x00" name="Channel 1 RSSI" type="BYTE" />
+            <param key="0x01" name="Channel 2 RSSI" type="BYTE" />
+            <param key="0x02" name="Channel 3 RSSI" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x67" version="3" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INSTALLATION_MAINTENANCE" help="Command Class Network Management Installation and Maintenance">
+        <cmd key="0x01" name="PRIORITY_ROUTE_SET" help="Priority Route Set">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Repeater 1" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Repeater 2" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Repeater 3" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Repeater 4" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x05" name="Speed" type="CONST">
+                <const key="0x00" flagname="9.6 kbit/sec" flagmask="0x01" />
+                <const key="0x01" flagname="40 kbit/sec" flagmask="0x02" />
+                <const key="0x02" flagname="100 kbit/sec" flagmask="0x03" />
             </param>
-            <param key="0x01" name="Repeater 1" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        </cmd>
+        <cmd key="0x02" name="PRIORITY_ROUTE_GET" help="Priority Route Get">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x03" name="PRIORITY_ROUTE_REPORT" help="Priority Route Report">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Type" type="CONST">
+                <const key="0x00" flagname="None" flagmask="0x00" />
+                <const key="0x01" flagname="ZW_PRIORITY_ROUTE_ZW_LWR" flagmask="0x01" />
+                <const key="0x02" flagname="ZW_PRIORITY_ROUTE_ZW_NLWR" flagmask="0x02" />
+                <const key="0x03" flagname="ZW_PRIORITY_ROUTE_APP_PR" flagmask="0x10" />
             </param>
-            <param key="0x02" name="Repeater 2" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+            <param key="0x02" name="Repeater 1" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Repeater 2" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Repeater 3" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x05" name="Repeater 4" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x06" name="Speed" type="CONST">
+                <const key="0x00" flagname="9.6 kbit/sec" flagmask="0x01" />
+                <const key="0x01" flagname="40 kbit/sec" flagmask="0x02" />
+                <const key="0x02" flagname="100 kbit/sec" flagmask="0x03" />
             </param>
-            <param key="0x03" name="Repeater 3" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        </cmd>
+        <cmd key="0x04" name="STATISTICS_GET" help="Statistics Get" support_mode="RX">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x05" name="STATISTICS_REPORT" help="Statistics Report" support_mode="TX">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <variant_group key="0x01" name="Statistics" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Type" type="CONST">
+                    <const key="0x00" flagname="Route Changes (RC)" flagmask="0x00" />
+                    <const key="0x01" flagname="Transmission Count (TC)" flagmask="0x01" />
+                    <const key="0x02" flagname="Neighbors (NB)" flagmask="0x02" />
+                    <const key="0x03" flagname="Packet Error Count (PEC)" flagmask="0x03" />
+                    <const key="0x04" flagname="Sum of transmission times (TS)" flagmask="0x04" />
+                    <const key="0x05" flagname="Sum of transmission times squrared (TS2)" flagmask="0x05" />
+                </param>
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x06" name="STATISTICS_CLEAR" help="Statistics Clear" support_mode="RX" />
+        <cmd key="0x07" name="RSSI_GET" help="RSSI Get" support_mode="RX" />
+        <cmd key="0x08" name="RSSI_REPORT" help="RSSI Report" support_mode="TX">
+            <param key="0x00" name="Channel 1 RSSI" type="BYTE" />
+            <param key="0x01" name="Channel 2 RSSI" type="BYTE" />
+            <param key="0x02" name="Channel 3 RSSI" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="S2_RESYNCHRONIZATION_EVENT" help="S2 Resynchronization Event">
+            <param key="0x00" name="NodeID" type="BYTE" />
+            <param key="0x01" name="Reason" type="CONST">
+                <const key="0x00" flagname="SOS_EVENT_REASON_UNANSWERED" flagmask="0x00" />
+            </param>
+            <param key="0x02" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x0B" name="EXTENDED_STATISTICS_GET" help="Extended Statistics Get">
+            <param key="0x00" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x0C" name="EXTENDED_STATISTICS_REPORT" help="Extended Statistics Report">
+            <param key="0x00" name="Extended NodeID" type="WORD" />
+            <variant_group key="0x01" name="Statistics" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Type" type="BYTE" />
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
+                </param>
+            </variant_group>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x67" version="4" name="COMMAND_CLASS_NETWORK_MANAGEMENT_INSTALLATION_MAINTENANCE" help="Command Class Network Management Installation and Maintenance">
+        <cmd key="0x01" name="PRIORITY_ROUTE_SET" help="Priority Route Set">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Repeater 1" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x02" name="Repeater 2" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Repeater 3" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Repeater 4" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x05" name="Speed" type="CONST">
+                <const key="0x00" flagname="9.6 kbit/sec" flagmask="0x01" />
+                <const key="0x01" flagname="40 kbit/sec" flagmask="0x02" />
+                <const key="0x02" flagname="100 kbit/sec" flagmask="0x03" />
             </param>
-            <param key="0x04" name="Repeater 4" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        </cmd>
+        <cmd key="0x02" name="PRIORITY_ROUTE_GET" help="Priority Route Get">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+        </cmd>
+        <cmd key="0x03" name="PRIORITY_ROUTE_REPORT" help="Priority Route Report">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Type" type="CONST">
+                <const key="0x00" flagname="None" flagmask="0x00" />
+                <const key="0x01" flagname="ZW_PRIORITY_ROUTE_ZW_LWR" flagmask="0x01" />
+                <const key="0x02" flagname="ZW_PRIORITY_ROUTE_ZW_NLWR" flagmask="0x02" />
+                <const key="0x03" flagname="ZW_PRIORITY_ROUTE_APP_PR" flagmask="0x10" />
             </param>
-            <param key="0x05" name="Speed" type="CONST" typehashcode="0x0B">
+            <param key="0x02" name="Repeater 1" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x03" name="Repeater 2" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x04" name="Repeater 3" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x05" name="Repeater 4" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x06" name="Speed" type="CONST">
                 <const key="0x00" flagname="9.6 kbit/sec" flagmask="0x01" />
                 <const key="0x01" flagname="40 kbit/sec" flagmask="0x02" />
                 <const key="0x02" flagname="100 kbit/sec" flagmask="0x03" />
             </param>
         </cmd>
-        <cmd key="0x04" name="STATISTICS_GET" help="Statistics Get">
-            <param key="0x00" name="NodeID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
+        <cmd key="0x04" name="STATISTICS_GET" help="Statistics Get" support_mode="RX">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
         </cmd>
-        <cmd key="0x05" name="STATISTICS_REPORT" help="Statistics Report">
-            <param key="0x00" name="NodeID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <variant_group key="0x01" name="Statistics" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x05" name="STATISTICS_REPORT" help="Statistics Report" support_mode="TX">
+            <param key="0x00" name="NodeID" type="BYTE" encaptype="NODE_NUMBER" />
+            <variant_group key="0x01" name="Statistics" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Type" type="CONST">
                     <const key="0x00" flagname="Route Changes (RC)" flagmask="0x00" />
                     <const key="0x01" flagname="Transmission Count (TC)" flagmask="0x01" />
                     <const key="0x02" flagname="Neighbors (NB)" flagmask="0x02" />
@@ -14700,61 +15319,90 @@
                     <const key="0x04" flagname="Sum of transmission times (TS)" flagmask="0x04" />
                     <const key="0x05" flagname="Sum of transmission times squrared (TS2)" flagmask="0x05" />
                 </param>
-                <param key="0x01" name="Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
                 </param>
-                <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C">
-                    <variant paramoffs="1" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x06" name="STATISTICS_CLEAR" help="Statistics Clear" support_mode="RX" />
+        <cmd key="0x07" name="RSSI_GET" help="RSSI Get" support_mode="RX" />
+        <cmd key="0x08" name="RSSI_REPORT" help="RSSI Report" support_mode="TX">
+            <param key="0x00" name="Channel 1 RSSI" type="BYTE" />
+            <param key="0x01" name="Channel 2 RSSI" type="BYTE" />
+            <param key="0x02" name="Channel 3 RSSI" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="S2_RESYNCHRONIZATION_EVENT" help="S2 Resynchronization Event">
+            <param key="0x00" name="NodeID" type="BYTE" />
+            <param key="0x01" name="Reason" type="CONST">
+                <const key="0x00" flagname="SOS_EVENT_REASON_UNANSWERED" flagmask="0x00" />
+            </param>
+            <param key="0x02" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x0B" name="EXTENDED_STATISTICS_GET" help="Extended Statistics Get">
+            <param key="0x00" name="Extended NodeID" type="WORD" />
+        </cmd>
+        <cmd key="0x0C" name="EXTENDED_STATISTICS_REPORT" help="Extended Statistics Report">
+            <param key="0x00" name="Extended NodeID" type="WORD" />
+            <variant_group key="0x01" name="Statistics" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Type" type="BYTE" />
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
                 </param>
             </variant_group>
         </cmd>
-        <cmd key="0x06" name="STATISTICS_CLEAR" help="Statistics Clear" />
+        <cmd key="0x0A" name="ZWAVE_LR_CHANNEL_CONFIGURATION_SET" help="Z-Wave Long Range Channel Configuration Set">
+            <param key="0x00" name="Z-Wave Long Range Channel" type="BYTE" />
+        </cmd>
+        <cmd key="0x0D" name="ZWAVE_LR_CHANNEL_CONFIGURATION_GET" help="Z-Wave Long Range Channel Configuration Get" />
+        <cmd key="0x0E" name="ZWAVE_LR_CHANNEL_CONFIGURATION_REPORT" help="Z-Wave Long Range Channel Configuration Report">
+            <param key="0x00" name="Z-Wave Long Range Channel" type="BYTE" />
+        </cmd>
     </cmd_class>
-    <cmd_class key="0x68" version="1" name="COMMAND_CLASS_ZIP_NAMING" help="Command Class Z/IP Naming and Location" read_only="false">
-        <cmd key="0x01" name="ZIP_NAMING_NAME_SET" help="Z/IP Name Set">
-            <param key="0x00" name="Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" is_ascii="true" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+    <cmd_class key="0x68" version="1" name="COMMAND_CLASS_ZIP_NAMING" help="Command Class Z/IP Naming and Location">
+        <cmd key="0x01" name="ZIP_NAMING_NAME_SET" help="Z/IP Name Set" support_mode="RX">
+            <param key="0x00" name="Name" type="VARIANT">
+                <variant paramoffs="255" is_ascii="true" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x02" name="ZIP_NAMING_NAME_GET" help="Z/IP Name Get" />
-        <cmd key="0x03" name="ZIP_NAMING_NAME_REPORT" help="Z/IP Name Report">
-            <param key="0x00" name="Name" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" is_ascii="true" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x02" name="ZIP_NAMING_NAME_GET" help="Z/IP Name Get" support_mode="RX" />
+        <cmd key="0x03" name="ZIP_NAMING_NAME_REPORT" help="Z/IP Name Report" support_mode="TX">
+            <param key="0x00" name="Name" type="VARIANT">
+                <variant paramoffs="255" is_ascii="true" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x04" name="ZIP_NAMING_LOCATION_SET" help="Z/IP Location Set">
-            <param key="0x00" name="Location" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" is_ascii="true" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x04" name="ZIP_NAMING_LOCATION_SET" help="Z/IP Location Set" support_mode="RX">
+            <param key="0x00" name="Location" type="VARIANT">
+                <variant paramoffs="255" is_ascii="true" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x05" name="ZIP_NAMING_LOCATION_GET" help="Z/IP Location Get" />
-        <cmd key="0x06" name="ZIP_NAMING_LOCATION_REPORT" help="Z/IP Location Report">
-            <param key="0x00" name="Location" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" is_ascii="true" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x05" name="ZIP_NAMING_LOCATION_GET" help="Z/IP Location Get" support_mode="RX" />
+        <cmd key="0x06" name="ZIP_NAMING_LOCATION_REPORT" help="Z/IP Location Report" support_mode="TX">
+            <param key="0x00" name="Location" type="VARIANT">
+                <variant paramoffs="255" is_ascii="true" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x69" version="1" name="COMMAND_CLASS_MAILBOX" help="Command Class Mailbox" read_only="false">
-        <cmd key="0x01" name="MAILBOX_CONFIGURATION_GET" help="Mailbox Configuration Get" />
-        <cmd key="0x02" name="MAILBOX_CONFIGURATION_SET" help="Mailbox Configuration Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x07" shifter="0">
+    <cmd_class key="0x69" version="1" name="COMMAND_CLASS_MAILBOX" help="Command Class Mailbox">
+        <cmd key="0x01" name="MAILBOX_CONFIGURATION_GET" help="Mailbox Configuration Get" support_mode="RX" />
+        <cmd key="0x02" name="MAILBOX_CONFIGURATION_SET" help="Mailbox Configuration Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x07">
                     <fieldenum value="Disable" />
                     <fieldenum value="Enable Mailbox Service" />
                     <fieldenum value="Enable Mailbox Proxy" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x01" name="Forwarding Destination IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x02" name="UDP Port Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="false" />
+            <param key="0x01" name="Forwarding Destination IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
+            <param key="0x02" name="UDP Port Number" type="WORD" />
         </cmd>
-        <cmd key="0x03" name="MAILBOX_CONFIGURATION_REPORT" help="Mailbox Configuration Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x07" shifter="0">
+        <cmd key="0x03" name="MAILBOX_CONFIGURATION_REPORT" help="Mailbox Configuration Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x07">
                     <fieldenum value="Disable" />
                     <fieldenum value="Enable Mailbox Service" />
                     <fieldenum value="Enable Mailbox Proxy" />
@@ -14765,22 +15413,16 @@
                 </fieldenum>
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Mailbox Capacity" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Forwarding Destination IPv6 Address" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
-            </param>
-            <param key="0x03" name="UDP Port Number" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="false" />
+            <param key="0x01" name="Mailbox Capacity" type="WORD" />
+            <param key="0x02" name="Forwarding Destination IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
+            <param key="0x03" name="UDP Port Number" type="WORD" />
         </cmd>
-        <cmd key="0x04" name="MAILBOX_QUEUE" help="Mailbox Queue">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x03" shifter="0">
+        <cmd key="0x04" name="MAILBOX_QUEUE" help="Mailbox Queue" support_mode="TX_RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x03">
                     <fieldenum value="Push" />
                     <fieldenum value="Pop" />
                     <fieldenum value="Waiting" />
@@ -14792,37 +15434,93 @@
                 <bitflag key="0x01" flagname="Last" flagmask="0x04" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x02" name="Queue Handle" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Queue Handle" type="BYTE" />
+            <param key="0x03" name="Mailbox Entry" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+        </cmd>
+        <cmd key="0x05" name="MAILBOX_WAKEUP_NOTIFICATION" help="Mailbox Wakeup Notification" support_mode="TX_RX">
+            <param key="0x00" name="Queue Handle" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="MAILBOX_NODE_FAILING" help="Mailbox Failing Node" support_mode="TX_RX">
+            <param key="0x00" name="Queue Handle" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x69" version="2" name="COMMAND_CLASS_MAILBOX" help="Command Class Mailbox">
+        <cmd key="0x01" name="MAILBOX_CONFIGURATION_GET" help="Mailbox Configuration Get" support_mode="RX" />
+        <cmd key="0x02" name="MAILBOX_CONFIGURATION_SET" help="Mailbox Configuration Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x07">
+                    <fieldenum value="Disable" />
+                    <fieldenum value="Enable Mailbox Service" />
+                    <fieldenum value="Enable Mailbox Proxy" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
             </param>
-            <param key="0x03" name="Mailbox Entry" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="Forwarding Destination IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
+            <param key="0x02" name="UDP Port Number" type="WORD" />
         </cmd>
-        <cmd key="0x05" name="MAILBOX_WAKEUP_NOTIFICATION" help="Mailbox Wakeup Notification">
-            <param key="0x00" name="Queue Handle" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x03" name="MAILBOX_CONFIGURATION_REPORT" help="Mailbox Configuration Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x07">
+                    <fieldenum value="Disable" />
+                    <fieldenum value="Enable Mailbox Service" />
+                    <fieldenum value="Enable Mailbox Proxy" />
+                </fieldenum>
+                <fieldenum key="0x01" fieldname="Supported Modes" fieldmask="0x18" shifter="3">
+                    <fieldenum value="Mailbox Service supported" />
+                    <fieldenum value="Mailbox Proxy supported" />
+                </fieldenum>
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
+            <param key="0x01" name="Mailbox Capacity" type="WORD" />
+            <param key="0x02" name="Forwarding Destination IPv6 Address" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
+            </param>
+            <param key="0x03" name="UDP Port Number" type="WORD" />
         </cmd>
-        <cmd key="0x06" name="MAILBOX_NODE_FAILING" help="Mailbox Failing Node">
-            <param key="0x00" name="Queue Handle" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="MAILBOX_QUEUE" help="Mailbox Queue" support_mode="TX_RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x03">
+                    <fieldenum value="Push" />
+                    <fieldenum value="Pop" />
+                    <fieldenum value="Waiting" />
+                    <fieldenum value="Ping" />
+                    <fieldenum value="ACK" />
+                    <fieldenum value="NACK" />
+                    <fieldenum value="Queue Full" />
+                </fieldenum>
+                <bitflag key="0x01" flagname="Last" flagmask="0x04" />
+                <bitfield key="0x02" fieldname="Reserved" fieldmask="0xF8" shifter="3" />
+            </param>
+            <param key="0x02" name="Queue Handle" type="BYTE" />
+            <param key="0x03" name="Mailbox Entry" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
+        <cmd key="0x05" name="MAILBOX_WAKEUP_NOTIFICATION" help="Mailbox Wakeup Notification" support_mode="TX_RX">
+            <param key="0x00" name="Queue Handle" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="MAILBOX_NODE_FAILING" help="Mailbox Failing Node" support_mode="TX_RX">
+            <param key="0x00" name="Queue Handle" type="BYTE" />
+        </cmd>
     </cmd_class>
-    <cmd_class key="0x6A" version="1" name="COMMAND_CLASS_WINDOW_COVERING" help="Command Class Window Covering" read_only="false">
-        <cmd key="0x01" name="WINDOW_COVERING_SUPPORTED_GET" help="Window Covering Supported Get" />
-        <cmd key="0x02" name="WINDOW_COVERING_SUPPORTED_REPORT" help="Window Covering Supported Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Number of Parameter Mask bytes" fieldmask="0x0F" shifter="0" />
+    <cmd_class key="0x6A" version="1" name="COMMAND_CLASS_WINDOW_COVERING" help="Command Class Window Covering">
+        <cmd key="0x01" name="WINDOW_COVERING_SUPPORTED_GET" help="Window Covering Supported Get" support_mode="RX" />
+        <cmd key="0x02" name="WINDOW_COVERING_SUPPORTED_REPORT" help="Window Covering Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Parameter Mask bytes" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Parameter Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x0F" lenoffs="0" />
+            <param key="0x01" name="Parameter Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x0F" />
             </param>
         </cmd>
-        <cmd key="0x03" name="WINDOW_COVERING_GET" help="Window Covering Get">
-            <param key="0x00" name="Parameter ID" type="CONST" typehashcode="0x0B">
+        <cmd key="0x03" name="WINDOW_COVERING_GET" help="Window Covering Get" support_mode="RX">
+            <param key="0x00" name="Parameter ID" type="CONST">
                 <const key="0x00" flagname="out_left 1" flagmask="0x00" />
                 <const key="0x01" flagname="out_left 2" flagmask="0x01" />
                 <const key="0x02" flagname="out_right 1" flagmask="0x02" />
@@ -14841,16 +15539,16 @@
                 <const key="0x0F" flagname="out_top 2" flagmask="0x0F" />
                 <const key="0x10" flagname="in_bottom 1" flagmask="0x10" />
                 <const key="0x11" flagname="in_bottom 2" flagmask="0x11" />
-                <const key="0x12" flagname="in_top 1" flagmask="0x0B" />
-                <const key="0x13" flagname="in_top 2" flagmask="0x12" />
-                <const key="0x14" flagname="in_top_bottom 1" flagmask="0x13" />
-                <const key="0x15" flagname="in_top_bottom 2" flagmask="0x14" />
-                <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x15" />
-                <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x16" />
+                <const key="0x12" flagname="in_top 1" flagmask="0x12" />
+                <const key="0x13" flagname="in_top 2" flagmask="0x13" />
+                <const key="0x14" flagname="in_top_bottom 1" flagmask="0x14" />
+                <const key="0x15" flagname="in_top_bottom 2" flagmask="0x15" />
+                <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x16" />
+                <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x17" />
             </param>
         </cmd>
-        <cmd key="0x04" name="WINDOW_COVERING_REPORT" help="Window Covering Report">
-            <param key="0x00" name="Parameter ID" type="CONST" typehashcode="0x0B">
+        <cmd key="0x04" name="WINDOW_COVERING_REPORT" help="Window Covering Report" support_mode="TX">
+            <param key="0x00" name="Parameter ID" type="CONST">
                 <const key="0x00" flagname="out_left 1" flagmask="0x00" />
                 <const key="0x01" flagname="out_left 2" flagmask="0x01" />
                 <const key="0x02" flagname="out_right 1" flagmask="0x02" />
@@ -14869,30 +15567,24 @@
                 <const key="0x0F" flagname="out_top 2" flagmask="0x0F" />
                 <const key="0x10" flagname="in_bottom 1" flagmask="0x10" />
                 <const key="0x11" flagname="in_bottom 2" flagmask="0x11" />
-                <const key="0x12" flagname="in_top 1" flagmask="0x0B" />
-                <const key="0x13" flagname="in_top 2" flagmask="0x12" />
-                <const key="0x14" flagname="in_top_bottom 1" flagmask="0x13" />
-                <const key="0x15" flagname="in_top_bottom 2" flagmask="0x14" />
-                <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x15" />
-                <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x16" />
-            </param>
-            <param key="0x01" name="Current Value" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Target Value" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Duration" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-        </cmd>
-        <cmd key="0x05" name="WINDOW_COVERING_SET" help="Window Covering Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Parameter Count" fieldmask="0x1F" shifter="0" />
+                <const key="0x12" flagname="in_top 1" flagmask="0x12" />
+                <const key="0x13" flagname="in_top 2" flagmask="0x13" />
+                <const key="0x14" flagname="in_top_bottom 1" flagmask="0x14" />
+                <const key="0x15" flagname="in_top_bottom 2" flagmask="0x15" />
+                <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x16" />
+                <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x17" />
+            </param>
+            <param key="0x01" name="Current Value" type="BYTE" />
+            <param key="0x02" name="Target Value" type="BYTE" />
+            <param key="0x03" name="Duration" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="WINDOW_COVERING_SET" help="Window Covering Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Parameter Count" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0x00" sizemask="0x1F" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Parameter ID" type="CONST" typehashcode="0x0B">
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0x1F" sizeoffs="0x00">
+                <param key="0x00" name="Parameter ID" type="CONST">
                     <const key="0x00" flagname="out_left 1" flagmask="0x00" />
                     <const key="0x01" flagname="out_left 2" flagmask="0x01" />
                     <const key="0x02" flagname="out_right 1" flagmask="0x02" />
@@ -14911,28 +15603,24 @@
                     <const key="0x0F" flagname="out_top 2" flagmask="0x0F" />
                     <const key="0x10" flagname="in_bottom 1" flagmask="0x10" />
                     <const key="0x11" flagname="in_bottom 2" flagmask="0x11" />
-                    <const key="0x12" flagname="in_top 1" flagmask="0x0B" />
-                    <const key="0x13" flagname="in_top 2" flagmask="0x12" />
-                    <const key="0x14" flagname="in_top_bottom 1" flagmask="0x13" />
-                    <const key="0x15" flagname="in_top_bottom 2" flagmask="0x14" />
-                    <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x15" />
-                    <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x16" />
-                </param>
-                <param key="0x01" name="Value" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
+                    <const key="0x12" flagname="in_top 1" flagmask="0x12" />
+                    <const key="0x13" flagname="in_top 2" flagmask="0x13" />
+                    <const key="0x14" flagname="in_top_bottom 1" flagmask="0x14" />
+                    <const key="0x15" flagname="in_top_bottom 2" flagmask="0x15" />
+                    <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x16" />
+                    <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x17" />
                 </param>
+                <param key="0x01" name="Value" type="BYTE" />
             </variant_group>
-            <param key="0x02" name="Duration" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x02" name="Duration" type="BYTE" />
         </cmd>
-        <cmd key="0x06" name="WINDOW_COVERING_START_LEVEL_CHANGE" help="Window Covering Start Level Change">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Res1" fieldmask="0x3F" shifter="0" />
+        <cmd key="0x06" name="WINDOW_COVERING_START_LEVEL_CHANGE" help="Window Covering Start Level Change" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Res1" fieldmask="0x3F" />
                 <bitflag key="0x01" flagname="Up Down" flagmask="0x40" />
                 <bitflag key="0x02" flagname="Res2" flagmask="0x80" />
             </param>
-            <param key="0x01" name="Parameter ID" type="CONST" typehashcode="0x0B">
+            <param key="0x01" name="Parameter ID" type="CONST">
                 <const key="0x00" flagname="out_left 1" flagmask="0x00" />
                 <const key="0x01" flagname="out_left 2" flagmask="0x01" />
                 <const key="0x02" flagname="out_right 1" flagmask="0x02" />
@@ -14951,19 +15639,17 @@
                 <const key="0x0F" flagname="out_top 2" flagmask="0x0F" />
                 <const key="0x10" flagname="in_bottom 1" flagmask="0x10" />
                 <const key="0x11" flagname="in_bottom 2" flagmask="0x11" />
-                <const key="0x12" flagname="in_top 1" flagmask="0x0B" />
-                <const key="0x13" flagname="in_top 2" flagmask="0x12" />
-                <const key="0x14" flagname="in_top_bottom 1" flagmask="0x13" />
-                <const key="0x15" flagname="in_top_bottom 2" flagmask="0x14" />
-                <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x15" />
-                <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x16" />
-            </param>
-            <param key="0x02" name="Duration" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+                <const key="0x12" flagname="in_top 1" flagmask="0x12" />
+                <const key="0x13" flagname="in_top 2" flagmask="0x13" />
+                <const key="0x14" flagname="in_top_bottom 1" flagmask="0x14" />
+                <const key="0x15" flagname="in_top_bottom 2" flagmask="0x15" />
+                <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x16" />
+                <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x17" />
             </param>
+            <param key="0x02" name="Duration" type="BYTE" />
         </cmd>
-        <cmd key="0x07" name="WINDOW_COVERING_STOP_LEVEL_CHANGE" help="Window Covering Stop Level Change">
-            <param key="0x00" name="Parameter ID" type="CONST" typehashcode="0x0B">
+        <cmd key="0x07" name="WINDOW_COVERING_STOP_LEVEL_CHANGE" help="Window Covering Stop Level Change" support_mode="RX">
+            <param key="0x00" name="Parameter ID" type="CONST">
                 <const key="0x00" flagname="out_left 1" flagmask="0x00" />
                 <const key="0x01" flagname="out_left 2" flagmask="0x01" />
                 <const key="0x02" flagname="out_right 1" flagmask="0x02" />
@@ -14982,103 +15668,95 @@
                 <const key="0x0F" flagname="out_top 2" flagmask="0x0F" />
                 <const key="0x10" flagname="in_bottom 1" flagmask="0x10" />
                 <const key="0x11" flagname="in_bottom 2" flagmask="0x11" />
-                <const key="0x12" flagname="in_top 1" flagmask="0x0B" />
-                <const key="0x13" flagname="in_top 2" flagmask="0x12" />
-                <const key="0x14" flagname="in_top_bottom 1" flagmask="0x13" />
-                <const key="0x15" flagname="in_top_bottom 2" flagmask="0x14" />
-                <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x15" />
-                <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x16" />
+                <const key="0x12" flagname="in_top 1" flagmask="0x12" />
+                <const key="0x13" flagname="in_top 2" flagmask="0x13" />
+                <const key="0x14" flagname="in_top_bottom 1" flagmask="0x14" />
+                <const key="0x15" flagname="in_top_bottom 2" flagmask="0x15" />
+                <const key="0x16" flagname="Horizontal slats angle 1" flagmask="0x16" />
+                <const key="0x17" flagname="Horizontal slats angle 2" flagmask="0x17" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x9F" version="1" name="COMMAND_CLASS_SECURITY_2" help="Command Class Security 2" read_only="false">
-        <cmd key="0x01" name="SECURITY_2_NONCE_GET" help="S2 Nonce Get">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+    <cmd_class key="0x9F" version="1" name="COMMAND_CLASS_SECURITY_2" help="Command Class Security 2">
+        <cmd key="0x01" name="SECURITY_2_NONCE_GET" help="S2 Nonce Get" support_mode="RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
         </cmd>
-        <cmd key="0x02" name="SECURITY_2_NONCE_REPORT" help="S2 Nonce Report">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x02" name="SECURITY_2_NONCE_REPORT" help="S2 Nonce Report" support_mode="TX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="SOS" flagmask="0x01" />
                 <bitflag key="0x01" flagname="MOS" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x02" name="Receivers Entropy Input" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x02" name="Receivers Entropy Input" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
-        <cmd key="0x03" name="SECURITY_2_MESSAGE_ENCAPSULATION" help="S2 Message Encapsulation">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x03" name="SECURITY_2_MESSAGE_ENCAPSULATION" help="S2 Message Encapsulation" support_mode="TX_RX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Extension" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Encrypted Extension" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <variant_group key="0x02" name="vg1" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" optionaloffs="0x01" optionalmask="0x01" moretofollowoffs="0x01" moretofollowmask="0x80" typehashcode="0x0D">
-                <param key="0x00" name="Extension Length" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="false" />
-                </param>
-                <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                    <bitfield key="0x00" fieldname="Type" fieldmask="0x3F" shifter="0" />
+            <variant_group key="0x02" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" optionaloffs="0x01" optionalmask="0x01" moretofollowoffs="0x01" moretofollowmask="0x80">
+                <param key="0x00" name="Extension Length" type="BYTE" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Type" fieldmask="0x3F" />
                     <bitflag key="0x01" flagname="Critical" flagmask="0x40" />
                     <bitflag key="0x02" flagname="More to follow" flagmask="0x80" />
                 </param>
-                <param key="0x02" name="Extension" type="VARIANT" typehashcode="0x0C">
-                    <variant paramoffs="0" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" sizechange="-2" />
+                <param key="0x02" name="Extension" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" sizechange="-2" />
                 </param>
             </variant_group>
-            <param key="0x03" name="CCM Ciphertext Object" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x03" name="CCM Ciphertext Object" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x04" name="KEX_GET" help="KEX Get" />
-        <cmd key="0x05" name="KEX_REPORT" help="KEX Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x04" name="KEX_GET" help="KEX Get" support_mode="RX" />
+        <cmd key="0x05" name="KEX_REPORT" help="KEX Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Echo" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Request CSA" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Supported KEX Schemes" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Supported ECDH Profiles" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Requested Keys" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x01" name="Supported KEX Schemes" type="BYTE" />
+            <param key="0x02" name="Supported ECDH Profiles" type="BYTE" />
+            <param key="0x03" name="Requested Keys" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Unauthenticated" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Authenticated" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Access" flagmask="0x02" />
-                <bitflag key="0x03" flagname="S0" flagmask="0x07" />
+                <bitflag key="0x03" flagname="Reserved3" flagmask="0x03" />
+                <bitflag key="0x04" flagname="Reserved4" flagmask="0x04" />
+                <bitflag key="0x05" flagname="Reserved5" flagmask="0x05" />
+                <bitflag key="0x06" flagname="Reserved6" flagmask="0x06" />
+                <bitflag key="0x07" flagname="S0" flagmask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x06" name="KEX_SET" help="KEX Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x06" name="KEX_SET" help="KEX Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Echo" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Request CSA" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Selected KEX Scheme" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Selected ECDH Profile" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Granted Keys" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x01" name="Selected KEX Scheme" type="BYTE" />
+            <param key="0x02" name="Selected ECDH Profile" type="BYTE" />
+            <param key="0x03" name="Granted Keys" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Unauthenticated" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Authenticated" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Access" flagmask="0x02" />
-                <bitflag key="0x03" flagname="S0" flagmask="0x07" />
+                <bitflag key="0x03" flagname="Reserved3" flagmask="0x03" />
+                <bitflag key="0x04" flagname="Reserved4" flagmask="0x04" />
+                <bitflag key="0x05" flagname="Reserved5" flagmask="0x05" />
+                <bitflag key="0x06" flagname="Reserved6" flagmask="0x06" />
+                <bitflag key="0x07" flagname="S0" flagmask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x07" name="KEX_FAIL" help="KEX Fail">
-            <param key="0x00" name="KEX Fail Type" type="CONST" typehashcode="0x0B">
+        <cmd key="0x07" name="KEX_FAIL" help="KEX Fail" support_mode="TX_RX">
+            <param key="0x00" name="KEX Fail Type" type="CONST">
                 <const key="0x00" flagname="KEX_KEY" flagmask="0x01" />
                 <const key="0x01" flagname="KEX_SCHEME" flagmask="0x02" />
                 <const key="0x02" flagname="KEX_CURVES" flagmask="0x03" />
@@ -15090,204 +15768,181 @@
                 <const key="0x08" flagname="KEY_REPORT" flagmask="0x0A" />
             </param>
         </cmd>
-        <cmd key="0x08" name="PUBLIC_KEY_REPORT" help="Public Key Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x08" name="PUBLIC_KEY_REPORT" help="Public Key Report" support_mode="TX_RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Including Node" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x01" name="ECDH Public Key" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+            <param key="0x01" name="ECDH Public Key" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
-        <cmd key="0x09" name="SECURITY_2_NETWORK_KEY_GET" help="S2 Network Key Get">
-            <param key="0x00" name="Requested Key" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x09" name="SECURITY_2_NETWORK_KEY_GET" help="S2 Network Key Get" support_mode="TX">
+            <param key="0x00" name="Requested Key" type="BYTE">
                 <bitflag key="0x01" flagname="Unauthenticated" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Authenticated" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Access" flagmask="0x02" />
-                <bitflag key="0x04" flagname="S0" flagmask="0x07" />
+                <bitflag key="0x04" flagname="Reserved3" flagmask="0x03" />
+                <bitflag key="0x05" flagname="Reserved4" flagmask="0x04" />
+                <bitflag key="0x06" flagname="Reserved5" flagmask="0x05" />
+                <bitflag key="0x07" flagname="Reserved6" flagmask="0x06" />
+                <bitflag key="0x08" flagname="S0" flagmask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="SECURITY_2_NETWORK_KEY_REPORT" help="S2 Network Key Report">
-            <param key="0x00" name="Granted Key" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="true" showhex="true" />
+        <cmd key="0x0A" name="SECURITY_2_NETWORK_KEY_REPORT" help="S2 Network Key Report" support_mode="RX">
+            <param key="0x00" name="Granted Key" type="BYTE">
                 <bitflag key="0x01" flagname="Unauthenticated" flagmask="0x00" />
                 <bitflag key="0x02" flagname="Authenticated" flagmask="0x01" />
                 <bitflag key="0x03" flagname="Access" flagmask="0x02" />
-                <bitflag key="0x04" flagname="S0" flagmask="0x07" />
+                <bitflag key="0x04" flagname="Reserved3" flagmask="0x03" />
+                <bitflag key="0x05" flagname="Reserved4" flagmask="0x04" />
+                <bitflag key="0x06" flagname="Reserved5" flagmask="0x05" />
+                <bitflag key="0x07" flagname="Reserved6" flagmask="0x06" />
+                <bitflag key="0x08" flagname="S0" flagmask="0x07" />
             </param>
-            <param key="0x01" name="Network Key" type="ARRAY" typehashcode="0x05">
-                <arrayattrib key="0x00" len="16" is_ascii="false" showhex="true" />
+            <param key="0x01" name="Network Key" type="ARRAY">
+                <arrayattrib key="0x00" len="16" />
             </param>
         </cmd>
-        <cmd key="0x0B" name="SECURITY_2_NETWORK_KEY_VERIFY" help="S2 Network Key Verify" />
-        <cmd key="0x0C" name="SECURITY_2_TRANSFER_END" help="S2 Transfer End">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x0B" name="SECURITY_2_NETWORK_KEY_VERIFY" help="S2 Network Key Verify" support_mode="TX" />
+        <cmd key="0x0C" name="SECURITY_2_TRANSFER_END" help="S2 Transfer End" support_mode="TX_RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Key Request Complete" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Key Verified" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="SECURITY_2_COMMANDS_SUPPORTED_GET" help="S2 Commands Supported Get" />
-        <cmd key="0x0E" name="SECURITY_2_COMMANDS_SUPPORTED_REPORT" help="S2 Commands Supported Report">
-            <param key="0x00" name="Command Class" type="VARIANT" typehashcode="0x0C" encaptype="CMD_CLASS_REF">
-                <variant paramoffs="255" showhex="false" signed="true" sizemask="0x00" sizeoffs="0" />
-            </param>
-        </cmd>
-        <cmd key="0x0F" name="SECURITY_2_CAPABILITIES_GET" help="S2 Capabilities Get" />
-        <cmd key="0x10" name="SECURITY_2_CAPABILITIES_REPORT" help="S2 Capabilities Report">
-            <param key="0x00" name="Supported SPANs" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Supported MPANs" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x0D" name="SECURITY_2_COMMANDS_SUPPORTED_GET" help="S2 Commands Supported Get" support_mode="RX" />
+        <cmd key="0x0E" name="SECURITY_2_COMMANDS_SUPPORTED_REPORT" help="S2 Commands Supported Report" support_mode="TX">
+            <param key="0x00" name="Command Class" type="VARIANT" encaptype="CMD_CLASS_REF">
+                <variant paramoffs="255" sizemask="0x00" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x6B" version="1" name="COMMAND_CLASS_IRRIGATION" help="Command Class Irrigation" read_only="false">
-        <cmd key="0x01" name="IRRIGATION_SYSTEM_INFO_GET" help="Irrigation System Info Get" />
-        <cmd key="0x02" name="IRRIGATION_SYSTEM_INFO_REPORT" help="Irrigation System Info Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+    <cmd_class key="0x6B" version="1" name="COMMAND_CLASS_IRRIGATION" help="Command Class Irrigation">
+        <cmd key="0x01" name="IRRIGATION_SYSTEM_INFO_GET" help="Irrigation System Info Get" support_mode="RX" />
+        <cmd key="0x02" name="IRRIGATION_SYSTEM_INFO_REPORT" help="Irrigation System Info Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Master Valve" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved1" fieldmask="0x06" shifter="1" />
                 <bitfield key="0x02" fieldname="Reserved2" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x03" fieldname="Reserved3" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Total Number of Valves" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x02" name="Total Number of Valve Tables" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x03" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Valve Table Max Size" fieldmask="0x0F" shifter="0" />
+            <param key="0x01" name="Total Number of Valves" type="BYTE" />
+            <param key="0x02" name="Total Number of Valve Tables" type="BYTE" />
+            <param key="0x03" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Valve Table Max Size" fieldmask="0x0F" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x03" name="IRRIGATION_SYSTEM_STATUS_GET" help="Irrigation System Status Get" />
-        <cmd key="0x04" name="IRRIGATION_SYSTEM_STATUS_REPORT" help="Irrigation System Status Report">
-            <param key="0x00" name="System Voltage" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Sensor Status" type="CONST" typehashcode="0x0B">
+        <cmd key="0x03" name="IRRIGATION_SYSTEM_STATUS_GET" help="Irrigation System Status Get" support_mode="RX" />
+        <cmd key="0x04" name="IRRIGATION_SYSTEM_STATUS_REPORT" help="Irrigation System Status Report" support_mode="TX">
+            <param key="0x00" name="System Voltage" type="BYTE" />
+            <param key="0x01" name="Sensor Status" type="CONST">
                 <const key="0x00" flagname="Flow Sensor Detected" flagmask="0x00" />
                 <const key="0x01" flagname="Pressure Sensor Detected" flagmask="0x01" />
                 <const key="0x02" flagname="Rain Sensor Detected" flagmask="0x02" />
                 <const key="0x03" flagname="Moisture Sensor Detected" flagmask="0x03" />
             </param>
-            <param key="0x02" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Flow Size" fieldmask="0x07" shifter="0" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Flow Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Flow Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Flow Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x03" name="Flow Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="2" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x03" name="Flow Value" type="VARIANT">
+                <variant paramoffs="2" sizemask="0x07" />
             </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Pressure Size" fieldmask="0x07" shifter="0" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Pressure Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Pressure Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Pressure Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Pressure Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="4" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x05" name="Pressure Value" type="VARIANT">
+                <variant paramoffs="4" sizemask="0x07" />
             </param>
-            <param key="0x06" name="Shutoff Duration" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x07" name="System Error Status" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x06" name="Shutoff Duration" type="BYTE" />
+            <param key="0x07" name="System Error Status" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="not programmed" flagmask="0x00" />
                 <bitflag key="0x01" flagname="emergency shutdown" flagmask="0x01" />
                 <bitflag key="0x02" flagname="high threshold triggered" flagmask="0x02" />
                 <bitflag key="0x03" flagname="low threshold triggered" flagmask="0x03" />
                 <bitflag key="0x04" flagname="valve errors" flagmask="0x04" />
             </param>
-            <param key="0x08" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+            <param key="0x08" name="Properties3" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Master Valve" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x09" name="Valve ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x09" name="Valve ID" type="BYTE" />
         </cmd>
-        <cmd key="0x05" name="IRRIGATION_SYSTEM_CONFIG_SET" help="Irrigation System Config Set">
-            <param key="0x00" name="Master Valve Delay" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="High Pressure Threshold Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x05" name="IRRIGATION_SYSTEM_CONFIG_SET" help="Irrigation System Config Set" support_mode="RX">
+            <param key="0x00" name="Master Valve Delay" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="High Pressure Threshold Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="High Pressure Threshold Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="High Pressure Threshold Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="High Pressure Threshold Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="High Pressure Threshold Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Low Pressure Threshold Size" fieldmask="0x07" shifter="0" />
+            <param key="0x03" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Low Pressure Threshold Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Low Pressure Threshold Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Low Pressure Threshold Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x04" name="Low Pressure Threshold Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="3" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x04" name="Low Pressure Threshold Value" type="VARIANT">
+                <variant paramoffs="3" sizemask="0x07" />
             </param>
-            <param key="0x05" name="Sensor Polarity" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x05" name="Sensor Polarity" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Rain Sensor Polarity" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Moisture Sensor Polarity" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Valid" flagmask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x06" name="IRRIGATION_SYSTEM_CONFIG_GET" help="Irrigation System Config Get" />
-        <cmd key="0x07" name="IRRIGATION_SYSTEM_CONFIG_REPORT" help="Irrigation System Config Report">
-            <param key="0x00" name="Master Valve Delay" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="High Pressure Threshold Size" fieldmask="0x07" shifter="0" />
+        <cmd key="0x06" name="IRRIGATION_SYSTEM_CONFIG_GET" help="Irrigation System Config Get" support_mode="RX" />
+        <cmd key="0x07" name="IRRIGATION_SYSTEM_CONFIG_REPORT" help="Irrigation System Config Report" support_mode="TX">
+            <param key="0x00" name="Master Valve Delay" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="High Pressure Threshold Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="High Pressure Threshold Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="High Pressure Threshold Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="High Pressure Threshold Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="High Pressure Threshold Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Low Pressure Threshold Size" fieldmask="0x07" shifter="0" />
+            <param key="0x03" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Low Pressure Threshold Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Low Pressure Threshold Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Low Pressure Threshold Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x04" name="Low Pressure Threshold Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="3" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x04" name="Low Pressure Threshold Value" type="VARIANT">
+                <variant paramoffs="3" sizemask="0x07" />
             </param>
-            <param key="0x05" name="Sensor Polarity" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x05" name="Sensor Polarity" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Rain Sensor Polarity" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Moisture Sensor Polarity" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Valid" flagmask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x08" name="IRRIGATION_VALVE_INFO_GET" help="Irrigation Valve Info Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x08" name="IRRIGATION_VALVE_INFO_GET" help="Irrigation Valve Info Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Master Valve" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x01" name="Valve ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Valve ID" type="BYTE" />
         </cmd>
-        <cmd key="0x09" name="IRRIGATION_VALVE_INFO_REPORT" help="Irrigation Valve Info Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x09" name="IRRIGATION_VALVE_INFO_REPORT" help="Irrigation Valve Info Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Master" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Connected" flagmask="0x02" />
                 <bitfield key="0x02" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Valve ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Nominal Current" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Valve Error Status" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x01" name="Valve ID" type="BYTE" />
+            <param key="0x02" name="Nominal Current" type="BYTE" />
+            <param key="0x03" name="Valve Error Status" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="short circuit" flagmask="0x00" />
                 <bitflag key="0x01" flagname="current high threshold" flagmask="0x01" />
                 <bitflag key="0x02" flagname="current low threshold" flagmask="0x02" />
@@ -15296,343 +15951,492 @@
                 <bitflag key="0x05" flagname="flow low threshold" flagmask="0x05" />
             </param>
         </cmd>
-        <cmd key="0x0A" name="IRRIGATION_VALVE_CONFIG_SET" help="Irrigation Valve Config Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x0A" name="IRRIGATION_VALVE_CONFIG_SET" help="Irrigation Valve Config Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Master Valve" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x01" name="Valve ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Nominal Current High Threshold" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Nominal Current Low Threshold" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Maximum Flow Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Valve ID" type="BYTE" />
+            <param key="0x02" name="Nominal Current High Threshold" type="BYTE" />
+            <param key="0x03" name="Nominal Current Low Threshold" type="BYTE" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Maximum Flow Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Maximum Flow Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Maximum Flow Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Maximum Flow Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="4" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x05" name="Maximum Flow Value" type="VARIANT">
+                <variant paramoffs="4" sizemask="0x07" />
             </param>
-            <param key="0x06" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Flow High Threshold Size" fieldmask="0x07" shifter="0" />
+            <param key="0x06" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Flow High Threshold Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Flow High Threshold Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Flow High Threshold Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Flow High Threshold Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x07" name="Flow High Threshold Value" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x07" />
             </param>
-            <param key="0x08" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Flow Low Threshold Size" fieldmask="0x07" shifter="0" />
+            <param key="0x08" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Flow Low Threshold Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Flow Low Threshold Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Flow Low Threshold Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x09" name="Flow Low Threshold Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="8" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x09" name="Flow Low Threshold Value" type="VARIANT">
+                <variant paramoffs="8" sizemask="0x07" />
             </param>
-            <param key="0x0A" name="Sensor Usage" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x0A" name="Sensor Usage" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Use Rain Sensor" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Use Moisture Sensor" flagmask="0x01" />
             </param>
         </cmd>
-        <cmd key="0x0B" name="IRRIGATION_VALVE_CONFIG_GET" help="Irrigation Valve Config Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x0B" name="IRRIGATION_VALVE_CONFIG_GET" help="Irrigation Valve Config Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Master Valve" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x01" name="Valve ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
+            <param key="0x01" name="Valve ID" type="BYTE" />
         </cmd>
-        <cmd key="0x0C" name="IRRIGATION_VALVE_CONFIG_REPORT" help="Irrigation Valve Config Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x0C" name="IRRIGATION_VALVE_CONFIG_REPORT" help="Irrigation Valve Config Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Master Valve" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x01" name="Valve ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x02" name="Nominal Current High Threshold" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x03" name="Nominal Current Low Threshold" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x04" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Maximum Flow Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Valve ID" type="BYTE" />
+            <param key="0x02" name="Nominal Current High Threshold" type="BYTE" />
+            <param key="0x03" name="Nominal Current Low Threshold" type="BYTE" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Maximum Flow Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Maximum Flow Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Maximum Flow Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Maximum Flow Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="4" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x05" name="Maximum Flow Value" type="VARIANT">
+                <variant paramoffs="4" sizemask="0x07" />
             </param>
-            <param key="0x06" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Flow High Threshold Size" fieldmask="0x07" shifter="0" />
+            <param key="0x06" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Flow High Threshold Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Flow High Threshold Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Flow High Threshold Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Flow High Threshold Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="6" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x07" name="Flow High Threshold Value" type="VARIANT">
+                <variant paramoffs="6" sizemask="0x07" />
             </param>
-            <param key="0x08" name="Properties4" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Flow Low Threshold Size" fieldmask="0x07" shifter="0" />
+            <param key="0x08" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Flow Low Threshold Size" fieldmask="0x07" />
                 <bitfield key="0x01" fieldname="Flow Low Threshold Scale" fieldmask="0x18" shifter="3" />
                 <bitfield key="0x02" fieldname="Flow Low Threshold Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x09" name="Flow Low Threshold Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="8" showhex="true" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x09" name="Flow Low Threshold Value" type="VARIANT">
+                <variant paramoffs="8" sizemask="0x07" />
             </param>
-            <param key="0x0A" name="Sensor Usage" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+            <param key="0x0A" name="Sensor Usage" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Use Rain Sensor" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Use Moisture Sensor" flagmask="0x01" />
             </param>
         </cmd>
-        <cmd key="0x0D" name="IRRIGATION_VALVE_RUN" help="Irrigation Valve Run">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
+        <cmd key="0x0D" name="IRRIGATION_VALVE_RUN" help="Irrigation Valve Run" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
                 <bitflag key="0x00" flagname="Master Valve" flagmask="0x01" />
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFE" shifter="1" />
             </param>
-            <param key="0x01" name="Valve ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Valve ID" type="BYTE" />
+            <param key="0x02" name="Duration" type="WORD" />
+        </cmd>
+        <cmd key="0x0E" name="IRRIGATION_VALVE_TABLE_SET" help="Irrigation Valve Table Set" support_mode="RX">
+            <param key="0x00" name="Valve Table ID" type="BYTE" />
+            <variant_group key="0x01" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Valve ID" type="BYTE" />
+                <param key="0x01" name="Duration" type="WORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x0F" name="IRRIGATION_VALVE_TABLE_GET" help="Irrigation Valve Table Get" support_mode="RX">
+            <param key="0x00" name="Valve Table ID" type="BYTE" />
+        </cmd>
+        <cmd key="0x10" name="IRRIGATION_VALVE_TABLE_REPORT" help="Irrigation Valve Table Report" support_mode="TX">
+            <param key="0x00" name="Valve Table ID" type="BYTE" />
+            <variant_group key="0x01" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Valve ID" type="BYTE" />
+                <param key="0x01" name="Duration" type="WORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x11" name="IRRIGATION_VALVE_TABLE_RUN" help="Irrigation Valve Table Run" support_mode="RX">
+            <param key="0x00" name="Valve Table ID" type="VARIANT">
+                <variant paramoffs="255" sizemask="0x00" />
+            </param>
+        </cmd>
+        <cmd key="0x12" name="IRRIGATION_SYSTEM_SHUTOFF" help="Irrigation System Shutoff" support_mode="RX">
+            <param key="0x00" name="Duration" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x6C" version="1" name="COMMAND_CLASS_SUPERVISION" help="Command Class Supervision">
+        <cmd key="0x01" name="SUPERVISION_GET" help="Supervision Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Session ID" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved" flagmask="0x40" />
+                <bitflag key="0x02" flagname="Status Updates" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Encapsulated Command Length" type="BYTE" />
+            <param key="0x02" name="Encapsulated Command" type="VARIANT" encaptype="CMD_ENCAP" skipfield="true">
+                <variant paramoffs="1" sizemask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x02" name="SUPERVISION_REPORT" help="Supervision Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Session ID" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved" flagmask="0x40" />
+                <bitflag key="0x02" flagname="More Status Updates" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Status" type="CONST">
+                <const key="0x00" flagname="NO_SUPPORT" flagmask="0x00" />
+                <const key="0x01" flagname="WORKING" flagmask="0x01" />
+                <const key="0x02" flagname="FAIL" flagmask="0x02" />
+                <const key="0x03" flagname="BUSY" flagmask="0x03" />
+                <const key="0x04" flagname="SUCCESS" flagmask="0xFF" />
+            </param>
+            <param key="0x02" name="Duration" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x6C" version="2" name="COMMAND_CLASS_SUPERVISION" help="Command Class Supervision">
+        <cmd key="0x01" name="SUPERVISION_GET" help="Supervision Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Session ID" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved" flagmask="0x40" />
+                <bitflag key="0x02" flagname="Status Updates" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Encapsulated Command Length" type="BYTE" />
+            <param key="0x02" name="Encapsulated Command" type="VARIANT" encaptype="CMD_ENCAP" skipfield="true">
+                <variant paramoffs="1" sizemask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x02" name="SUPERVISION_REPORT" help="Supervision Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Session ID" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Wake Up Request" flagmask="0x40" />
+                <bitflag key="0x02" flagname="More Status Updates" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Status" type="CONST">
+                <const key="0x00" flagname="NO_SUPPORT" flagmask="0x00" />
+                <const key="0x01" flagname="WORKING" flagmask="0x01" />
+                <const key="0x02" flagname="FAIL" flagmask="0x02" />
+                <const key="0x03" flagname="BUSY" flagmask="0x03" />
+                <const key="0x04" flagname="SUCCESS" flagmask="0xFF" />
+            </param>
+            <param key="0x02" name="Duration" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x64" version="1" name="COMMAND_CLASS_HUMIDITY_CONTROL_SETPOINT" help="Command Class Humidity Control Setpoint">
+        <cmd key="0x01" name="HUMIDITY_CONTROL_SETPOINT_SET" help="Humidity Control Setpoint Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
+                    <fieldenum key="0x01" value="Humidifier" />
+                    <fieldenum key="0x02" value="Dehumidifier" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
+            </param>
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <fieldenum key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3">
+                    <fieldenum value="Percentage" />
+                    <fieldenum value="Absolute" />
+                </fieldenum>
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
+            </param>
+        </cmd>
+        <cmd key="0x02" name="HUMIDITY_CONTROL_SETPOINT_GET" help="Humidity Control Setpoint Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
+                    <fieldenum key="0x01" value="Humidifier" />
+                    <fieldenum key="0x02" value="Dehumidifier" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="HUMIDITY_CONTROL_SETPOINT_REPORT" help="Humidity Control Setpoint Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
+                    <fieldenum key="0x01" value="Humidifier" />
+                    <fieldenum key="0x02" value="Dehumidifier" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Duration" type="WORD" typehashcode="0x02">
-                <word key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
+                <fieldenum key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3">
+                    <fieldenum value="Percentage" />
+                    <fieldenum value="Absolute" />
+                </fieldenum>
+                <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-        </cmd>
-        <cmd key="0x0E" name="IRRIGATION_VALVE_TABLE_SET" help="Irrigation Valve Table Set">
-            <param key="0x00" name="Valve Table ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Valve ID" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Duration" type="WORD" typehashcode="0x02">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
-            </variant_group>
         </cmd>
-        <cmd key="0x0F" name="IRRIGATION_VALVE_TABLE_GET" help="Irrigation Valve Table Get">
-            <param key="0x00" name="Valve Table ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x04" name="HUMIDITY_CONTROL_SETPOINT_SUPPORTED_GET" help="Humidity Control Setpoint Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="HUMIDITY_CONTROL_SETPOINT_SUPPORTED_REPORT" help="Humidity Control Setpoint Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
+                <bitflag key="0x00" flagname="Humidifier" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Dehumidifier" flagmask="0x02" />
             </param>
         </cmd>
-        <cmd key="0x10" name="IRRIGATION_VALVE_TABLE_REPORT" help="Irrigation Valve Table Report">
-            <param key="0x00" name="Valve Table ID" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x06" name="HUMIDITY_CONTROL_SETPOINT_SCALE_SUPPORTED_GET" help="Humidity Control Setpoint Scale Supported Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
+                    <fieldenum key="0x01" value="Humidifier" />
+                    <fieldenum key="0x02" value="Dehumidifier" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <variant_group key="0x01" name="vg1" variantKey="0x00" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00" typehashcode="0x0D">
-                <param key="0x00" name="Valve ID" type="BYTE" typehashcode="0x01">
-                    <valueattrib key="0x00" hasdefines="false" showhex="true" />
-                </param>
-                <param key="0x01" name="Duration" type="WORD" typehashcode="0x02">
-                    <word key="0x00" hasdefines="false" showhex="true" />
-                </param>
-            </variant_group>
         </cmd>
-        <cmd key="0x11" name="IRRIGATION_VALVE_TABLE_RUN" help="Irrigation Valve Table Run">
-            <param key="0x00" name="Valve Table ID" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="255" showhex="true" signed="true" sizemask="0x00" sizeoffs="0" />
+        <cmd key="0x07" name="HUMIDITY_CONTROL_SETPOINT_SCALE_SUPPORTED_REPORT" help="Humidity Control Setpoint Scale Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F">
+                    <fieldenum value="Percentage" />
+                    <fieldenum value="Absolute" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x12" name="IRRIGATION_SYSTEM_SHUTOFF" help="Irrigation System Shutoff">
-            <param key="0x00" name="Duration" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        <cmd key="0x08" name="HUMIDITY_CONTROL_SETPOINT_CAPABILITIES_GET" help="Humidity Control Setpoint Capabilities Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
+                    <fieldenum key="0x01" value="Humidifier" />
+                    <fieldenum key="0x02" value="Dehumidifier" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-    </cmd_class>
-    <cmd_class key="0x6C" version="1" name="COMMAND_CLASS_SUPERVISION" help="Command Class Supervision" read_only="false">
-        <cmd key="0x01" name="SUPERVISION_GET" help="Supervision Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Session ID" fieldmask="0x3F" shifter="0" />
-                <bitflag key="0x01" flagname="Reserved" flagmask="0x40" />
-                <bitflag key="0x02" flagname="Status Updates" flagmask="0x80" />
-            </param>
-            <param key="0x01" name="Encapsulated Command Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+        <cmd key="0x09" name="HUMIDITY_CONTROL_SETPOINT_CAPABILITIES_REPORT" help="Humidity Control Setpoint Capabilities Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
+                    <fieldenum key="0x01" value="Humidifier" />
+                    <fieldenum key="0x02" value="Dehumidifier" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x02" name="Encapsulated Command" type="VARIANT" typehashcode="0x0C" encaptype="CMD_ENCAP" skipfield="true">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size1" fieldmask="0x07" />
+                <fieldenum key="0x01" fieldname="Scale1" fieldmask="0x18" shifter="3">
+                    <fieldenum value="Percentage" />
+                    <fieldenum value="Absolute" />
+                </fieldenum>
+                <bitfield key="0x02" fieldname="Precision1" fieldmask="0xE0" shifter="5" />
             </param>
-        </cmd>
-        <cmd key="0x02" name="SUPERVISION_REPORT" help="Supervision Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Session ID" fieldmask="0x3F" shifter="0" />
-                <bitflag key="0x01" flagname="Reserved" flagmask="0x40" />
-                <bitflag key="0x02" flagname="More Status Updates" flagmask="0x80" />
+            <param key="0x02" name="Minimum Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x01" name="Status" type="CONST" typehashcode="0x0B">
-                <const key="0x00" flagname="NO_SUPPORT" flagmask="0x00" />
-                <const key="0x01" flagname="WORKING" flagmask="0x01" />
-                <const key="0x02" flagname="FAIL" flagmask="0x02" />
-                <const key="0x03" flagname="BUSY" flagmask="0x03" />
-                <const key="0x04" flagname="SUCCESS" flagmask="0xFF" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size2" fieldmask="0x07" />
+                <fieldenum key="0x01" fieldname="Scale2" fieldmask="0x18" shifter="3">
+                    <fieldenum value="Percentage" />
+                    <fieldenum value="Absolute" />
+                </fieldenum>
+                <bitfield key="0x02" fieldname="Precision2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Duration" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x04" name="Maximum Value" type="VARIANT">
+                <variant paramoffs="3" sizemask="0x07" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x64" version="1" name="COMMAND_CLASS_HUMIDITY_CONTROL_SETPOINT" help="Command Class Humidity Control Setpoint" read_only="false">
-        <cmd key="0x01" name="HUMIDITY_CONTROL_SETPOINT_SET" help="Humidity Control Setpoint Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x64" version="2" name="COMMAND_CLASS_HUMIDITY_CONTROL_SETPOINT" help="Command Class Humidity Control Setpoint">
+        <cmd key="0x01" name="HUMIDITY_CONTROL_SETPOINT_SET" help="Humidity Control Setpoint Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum key="0x01" value="Humidifier" />
                     <fieldenum key="0x02" value="Dehumidifier" />
+                    <fieldenum key="0x03" value="Auto" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <fieldenum key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3">
                     <fieldenum value="Percentage" />
                     <fieldenum value="Absolute" />
                 </fieldenum>
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x02" name="HUMIDITY_CONTROL_SETPOINT_GET" help="Humidity Control Setpoint Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x02" name="HUMIDITY_CONTROL_SETPOINT_GET" help="Humidity Control Setpoint Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum key="0x01" value="Humidifier" />
                     <fieldenum key="0x02" value="Dehumidifier" />
+                    <fieldenum key="0x03" value="Auto" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x03" name="HUMIDITY_CONTROL_SETPOINT_REPORT" help="Humidity Control Setpoint Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x03" name="HUMIDITY_CONTROL_SETPOINT_REPORT" help="Humidity Control Setpoint Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum key="0x01" value="Humidifier" />
                     <fieldenum key="0x02" value="Dehumidifier" />
+                    <fieldenum key="0x03" value="Auto" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size" fieldmask="0x07" />
                 <fieldenum key="0x01" fieldname="Scale" fieldmask="0x18" shifter="3">
                     <fieldenum value="Percentage" />
                     <fieldenum value="Absolute" />
                 </fieldenum>
                 <bitfield key="0x02" fieldname="Precision" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
         </cmd>
-        <cmd key="0x04" name="HUMIDITY_CONTROL_SETPOINT_SUPPORTED_GET" help="Humidity Control Setpoint Supported Get" />
-        <cmd key="0x05" name="HUMIDITY_CONTROL_SETPOINT_SUPPORTED_REPORT" help="Humidity Control Setpoint Supported Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+        <cmd key="0x04" name="HUMIDITY_CONTROL_SETPOINT_SUPPORTED_GET" help="Humidity Control Setpoint Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="HUMIDITY_CONTROL_SETPOINT_SUPPORTED_REPORT" help="Humidity Control Setpoint Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Humidifier" flagmask="0x01" />
                 <bitflag key="0x01" flagname="Dehumidifier" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Auto" flagmask="0x03" />
             </param>
         </cmd>
-        <cmd key="0x06" name="HUMIDITY_CONTROL_SETPOINT_SCALE_SUPPORTED_GET" help="Humidity Control Setpoint Scale Supported Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x06" name="HUMIDITY_CONTROL_SETPOINT_SCALE_SUPPORTED_GET" help="Humidity Control Setpoint Scale Supported Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum key="0x01" value="Humidifier" />
                     <fieldenum key="0x02" value="Dehumidifier" />
+                    <fieldenum key="0x03" value="Auto" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x07" name="HUMIDITY_CONTROL_SETPOINT_SCALE_SUPPORTED_REPORT" help="Humidity Control Setpoint Scale Supported Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F" shifter="0">
+        <cmd key="0x07" name="HUMIDITY_CONTROL_SETPOINT_SCALE_SUPPORTED_REPORT" help="Humidity Control Setpoint Scale Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Scale Bit Mask" fieldmask="0x0F">
                     <fieldenum value="Percentage" />
                     <fieldenum value="Absolute" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x08" name="HUMIDITY_CONTROL_SETPOINT_CAPABILITIES_GET" help="Humidity Control Setpoint Capabilities Get">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x08" name="HUMIDITY_CONTROL_SETPOINT_CAPABILITIES_GET" help="Humidity Control Setpoint Capabilities Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum key="0x01" value="Humidifier" />
                     <fieldenum key="0x02" value="Dehumidifier" />
+                    <fieldenum key="0x03" value="Auto" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x09" name="HUMIDITY_CONTROL_SETPOINT_CAPABILITIES_REPORT" help="Humidity Control Setpoint Capabilities Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F" shifter="0">
+        <cmd key="0x09" name="HUMIDITY_CONTROL_SETPOINT_CAPABILITIES_REPORT" help="Humidity Control Setpoint Capabilities Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Setpoint Type" fieldmask="0x0F">
                     <fieldenum key="0x01" value="Humidifier" />
                     <fieldenum key="0x02" value="Dehumidifier" />
+                    <fieldenum key="0x03" value="Auto" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size1" fieldmask="0x07" shifter="0" />
+            <param key="0x01" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size1" fieldmask="0x07" />
                 <fieldenum key="0x01" fieldname="Scale1" fieldmask="0x18" shifter="3">
                     <fieldenum value="Percentage" />
                     <fieldenum value="Absolute" />
                 </fieldenum>
                 <bitfield key="0x02" fieldname="Precision1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x02" name="Minimum Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="1" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x02" name="Minimum Value" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x07" />
             </param>
-            <param key="0x03" name="Properties3" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Size2" fieldmask="0x07" shifter="0" />
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Size2" fieldmask="0x07" />
                 <fieldenum key="0x01" fieldname="Scale2" fieldmask="0x18" shifter="3">
                     <fieldenum value="Percentage" />
                     <fieldenum value="Absolute" />
                 </fieldenum>
                 <bitfield key="0x02" fieldname="Precision2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x04" name="Maximum Value" type="VARIANT" typehashcode="0x0C">
-                <variant paramoffs="3" showhex="false" signed="true" sizemask="0x07" sizeoffs="0" />
+            <param key="0x04" name="Maximum Value" type="VARIANT">
+                <variant paramoffs="3" sizemask="0x07" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x6D" version="1" name="COMMAND_CLASS_HUMIDITY_CONTROL_MODE" help="Command Class Humidity Control Mode">
+        <cmd key="0x01" name="HUMIDITY_CONTROL_MODE_SET" help="Humidity Control Mode Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x0F">
+                    <fieldenum value="Off" />
+                    <fieldenum value="Humidify" />
+                    <fieldenum value="Dehumidify" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
+            </param>
+        </cmd>
+        <cmd key="0x02" name="HUMIDITY_CONTROL_MODE_GET" help="Humidity Control Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="HUMIDITY_CONTROL_MODE_REPORT" help="Humidity Control Mode Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x0F">
+                    <fieldenum value="Off" />
+                    <fieldenum value="Humidify" />
+                    <fieldenum value="Dehumidify" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
+            </param>
+        </cmd>
+        <cmd key="0x04" name="HUMIDITY_CONTROL_MODE_SUPPORTED_GET" help="Humidity Control Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="HUMIDITY_CONTROL_MODE_SUPPORTED_REPORT" help="Humidity Control Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
+                <bitflag key="0x00" flagname="Off" flagmask="0x00" />
+                <bitflag key="0x01" flagname="Humidify" flagmask="0x01" />
+                <bitflag key="0x02" flagname="Dehumidify" flagmask="0x02" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x6D" version="1" name="COMMAND_CLASS_HUMIDITY_CONTROL_MODE" help="Command Class Humidity Control Mode" read_only="false">
-        <cmd key="0x01" name="HUMIDITY_CONTROL_MODE_SET" help="Humidity Control Mode Set">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x6D" version="2" name="COMMAND_CLASS_HUMIDITY_CONTROL_MODE" help="Command Class Humidity Control Mode">
+        <cmd key="0x01" name="HUMIDITY_CONTROL_MODE_SET" help="Humidity Control Mode Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x0F">
                     <fieldenum value="Off" />
                     <fieldenum value="Humidify" />
                     <fieldenum value="Dehumidify" />
+                    <fieldenum value="Auto" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x02" name="HUMIDITY_CONTROL_MODE_GET" help="Humidity Control Mode Get" />
-        <cmd key="0x03" name="HUMIDITY_CONTROL_MODE_REPORT" help="Humidity Control Mode Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x0F" shifter="0">
+        <cmd key="0x02" name="HUMIDITY_CONTROL_MODE_GET" help="Humidity Control Mode Get" support_mode="RX" />
+        <cmd key="0x03" name="HUMIDITY_CONTROL_MODE_REPORT" help="Humidity Control Mode Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Mode" fieldmask="0x0F">
                     <fieldenum value="Off" />
                     <fieldenum value="Humidify" />
                     <fieldenum value="Dehumidify" />
+                    <fieldenum value="Auto" />
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
             </param>
         </cmd>
-        <cmd key="0x04" name="HUMIDITY_CONTROL_MODE_SUPPORTED_GET" help="Humidity Control Mode Supported Get" />
-        <cmd key="0x05" name="HUMIDITY_CONTROL_MODE_SUPPORTED_REPORT" help="Humidity Control Mode Supported Report">
-            <param key="0x00" name="Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="255" lenmask="0x00" lenoffs="0" len="1" />
+        <cmd key="0x04" name="HUMIDITY_CONTROL_MODE_SUPPORTED_GET" help="Humidity Control Mode Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="HUMIDITY_CONTROL_MODE_SUPPORTED_REPORT" help="Humidity Control Mode Supported Report" support_mode="TX">
+            <param key="0x00" name="Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="255" lenmask="0x00" len="1" />
                 <bitflag key="0x00" flagname="Off" flagmask="0x00" />
                 <bitflag key="0x01" flagname="Humidify" flagmask="0x01" />
                 <bitflag key="0x02" flagname="Dehumidify" flagmask="0x02" />
+                <bitflag key="0x03" flagname="Auto" flagmask="0x03" />
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x6E" version="1" name="COMMAND_CLASS_HUMIDITY_CONTROL_OPERATING_STATE" help="Command Class Humidity Control Operating State" read_only="false">
-        <cmd key="0x01" name="HUMIDITY_CONTROL_OPERATING_STATE_GET" help="Humidity Control Operating State Get" />
-        <cmd key="0x02" name="HUMIDITY_CONTROL_OPERATING_STATE_REPORT" help="Humidity Control Operating State Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Operating State" fieldmask="0x0F" shifter="0">
+    <cmd_class key="0x6E" version="1" name="COMMAND_CLASS_HUMIDITY_CONTROL_OPERATING_STATE" help="Command Class Humidity Control Operating State">
+        <cmd key="0x01" name="HUMIDITY_CONTROL_OPERATING_STATE_GET" help="Humidity Control Operating State Get" support_mode="RX" />
+        <cmd key="0x02" name="HUMIDITY_CONTROL_OPERATING_STATE_REPORT" help="Humidity Control Operating State Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Operating State" fieldmask="0x0F">
                     <fieldenum value="Idle" />
                     <fieldenum value="Humidifying" />
                     <fieldenum value="Dehumidifying" />
@@ -15641,13 +16445,11 @@
             </param>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x6F" version="1" name="COMMAND_CLASS_ENTRY_CONTROL" help="Command Class Entry Control" read_only="false">
-        <cmd key="0x01" name="ENTRY_CONTROL_NOTIFICATION" help="Entry Control Notification">
-            <param key="0x00" name="Sequence Number" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
-            </param>
-            <param key="0x01" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <fieldenum key="0x00" fieldname="Data Type" fieldmask="0x03" shifter="0">
+    <cmd_class key="0x6F" version="1" name="COMMAND_CLASS_ENTRY_CONTROL" help="Command Class Entry Control">
+        <cmd key="0x01" name="ENTRY_CONTROL_NOTIFICATION" help="Entry Control Notification" support_mode="TX">
+            <param key="0x00" name="Sequence Number" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Data Type" fieldmask="0x03">
                     <fieldenum value="NA" />
                     <fieldenum value="RAW" />
                     <fieldenum value="ASCII" />
@@ -15655,7 +16457,7 @@
                 </fieldenum>
                 <bitfield key="0x01" fieldname="Reserved" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x02" name="Event Type" type="CONST" typehashcode="0x0B">
+            <param key="0x02" name="Event Type" type="CONST">
                 <const key="0x00" flagname="CACHING" flagmask="0x00" />
                 <const key="0x01" flagname="CACHED_KEYS" flagmask="0x01" />
                 <const key="0x02" flagname="ENTER" flagmask="0x02" />
@@ -15683,41 +16485,37 @@
                 <const key="0x18" flagname="TEST" flagmask="0x18" />
                 <const key="0x19" flagname="CANCEL" flagmask="0x19" />
             </param>
-            <param key="0x03" name="Event Data Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x04" name="Event Data" type="VARIANT" typehashcode="0x0C" optionaloffs="0x00" optionalmask="0xFF">
-                <variant paramoffs="3" showhex="true" signed="true" sizemask="0xFF" sizeoffs="0" />
+            <param key="0x03" name="Event Data Length" type="BYTE" />
+            <param key="0x04" name="Event Data" type="VARIANT">
+                <variant paramoffs="3" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="ENTRY_CONTROL_KEY_SUPPORTED_GET" help="Entry Control Key Supported Get" />
-        <cmd key="0x03" name="ENTRY_CONTROL_KEY_SUPPORTED_REPORT" help="Entry Control Key Supported Report">
-            <param key="0x00" name="Key Supported Bit Mask Length" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
-            </param>
-            <param key="0x01" name="Key Supported Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="0" lenmask="0xFF" lenoffs="0" />
+        <cmd key="0x02" name="ENTRY_CONTROL_KEY_SUPPORTED_GET" help="Entry Control Key Supported Get" support_mode="RX" />
+        <cmd key="0x03" name="ENTRY_CONTROL_KEY_SUPPORTED_REPORT" help="Entry Control Key Supported Report" support_mode="TX">
+            <param key="0x00" name="Key Supported Bit Mask Length" type="BYTE" />
+            <param key="0x01" name="Key Supported Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x04" name="ENTRY_CONTROL_EVENT_SUPPORTED_GET" help="Entry Control Event Supported Get" />
-        <cmd key="0x05" name="ENTRY_CONTROL_EVENT_SUPPORTED_REPORT" help="Entry Control Event Supported Report">
-            <param key="0x00" name="Properties1" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Data Type Supported Bit Mask Length" fieldmask="0x03" shifter="0" />
+        <cmd key="0x04" name="ENTRY_CONTROL_EVENT_SUPPORTED_GET" help="Entry Control Event Supported Get" support_mode="RX" />
+        <cmd key="0x05" name="ENTRY_CONTROL_EVENT_SUPPORTED_REPORT" help="Entry Control Event Supported Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Data Type Supported Bit Mask Length" fieldmask="0x03" />
                 <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xFC" shifter="2" />
             </param>
-            <param key="0x01" name="Data Type Supported Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="0" lenmask="0x03" lenoffs="0" />
+            <param key="0x01" name="Data Type Supported Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x03" />
                 <bitflag key="0x00" flagname="NA" flagmask="0x00" />
                 <bitflag key="0x01" flagname="RAW" flagmask="0x01" />
                 <bitflag key="0x02" flagname="ASCII" flagmask="0x02" />
                 <bitflag key="0x03" flagname="MD5" flagmask="0x03" />
             </param>
-            <param key="0x02" name="Properties2" type="STRUCT_BYTE" typehashcode="0x07" comment="">
-                <bitfield key="0x00" fieldname="Event Supported Bit Mask Length" fieldmask="0x1F" shifter="0" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Event Supported Bit Mask Length" fieldmask="0x1F" />
                 <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x03" name="Event Type Supported Bit Mask" type="BITMASK" typehashcode="0x06">
-                <bitmask key="0x00" paramoffs="2" lenmask="0x1F" lenoffs="0" />
+            <param key="0x03" name="Event Type Supported Bit Mask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="2" lenmask="0x1F" />
                 <bitflag key="0x00" flagname="CACHING" flagmask="0x00" />
                 <bitflag key="0x01" flagname="CACHED_KEYS" flagmask="0x01" />
                 <bitflag key="0x02" flagname="ENTER" flagmask="0x02" />
@@ -15745,58 +16543,790 @@
                 <bitflag key="0x18" flagname="TEST" flagmask="0x18" />
                 <bitflag key="0x19" flagname="CANCEL" flagmask="0x19" />
             </param>
-            <param key="0x04" name="Key Cached Size supported Minimum" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x04" name="Key Cached Size supported Minimum" type="BYTE" />
+            <param key="0x05" name="Key Cached Size supported Maximum" type="BYTE" />
+            <param key="0x06" name="Key Cached Timeout supported Minimum" type="BYTE" />
+            <param key="0x07" name="Key Cached Timeout supported Maximum" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="ENTRY_CONTROL_CONFIGURATION_SET" help="Entry Control Configuration Set" support_mode="RX">
+            <param key="0x00" name="Key Cache Size" type="BYTE" />
+            <param key="0x01" name="Key Cache Timeout" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="ENTRY_CONTROL_CONFIGURATION_GET" help="Entry Control Configuration Get" support_mode="RX" />
+        <cmd key="0x08" name="ENTRY_CONTROL_CONFIGURATION_REPORT" help="Entry Control Configuration Report" support_mode="TX">
+            <param key="0x00" name="Key Cache Size" type="BYTE" />
+            <param key="0x01" name="Key Cache Timeout" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x74" version="1" name="COMMAND_CLASS_INCLUSION_CONTROLLER" help="Command Class Inclusion Controller">
+        <cmd key="0x01" name="INITIATE" help="Initiate" support_mode="TX_RX">
+            <param key="0x00" name="Node ID" type="BYTE" encaptype="NODE_NUMBER" />
+            <param key="0x01" name="Step ID" type="CONST">
+                <const key="0x00" flagname="PROXY_INCLUSION" flagmask="0x01" />
+                <const key="0x01" flagname="S0_INCLUSION" flagmask="0x02" />
+                <const key="0x02" flagname="PROXY_INCLUSION_REPLACE" flagmask="0x03" />
+            </param>
+        </cmd>
+        <cmd key="0x02" name="COMPLETE" help="Complete" support_mode="TX_RX">
+            <param key="0x00" name="Step ID" type="CONST">
+                <const key="0x00" flagname="PROXY_INCLUSION" flagmask="0x01" />
+                <const key="0x01" flagname="S0_INCLUSION" flagmask="0x02" />
+                <const key="0x02" flagname="PROXY_INCLUSION_REPLACE" flagmask="0x03" />
+            </param>
+            <param key="0x01" name="Status" type="CONST">
+                <const key="0x00" flagname="STEP_OK" flagmask="0x01" />
+                <const key="0x01" flagname="STEP_USER_REJECTED" flagmask="0x02" />
+                <const key="0x02" flagname="STEP_FAILED" flagmask="0x03" />
+                <const key="0x03" flagname="STEP_NOT_SUPPORTED" flagmask="0x04" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x78" version="1" name="COMMAND_CLASS_NODE_PROVISIONING" help="Command Class Node Provisioning">
+        <cmd key="0x01" name="NODE_PROVISIONING_SET" help="Node Provisioning Set" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x02" name="DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
+            </param>
+            <variant_group key="0x03" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties2" type="STRUCT_BYTE">
+                    <bitflag key="0x00" flagname="Critical" flagmask="0x01" />
+                    <bitfield key="0x01" fieldname="Meta Data Type" fieldmask="0xFE" shifter="1" />
+                </param>
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x02" name="NODE_PROVISIONING_DELETE" help="Node Provisioning Delete" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x05" name="Key Cached Size supported Maximum" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
-            <param key="0x06" name="Key Cached Timeout supported Minimum" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        </cmd>
+        <cmd key="0x03" name="NODE_PROVISIONING_LIST_ITERATION_GET" help="Node Provisioning List Iteration Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Remaining Counter" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="NODE_PROVISIONING_LIST_ITERATION_REPORT" help="Node Provisioning List Iteration Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Remaining Count" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x07" name="Key Cached Timeout supported Maximum" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x03" name="DSK" type="VARIANT">
+                <variant paramoffs="2" sizemask="0x1F" />
             </param>
+            <variant_group key="0x04" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties2" type="STRUCT_BYTE">
+                    <bitflag key="0x00" flagname="Critical" flagmask="0x01" />
+                    <bitfield key="0x01" fieldname="Meta Data Type" fieldmask="0xFE" shifter="1" />
+                </param>
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
+                </param>
+            </variant_group>
         </cmd>
-        <cmd key="0x06" name="ENTRY_CONTROL_CONFIGURATION_SET" help="Entry Control Configuration Set">
-            <param key="0x00" name="Key Cache Size" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x05" name="NODE_PROVISIONING_GET" help="Node Provisioning Get" support_mode="RX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Key Cache Timeout" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
         </cmd>
-        <cmd key="0x07" name="ENTRY_CONTROL_CONFIGURATION_GET" help="Entry Control Configuration Get" />
-        <cmd key="0x08" name="ENTRY_CONTROL_CONFIGURATION_REPORT" help="Entry Control Configuration Report">
-            <param key="0x00" name="Key Cache Size" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+        <cmd key="0x06" name="NODE_PROVISIONING_REPORT" help="Node Provisioning Report" support_mode="TX">
+            <param key="0x00" name="Seq No" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="DSK Length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
             </param>
-            <param key="0x01" name="Key Cache Timeout" type="BYTE" typehashcode="0x01">
-                <valueattrib key="0x00" hasdefines="false" showhex="true" />
+            <param key="0x02" name="DSK" type="VARIANT">
+                <variant paramoffs="1" sizemask="0x1F" />
             </param>
+            <variant_group key="0x03" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitflag key="0x00" flagname="Critical" flagmask="0x01" />
+                    <bitfield key="0x01" fieldname="Meta Data Type" fieldmask="0xFE" shifter="1" />
+                </param>
+                <param key="0x01" name="Length" type="BYTE" />
+                <param key="0x02" name="Value" type="VARIANT">
+                    <variant paramoffs="1" sizemask="0xFF" />
+                </param>
+            </variant_group>
         </cmd>
     </cmd_class>
-    <cmd_class key="0x74" version="1" name="COMMAND_CLASS_INCLUSION_CONTROLLER" help="Command Class Inclusion Controller" read_only="false">
-        <cmd key="0x01" name="INITIATE" help="Initiate">
-            <param key="0x00" name="Node ID" type="BYTE" typehashcode="0x01" encaptype="NODE_NUMBER">
-                <valueattrib key="0x00" hasdefines="false" showhex="false" />
+    <cmd_class key="0x79" version="1" name="COMMAND_CLASS_SOUND_SWITCH" help="Command Class Sound Switch">
+        <cmd key="0x01" name="SOUND_SWITCH_TONES_NUMBER_GET" help="Sound Switch Tones Number Get" support_mode="RX" />
+        <cmd key="0x02" name="SOUND_SWITCH_TONES_NUMBER_REPORT" help="Sound Switch Tones Number Report" support_mode="TX">
+            <param key="0x00" name="Supported Tones" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="SOUND_SWITCH_TONE_INFO_GET" help="Sound Switch Tone Info Get" support_mode="RX">
+            <param key="0x00" name="Tone Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="SOUND_SWITCH_TONE_INFO_REPORT" help="Sound Switch Tone Info Report" support_mode="TX">
+            <param key="0x00" name="Tone Identifier" type="BYTE" />
+            <param key="0x01" name="Tone Duration" type="WORD" />
+            <param key="0x02" name="Name Length" type="BYTE" />
+            <param key="0x03" name="Name" type="VARIANT">
+                <variant paramoffs="2" is_ascii="true" sizemask="0xFF" />
             </param>
-            <param key="0x01" name="Step ID" type="CONST" typehashcode="0x0B">
-                <const key="0x00" flagname="PROXY_INCLUSION" flagmask="0x01" />
-                <const key="0x01" flagname="S0_INCLUSION" flagmask="0x02" />
+        </cmd>
+        <cmd key="0x05" name="SOUND_SWITCH_CONFIGURATION_SET" help="Sound Switch Configuration Set" support_mode="RX">
+            <param key="0x00" name="Volume" type="BYTE" />
+            <param key="0x01" name="Default Tone Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="SOUND_SWITCH_CONFIGURATION_GET" help="Sound Switch Configuration Get" support_mode="RX" />
+        <cmd key="0x07" name="SOUND_SWITCH_CONFIGURATION_REPORT" help="Sound Switch Configuration Report" support_mode="TX">
+            <param key="0x00" name="Volume" type="BYTE" />
+            <param key="0x01" name="Default Tone Identifer" type="BYTE" />
+        </cmd>
+        <cmd key="0x08" name="SOUND_SWITCH_TONE_PLAY_SET" help="Sound Switch Tone Play Set" support_mode="RX">
+            <param key="0x00" name="Tone identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="SOUND_SWITCH_TONE_PLAY_GET" help="Sound Switch Tone Play Get" support_mode="RX" />
+        <cmd key="0x0A" name="SOUND_SWITCH_TONE_PLAY_REPORT" help="Sound Switch Tone Play Report" support_mode="TX">
+            <param key="0x00" name="Tone Identifier" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x79" version="2" name="COMMAND_CLASS_SOUND_SWITCH" help="Command Class Sound Switch">
+        <cmd key="0x01" name="SOUND_SWITCH_TONES_NUMBER_GET" help="Sound Switch Tones Number Get" support_mode="RX" />
+        <cmd key="0x02" name="SOUND_SWITCH_TONES_NUMBER_REPORT" help="Sound Switch Tones Number Report" support_mode="TX">
+            <param key="0x00" name="Supported Tones" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="SOUND_SWITCH_TONE_INFO_GET" help="Sound Switch Tone Info Get" support_mode="RX">
+            <param key="0x00" name="Tone Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="SOUND_SWITCH_TONE_INFO_REPORT" help="Sound Switch Tone Info Report" support_mode="TX">
+            <param key="0x00" name="Tone Identifier" type="BYTE" />
+            <param key="0x01" name="Tone Duration" type="WORD" />
+            <param key="0x02" name="Name Length" type="BYTE" />
+            <param key="0x03" name="Name" type="VARIANT">
+                <variant paramoffs="2" is_ascii="true" sizemask="0xFF" />
             </param>
         </cmd>
-        <cmd key="0x02" name="COMPLETE" help="Complete">
-            <param key="0x00" name="Step ID" type="CONST" typehashcode="0x0B">
-                <const key="0x00" flagname="PROXY_INCLUSION" flagmask="0x01" />
-                <const key="0x01" flagname="S0_INCLUSION" flagmask="0x02" />
+        <cmd key="0x05" name="SOUND_SWITCH_CONFIGURATION_SET" help="Sound Switch Configuration Set" support_mode="RX">
+            <param key="0x00" name="Volume" type="BYTE" />
+            <param key="0x01" name="Default Tone Identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="SOUND_SWITCH_CONFIGURATION_GET" help="Sound Switch Configuration Get" support_mode="RX" />
+        <cmd key="0x07" name="SOUND_SWITCH_CONFIGURATION_REPORT" help="Sound Switch Configuration Report" support_mode="TX">
+            <param key="0x00" name="Volume" type="BYTE" />
+            <param key="0x01" name="Default Tone Identifer" type="BYTE" />
+        </cmd>
+        <cmd key="0x08" name="SOUND_SWITCH_TONE_PLAY_SET" help="Sound Switch Tone Play Set" support_mode="RX">
+            <param key="0x00" name="Tone identifier" type="BYTE" />
+            <param key="0x01" name="Play Command Tone Volume" type="BYTE" />
+        </cmd>
+        <cmd key="0x09" name="SOUND_SWITCH_TONE_PLAY_GET" help="Sound Switch Tone Play Get" support_mode="RX" />
+        <cmd key="0x0A" name="SOUND_SWITCH_TONE_PLAY_REPORT" help="Sound Switch Tone Play Report" support_mode="TX">
+            <param key="0x00" name="Tone Identifier" type="BYTE" />
+            <param key="0x01" name="Play Command Tone Volume" type="BYTE" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0xA0" version="1" name="COMMAND_CLASS_IR_REPEATER" help="Command Class IR Repeater">
+        <cmd key="0x01" name="IR_REPEATER_CAPABILITIES_GET" help="IR Repeater Capabilities Get" />
+        <cmd key="0x02" name="IR_REPEATER_CAPABILITIES_REPORT" help="IR Repeater Capabilities Report">
+            <param key="0x00" name="Number of IR Code identifiers for learning" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Duty Cycle bitmask" fieldmask="0x07" />
+                <bitflag key="0x01" flagname="BES" flagmask="0x08" />
+                <bitflag key="0x02" flagname="PES" flagmask="0x10" />
+                <bitflag key="0x03" flagname="RLC" flagmask="0x20" />
+                <bitflag key="0x04" flagname="LCR" flagmask="0x40" />
+                <bitflag key="0x05" flagname="IRR" flagmask="0x80" />
+            </param>
+            <param key="0x02" name="Carrier" type="BYTE" />
+            <param key="0x03" name="Minimum Sub Carrier" type="BYTE" />
+            <param key="0x04" name="Maxium Sub Carrier" type="BYTE" />
+            <param key="0x05" name="Minimum Pulse time unit (MSB)" type="BYTE" />
+            <param key="0x06" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Maximum Pulse time unit (MSB)" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Minimum Pulse time unit (LSB)" fieldmask="0xF0" shifter="4" />
+            </param>
+            <param key="0x07" name="Maximum Pulse time unit (LSB)" type="BYTE" />
+        </cmd>
+        <cmd key="0x03" name="IR_REPEATER_IR_CODE_LEARNING_START" help="IR Repeater IR Code Learning Start">
+            <param key="0x00" name="IR Code identifier" type="BYTE" />
+            <param key="0x01" name="Timeout" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Pulse time unit (MSB)" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
             </param>
-            <param key="0x01" name="Status" type="CONST" typehashcode="0x0B">
-                <const key="0x00" flagname="STEP_OK" flagmask="0x01" />
-                <const key="0x01" flagname="STEP_USER_REJECTED" flagmask="0x02" />
-                <const key="0x02" flagname="STEP_FAILED" flagmask="0x03" />
-                <const key="0x03" flagname="STEP_NOT_SUPPORTED" flagmask="0x04" />
+            <param key="0x03" name="Pulse time unit (LSB)" type="BYTE" />
+        </cmd>
+        <cmd key="0x04" name="IR_REPEATER_IR_CODE_LEARNING_STOP" help="IR Repeater IR Code Learning Stop" />
+        <cmd key="0x05" name="IR_REPEATER_IR_CODE_LEARNING_STATUS" help="IR Repeater IR Code Learning Status">
+            <param key="0x00" name="IR Code identifier" type="BYTE" />
+            <param key="0x01" name="Status" type="CONST">
+                <const key="0x00" flagname="Learning buffer overflow" flagmask="0x00" />
+                <const key="0x01" flagname="Forced learning stop" flagmask="0x01" />
+                <const key="0x02" flagname="Timeout" flagmask="0x02" />
+                <const key="0x03" flagname="Success" flagmask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x06" name="IR_REPEATER_LEARNT_IR_CODE_REMOVE" help="IR Repeater Learnt IR Code Remove">
+            <param key="0x00" name="IR Code identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x07" name="IR_REPEATER_LEARNT_IR_CODE_GET" help="IR Repeater Learnt IR Code Get" />
+        <cmd key="0x08" name="IR_REPEATER_LEARNT_IR_CODE_REPORT" help="IR Repeater Learnt IR Code Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="IR Code idenfier status length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x01" name="IR Code identifier status bitmask" type="BITMASK">
+                <bitmask key="0x00" paramoffs="0" lenmask="0x1F" />
+            </param>
+        </cmd>
+        <cmd key="0x09" name="IR_REPEATER_LEARNT_IR_CODE_READBACK_GET" help="IR Repeater Learnt IR Code Readback Get">
+            <param key="0x00" name="IR Code identifier" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report Number (MSB)" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved1" flagmask="0x80" />
+            </param>
+            <param key="0x02" name="Report Number (LSB)" type="BYTE" />
+        </cmd>
+        <cmd key="0x0A" name="IR_REPEATER_LEARNT_IR_CODE_READBACK_REPORT" help="IR Repeater Learnt IR Code Readback Report">
+            <param key="0x00" name="IR Code identifier" type="BYTE" />
+            <param key="0x01" name="Sub Carrier" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Pulse time unit (MSB)" fieldmask="0x0F" />
+                <fieldenum key="0x01" fieldname="Duty Cycle" fieldmask="0x30" shifter="4">
+                    <fieldenum value="1/2 Duty Cycle" />
+                    <fieldenum value="1/3 Duty Cycle" />
+                    <fieldenum value="1/4 Duty Cycle" />
+                    <fieldenum value="Reserved" />
+                </fieldenum>
+                <bitfield key="0x02" fieldname="Reserved1" fieldmask="0xC0" shifter="6" />
+            </param>
+            <param key="0x03" name="Pulse time unit (LSB)" type="BYTE" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report Number (MSB)" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Last" flagmask="0x80" />
+            </param>
+            <param key="0x05" name="Report Number (LSB)" type="BYTE" />
+            <variant_group key="0x06" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties3" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Data block length" fieldmask="0x3F" />
+                    <fieldenum key="0x01" fieldname="Data block type" fieldmask="0xC0" shifter="6">
+                        <fieldenum value="bit encoding" />
+                        <fieldenum value="pulse encoding" />
+                    </fieldenum>
+                </param>
+                <param key="0x01" name="Data block value" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0x3F" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x0B" name="IR_REPEATER_CONFIGURATION_SET" help="IR Repeater Configuration Set">
+            <param key="0x00" name="Period (MSB)" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Period (LSB)" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
+            </param>
+            <variant_group key="0x02" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Data bit encoding length" type="WORD" />
+                <param key="0x01" name="Data bit encoding" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x0C" name="IR_REPEATER_CONFIGURATION_GET" help="IR Repeater Configuration Get" />
+        <cmd key="0x0D" name="IR_REPEATER_CONFIGURATION_REPORT" help="IR Repeater Configuration Report">
+            <param key="0x00" name="Period (MSB)" type="BYTE" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Period (LSB)" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
+            </param>
+            <variant_group key="0x02" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Data bit encoding length" type="WORD" />
+                <param key="0x01" name="Data bit encoding" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0xFF" />
+                </param>
+            </variant_group>
+        </cmd>
+        <cmd key="0x0E" name="IR_REPEATER_REPEAT_LEARNT_CODE" help="IR Repeater Repeat Learnt Code">
+            <param key="0x00" name="IR Code identifier" type="BYTE" />
+        </cmd>
+        <cmd key="0x0F" name="IR_REPEATER_REPEAT" help="IR Repeater Repeat">
+            <param key="0x00" name="Sequence number" type="BYTE" />
+            <param key="0x01" name="Sub carrier" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Pulse time unit (MSB)" fieldmask="0x0F" />
+                <fieldenum key="0x01" fieldname="Duty Cycle" fieldmask="0x30" shifter="4">
+                    <fieldenum value="1/2 Duty Cycle" />
+                    <fieldenum value="1/3 Duty Cycle" />
+                    <fieldenum value="1/4 Duty Cycle" />
+                    <fieldenum value="Reserved" />
+                </fieldenum>
+                <bitfield key="0x02" fieldname="Reserved1" fieldmask="0xC0" shifter="6" />
+            </param>
+            <param key="0x03" name="Pulse time unit (LSB)" type="BYTE" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Report number (MSB)" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Last" flagmask="0x80" />
+            </param>
+            <param key="0x05" name="Report number (LSB)" type="BYTE" />
+            <variant_group key="0x06" name="vg1" paramOffs="0xFF" sizemask="0x00" sizeoffs="0x00">
+                <param key="0x00" name="Properties3" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Data block length" fieldmask="0x3F" />
+                    <fieldenum key="0x01" fieldname="Data block type" fieldmask="0xC0" shifter="6">
+                        <fieldenum value="bit encoding" />
+                        <fieldenum value="pulse encoding" />
+                    </fieldenum>
+                </param>
+                <param key="0x01" name="Data block value" type="VARIANT">
+                    <variant paramoffs="0" sizemask="0x3F" />
+                </param>
+            </variant_group>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0xA1" version="1" name="COMMAND_CLASS_AUTHENTICATION" help="Command Class Authentication">
+        <cmd key="0x01" name="AUTHENTICATION_CAPABILITY_GET" help="Authentication Capability Get" />
+        <cmd key="0x02" name="AUTHENTICATION_CAPABILITY_REPORT" help="Authentication Capability Report">
+            <param key="0x00" name="Supported Data ID Entries" type="WORD" />
+            <param key="0x01" name="Supported Authentication ID Entries" type="WORD" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Authentication Technology Type Bit Mask length" fieldmask="0x0F" />
+                <bitflag key="0x01" flagname="Reserved1" flagmask="0x10" />
+                <bitflag key="0x02" flagname="OR" flagmask="0x20" />
+                <bitflag key="0x03" flagname="MADR" flagmask="0x40" />
+                <bitflag key="0x04" flagname="MAR" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Supported Authentication Technology Type Bit Mask" type="VARIANT">
+                <variant paramoffs="2" sizemask="0x0F" />
+            </param>
+            <param key="0x04" name="Supported Checksum Type Bit Mask" type="BYTE" />
+            <param key="0x05" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Supported Fallback Status Bit Mask length" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0xE0" shifter="5" />
+            </param>
+            <param key="0x06" name="Supported Fallback Status Bit Mask" type="VARIANT">
+                <variant paramoffs="5" sizemask="0x1F" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="AUTHENTICATION_DATA_SET" help="Authentication Data Set">
+            <param key="0x00" name="Authentication Data ID" type="WORD" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Authentication Technology Type" fieldmask="0x0F">
+                    <fieldenum value="Reserved0" />
+                    <fieldenum value="RFID tag" />
+                    <fieldenum value="Magnetic card" />
+                </fieldenum>
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
+            </param>
+            <param key="0x02" name="Authentication Data length" type="BYTE" />
+            <param key="0x03" name="Authentication Data" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x04" name="AUTHENTICATION_DATA_GET" help="Authentication Data Get">
+            <param key="0x00" name="Authentication Data ID" type="WORD" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Report More" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xFE" shifter="1" />
+            </param>
+        </cmd>
+        <cmd key="0x05" name="AUTHENTICATION_DATA_REPORT" help="Authentication Data Report">
+            <param key="0x00" name="Number of Authentication Data ID Blocks" type="BYTE" />
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Authentication Data ID" type="WORD" />
+                <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Authentication Technology Type" fieldmask="0x0F" />
+                    <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xF0" shifter="4" />
+                </param>
+                <param key="0x02" name="Authentication Data Length" type="BYTE" />
+                <param key="0x03" name="Authentication Data" type="VARIANT">
+                    <variant paramoffs="2" sizemask="0xFF" />
+                </param>
+            </variant_group>
+            <param key="0x02" name="Next Authentication Data ID" type="WORD" />
+        </cmd>
+        <cmd key="0x06" name="AUTHENTICATION_TECHNOLOGIES_COMBINATION_SET" help="Authentication Technologies Combination Set">
+            <param key="0x00" name="Authentication ID" type="WORD" />
+            <param key="0x01" name="Fallback Status" type="CONST">
+                <const key="0x00" flagname="Available" flagmask="0x00" />
+                <const key="0x01" flagname="Enabled" flagmask="0x01" />
+                <const key="0x02" flagname="Disabled" flagmask="0x02" />
+                <const key="0x03" flagname="Messaging" flagmask="0x03" />
+                <const key="0x04" flagname="Passage Mode" flagmask="0x04" />
+            </param>
+            <param key="0x02" name="User Identifier" type="WORD" />
+            <param key="0x03" name="Schedule ID" type="WORD" />
+            <param key="0x04" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of Authentication Data IDs" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="OR logic" flagmask="0x80" />
+            </param>
+            <variant_group key="0x05" name="vg1" paramOffs="0x04" sizemask="0x7F" sizeoffs="0x00">
+                <param key="0x00" name="Authentication Data ID" type="WORD" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x07" name="AUTHENTICATION_TECHNOLOGIES_COMBINATION_GET" help="Authentication Technologies Combination Get">
+            <param key="0x00" name="Authentication ID" type="WORD" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Report More" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xFE" shifter="1" />
+            </param>
+        </cmd>
+        <cmd key="0x08" name="AUTHENTICATION_TECHNOLOGIES_COMBINATION_REPORT" help="Authentication Technologies Combination Report">
+            <param key="0x00" name="Number of Authentication ID blocks" type="BYTE" />
+            <variant_group key="0x01" name="vg1" paramOffs="0x00" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Authentication ID block length" type="BYTE" />
+                <param key="0x01" name="Authentication ID" type="WORD" />
+                <param key="0x02" name="Fallback Status" type="CONST">
+                    <const key="0x00" flagname="Available" flagmask="0x00" />
+                    <const key="0x01" flagname="Enabled" flagmask="0x01" />
+                    <const key="0x02" flagname="Disabled" flagmask="0x02" />
+                    <const key="0x03" flagname="Messaging" flagmask="0x03" />
+                    <const key="0x04" flagname="Passage Mode" flagmask="0x04" />
+                </param>
+                <param key="0x03" name="User Identifier" type="WORD" />
+                <param key="0x04" name="Schedule ID" type="WORD" />
+                <param key="0x05" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Number of Authentication Data IDs" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="OR logic" flagmask="0x80" />
+                </param>
+                <variant_group key="0x06" name="vg2" paramOffs="0x05" sizemask="0x7F" sizeoffs="0x00">
+                    <param key="0x00" name="Authentication Data ID" type="WORD" />
+                </variant_group>
+            </variant_group>
+            <param key="0x02" name="Next Authentication ID" type="WORD" />
+        </cmd>
+        <cmd key="0x09" name="AUTHENTICATION_CHECKSUM_GET" help="Authentication Checksum Get">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Authentication Technology Type" fieldmask="0x0F">
+                    <fieldenum value="Reserved0" />
+                    <fieldenum value="RFID tag" />
+                    <fieldenum value="Magnetic card" />
+                </fieldenum>
+                <fieldenum key="0x01" fieldname="Checksum type" fieldmask="0x70" shifter="4">
+                    <fieldenum value="Authentication Data" />
+                    <fieldenum value="Combination Entries" />
+                    <fieldenum value="Reserved2" />
+                    <fieldenum value="Reserved3" />
+                    <fieldenum value="Reserved4" />
+                    <fieldenum value="Reserved5" />
+                    <fieldenum value="Reserved6" />
+                    <fieldenum value="Reserved7" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="Reserved1" flagmask="0x80" />
+            </param>
+        </cmd>
+        <cmd key="0x0A" name="AUTHENTICATION_CHECKSUM_REPORT" help="Authentication Checksum Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <fieldenum key="0x00" fieldname="Authentication Technology Type" fieldmask="0x0F">
+                    <fieldenum value="Reserved0" />
+                    <fieldenum value="RFID tag" />
+                    <fieldenum value="Magnetic card" />
+                </fieldenum>
+                <fieldenum key="0x01" fieldname="Checksum type" fieldmask="0x70" shifter="4">
+                    <fieldenum value="Authentication Data" />
+                    <fieldenum value="Combination Entries" />
+                    <fieldenum value="Reserved2" />
+                    <fieldenum value="Reserved3" />
+                    <fieldenum value="Reserved4" />
+                    <fieldenum value="Reserved5" />
+                    <fieldenum value="Reserved6" />
+                    <fieldenum value="Reserved7" />
+                </fieldenum>
+                <bitflag key="0x02" flagname="Reserved1" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Checksum" type="WORD" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0xA2" version="1" name="COMMAND_CLASS_AUTHENTICATION_MEDIA_WRITE" help="Command Class Authentication Media Write">
+        <cmd key="0x01" name="AUTHENTICATION_MEDIA_CAPABILITY_GET" help="Authentication Media Capability Get" />
+        <cmd key="0x02" name="AUTHENTICATION_MEDIA_CAPABILITY_REPORT" help="Authentication Media Capability Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="DGS" flagmask="0x01" />
+                <bitfield key="0x01" fieldname="Reserved1" fieldmask="0xFE" shifter="1" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="AUTHENTICATION_MEDIA_WRITE_START" help="Authentication Media Write Start">
+            <param key="0x00" name="Sequence number" type="BYTE" />
+            <param key="0x01" name="Timeout" type="BYTE" />
+            <param key="0x02" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Reserved1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Generate data" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Data Length" type="BYTE" />
+            <param key="0x04" name="Data" type="VARIANT">
+                <variant paramoffs="3" sizemask="0xFF" />
+            </param>
+        </cmd>
+        <cmd key="0x04" name="AUTHENTICATION_MEDIA_WRITE_STOP" help="Authentication Media Write Stop" />
+        <cmd key="0x05" name="AUTHENTICATION_MEDIA_WRITE_STATUS" help="Authentication Media Write Status">
+            <param key="0x00" name="Sequence number" type="BYTE" />
+            <param key="0x01" name="Status" type="CONST">
+                <const key="0x00" flagname="Write operation not supported" flagmask="0x00" />
+                <const key="0x01" flagname="Forced stop" flagmask="0x01" />
+                <const key="0x02" flagname="Timeout" flagmask="0x02" />
+                <const key="0x03" flagname="Another operation is ongoing" flagmask="0x03" />
+                <const key="0x04" flagname="Aborted" flagmask="0x04" />
+                <const key="0x05" flagname="Proprietary hex data restriction" flagmask="0x05" />
+                <const key="0x06" flagname="Non re-writable target" flagmask="0x06" />
+                <const key="0x07" flagname="Completed with no status" flagmask="0x07" />
+                <const key="0x08" flagname="Success" flagmask="0x08" />
+            </param>
+            <param key="0x02" name="Data Length" type="BYTE" />
+            <param key="0x03" name="Data" type="VARIANT">
+                <variant paramoffs="2" sizemask="0xFF" />
+            </param>
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0xA3" version="1" name="COMMAND_CLASS_GENERIC_SCHEDULE" help="Command Class Generic Schedule">
+        <cmd key="0x01" name="GENERIC_SCHEDULE_CAPABILITIES_GET" help="Generic Schedule Capabilities Get" support_mode="RX" />
+        <cmd key="0x02" name="GENERIC_SCHEDULE_CAPABILITIES_REPORT" help="Generic Schedule Capabilities Report" support_mode="TX">
+            <param key="0x00" name="Number of supported Schedule IDs" type="WORD" />
+            <param key="0x01" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Number of supported Time Range IDs 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved1" flagmask="0x80" />
+            </param>
+            <param key="0x02" name="Number of supported Time Range IDs 2" type="BYTE" />
+            <param key="0x03" name="Number of supported Time Ranges per Schedule" type="BYTE" />
+            <param key="0x04" name="Properties2" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="Hour &amp; Minute" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Date" flagmask="0x02" />
+                <bitflag key="0x02" flagname="Weekdays" flagmask="0x04" />
+                <bitfield key="0x03" fieldname="Reserved2" fieldmask="0xF8" shifter="3" />
+            </param>
+        </cmd>
+        <cmd key="0x03" name="GENERIC_SCHEDULE_TIME_RANGE_SET" help="Generic Schedule Time Range Set" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Time Range ID 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved1" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Time Range ID 2" type="BYTE" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Weekday bitmask" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="In use 1" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Year 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="In use 2" flagmask="0x80" />
+            </param>
+            <param key="0x04" name="Start Year 2" type="BYTE" />
+            <param key="0x05" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Year 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="In use 3" flagmask="0x80" />
+            </param>
+            <param key="0x06" name="Stop Year 2" type="BYTE" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x70" shifter="4" />
+                <bitflag key="0x02" flagname="In Use 4" flagmask="0x80" />
+            </param>
+            <param key="0x08" name="Properties6" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Month" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved3" fieldmask="0x70" shifter="4" />
+                <bitflag key="0x02" flagname="In Use 5" flagmask="0x80" />
+            </param>
+            <param key="0x09" name="Properties7" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved4" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In Use 6" flagmask="0x80" />
+            </param>
+            <param key="0x0A" name="Properties8" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Day" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved5" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In Use 7" flagmask="0x80" />
+            </param>
+            <param key="0x0B" name="Properties9" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved6" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In Use 8" flagmask="0x80" />
+            </param>
+            <param key="0x0C" name="Properties10" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved7" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In Use 9" flagmask="0x80" />
+            </param>
+            <param key="0x0D" name="Properties11" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved8" flagmask="0x40" />
+                <bitflag key="0x02" flagname="In use 10" flagmask="0x80" />
+            </param>
+            <param key="0x0E" name="Properties12" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved9" flagmask="0x40" />
+                <bitflag key="0x02" flagname="In use 11" flagmask="0x80" />
+            </param>
+            <param key="0x0F" name="Properties13" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Daily Start Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved10" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In use 12" flagmask="0x80" />
+            </param>
+            <param key="0x10" name="Properties14" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Daily Stop Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved11" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In use 13" flagmask="0x80" />
+            </param>
+            <param key="0x11" name="Properties15" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Daily Start Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved12" flagmask="0x40" />
+                <bitflag key="0x02" flagname="In use 14" flagmask="0x80" />
+            </param>
+            <param key="0x12" name="Properties16" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Daily Stop Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved13" flagmask="0x40" />
+                <bitflag key="0x02" flagname="In use 15" flagmask="0x80" />
+            </param>
+        </cmd>
+        <cmd key="0x04" name="GENERIC_SCHEDULE_TIME_RANGE_GET" help="Generic Schedule Time Range Get" support_mode="RX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Time Range ID 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved1" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Time Range ID 2" type="BYTE" />
+        </cmd>
+        <cmd key="0x05" name="GENERIC_SCHEDULE_TIME_RANGE_REPORT" help="Generic Schedule Time Range Report" support_mode="TX">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Time Range ID 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved1" flagmask="0x80" />
+            </param>
+            <param key="0x01" name="Time Range ID 2" type="BYTE" />
+            <param key="0x02" name="Properties2" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Weekday bitmask" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="In use 1" flagmask="0x80" />
+            </param>
+            <param key="0x03" name="Properties3" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Year 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="In use 2" flagmask="0x80" />
+            </param>
+            <param key="0x04" name="Start Year 2" type="BYTE" />
+            <param key="0x05" name="Properties4" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Year 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="In use 3" flagmask="0x80" />
+            </param>
+            <param key="0x06" name="Stop Year 2" type="BYTE" />
+            <param key="0x07" name="Properties5" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Month" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved2" fieldmask="0x70" shifter="4" />
+                <bitflag key="0x02" flagname="In Use 4" flagmask="0x80" />
+            </param>
+            <param key="0x08" name="Properties6" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Month" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved3" fieldmask="0x70" shifter="4" />
+                <bitflag key="0x02" flagname="In Use 5" flagmask="0x80" />
+            </param>
+            <param key="0x09" name="Properties7" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Day" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved4" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In Use 6" flagmask="0x80" />
+            </param>
+            <param key="0x0A" name="Properties8" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Day" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved5" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In Use 7" flagmask="0x80" />
+            </param>
+            <param key="0x0B" name="Properties9" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved6" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In Use 8" flagmask="0x80" />
+            </param>
+            <param key="0x0C" name="Properties10" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved7" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In Use 9" flagmask="0x80" />
+            </param>
+            <param key="0x0D" name="Properties11" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Start Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved8" flagmask="0x40" />
+                <bitflag key="0x02" flagname="In use 10" flagmask="0x80" />
+            </param>
+            <param key="0x0E" name="Properties12" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Stop Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved9" flagmask="0x40" />
+                <bitflag key="0x02" flagname="In use 11" flagmask="0x80" />
+            </param>
+            <param key="0x0F" name="Properties13" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Daily Start Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved10" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In use 12" flagmask="0x80" />
+            </param>
+            <param key="0x10" name="Properties14" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Daily Stop Hour" fieldmask="0x1F" />
+                <bitfield key="0x01" fieldname="Reserved11" fieldmask="0x60" shifter="5" />
+                <bitflag key="0x02" flagname="In use 13" flagmask="0x80" />
+            </param>
+            <param key="0x11" name="Properties15" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Daily Start Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved12" flagmask="0x40" />
+                <bitflag key="0x02" flagname="In use 14" flagmask="0x80" />
+            </param>
+            <param key="0x12" name="Properties16" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Daily Stop Minute" fieldmask="0x3F" />
+                <bitflag key="0x01" flagname="Reserved13" flagmask="0x40" />
+                <bitflag key="0x02" flagname="In use 15" flagmask="0x80" />
+            </param>
+            <param key="0x13" name="Properties17" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Next Time Range ID 1" fieldmask="0x7F" />
+                <bitflag key="0x01" flagname="Reserved14" flagmask="0x80" />
+            </param>
+            <param key="0x14" name="Next Time Range ID 2" type="BYTE" />
+        </cmd>
+        <cmd key="0x06" name="GENERIC_SCHEDULE_SET" help="Generic Schedule Set" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="WORD" />
+            <param key="0x01" name="Number of Time Range IDs" type="BYTE" />
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Time Range ID 1" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Include" flagmask="0x80" />
+                </param>
+                <param key="0x01" name="Time Range ID 2" type="BYTE" />
+            </variant_group>
+        </cmd>
+        <cmd key="0x07" name="GENERIC_SCHEDULE_GET" help="Generic Schedule Get" support_mode="RX">
+            <param key="0x00" name="Schedule ID" type="WORD" />
+        </cmd>
+        <cmd key="0x08" name="GENERIC_SCHEDULE_REPORT" help="Generic Schedule Report" support_mode="TX">
+            <param key="0x00" name="Schedule ID" type="WORD" />
+            <param key="0x01" name="Number of Time Range IDs" type="BYTE" />
+            <variant_group key="0x02" name="vg1" paramOffs="0x01" sizemask="0xFF" sizeoffs="0x00">
+                <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                    <bitfield key="0x00" fieldname="Time Range ID 1" fieldmask="0x7F" />
+                    <bitflag key="0x01" flagname="Include" flagmask="0x80" />
+                </param>
+                <param key="0x01" name="Time Range ID 2" type="BYTE" />
+            </variant_group>
+            <param key="0x03" name="Next Schedule ID" type="WORD" />
+        </cmd>
+    </cmd_class>
+    <cmd_class key="0x7E" version="1" name="COMMAND_CLASS_ANTITHEFT_UNLOCK" help="Command Class Anti-theft Unlock">
+        <cmd key="0x01" name="ANTITHEFT_UNLOCK_STATE_GET" help="Anti-Theft Unlock State Get" />
+        <cmd key="0x02" name="ANTITHEFT_UNLOCK_STATE_REPORT" help="Anti-Theft Unlock State Report">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitflag key="0x00" flagname="State" flagmask="0x01" />
+                <bitflag key="0x01" flagname="Restricted" flagmask="0x02" />
+                <bitfield key="0x02" fieldname="Anti-theft Hint Length" fieldmask="0x3C" shifter="2" />
+                <bitfield key="0x03" fieldname="Reserved" fieldmask="0xC0" shifter="6" />
+            </param>
+            <param key="0x01" name="Anti-theft Hint" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x3C" sizeoffs="2" />
+            </param>
+            <param key="0x02" name="Manufacturer ID" type="WORD" />
+            <param key="0x03" name="Z-Wave Alliance locking entity ID" type="WORD" />
+        </cmd>
+        <cmd key="0x03" name="ANTITHEFT_UNLOCK_SET" help="Anti-Theft Unlock Set">
+            <param key="0x00" name="Properties1" type="STRUCT_BYTE">
+                <bitfield key="0x00" fieldname="Magic code length" fieldmask="0x0F" />
+                <bitfield key="0x01" fieldname="Reserved" fieldmask="0xF0" shifter="4" />
+            </param>
+            <param key="0x01" name="Magic Code" type="VARIANT">
+                <variant paramoffs="0" sizemask="0x0F" />
             </param>
         </cmd>
     </cmd_class>
-</zw_classes>
+</zw_classes>
\ No newline at end of file