path: root/utils/openzwave/patches/001-v1.6-1965-g3fff11d2.patch

diff --git a/README.md b/README.md
index 323b838d..6294ddc9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,14 @@
 ![Open-ZWave Library](https://github.com/OpenZWave/open-zwave-web/raw/master/gfx/OZW_SF.png)
 ==================
 
-*Last Updated: 4 October 2019*
+*Last Updated: 17 November 2022*
+
+* * *
+
+## NOTICE: This project is no longer being maintained. :warning:
+openzwave has no more maintainers, are there any motivated to continue the development of the library?
+
+## Introduction
 
 Our goal is to create free software library that interfaces with Z-Wave controllers, allowing anyone to create applications to control devices on a Z-Wave network, without requiring in-depth knowledge of the Z-Wave protocol. OpenZWave is not about creating Z-Wave devices (nodes). The project consists of the main library, written in C++ and wrappers and supporting projects, to interface different languages and protocol(s).
 
diff --git a/config/2gig/ct200.xml b/config/2gig/ct200.xml
new file mode 100644
index 00000000..1e7bf001
--- /dev/null
+++ b/config/2gig/ct200.xml
@@ -0,0 +1,123 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Vivint Element</MetaDataItem>
+    <MetaDataItem name="Description">The Vivint Element Smart Thermostat has an elegantly simple design making it easy for anyone to use. It's hidden display comes to life when you need it, providing clear information and simple controls. This simplicity purposefully masks Element's true intelligence. Element works in concert with the Vivint SkyControl system, leveraging an unmatched understanding of home routines and activity levels. Element automatically and dynamically adjusts to match home activities and ensure a personalized balance of comfort and energy savings. </MetaDataItem>    
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0098:0022:c801</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/2gig/ct200.png</MetaDataItem>
+    <MetaDataItem id="0022" name="ZWProductPage" type="c801">https://products.z-wavealliance.org/products/1678</MetaDataItem>
+    <MetaDataItem id="0022" name="FrequencyName" type="c801">U.S. / Canada / Mexico </MetaDataItem>    
+    <MetaDataItem id="0022" name="Identifier" type="c801">CT200</MetaDataItem>
+    <ChangeLog>
+      <Entry author="srirams" date="11 Nov 2020" revision="1">Initial</Entry>
+    </ChangeLog>
+    <MetaDataItem id="0022" name="ZWProductPage" type="c801">https://products.z-wavealliance.org/products/1678/</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold the side button until you reach settings. Navigate to Installer / Reset.  Use this procedure only in the event that the network primary controller is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem id="0022" name="Identifier" type="c801">CT200</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Same process as inclusion.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/1678/CT200_UserGuide_20160308.pdf</MetaDataItem>
+    <MetaDataItem id="0022" name="FrequencyName" type="c801">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">When included into a Z-Wave network on battery power, this device is a FLiRS device.  The Thermostat will wake up for communication when it receives a valid Z-Wave beam.  </MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Hold the side button until you reach settings. Navigate to Installer / Network</MetaDataItem>
+  </MetaData>
+  <!--
+	Radio Thermostat Company of America CT200 Thermostat manual available at:
+	https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/1678/CT200_UserGuide_20160308.pdf
+	Additional information:
+	https://products.z-wavealliance.org/products/1678
+	-->
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="2" label="Temperature Reporting Threshold (8-bit)" units="" size="1" min="0" max="4" type="list">
+      <Help>This value determines the reporting threshold</Help>
+      <Item value="0" label="Disabled"/>
+      <Item value="1" label="Also Disabled"/>
+      <Item value="2" label="0.5 degrees F"/>
+      <Item value="3" label="1.0 degrees F"/>
+      <Item value="4" label="1.5 degrees F"/>
+    </Value>
+    <Value genre="config" instance="1" index="2" value="0" label="HVAC Settings" units="" size="4" min="0" max="0" type="int">
+      <Help>Retrieves the HVAC Settings</Help>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="0" label="Utility Lock" units="" size="1" min="0" max="255" type="byte">
+      <Help>Enable or Disable the Utility Lock</Help>
+    </Value>
+    <Value genre="config" instance="1" index="4" value="0" label="C-Wire/Battery Status" units="" size="1" min="0" max="0" type="list">
+      <Help>Query power which source is in use</Help>
+      <Item value="1" label="Powered by C-Wire"/>
+      <Item value="2" label="Powered by battery"/>
+    </Value>
+    <Value genre="config" instance="1" index="5" value="2" label="Humidity Reporting Threshold" units="" size="1" min="0" max="3" type="byte">
+      <Help>This value determines the reporting threshold</Help>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="0" label="Auxiliary/Emergency" units="" size="1" min="0" max="1" type="byte">
+      <Help>Auxiliary / Emergency Heat Pump Mode</Help>
+    </Value>
+    <Value genre="config" instance="1" index="7" value="2" label="Thermostat Swing Temp" units="degrees Fahrenheit" size="1" min="1" max="8" type="list">
+      <Help>Temperature spread between the on and off temperatures</Help>
+      <Item value="1" label="0.5 degrees Fahrenheit"/>
+      <Item value="2" label="1.0 degrees Fahrenheit"/>
+      <Item value="3" label="1.5 degrees Fahrenheit"/>
+      <Item value="4" label="2.0 degrees Fahrenheit"/>
+      <Item value="5" label="2.5 degrees Fahrenheit"/>
+      <Item value="6" label="3.0 degrees Fahrenheit"/>
+      <Item value="7" label="3.5 degrees Fahrenheit"/>
+      <Item value="8" label="4.0 degrees Fahrenheit"/>
+    </Value>
+    <Value genre="config" instance="1" index="8" value="4" label="Thermostat Diff Temp" units="" size="1" min="4" max="12" type="list">
+      <Help>How far off from target temp before turning on unit</Help>
+      <Item value="4" label="2.0 degrees Fahrenheit"/>
+      <Item value="6" label="3.0 degrees Fahrenheit"/>
+      <Item value="8" label="4.0 degrees Fahrenheit"/>
+      <Item value="10" label="5.0 degrees Fahrenheit"/>
+      <Item value="12" label="6.0 degrees Fahrenheit"/>
+    </Value>
+    <Value genre="config" instance="1" index="9" value="2" label="Thermostat Recovery Mode" units="" size="1" min="1" max="2" type="list">
+      <Help>Bring a space back to a normal occupied temp</Help>
+      <Item value="1" label="Fast Recovery Mode"/>
+      <Item value="2" label="Economy Recovery Mode"/>
+    </Value>
+    <Value genre="config" instance="1" index="11" value="1" label="Simple UI Mode" units="" size="1" min="0" max="1" type="list">
+      <Help>Toggle Simple UI Mode</Help>
+      <Item value="0" label="Disabled"/>
+      <Item value="1" label="Enabled"/>
+    </Value>
+    <Value genre="config" instance="1" index="12" value="0" label="Multicast" units="" size="1" min="0" max="1" type="list">
+      <Help>Toggle Multicast Mode</Help>
+      <Item value="0" label="Disabled"/>
+      <Item value="1" label="Enabled"/>
+    </Value>
+    <Value genre="config" instance="1" index="13" value="1" label="Main Display Selection" units="" size="1" min="1" max="2" type="list">
+      <Help>Control which info is displayed in the main display area</Help>
+      <Item value="1" label="Show Temperature"/>
+      <Item value="2" label="Show (unknown)"/>
+    </Value>
+    <Value genre="config" instance="1" index="14" value="2" label="Save Energy Mode Type" units="" size="1" min="1" max="255" type="byte">
+      <Help>Save Energy Mode behavior</Help>
+    </Value>
+    <Value genre="config" instance="1" index="15" value="0" label="Fan Timer" units="" size="1" min="0" max="60" type="byte">
+      <Help>Activate Fan w/ auto shutoff timer</Help>
+    </Value>
+    <Value genre="config" instance="1" index="17" value="0" label="Temperature Calibration" units="" size="1" min="-6" max="6" type="byte">
+      <Help>Temperature Calibration / Offset</Help>
+    </Value>
+    <Value genre="config" instance="1" index="18" value="0" label="Display Units" units="" size="1" min="0" max="1" type="list">
+      <Help>Celsius or Fahrenheit</Help>
+      <Item value="0" label="Fahrenheit"/>
+      <Item value="1" label="Celcius"/>
+    </Value>    
+  </CommandClass>
+  
+  <!-- This thermostat's setpoint descriptions are 0 based, not 1 -->
+  <CommandClass id="67">
+    <Compatibility>
+      <Base>0</Base>
+      <AltTypeInterpretation>true</AltTypeInterpretation>
+    </Compatibility>
+  </CommandClass>  
+
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>  
+
+</Product>
diff --git a/config/Localization.xml b/config/Localization.xml
index a9947ab9..695ae269 100644
--- a/config/Localization.xml
+++ b/config/Localization.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Localization xmlns="https://github.com/OpenZWave/open-zwave" Revision="8">
+<Localization xmlns="https://github.com/OpenZWave/open-zwave" Revision="12">
 	<CommandClass id="113">
 		<!-- Please keep Localization.xml in sync with NotificationCCTypes.xml -->
 		<!-- If you are adding new Types or Params, Please also consider updating ValueIDIndexesDefines.def -->
@@ -60,6 +60,8 @@
 			<ItemLabel itemIndex="9">Silenced</ItemLabel>
 			<ItemLabel itemIndex="10">Maintenance Required: Dust In Device</ItemLabel>
 			<ItemLabel itemIndex="11">Maintenance_Required: Periodic Inspection</ItemLabel>
+			<ItemLabel itemIndex="12">Rapid temperature fall at Location</ItemLabel>
+			<ItemLabel itemIndex="13">Rapid temperature fall at Unknown Location</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
 		<Value index="5">
@@ -73,6 +75,10 @@
 			<ItemLabel itemIndex="5">Replace Filter</ItemLabel>
 			<ItemLabel itemIndex="6">Water Flow</ItemLabel>
 			<ItemLabel itemIndex="7">Water Pressure</ItemLabel>
+			<ItemLabel itemIndex="8">Water Temperature</ItemLabel>
+			<ItemLabel itemIndex="9">Water Level</ItemLabel>
+			<ItemLabel itemIndex="10">Sump Pump Active</ItemLabel>
+			<ItemLabel itemIndex="11">Sump Pump Failure</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
 		<Value index="6">
@@ -102,6 +108,9 @@
 			<ItemLabel itemIndex="21">Wireless Lock Invalid UserCode Entered</ItemLabel>
 			<ItemLabel itemIndex="22">Door/Window Open</ItemLabel>
 			<ItemLabel itemIndex="23">Door/Window Closed</ItemLabel>
+			<ItemLabel itemIndex="24">Window/door handle is open</ItemLabel>
+			<ItemLabel itemIndex="25">Window/door handle is closed</ItemLabel>
+			<ItemLabel itemIndex="26">Messaging User Code entered via keypa</ItemLabel>
 			<ItemLabel itemIndex="64">Barrier Initializing</ItemLabel>
 			<ItemLabel itemIndex="65">Barrier Force Exceeded</ItemLabel>
 			<ItemLabel itemIndex="66">Barrier Motor Time Exceeded</ItemLabel>
@@ -130,6 +139,8 @@
 			<ItemLabel itemIndex="7">Motion Detected at Location</ItemLabel>
 			<ItemLabel itemIndex="8">Motion Detected at Unknown Location</ItemLabel>
 			<ItemLabel itemIndex="9">Tampering - Product Moved</ItemLabel>
+			<ItemLabel itemIndex="10">Impact detected</ItemLabel>
+			<ItemLabel itemIndex="11">Magnetic field interference detected</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
 		<Value index="8">
@@ -151,6 +162,8 @@
 			<ItemLabel itemIndex="13">Battery Charged</ItemLabel>
 			<ItemLabel itemIndex="14">Battery Low</ItemLabel>
 			<ItemLabel itemIndex="15">Battery Critical</ItemLabel>
+			<ItemLabel itemIndex="16">Back-up battery is low</ItemLabel>
+			<ItemLabel itemIndex="18">Back-up battery disconnected</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
 		<Value index="9">
@@ -164,6 +177,9 @@
 			<ItemLabel itemIndex="5">Heartbeat</ItemLabel>
 			<ItemLabel itemIndex="6">Tampering Detected</ItemLabel>
 			<ItemLabel itemIndex="7">Emergency Shutoff</ItemLabel>
+			<ItemLabel itemIndex="8">Digital input high state</ItemLabel>
+			<ItemLabel itemIndex="9">Digital input low state</ItemLabel>
+			<ItemLabel itemIndex="10">Digital input open</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
 		<Value index="10">
@@ -173,6 +189,7 @@
 			<ItemLabel itemIndex="1">Contact Police Department</ItemLabel>
 			<ItemLabel itemIndex="2">Contact Fire Department</ItemLabel>
 			<ItemLabel itemIndex="3">Contact Medical Service</ItemLabel>
+			<ItemLabel itemIndex="4">Panic alert</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
 		<Value index="11">
@@ -221,6 +238,11 @@
 			<ItemLabel itemIndex="4">Posture Changed</ItemLabel>
 			<ItemLabel itemIndex="5">Sitting On Edge Of Bed</ItemLabel>
 			<ItemLabel itemIndex="6">Volatile Organic Compound Level</ItemLabel>
+			<ItemLabel itemIndex="7">Sleep apnea detected</ItemLabel>
+			<ItemLabel itemIndex="8">Sleep stage 0 detected (Dreaming/REM)</ItemLabel>
+			<ItemLabel itemIndex="9">Sleep stage 1 detected (Light sleep, non-REM 1)</ItemLabel>
+			<ItemLabel itemIndex="10">Sleep stage 2 detected (Medium sleep, non-REM 2)</ItemLabel>
+			<ItemLabel itemIndex="11">Sleep stage 3 detected (Deep sleep, non-REM 3)</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
 		<Value index="14">
@@ -248,6 +270,7 @@
 			<ItemLabel itemIndex="0">Clear</ItemLabel>
 			<ItemLabel itemIndex="1">Rain Detected</ItemLabel>
 			<ItemLabel itemIndex="2">Moisture Detected</ItemLabel>
+			<ItemLabel itemIndex="3">Freeze</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
 		<Value index="17">
@@ -273,6 +296,60 @@
 			<ItemLabel itemIndex="6">Replacement Required</ItemLabel>
 			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
 		</Value>
+		<Value index="19">
+			<Help>Pest Control Alerts</Help>
+			<Label>Pest Control</Label>
+			<ItemLabel itemIndex="0">Clear</ItemLabel>
+			<ItemLabel itemIndex="1">Trap armed at Location</ItemLabel>
+			<ItemLabel itemIndex="2">Trap armed</ItemLabel>
+			<ItemLabel itemIndex="3">Trap re-arm required at Location</ItemLabel>
+			<ItemLabel itemIndex="4">Trap re-arm required</ItemLabel>
+			<ItemLabel itemIndex="5">Pest detected at Location</ItemLabel>
+			<ItemLabel itemIndex="6">Pest detected</ItemLabel>
+			<ItemLabel itemIndex="7">Pest exterminated at Location</ItemLabel>
+			<ItemLabel itemIndex="8">Pest exterminated</ItemLabel>
+			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
+		</Value>
+		<Value index="20">
+			<Help>Light Alerts</Help>
+			<Label>Light</Label>
+			<ItemLabel itemIndex="0">Clear</ItemLabel>
+			<ItemLabel itemIndex="1">Light detected</ItemLabel>
+			<ItemLabel itemIndex="2">Light color transition detected</ItemLabel>
+			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
+		</Value>
+		<Value index="21">
+			<Help>Water Quality Monitoring Alerts</Help>
+			<Label>Water Quality Monitoring</Label>
+			<ItemLabel itemIndex="0">Clear</ItemLabel>
+			<ItemLabel itemIndex="1">Chlorine</ItemLabel>
+			<ItemLabel itemIndex="2">Acidity (pH)</ItemLabel>
+			<ItemLabel itemIndex="3">Water Oxidation</ItemLabel>
+			<ItemLabel itemIndex="4">Chlorine empty</ItemLabel>
+			<ItemLabel itemIndex="5">Acidity (pH) empty</ItemLabel>
+			<ItemLabel itemIndex="6">Waterflow measuring station shortage detected</ItemLabel>
+			<ItemLabel itemIndex="7">Waterflow clear water shortage detected</ItemLabel>
+			<ItemLabel itemIndex="8">Disinfection system error detected</ItemLabel>
+			<ItemLabel itemIndex="9">Filter cleaning ongoing</ItemLabel>
+			<ItemLabel itemIndex="10">Heating operation ongoing</ItemLabel>
+			<ItemLabel itemIndex="11">Filter pump operation ongoing</ItemLabel>
+			<ItemLabel itemIndex="12">Freshwater operation ongoing</ItemLabel>
+			<ItemLabel itemIndex="13">Dry protection operation active</ItemLabel>
+			<ItemLabel itemIndex="14">Water tank is empty</ItemLabel>
+			<ItemLabel itemIndex="15">Water tank level is unknow</ItemLabel>
+			<ItemLabel itemIndex="16">Water tank is full</ItemLabel>
+			<ItemLabel itemIndex="17">Collective disorder</ItemLabel>
+			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
+		</Value>
+		<Value index="22">
+			<Help>Home Monitoring Alerts</Help>
+			<Label>Home Monitoring</Label>
+			<ItemLabel itemIndex="0">Clear</ItemLabel>
+			<ItemLabel itemIndex="1">Home occupied at Location</ItemLabel>
+			<ItemLabel itemIndex="2">Home occupied</ItemLabel>
+			<ItemLabel itemIndex="254">Unknown Event</ItemLabel>
+		</Value>
+
 		<!--  Index from 256 are Params -->
 		<Value index="256">
 			<Help>Previous Event that was sent</Help>
@@ -359,6 +436,10 @@
 			<Help>The ID of the Valve Table that triggered this alert</Help>
 			<Label>Valve Table ID</Label>
 		</Value>
+		<Value index="272">
+			<Help>Detected Power of interference</Help>
+			<Label>RSSI Level</Label>
+		</Value>
 		<Value index="512">
 			<Help>Alarm Type Received</Help>
 			<Help lang="fr">Type d'alarme reçu</Help>
@@ -528,7 +609,7 @@
 			<Label>Color Channels</Label>
 		</Value>
 		<Value index="3">
-			<Help>Duration to change colors</Help>
+			<Help>Duration to change colors (Values above 7620 use the devices default duration)</Help>
 			<Label>Duration</Label>
 		</Value>
 	</CommandClass>
@@ -631,6 +712,455 @@
 			<Help>Current Indicator State</Help>
 			<Label>Indicator</Label>
 		</Value>
+		<Value index="1">
+			<Help>Use to indicate that alarm is armed</Help>
+			<Label>Indicator: Armed</Label>
+		</Value>
+		<Value index="2">
+			<Help>Use to indicate that alarm is disarmed</Help>
+			<Label>Indicator: Not Armed</Label>
+		</Value>
+		<Value index="3">
+			<Help>Use to indicate that device is ready</Help>
+			<Label>Indicator: Ready</Label>
+		</Value>
+		<Value index="4">
+			<Help>Use to indicate a general error</Help>
+			<Label>Indicator: Fault</Label>
+		</Value>
+		<Value index="5">
+			<Help>Use to indicate that device is temporarily busy</Help>
+			<Label>Indicator: Busy</Label>
+		</Value>
+		<Value index="6">
+			<Help>Use to signal that device is waiting for ID</Help>
+			<Label>Indicator: Enter ID</Label>
+		</Value>
+		<Value index="7">
+			<Help>Use to signal that device is waiting for PIN code</Help>
+			<Label>Indicator: Enter PIN</Label>
+		</Value>
+		<Value index="8">
+			<Help>Use to indicate OK e.g. the entered code is accepted</Help>
+			<Label>Indicator: Code Accepted</Label>
+		</Value>
+		<Value index="9">
+			<Help>Use to indicate NOT OK e.g. the entered code is NOT accepted</Help>
+			<Label>Indicator: Code Not Accepted</Label>
+		</Value>
+		<Value index="10">
+			<Help>Use to indicate that the alarm is armed and users are staying in the home</Help>
+			<Label>Indicator: Armed Stay</Label>
+		</Value>
+		<Value index="11">
+			<Help>Use to indicate that the alarm is armed and users are away from the home</Help>
+			<Label>Indicator: Armed Away</Label>
+		</Value>
+		<Value index="12">
+			<Help>Use to indicate that the alarm is triggered and active with no reason specified</Help>
+			<Label>Indicator: Alarming</Label>
+		</Value>
+		<Value index="13">
+			<Help>Use to indicate that the alarm is triggered and active due to a Burglar event</Help>
+			<Label>Indicator: Alarming: Burglar</Label>
+		</Value>
+		<Value index="14">
+			<Help>Use to indicate that the alarm is triggered and active due to a Fire Alarm event</Help>
+			<Label>Indicator: Alarming: Smoke/Fire</Label>
+		</Value>
+		<Value index="15">
+			<Help>Use to indicate that the alarm is triggered and active due to a CO event</Help>
+			<Label>Indicator: Alarming: Carbon Monoxide</Label>
+		</Value>
+		<Value index="16">
+			<Help>Use to indicate that the device expects a bypass challenge code</Help>
+			<Label>Indicator: Bypass Challenge</Label>
+		</Value>
+		<Value index="17">
+			<Help>Use to indicate that the alarm is about to be activated unless disarmed by a code</Help>
+			<Label>Indicator: Entry Delay</Label>
+		</Value>
+		<Value index="18">
+			<Help>Use to indicate that the alarm will be active after the exit delay</Help>
+			<Label>Indicator: Exit Delay</Label>
+		</Value>
+		<Value index="19">
+			<Help>Use to indicate that the alarm is triggered and active due to a medical emergency</Help>
+			<Label>Indicator: Alarming: Medical</Label>
+		</Value>
+		<Value index="20">
+			<Help>Use to indicate that the alarm is triggered and active due to a freeze warning</Help>
+			<Label>Indicator: Alarming: Freeze Warning</Label>
+		</Value>
+		<Value index="21">
+			<Help>Use to indicate that the alarm is triggered and active due to a water leak</Help>
+			<Label>Indicator: Alarming: Water Leak</Label>
+		</Value>
+		<Value index="22">
+			<Help>Use to indicate that the alarm is triggered and active due to a panic alarm trigger</Help>
+			<Label>Indicator: Alarming: Panic</Label>
+		</Value>
+		<Value index="32">
+			<Help>Use to indicate that alarm zone 1 is armed</Help>
+			<Label>Indicator: Zone 1 Armed</Label>
+		</Value>
+		<Value index="33">
+			<Help>Use to indicate that alarm zone 2 is armed</Help>
+			<Label>Indicator: Zone 2 Armed</Label>
+		</Value>
+		<Value index="34">
+			<Help>Use to indicate that alarm zone 3 is armed</Help>
+			<Label>Indicator: Zone 3 Armed</Label>
+		</Value>
+		<Value index="35">
+			<Help>Use to indicate that alarm zone 4 is armed</Help>
+			<Label>Indicator: Zone 4 Armed</Label>
+		</Value>
+		<Value index="36">
+			<Help>Use to indicate that alarm zone 5 is armed</Help>
+			<Label>Indicator: Zone 5 Armed</Label>
+		</Value>
+		<Value index="37">
+			<Help>Use to indicate that alarm zone 6 is armed</Help>
+			<Label>Indicator: Zone 6 Armed</Label>
+		</Value>
+		<Value index="38">
+			<Help>Use to indicate that alarm zone 7 is armed</Help>
+			<Label>Indicator: Zone 7 Armed</Label>
+		</Value>
+		<Value index="39">
+			<Help>Use to indicate that alarm zone 8 is armed</Help>
+			<Label>Indicator: Zone 8 Armed</Label>
+		</Value>
+		<Value index="48">
+			<Help>Use to turn on LCD backlight, e.g. to shortly draw attention when alarm is activated from another entry control keypad.</Help>
+			<Label>Indicator: LCD Backlight</Label>
+		</Value>
+		<Value index="64">
+			<Help>Use to indicate that buttons are ready for user input</Help>
+			<Label>Indicator: Button: Backlight Letters</Label>
+		</Value>
+		<Value index="65">
+			<Help>Use to indicate that buttons are ready for user input</Help>
+			<Label>Indicator: Button: Backlight Digits</Label>
+		</Value>
+		<Value index="66">
+			<Help>Use to indicate that buttons are ready for user input</Help>
+			<Label>Indicator: Button: Backlight Command</Label>
+		</Value>
+		<Value index="67">
+			<Help>Use to draw attention to button 1</Help>
+			<Label>Indicator: Button 1</Label>
+		</Value>
+		<Value index="68">
+			<Help>Use to draw attention to button 2</Help>
+			<Label>Indicator: Button 2</Label>
+		</Value>
+		<Value index="69">
+			<Help>Use to draw attention to button 3</Help>
+			<Label>Indicator: Button 3</Label>
+		</Value>
+		<Value index="70">
+			<Help>Use to draw attention to button 4</Help>
+			<Label>Indicator: Button 4</Label>
+		</Value>
+		<Value index="71">
+			<Help>Use to draw attention to button 5</Help>
+			<Label>Indicator: Button 5</Label>
+		</Value>
+		<Value index="72">
+			<Help>Use to draw attention to button 6</Help>
+			<Label>Indicator: Button 6</Label>
+		</Value>
+		<Value index="73">
+			<Help>Use to draw attention to button 7</Help>
+			<Label>Indicator: Button 7</Label>
+		</Value>
+		<Value index="74">
+			<Help>Use to draw attention to button 8</Help>
+			<Label>Indicator: Button 8</Label>
+		</Value>
+		<Value index="75">
+			<Help>Use to draw attention to button 9</Help>
+			<Label>Indicator: Button 9</Label>
+		</Value>
+		<Value index="76">
+			<Help>Use to draw attention to button 10</Help>
+			<Label>Indicator: Button 10</Label>
+		</Value>
+		<Value index="77">
+			<Help>Use to draw attention to button 11</Help>
+			<Label>Indicator: Button 11</Label>
+		</Value>
+		<Value index="78">
+			<Help>Use to draw attention to button 12</Help>
+			<Label>Indicator: Button 12</Label>
+		</Value>
+		<Value index="80">
+			<Help>This indicator is used to identify the node.</Help>
+			<Label>Indicator: Node Identify</Label>
+		</Value>
+		<Value index="96">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 1</Label>
+		</Value>
+		<Value index="97">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 2</Label>
+		</Value>
+		<Value index="98">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 3</Label>
+		</Value>
+		<Value index="99">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 4</Label>
+		</Value>
+		<Value index="100">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 5</Label>
+		</Value>
+		<Value index="101">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 6</Label>
+		</Value>
+		<Value index="102">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 7</Label>
+		</Value>
+		<Value index="103">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 8</Label>
+		</Value>
+		<Value index="104">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 9</Label>
+		</Value>
+		<Value index="105">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 10</Label>
+		</Value>
+		<Value index="106">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 11</Label>
+		</Value>
+		<Value index="107">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 12</Label>
+		</Value>
+		<Value index="108">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 13</Label>
+		</Value>
+		<Value index="109">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 14</Label>
+		</Value>
+		<Value index="110">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 15</Label>
+		</Value>
+		<Value index="111">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 16</Label>
+		</Value>
+		<Value index="112">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 17</Label>
+		</Value>
+		<Value index="113">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 18</Label>
+		</Value>
+		<Value index="114">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 19</Label>
+		</Value>
+		<Value index="115">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 20</Label>
+		</Value>
+		<Value index="116">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 21</Label>
+		</Value>
+		<Value index="117">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 22</Label>
+		</Value>
+		<Value index="118">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 23</Label>
+		</Value>
+		<Value index="119">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 24</Label>
+		</Value>
+		<Value index="120">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 25</Label>
+		</Value>
+		<Value index="121">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 26</Label>
+		</Value>
+		<Value index="122">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 27</Label>
+		</Value>
+		<Value index="123">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 28</Label>
+		</Value>
+		<Value index="124">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 29</Label>
+		</Value>
+		<Value index="125">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 30</Label>
+		</Value>
+		<Value index="126">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 31</Label>
+		</Value>
+		<Value index="127">
+			<Help>Sound indication, use to indicate that a generic event happened.</Help>
+			<Label>Indicator: Generic Event Sound Notification 32</Label>
+		</Value>
+		<Value index="128">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 1</Label>
+		</Value>
+		<Value index="129">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 2</Label>
+		</Value>
+		<Value index="130">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 3</Label>
+		</Value>
+		<Value index="131">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 4</Label>
+		</Value>
+		<Value index="132">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 5</Label>
+		</Value>
+		<Value index="133">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 6</Label>
+		</Value>
+		<Value index="134">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 7</Label>
+		</Value>
+		<Value index="135">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 8</Label>
+		</Value>
+		<Value index="136">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 9</Label>
+		</Value>
+		<Value index="137">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 10</Label>
+		</Value>
+		<Value index="138">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 11</Label>
+		</Value>
+		<Value index="139">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 12</Label>
+		</Value>
+		<Value index="140">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 13</Label>
+		</Value>
+		<Value index="141">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 14</Label>
+		</Value>
+		<Value index="142">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 15</Label>
+		</Value>
+		<Value index="143">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 16</Label>
+		</Value>
+		<Value index="144">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 17</Label>
+		</Value>
+		<Value index="145">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 18</Label>
+		</Value>
+		<Value index="146">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 19</Label>
+		</Value>
+		<Value index="147">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 20</Label>
+		</Value>
+		<Value index="148">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 21</Label>
+		</Value>
+		<Value index="149">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 22</Label>
+		</Value>
+		<Value index="150">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 23</Label>
+		</Value>
+		<Value index="151">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 24</Label>
+		</Value>
+		<Value index="152">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 25</Label>
+		</Value>
+		<Value index="153">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 26</Label>
+		</Value>
+		<Value index="154">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 27</Label>
+		</Value>
+		<Value index="155">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 28</Label>
+		</Value>
+		<Value index="156">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 29</Label>
+		</Value>
+		<Value index="157">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 30</Label>
+		</Value>
+		<Value index="158">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 31</Label>
+		</Value>
+		<Value index="159">
+			<Help>Manufacturer Defined.</Help>
+			<Label>Indicator: Manufacturer Defined Indicator 32</Label>
+		</Value>
+		<Value index="240">
+			<Help>Use to draw attention or provide user feedback</Help>
+			<Label>Indicator: Buzzer</Label>
+		</Value>
+		<!-- We need to come back one day and do the Property Entries -->
 	</CommandClass>
 	<CommandClass id="137">
 		<Label>COMMAND_CLASS_LANGUAGE</Label>
@@ -1609,7 +2139,7 @@
 			<Label>Target State</Label>
 		</Value>
 		<Value index="2">
-			<Help>How Long to Transition to new State</Help>
+			<Help>How Long to Transition to new State (Values above 7620 use the devices default duration)</Help>
 			<Label>Transition Duration</Label>
 		</Value>
 	</CommandClass>
@@ -1636,7 +2166,7 @@
 			<Label>Start Level</Label>
 		</Value>
 		<Value index="5">
-			<Help>Duration taken when changing the Level of a Device</Help>
+			<Help>Duration taken when changing the Level of a Device (Values above 7620 use the devices default duration)</Help>
 			<Label>Dimming Duration</Label>
 		</Value>
 		<Value index="6">
diff --git a/config/NotificationCCTypes.xml b/config/NotificationCCTypes.xml
index 61546ad2..b0dbb1ac 100644
--- a/config/NotificationCCTypes.xml
+++ b/config/NotificationCCTypes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<NotificationTypes xmlns='https://github.com/OpenZWave/open-zwave' Revision="9">
+<NotificationTypes xmlns='https://github.com/OpenZWave/open-zwave' Revision="11">
+	<!-- Last Updated with Version 11 - 1/1/20 -->
 	<!-- Please keep Localization.xml in sync with NotificationCCTypes.xml -->
 	<!-- If you are adding new Types or Params, Please also consider updating ValueIDIndexesDefines.def -->
 	<!-- Bump Revision number, run "xmllint format" and "make xmltest" before submitting -->
@@ -111,6 +112,11 @@
 		</AlarmEvent>
 		<AlarmEvent id="11" name="Maintenance_Required: Periodic Inspection">
 		</AlarmEvent>
+		<AlarmEvent id="12" name="Rapid temperature fall at Location">
+			<AlarmEventParam id="257" type="location" name="Alert Location" />
+		</AlarmEvent>
+		<AlarmEvent id="13" name="Rapid temperature fall at Unknown Location">
+		</AlarmEvent>
 		<AlarmEvent id="254" name="Unknown Event">
 		</AlarmEvent>
 	</AlarmType>
@@ -147,6 +153,24 @@
 				<Item id="4" label="Max" />
 			</AlarmEventParam>
 		</AlarmEvent>
+		<AlarmEvent id="8" name="Water Temperature">
+			<AlarmEventParam id="259" type="list" name="Type">
+				<Item id="1" label="No Data" />
+				<Item id="2" label="Below Low Threshold" />
+				<Item id="3" label="Above High Threshold" />
+			</AlarmEventParam>
+		</AlarmEvent>
+		<AlarmEvent id="9" name="Water Level">
+			<AlarmEventParam id="259" type="list" name="Type">
+				<Item id="1" label="No Data" />
+				<Item id="2" label="Below Low Threshold" />
+				<Item id="3" label="Above High Threshold" />
+			</AlarmEventParam>
+		</AlarmEvent>
+		<AlarmEvent id="10" name="Sump Pump Active">
+		</AlarmEvent>
+		<AlarmEvent id="11" name="Sump Pump Failure">
+		</AlarmEvent>
 		<AlarmEvent id="254" name="Unknown Event">
 		</AlarmEvent>
 	</AlarmType>
@@ -203,6 +227,13 @@
 		</AlarmEvent>
 		<AlarmEvent id="23" name="Door/Window Closed">
 		</AlarmEvent>
+		<AlarmEvent id="24" name="Window/door handle is open">
+		</AlarmEvent>
+		<AlarmEvent id="25" name="Window/door handle is closed">
+		</AlarmEvent>
+		<AlarmEvent id="26" name="Messaging User Code entered via keypad">
+			<AlarmEventParam id="260" type="usercodereport" name="UserCode" />
+		</AlarmEvent>
 		<AlarmEvent id="64" name="Barrier Initializing">
 			<AlarmEventParam id="262" type="list" name="Progress">
 				<Item id="0" label="Process Complete" />
@@ -273,6 +304,13 @@
 		</AlarmEvent>
 		<AlarmEvent id="9" name="Tampering - Product Moved">
 		</AlarmEvent>
+		<AlarmEvent id="10" name="Impact detected">
+		</AlarmEvent>
+		<AlarmEvent id="11" name="Magnetic field interference detected">
+		</AlarmEvent>
+		<AlarmEvent id="12" name="RF Jamming detected">
+			<AlarmEventParam id="272" type="byte" name="RSSI Level" />
+		</AlarmEvent>
 		<AlarmEvent id="254" name="Unknown Event">
 		</AlarmEvent>
 	</AlarmType>
@@ -311,6 +349,10 @@
 		</AlarmEvent>
 		<AlarmEvent id="15" name="Battery Critical">
 		</AlarmEvent>
+		<AlarmEvent id="16" name="Back-up battery is low">
+		</AlarmEvent>
+		<AlarmEvent id="18" name="Back-up battery disconnected">
+		</AlarmEvent>
 		<AlarmEvent id="254" name="Unknown Event">
 		</AlarmEvent>
 	</AlarmType>
@@ -335,6 +377,12 @@
 		</AlarmEvent>
 		<AlarmEvent id="7" name="Emergency Shutoff">
 		</AlarmEvent>
+		<AlarmEvent id="8" name="Digital input high state">
+		</AlarmEvent>
+		<AlarmEvent id="9" name="Digital input low state">
+		</AlarmEvent>
+		<AlarmEvent id="10" name="Digital input open">
+		</AlarmEvent>
 		<AlarmEvent id="254" name="Unknown_Event">
 		</AlarmEvent>
 	</AlarmType>
@@ -349,6 +397,8 @@
 		</AlarmEvent>
 		<AlarmEvent id="3" name="Contact Medical Service">
 		</AlarmEvent>
+		<AlarmEvent id="4" name="Panic alert">
+		</AlarmEvent>
 		<AlarmEvent id="254" name="Unknown Event">
 		</AlarmEvent>
 	</AlarmType>
@@ -440,6 +490,20 @@
 				<Item id="4" label="Highly Polluted" />
 			</AlarmEventParam>
 		</AlarmEvent>
+		<AlarmEvent id="7" name="Sleep apnea detected">
+			<AlarmEventParam id="268" type="list" name="breath level">
+				<Item id="1" label="Low Breath" />
+				<Item id="2" label="No Breath" />
+			</AlarmEventParam>
+		</AlarmEvent>
+		<AlarmEvent id="8" name="Sleep stage 0 detected (Dreaming/REM)">
+		</AlarmEvent>
+		<AlarmEvent id="9" name="Sleep stage 1 detected (Light sleep, non-REM 1)">
+		</AlarmEvent>
+		<AlarmEvent id="10" name="Sleep stage 2 detected (Medium sleep, non-REM 2)">
+		</AlarmEvent>
+		<AlarmEvent id="11" name="Sleep stage 3 detected (Deep sleep, non-REM 3)">
+		</AlarmEvent>
 		<AlarmEvent id="254" name="Unknown Event">
 		</AlarmEvent>
 	</AlarmType>
@@ -502,6 +566,8 @@
 		</AlarmEvent>
 		<AlarmEvent id="2" name="Moisture Detected">
 		</AlarmEvent>
+		<AlarmEvent id="3" name="Freeze">
+		</AlarmEvent>
 		<AlarmEvent id="254" name="Unknown Event">
 		</AlarmEvent>
 	</AlarmType>
@@ -550,4 +616,115 @@
 		</AlarmEvent>
 	</AlarmType>
 
+	<AlarmType id="19" name="Pest Control">
+		<AlarmEvent id="0" name="Clear">
+			<AlarmEventParam id="256" type="byte" name="Previous Event Cleared" />
+		</AlarmEvent>
+		<AlarmEvent id="1" name="Trap armed at Location">
+			<AlarmEventParam id="257" type="location" name="Alert Location" />
+		</AlarmEvent>
+		<AlarmEvent id="2" name="Trap armed">
+		</AlarmEvent>
+		<AlarmEvent id="3" name="Trap re-arm required at Location">
+			<AlarmEventParam id="257" type="location" name="Alert Location" />
+		</AlarmEvent>
+		<AlarmEvent id="4" name="Trap re-arm required">
+		</AlarmEvent>
+		<AlarmEvent id="5" name="Pest detected at Location">
+			<AlarmEventParam id="257" type="location" name="Alert Location" />
+		</AlarmEvent>
+		<AlarmEvent id="6" name="Pest detected">
+		</AlarmEvent>
+		<AlarmEvent id="7" name="Pest exterminated at Location">
+			<AlarmEventParam id="257" type="location" name="Alert Location" />
+		</AlarmEvent>
+		<AlarmEvent id="8" name="Pest exterminated">
+		</AlarmEvent>
+		<AlarmEvent id="254" name="Unknown Event">
+		</AlarmEvent>
+	</AlarmType>
+
+	<AlarmType id="20" name="Light">
+		<AlarmEvent id="0" name="Clear">
+			<AlarmEventParam id="256" type="byte" name="Previous Event Cleared" />
+		</AlarmEvent>
+		<AlarmEvent id="1" name="Light detected">
+		</AlarmEvent>
+		<AlarmEvent id="2" name="Light color transition detected">
+		</AlarmEvent>
+		<AlarmEvent id="254" name="Unknown Event">
+		</AlarmEvent>
+	</AlarmType>
+
+	<AlarmType id="21" name="Water Quality Monitoring">
+		<AlarmEvent id="0" name="Clear">
+			<AlarmEventParam id="256" type="byte" name="Previous Event Cleared" />
+		</AlarmEvent>
+		<AlarmEvent id="1" name="Chlorine">
+			<AlarmEventParam id="259" type="list" name="Threshold">
+				<Item id="1" label="Below Low Threshold" />
+				<Item id="2" label="Above High Threshold" />
+			</AlarmEventParam>
+		</AlarmEvent>
+		<AlarmEvent id="2" name="Acidity (pH)">
+			<AlarmEventParam id="259" type="list" name="Threshold">
+				<Item id="1" label="Below Low Threshold" />
+				<Item id="2" label="Above High Threshold" />
+				<Item id="3" label="Decreasing pH" />
+				<Item id="4" label="Increasing pH" />
+			</AlarmEventParam>
+		</AlarmEvent>
+		<AlarmEvent id="3" name="Water Oxidation">
+			<AlarmEventParam id="259" type="list" name="Type">
+				<Item id="1" label="Below Low Threshold" />
+				<Item id="2" label="Above High Threshold" />
+			</AlarmEventParam>
+		</AlarmEvent>
+		<AlarmEvent id="4" name="Chlorine empty">
+		</AlarmEvent>
+		<AlarmEvent id="5" name="Acidity (pH) empty">
+		</AlarmEvent>
+		<AlarmEvent id="6" name="Waterflow measuring station shortage detected">
+		</AlarmEvent>
+		<AlarmEvent id="7" name="Waterflow clear water shortage detected">
+		</AlarmEvent>
+		<AlarmEvent id="8" name="Disinfection system error detected">
+			<AlarmEventParam id="1" type="byte" name="Error" />
+		</AlarmEvent>
+		<AlarmEvent id="9" name="Filter cleaning ongoing">
+			<AlarmEventParam id="1" type="byte" name="Progress" />
+		</AlarmEvent>
+		<AlarmEvent id="10" name="Heating operation ongoing">
+		</AlarmEvent>
+		<AlarmEvent id="11" name="Filter pump operation ongoing">
+		</AlarmEvent>
+		<AlarmEvent id="12" name="Freshwater operation ongoing">
+		</AlarmEvent>
+		<AlarmEvent id="13" name="Dry protection operation active">
+		</AlarmEvent>
+		<AlarmEvent id="14" name="Water tank is empty">
+		</AlarmEvent>
+		<AlarmEvent id="15" name="Water tank level is unknown">
+		</AlarmEvent>
+		<AlarmEvent id="16" name="Water tank is full">
+		</AlarmEvent>
+		<AlarmEvent id="17" name="Collective disorder">
+		</AlarmEvent>
+		<AlarmEvent id="254" name="Unknown Event">
+		</AlarmEvent>
+	</AlarmType>
+
+	<AlarmType id="22" name="Home Monitoring">
+		<AlarmEvent id="0" name="Clear">
+			<AlarmEventParam id="256" type="byte" name="Previous Event Cleared" />
+		</AlarmEvent>
+		<AlarmEvent id="1" name="Home occupied at Location">
+			<AlarmEventParam id="257" type="location" name="Alert Location" />
+		</AlarmEvent>
+		<AlarmEvent id="2" name="Home occupied">
+		</AlarmEvent>
+		<AlarmEvent id="254" name="Unknown Event">
+		</AlarmEvent>
+	</AlarmType>
+
 </NotificationTypes>
diff --git a/config/abus/SHRM10000.xml b/config/abus/SHRM10000.xml
new file mode 100644
index 00000000..acbc8c4c
--- /dev/null
+++ b/config/abus/SHRM10000.xml
@@ -0,0 +1,40 @@
+<!--
+Smart Smoke Sensor SHRM10000
+http://products.z-wavealliance.org/products/3089
+--><Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0403:0003:0002</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/abus/SHRM10000.jpg</MetaDataItem>
+    <MetaDataItem id="0003" name="ZWProductPage" type="0002">https://products.z-wavealliance.org/products/3089/</MetaDataItem>
+    <MetaDataItem name="Description">The Smart Smoke Alarm adopts Z-Wave protocol, when the sensor detects smoke to the set level, it will issue  acoustic-optic alarm to alert the users and also send alarm notifications to gateway immediately.It's suitable to be installed in living room, office,warehouse,and etc.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">-  Click [Add] icon in Z-Wave Controller .
+-  Press the Net_Button 3 times within 1.5s, Green LED is Blinking 3 times within 1 second.
+-  If Inclusion Process is successful, Green led will turn off.
+</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">-  Click [Remove] icon in Z-Wave Controller
+-  Press the Net_Button 3 times within 1.5s 
+-  If Exclusion Process is successful, Green led is Blinking 6 times, then turn off.
+</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">-  Wake up Notification is transmitted every 24 hours by default.
+-  Wake up Notification is transmitted after Notification Report is Transmitted </MetaDataItem>
+    <MetaDataItem name="ResetDescription">--Long press Net_Button while installing batteries in the product.
+- Device Reset Locally notification is Transmitted.
+Please use this procedure only when the network primary controller is missing or otherwise inoperable.
+</MetaDataItem>
+    <MetaDataItem id="0003" name="Identifier" type="0002">HS1SA-Z</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/3006/HS1SA-Z S2-documentation_3.pdf</MetaDataItem>
+    <MetaDataItem name="Name">Smart Smoke Alarm</MetaDataItem>
+    <MetaDataItem id="0003" name="FrequencyName" type="0002">CEPT (Europe)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Oliver Eiber" date="09 September 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3089/xml</Entry>
+     </ChangeLog>
+  </MetaData>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="LifeLine" max_associations="1"/>
+      <Group index="2" label="Binary Sensor" max_associations="5"/>
+      <Group index="3" label="Notification" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/aeotec/zw095.xml b/config/aeotec/zw095.xml
index 6934b2bf..ca4fa7d4 100644
--- a/config/aeotec/zw095.xml
+++ b/config/aeotec/zw095.xml
@@ -1,7 +1,7 @@
 <!--
 Aeotec ZW095 Home Energy Meter Gen5
 https://aeotec.freshdesk.com/helpdesk/attachments/6009584689
---><Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0086:005F:0102</MetaDataItem>
     <MetaDataItem name="ProductPic">images/aeotec/zw095.png</MetaDataItem>
@@ -21,6 +21,7 @@ Products that are Z-Wave certified can be used and communicate with other Z-Wave
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1289/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="23 May 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1596/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2046/xml</Entry>
+	    <Entry author="Muhammad Zaman - mzaman@microsoft.com" date="18 Jan 2021" revision="6">Configure ordinary lifeline association instead of multi channel lifeline association</Entry>
     </ChangeLog>
     <MetaDataItem id="005F" name="ZWProductPage" type="0002">https://products.z-wavealliance.org/products/2046/</MetaDataItem>
     <MetaDataItem id="005F" name="FrequencyName" type="0002">CEPT (Europe)</MetaDataItem>
@@ -250,5 +251,10 @@ Products that are Z-Wave certified can be used and communicate with other Z-Wave
     <Associations num_groups="1">
       <Group index="1" label="Lifeline" max_associations="5"/>
     </Associations>
+  </CommandClass>  
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>false</ForceInstances>
+    </Compatibility>
   </CommandClass>
 </Product>
diff --git a/config/aeotec/zw100.xml b/config/aeotec/zw100.xml
index 03381caa..5a049037 100644
--- a/config/aeotec/zw100.xml
+++ b/config/aeotec/zw100.xml
@@ -1,8 +1,8 @@
-<!-- 
+<!--
 Aeotec ZW100 MultiSensor 6
 https://aeotec.freshdesk.com/helpdesk/attachments/6028954764
 V1.10 + V1.11 (12/14/2017)
---><Product Revision="24" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="25" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0086:0064:0102</MetaDataItem>
     <MetaDataItem name="ProductPic">images/aeotec/zw100.png</MetaDataItem>
@@ -25,6 +25,7 @@ V1.10 + V1.11 (12/14/2017)
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="22">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2684/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="23">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2695/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="24">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2714/xml</Entry>
+      <Entry author="Mark Ruys - mark@paracas.nl" date="10 Apr 2021" revision="25">Updated parameter 41 documentation based on https://help.aeotec.com/support/solutions/articles/6000219267-set-parameter-41-in-fibaro-home-center</Entry>
     </ChangeLog>
     <MetaDataItem id="0064" name="ZWProductPage" type="0002">https://products.z-wavealliance.org/products/2714/</MetaDataItem>
     <MetaDataItem id="0064" name="Identifier" type="0002">ZW100-C</MetaDataItem>
@@ -78,22 +79,23 @@ V1.10 + V1.11 (12/14/2017)
 			Value=10 to 50.</Help>
     </Value>
     <Value genre="config" index="40" label="Report Only On Thresholds" max="1" min="0" size="1" type="list" value="0">
-      <Help>Enable/disable the selective reporting only when measurements reach a certain threshold or percentage 
+      <Help>Enable/disable the selective reporting only when measurements reach a certain threshold or percentage
 			set in the threshold settings.  This is used to reduce network
 			traffic.</Help>
       <Item label="Disabled" value="0"/>
       <Item label="Enabled" value="1"/>
     </Value>
-    <Value genre="config" index="41" label="Temperature Reporting Threshold" max="39321" min="0" size="4" type="int" units="C/F" value="20">
-      <Help>Threshold change in temperature to induce an automatic report.  
-			Note: 
-			1. The unit is Fahrenheit for US version, Celsius for EU/AU version.
-			2. The value contains one decimal point. E.g. if the value is set to 20, the threshold value = 2.0 C (EU/AU) or 2.0 F (US). When the temperature has changed by 2.0 (of the appropriate unit), a temperature report will be sent.
-			</Help>
+    <Value genre="config" index="41" label="Temperature Reporting Threshold" min="655616" max="8323584" size="4" type="int" units="C/F" value="1310976">
+      <Help>Threshold change in temperature to induce an automatic report. In hexadecimal, the value should be in the form 0xAABBCCDD (firmware 1.10 and up) or 0xAABBCC (older firmware):
+			1. AA should be 00
+			2. BB contains the temperature threshold with one decimal point. E.g. if the value is set to 0x14 (20 decimal), the threshold value is 2.0 degrees. So when the temperature has changed by 2.0 degrees, a temperature report will be sent.
+			3. CC contains the unit: 01 for Celsius, 02 for Fahrenheit
+			4. DD should be 00
+			Example: decimal 1310976 is hexadecimal 0x140100, so 0x14 is 20 decimal, hence a change of 2.0 degree Celsius will trigger a notification report.</Help>
     </Value>
     <Value genre="config" index="42" label="Humidity Reporting Threshold" max="100" min="0" size="1" type="byte" units="%" value="10">
-      <Help>Threshold change in humidity to induce an automatic report. 
-			Note: 
+      <Help>Threshold change in humidity to induce an automatic report.
+			Note:
 			1. The unit is %.
 			2. The default value is 10, which means that a 10% change in humidity will trigger a report.
 			</Help>
@@ -102,8 +104,8 @@ V1.10 + V1.11 (12/14/2017)
       <Help>Threshold change in luminance to induce an automatic report.</Help>
     </Value>
     <Value genre="config" index="44" label="Battery Reporting Threshold" max="100" min="0" size="1" type="byte" units="%" value="10">
-      <Help>Threshold change in battery level to induce an  automatic report. 
-			Note: 
+      <Help>Threshold change in battery level to induce an  automatic report.
+			Note:
 			1. The unit is %.
 			2. The default value is 10, which means that a 10% change in battery will trigger a report.
 			</Help>
@@ -121,8 +123,8 @@ V1.10 + V1.11 (12/14/2017)
     <Value bitmask="255" genre="config" index="48" label="Enable/disable to send a report on Threshold" size="1" type="bitset" units="" value="0">
       <Help>
 			Enable/disable to send a report when the measurement is more than the upper limit value or less than the lower limit value.
-			Note: 
-			If USB power, the Sensor will check the limit every 10 seconds. If battery power, the Sensor will check the limit when it is waken up. 
+			Note:
+			If USB power, the Sensor will check the limit every 10 seconds. If battery power, the Sensor will check the limit when it is waken up.
 			</Help>
       <Help lang="fr">French Help</Help>
       <Label lang="fr">Enable/disable to send a report on Threshold-fr</Label>
@@ -175,26 +177,24 @@ V1.10 + V1.11 (12/14/2017)
         <Help lang="fr">Upper Ultraviolet Threshold-fr</Help>
       </BitSet>
     </Value>
-    <Value genre="config" index="49" label="Set the upper limit value of temperature sensor" type="int" value="71681">
+    <Value genre="config" index="49" label="Set the upper limit value of temperature sensor" type="int" size="4" value="18350336">
       <Help>
 			When the measurement is more than this upper limit, which will trigger to sent out a sensor report.
-			High byte is the upper limit value. Low byte is the unit (0x01=Celsius, 0x02=Fahrenheit).
-			1. When unit is Celsius.
-			Upper limit range: -40.0 to 100.0 C (0xFE70 to 0x03E8).
+			High two bytes is the upper limit value. Low two (firmware 1.10 and up) or single (older firmware) bytes is the unit (0x0100=Celsius, 0x0200=Fahrenheit).
+			1. When unit is Celsius, upper limit rang is from: -40.0 to 100.0 C (0xFE70 to 0x03E8).
 			E.g. The default upper limit of EU/AU version is 28.0 C (0x0118), when the measurement is more than 28.0C, it will be triggered to send out a temperature sensor report.
-			2. When unit is Fahrenheit.
-			Upper limit range: -40.0 to 212.0 F (0xFE70 to 0x0848).
+			2. When unit is Fahrenheit, upper limit range: -40.0 to 212.0 F (0xFE70 to 0x0848).
 			E.g. The default upper limit of US version is 82.4F (0X0338), when the measurement is more than 82.4F, it will be triggered to send out a temperature sensor report.
 			</Help>
     </Value>
-    <Value genre="config" index="50" label="Set the lower limit value of temperature sensor" type="int" value="1">
+    <Value genre="config" index="50" label="Set the lower limit value of temperature sensor" type="int" size="4" value="256">
       <Help>
 			When the measurement is less than this lower limit, which will trigger to sent out a sensor report.
-			High byte is the lower limit value. Low byte is the unit (0x01=Celsius, 0x02=Fahrenheit).
+			High two bytes is the lower limit value. Low two (firmware 1.10 and up) or single (older firmware) bytes is the unit (0x0100=Celsius, 0x0200=Fahrenheit).
 			1. When unit is Celsius.
 			Lower limit range: -40.0 to 100.0 C (0xFE70 to 0x03E8).
 			E.g. The default lower limit of EU/AU version is 0 C (0x0000), when the measurement is less than 0C, it will be triggered to send out a temperature sensor report.
-			2. When unit is Fahrenheit. 
+			2. When unit is Fahrenheit.
 			Upper limit range: -40.0 to 212.0 F (0xFE70 to 0x0848).
 			E.g. The default lower limit of US version is 32.0F (0x0140), when the measurement is less than 32.0F, it will be triggered to send out a temperature sensor report.
 			</Help>
@@ -203,35 +203,35 @@ V1.10 + V1.11 (12/14/2017)
       <Help>
 			When the measurement is more than this upper limit, which will trigger to sent out a sensor report.
 			Upper limit range: 0 to 100%.
-			E.g. The default upper limit is 60%, when the measurement is more than 60%, it will be triggered to send out a humidity sensor report. 
+			E.g. The default upper limit is 60%, when the measurement is more than 60%, it will be triggered to send out a humidity sensor report.
 			</Help>
     </Value>
     <Value genre="config" index="52" label="Set the lower limit value of humidity sensor" max="100" min="0" type="byte" units="%" value="50">
       <Help>
 			When the measurement is less than this lower limit, which will trigger to sent out a sensor report.
 			Lower limit range: 0 to 100%.
-			E.g. The default lower limit is 50%, when the measurement is less than 50%, it will be triggered to send out a humidity sensor report. 
+			E.g. The default lower limit is 50%, when the measurement is less than 50%, it will be triggered to send out a humidity sensor report.
 			</Help>
     </Value>
     <Value genre="config" index="53" label="Set the upper limit value of Lighting sensor" max="30000" min="0" type="short" units="lux" value="1000">
       <Help>
 			When the measurement is more than this upper limit, which will trigger to sent out a sensor report.
 			Upper limit range: 0 to 30000 Lux.
-			E.g. The default upper limit is 1000Lux, when the measurement is more than 1000Lux, it will be triggered to send out a Lighting sensor report. 
+			E.g. The default upper limit is 1000Lux, when the measurement is more than 1000Lux, it will be triggered to send out a Lighting sensor report.
 			</Help>
     </Value>
     <Value genre="config" index="54" label="Set the lower limit value of Lighting sensor" max="30000" min="0" type="short" units="lux" value="100">
       <Help>
 			When the measurement is less than this lower limit, which will trigger to sent out a sensor report.
 			Lower limit range: 0 to 30000 Lux.
-			E.g. The default lower limit is 100Lux, when the measurement is less than 100Lux, it will be triggered to send out a Lighting sensor report. 			
+			E.g. The default lower limit is 100Lux, when the measurement is less than 100Lux, it will be triggered to send out a Lighting sensor report.
 			</Help>
     </Value>
     <Value genre="config" index="55" label="Set the upper limit value of ultraviolet sensor" max="11" min="1" type="byte" units="UV" value="8">
       <Help>
 			 When the measurement is more than this upper limit, which will trigger to sent out a sensor report.
 			 Upper limit range: 1 to 11.
-			 E.g. The default upper limit is 8, when the measurement is more than 8, it will be triggered to send out a ultraviolet sensor report. 
+			 E.g. The default upper limit is 8, when the measurement is more than 8, it will be triggered to send out a ultraviolet sensor report.
 			</Help>
     </Value>
     <Value genre="config" index="56" label="Set the lower limit value of ultraviolet sensor" max="11" min="1" type="byte" units="UV" value="4">
@@ -244,9 +244,9 @@ V1.10 + V1.11 (12/14/2017)
     <Value genre="config" index="57" label="Set the recover limit value of temperature sensor" type="short" value="5121">
       <Help>
 			Note:
-			1. When the current measurement lower or equal (Upper limit - Recover limit), the upper limit report is enabled and then it would send out a sensor report when the next measurement is more than the upper limit. 
+			1. When the current measurement lower or equal (Upper limit - Recover limit), the upper limit report is enabled and then it would send out a sensor report when the next measurement is more than the upper limit.
 			After that, the upper limit report would be disabled again until the measurement lower or equal (Upper limit - Recover limit).
-			2. When the current measurement greater or equal (Lower limit + Recover limit), the lower limit report is enabled and then it would send out a sensor report when the next measurement is less than the lower limit. 
+			2. When the current measurement greater or equal (Lower limit + Recover limit), the lower limit report is enabled and then it would send out a sensor report when the next measurement is less than the lower limit.
 			After that, the lower limit report would be disabled again until the measurement greater or equal (Lower limit + Recover limit).
 			3. High byte is the recover limit value. Low byte is the unit (0x01=Celsius, 0x02=Fahrenheit).
 			4. Recover limit range: 1.0 to 25.5 C/ F (0x0101 to 0xFF01 or 0x0102 to 0xFF02).
@@ -256,20 +256,20 @@ V1.10 + V1.11 (12/14/2017)
     <Value genre="config" index="58" label="Set the recover limit value of humidity sensor" max="255" min="1" type="byte" units="%" value="5">
       <Help>
 			 Note:
-			1. When the current measurement lower or equal (Upper limit - Recover limit), the upper limit report is enabled and then it would send out a sensor report when the next measurement is more than the upper limit. 
+			1. When the current measurement lower or equal (Upper limit - Recover limit), the upper limit report is enabled and then it would send out a sensor report when the next measurement is more than the upper limit.
 			After that the upper limit report would be disabled again until the measurement lower or equal (Upper limit - Recover limit).
-			2. When the current measurement greater or equal (Lower limit + Recover limit), the lower limit report is enabled and then it would send out a sensor report when the next measurement is less than the lower limit. 
+			2. When the current measurement greater or equal (Lower limit + Recover limit), the lower limit report is enabled and then it would send out a sensor report when the next measurement is less than the lower limit.
 			After that the lower limit report would be disabled again until the measurement greater or equal(Lower limit + Recover limit).
 			3. Recover limit range: 1 to 50% (0x01 to 0x32).
-			E.g. The default recover limit value is 5%, when the measurement is less than (Upper limit - 5), the upper limit report would be enabled one time or when the measurement is more than (Lower limit + 5), the lower limit report would be enabled one time. 
+			E.g. The default recover limit value is 5%, when the measurement is less than (Upper limit - 5), the upper limit report would be enabled one time or when the measurement is more than (Lower limit + 5), the lower limit report would be enabled one time.
 			</Help>
     </Value>
     <Value genre="config" index="59" label="Set the recover limit value of Lighting sensor" max="255" min="1" type="byte" units="10xlux" value="10">
       <Help>
 			Note:
-			1. When the current measurement lower or equal (Upper limit - Recover limit), the upper limit report is enabled and then it would send out a sensor report when the next measurement is more than the upper limit. 
+			1. When the current measurement lower or equal (Upper limit - Recover limit), the upper limit report is enabled and then it would send out a sensor report when the next measurement is more than the upper limit.
 			After that the upper limit report would be disabled again until the measurement lower or equal (Upper limit - Recover limit).
-			2. When the current measurement greater or equal (Lower limit + Recover limit), the lower limit report is enabled and then it would send out a sensor report when the next measurement is less than the lower limit. 
+			2. When the current measurement greater or equal (Lower limit + Recover limit), the lower limit report is enabled and then it would send out a sensor report when the next measurement is less than the lower limit.
 			After that the lower limit report would be disabled again until the measurement greater or equal (Lower limit + Recover limit).
 			3. Unit = 10*Recover limit (Lux)
 			4. Recover limit range: 10 to 2550Lux (0x01 to 0xFF).
@@ -279,12 +279,12 @@ V1.10 + V1.11 (12/14/2017)
     <Value genre="config" index="60" label="Set the recover limit value of Ultraviolet sensor" max="5" min="1" type="byte" units="UV" value="2">
       <Help>
 			 Note:
-			1. When the current measurement lower or equal (Upper limit - Recover limit), the upper limit report is enabled and then it would send out a sensor report when the next measurement is more than the upper limit. 
+			1. When the current measurement lower or equal (Upper limit - Recover limit), the upper limit report is enabled and then it would send out a sensor report when the next measurement is more than the upper limit.
 			After that the upper limit report would be disabled again until the measurement lower or equal (Upper limit - Recover limit).
-			2. When the current measurement greater or equal (Lower limit + Recover limit), the lower limit report is enabled and then it would send out a sensor report when the next measurement is less than the lower limit. 
+			2. When the current measurement greater or equal (Lower limit + Recover limit), the lower limit report is enabled and then it would send out a sensor report when the next measurement is less than the lower limit.
 			After that the lower limit report would be disabled again until the measurement greater or equal(Lower limit + Recover limit).
 			3. Recover limit range: 1 to 50% (0x01 to 0x32).
-			E.g. The default recover limit value is 5%, when the measurement is less than (Upper limit - 5), the upper limit report would be enabled one time or when the measurement is more than (Lower limit + 5), the lower limit report would be enabled one time. 
+			E.g. The default recover limit value is 5%, when the measurement is less than (Upper limit - 5), the upper limit report would be enabled one time or when the measurement is more than (Lower limit + 5), the lower limit report would be enabled one time.
 			</Help>
     </Value>
     <Value genre="config" index="61" label="Get the out-of-limit state of the Sensors" max="255" min="0" read_only="true" type="byte" units="" value="0">
@@ -398,10 +398,10 @@ V1.10 + V1.11 (12/14/2017)
       <Help>Temperature calibration (the available value range is [-128,127] or [-12.8C,12.7C]).
 			Note:
 			1. High byte is the calibration value. Low byte is the unit (0x01=Celsius,0x02=Fahrenheit)
-			2. The calibration value (high byte) contains one decimal point. 
+			2. The calibration value (high byte) contains one decimal point.
 			E.g. if the value is set to 20 (0x1401), the calibration value is 2.0C (EU/AU version) or if the value is set to 20 (0x1402), the calibration value is 2.0F (US version)
-			3. The calibration value (high byte) = standard value - measure value. 
-			E.g. If measure value =25.3C and the standard value = 23.2C, so the calibration value= 23.2C - 25.3C= -2.1C (0xEB). 
+			3. The calibration value (high byte) = standard value - measure value.
+			E.g. If measure value =25.3C and the standard value = 23.2C, so the calibration value= 23.2C - 25.3C= -2.1C (0xEB).
 			If the measure value =30.1C and the standard value = 33.2C, so the calibration value= 33.2C - 30.1C=3.1C (0x1F).
 			Default value: 1 for EU/AU version, 2 for US version.
 			</Help>
@@ -410,21 +410,21 @@ V1.10 + V1.11 (12/14/2017)
       <Help>The calibration value = standard value - measure value.
 			(the available value range is [-50, 50]).
 			If measure value =80RH and the standard value = 75RH, so the calibration value= 75RH-80RH = -5RH (0xFB).
-			If the measure value =85RH and the standard value = 90RH, so the calibration value= 90RH-85RH = 5RH (0x05).  
+			If the measure value =85RH and the standard value = 90RH, so the calibration value= 90RH-85RH = 5RH (0x05).
 			</Help>
     </Value>
     <Value genre="config" index="203" label="Luminance Calibration" max="65535" min="0" type="short" value="0">
-      <Help>The calibration value = standard value - measure value. 
+      <Help>The calibration value = standard value - measure value.
 			(the available value range is [-1000, 1000]).
-			If measure value =800Lux and the standard value = 750Lux, so the calibration value= 750-800 = -50 (0xFFCE). 
-			If the measure value =850Lux and the standard value = 900Lux, so the calibration value= 900-850 = 50 (0x0032). 
+			If measure value =800Lux and the standard value = 750Lux, so the calibration value= 750-800 = -50 (0xFFCE).
+			If the measure value =850Lux and the standard value = 900Lux, so the calibration value= 900-850 = 50 (0x0032).
 			</Help>
     </Value>
     <Value genre="config" index="204" label="Ultraviolet Calibration" max="255" min="0" type="byte" value="0">
-      <Help>The calibration value = standard value measure value. 
+      <Help>The calibration value = standard value measure value.
 			(the available value range is [-10, 10]).
-			If measure value =9 and the standard value = 8, so the calibration value= 8-9 = -1 (0xFE). 
-			If the measure value =7 and the standard value = 9, so the calibration value= 9-7 = 2 (0x02).  
+			If measure value =9 and the standard value = 8, so the calibration value= 8-9 = -1 (0xFE).
+			If the measure value =7 and the standard value = 9, so the calibration value= 9-7 = 2 (0x02).
 			</Help>
     </Value>
     <Value genre="config" index="252" label="Enable/disable Lock Configuration" max="1" min="0" size="1" type="list" units="" value="0">
diff --git a/config/aeotec/zw111.xml b/config/aeotec/zw111.xml
index ee9bddcf..29e43523 100644
--- a/config/aeotec/zw111.xml
+++ b/config/aeotec/zw111.xml
@@ -2,7 +2,7 @@
 Aeotec ZW111 Nano Dimmer, base on Engineering Spec 3/6/2018 V2.02
 Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
 https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
---><Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0086:006F:0103</MetaDataItem>
     <MetaDataItem name="ProductPic">images/aeotec/zw111.png</MetaDataItem>
@@ -21,6 +21,8 @@ The Nano Dimmer is also a security Z-Wave plus device and supports Over The Air
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2095/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2135/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2149/xml</Entry>
+      <Entry author="Matej Drobnič - matejdro@gmail.com" date="27 Dec 2020" revision="7">Enable Basic command class</Entry>
+      <Entry author="Jean-François Auger - nechry@gmail.com" date="06 Jan 2021" revision="8">Revert 2517</Entry>
     </ChangeLog>
     <MetaDataItem id="006F" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2135/</MetaDataItem>
     <MetaDataItem id="006F" name="Identifier" type="0003">ZW111-C</MetaDataItem>
diff --git a/config/aeotec/zw116.xml b/config/aeotec/zw116.xml
index 6728ec4b..34399a53 100644
--- a/config/aeotec/zw116.xml
+++ b/config/aeotec/zw116.xml
@@ -1,7 +1,7 @@
 <!--
 Aeotec ZW116 Nano Switch, base on Engineering Spec 03/19/2018 V2.0
 Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D 
---><Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0086:0074:0103</MetaDataItem>
     <MetaDataItem name="ProductPic">images/aeotec/zw116.png</MetaDataItem>
@@ -20,6 +20,8 @@ The Nano Switch is also a security Z-Wave device and supports Over The Air (OTA)
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2208/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2288/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2289/xml</Entry>
+      <Entry author="Matej Drobnič - matejdro@gmail.com" date="27 Dec 2020" revision="7">Enable Basic command class</Entry>
+      <Entry author="Jean-François Auger - nechry@gmail.com" date="06 Jan 2021" revision="8">Revert 2517</Entry>
     </ChangeLog>
     <MetaDataItem id="0074" name="ZWProductPage" type="0203">https://products.z-wavealliance.org/products/2288/</MetaDataItem>
     <MetaDataItem id="0074" name="Identifier" type="0203">ZW116-B</MetaDataItem>
diff --git a/config/aeotec/zw132.xml b/config/aeotec/zw132.xml
index 35008e25..56ec3710 100644
--- a/config/aeotec/zw132.xml
+++ b/config/aeotec/zw132.xml
@@ -1,7 +1,7 @@
 <!--
 Aeotec ZW132 Dual Nano Switch, base on Engineering Spec 03/19/2018 V2.0
 Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D 
---><Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="7" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0086:0084:0103</MetaDataItem>
     <MetaDataItem name="ProductPic">images/aeotec/zw132.png</MetaDataItem>
@@ -20,6 +20,8 @@ The Dual Nano Switch is also a security Z-Wave device and supports Over The Air
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2136/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2150/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2151/xml</Entry>
+      <Entry author="Matej Drobnič - matejdro@gmail.com" date="27 Dec 2020" revision="6">Enable Basic command class</Entry>
+      <Entry author="Jean-François Auger - nechry@gmail.com" date="06 Jan 2021" revision="7">Revert 2517</Entry>
     </ChangeLog>
     <MetaDataItem id="0084" name="ZWProductPage" type="0203">https://products.z-wavealliance.org/products/2150/</MetaDataItem>
     <MetaDataItem id="0084" name="Identifier" type="0203">ZW132-B</MetaDataItem>
diff --git a/config/aeotec/zw141.xml b/config/aeotec/zw141.xml
index e4083d22..90c022bb 100644
--- a/config/aeotec/zw141.xml
+++ b/config/aeotec/zw141.xml
@@ -3,7 +3,7 @@ Aeotec ZW141 Nano Shutter, based on Engineering Spec 8/22/2019
 Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
 
 -->
-<Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0086:008D:0103</MetaDataItem>
     <MetaDataItem name="ProductPic">images/aeotec/zw141.png</MetaDataItem>
@@ -41,6 +41,8 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2953/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3075/xml</Entry>
       <Entry author="Duy Nguyen - dooz127@gmail.com" date="16 Feb 2020" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/3693/XML</Entry>	    
+      <Entry author="Matej Drobnič - matejdro@gmail.com" date="02 Oct 2020" revision="7">Fixed timing types, Fixed button list types</Entry>	 
+      <Entry author="Jean-François Auger - nechry@gmail.com" date="14 Apr 2021" revision="8">Add missing list item for param 22</Entry>	
     </ChangeLog>
     <MetaDataItem id="008D" name="FrequencyName" type="0103">U.S. / Canada / Mexico</MetaDataItem>
     <MetaDataItem id="008D" name="Identifier" type="0103">ZW141-A</MetaDataItem>
@@ -55,23 +57,29 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
       <Item label="Move to 99%" value="1" />
       <Item label="Move to 0%" value="2" />
     </Value>	
-    <Value genre="config" index="22" label="Motor direction" size="1" type="list" units="" value="2">
+    <Value genre="config" index="22" label="Motor direction" size="1" type="list" value="0">
       <Help>Set to toggle the motor running direction</Help>
+      <Item label="Shutter/Venetian: Out 1= Up, Out 2= Down" value="0" />
+      <Item label="Shutter: Out 1= Down, Out 2= Up. Venetian: Out 1= Up, Out 2= Down" value="1" />
+      <Item label="Shutter: Out 1= Up, Out 2= Down. Venetian: Out 1= Down, Out 2= Up" value="2" />
+      <Item label="Shutter/Venetian: Out 1= Down, Out 2= Up" value="3" />      
     </Value>
-    <Value genre="config" index="34" label="Blade turn time" size="2" max="32767" min="10" type="decimal" units="0.01 seconds" value="150">
+    <Value genre="config" index="34" label="Blade turn time" size="2" max="32767" min="10" type="short" units="0.01 seconds" value="150">
       <Help>Set the blade turn time for Venetian mode. Details can be found in section 4.2 of Advanced information Product Manual.</Help>
     </Value>
-    <Value genre="config" index="35" label="Curtain trip time" size="2" max="32767" min="500" type="decimal" units="0.01 seconds" value="15000">
+    <Value genre="config" index="35" label="Curtain trip time" size="2" max="32767" min="500" type="short" units="0.01 seconds" value="15000">
       <Help>Set the run time of the curtain. Details can be found in section 4.2 of Advanced information Product Manual.</Help>
     </Value>
     <Value genre="config" index="36" label="Enter/exit calibration mode" size="1" type="list" units="" value="0" write_only="true"> 
       <Help>Set to enter/exit calibration mode</Help>
-      <Item label="Set: Exit calibration mode/Report: Not in calibration mode" value="0" />
-      <Item label="Set: Enter shutter mode calibration/Report: in shutter mode calibration" value="1" />
-      <Item label="Set: Enter Venetian mode calibration/Report: in Venetian mode calibration" value="2" />
+      <Item label="Exit calibration mode/Report: Not in calibration mode" value="0" />
+      <Item label="Enter shutter mode calibration/Report: in shutter mode calibration" value="1" />
+      <Item label="Enter Venetian mode calibration/Report: in Venetian mode calibration" value="2" />
     </Value>
     <Value genre="config" index="37" label="User confirmation for calibration" size="1" type="list" units="" value="0" write_only="true">
       <Help>Set user confirmation for calibration</Help>
+      <Item label="Default" value="0" />
+      <Item label="Confirm calibration" value="1" />
     </Value>
     <Value genre="config" index="38" label="Calibration mode status report" size="1" type="list" units="" value="0" read_only="true">
       <Help>Get calibration mode status report</Help>
@@ -89,6 +97,8 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
     </Value>
     <Value genre="config" index="40" label="Repositioning" size="1" type="list" units="" value="1" write_only="true">
       <Help>Set to begin repositioning</Help>
+      <Item label="Default" value="0" />
+      <Item label="In repositioning" value="1" />
     </Value>		
     <Value genre="config" index="41" label="Repositioning status report" size="1" type="list" units="" value="0" read_only="true">
       <Help>Get repositioning status report</Help>
diff --git a/config/aeotec/zwa002.xml b/config/aeotec/zwa002.xml
index cf3cc67c..9a0781e8 100644
--- a/config/aeotec/zwa002.xml
+++ b/config/aeotec/zwa002.xml
@@ -1,7 +1,7 @@
 <!-- 
 ZWA002 LED Bulb 6 Multi-Color
 https://products.z-wavealliance.org/products/2881
---><Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0371:0002:0103</MetaDataItem>
     <MetaDataItem name="ProductPic">images/aeotec/zwa002.png</MetaDataItem>
@@ -44,6 +44,7 @@ Blinks between 100% White and Blue 0x0000FF color for 3 seconds (at a rate of 20
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2880/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="3">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2881/xml</Entry>
+      <Entry author="Justin Hammond" date="02 July 2020" revision="4">Add Verified Change Flag to Color CC</Entry>
     </ChangeLog>
     <MetaDataItem id="0002" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2881/</MetaDataItem>
     <MetaDataItem id="0002" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
@@ -94,6 +95,11 @@ Blinks between 100% White and Blue 0x0000FF color for 3 seconds (at a rate of 20
 			</Help>
     </Value>
   </CommandClass>
+  <CommandClass id="51">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
+  </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
     <Associations num_groups="1">
diff --git a/config/aeotec/zwa009.xml b/config/aeotec/zwa009.xml
new file mode 100644
index 00000000..729e6e6d
--- /dev/null
+++ b/config/aeotec/zwa009.xml
@@ -0,0 +1,119 @@
+<!-- ZWA009 AërQ Temperature & Humidity Sensor -->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0371:0002:0009</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/aeotec/zwa009.png</MetaDataItem>
+    <!-- <MetaDataItem id="0002" name="ZWProductPage" type="0009">https://products.z-wavealliance.org/products/3872/</MetaDataItem> -->
+    <MetaDataItem name="Name">Water Sensor 7 Pro</MetaDataItem>
+    <MetaDataItem id="0002" name="FrequencyName" type="0009">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="0002" name="Identifier" type="0009">ZWA009-C</MetaDataItem>
+    <MetaDataItem name="Description">This device measures the three air quality parameters temperature, humidity and dew point and reports them to a central controller. 
+      Besides this, the device can directly control groups of other Z-Wave devices on over- and undershooting a set temperature and/or humidity parameter. 
+      This can be used to establish control loops for temperature and humidity. 
+      The device wakes up every 15 minutes to measure the values and it will send unsolicited reports when values change. 
+      Additionally, the device will report all values on request.
+      The AërQ Sensor is actively monitoring the danger of mould in a room based on the temperature and humidity and will issue alarm warnings when critical air conditions met. 
+      Wireless Alarm and red and a green blinking LED will indicate a mould condition. 
+      This local LED warning function is also available when the device is not included in any Z-Wave network and works stand alone.
+    </MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Press the button once</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Insert the battery.
+      2. Press the button quickly three times in a row.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Press the button quickly three times in a row.
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Keep the button pressed for 10 seconds. Then the green LED will start blinking. 
+    Release the button, when the LED stops blinking. Your device is reset to factory default now.
+    </MetaDataItem>
+    <MetaDataItem name="ProductManual">https://aeotec.freshdesk.com/support/solutions/folders/6000236759</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://aeotec.freshdesk.com/support/solutions/folders/6000236759</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond" date="06 July 2020" revision="1">Initial Config File</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Basic set as report -->
+  <CommandClass id="32">
+    <Compatibility>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Minimum Temperature change to report" max="100" min="0" size="1" type="byte" value="20">
+      <Help>This value defines the minimum change of temperature to cause an unsolicited report of humidity to the central controller using Lifeline. 
+      If the value is set to 0, there will be no reports sent to the controller, when the temperature changes. 
+      However, periodic reports, managed by configuration parameter 4, may still be active.
+      </Help>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Minimum humidity change to report" max="20" min="0" size="1" type="byte" value="5">
+      <Help>This value defines the minimum change of humidity to cause an unsolicited report of humidity to the central controller using Lifeline. 
+      If the value is set to 0, there will be no reports sent to the controller, when the humidity changes. 
+      However, periodic reports, managed by configuration parameter 4, may still be active.
+      </Help>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Periodic Reports" max="65535" min="0" size="2" type="short" units="seconds" value="43200">
+      <Help>This parameter defines the time interval to send an unsolicited report. 
+      If the value is set to 0, there will be no periodic reports sent to the controller. 
+      However, reports on temperature/humidity changes, managed by configuration parameters 1 and 2, may still be active.
+      </Help>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="Temperature Upper Watermark value" max="1000" min="0" size="2" type="short" units="1/10 degree" value="0">
+      <Help>This parameter defines a temperature. 
+      If the measured temperature surpasses this watermark a BASIC command is sent into Association Group 2
+      </Help>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Temperature Lower Watermark value" max="1000" min="0" size="2" type="short" units="1/10 degree" value="0">
+      <Help>This parameter defines a temperature. 
+      If the measured temperature dropps below this watermark a BASIC command is sent into Association Group 3
+      </Help>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Humidity Upper Watermark value" max="90" min="0" size="1" type="byte" units="%" value="0">
+      <Help>This parameter defines a relative humidity. 
+      If the measured relative humidity surpasses this watermark a BASIC command is sent into Association Group 4
+      </Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="Humidity Lower Watermark value" max="90" min="0" size="1" type="byte" units="%" value="0">
+      <Help>This parameter defines a relative humidity. 
+      If the measured temperature drops below this relative humidity a BASIC command is sent into Association Group 5
+      </Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Low Temperature Trigger BASIC Set Command Value" max="255" min="0" size="1" type="byte" value="0">
+      <Help>This defines what BASIC command shall be sent out into association group 3
+      </Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="High Temperature Trigger BASIC Set Command Value" max="255" min="0" size="1" type="byte" value="0">
+      <Help>This defines what BASIC command shall be sent out into association group 2
+      </Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Low Humidity Trigger BASIC Set Command Value" max="255" min="0" size="1" type="byte" value="0">
+      <Help>This defines what BASIC command shall be sent out into association group 5
+      </Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="High Humidity Trigger BASIC Set Command Value" max="255" min="0" size="1" type="byte" value="0">
+      <Help>This defines what BASIC command shall be sent out into association group 4
+      </Help>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Offset value for Mould danger notification" max="10" min="0" size="1" type="byte" value="0">
+      <Help>This value allows to increase the humidity threshold for mould danger notification by max 10%
+      </Help>
+    </Value>
+    <Value genre="config" index="255" instance="1" label="Reset Parameter" max="14294967295" min="0" size="4" type="int" write_only="true" value="0">
+      <Help>This parameter helps reset configuration parameters and the device to factory defaults
+      </Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Reset all Parameter settings to their default settings" value="4294967294"/>
+      <Item label="Completely factory reset sensor and send device reset locally notification" value="4294967295"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="6">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="High Temperature Notification" max_associations="5"/>
+      <Group index="3" label="Low Temperature Notification" max_associations="5"/>
+      <Group index="4" label="High Humidity Notification" max_associations="5"/>
+      <Group index="5" label="Low Humidity Notification" max_associations="5"/>
+      <Group index="6" label="Air Temperature" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/aeotec/zwa011.xml b/config/aeotec/zwa011.xml
new file mode 100644
index 00000000..cae441bd
--- /dev/null
+++ b/config/aeotec/zwa011.xml
@@ -0,0 +1,157 @@
+<!-- ZWA008 Door Window Sensor 7 -->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0371:000B:0002</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/aeotec/zwa011.png</MetaDataItem>
+    <MetaDataItem id="000B" name="ZWProductPage" type="0002">https://products.z-wavealliance.org/products/3866/</MetaDataItem>
+    <MetaDataItem name="Name">Door / Window Sensor 7</MetaDataItem>
+    <MetaDataItem id="000B" name="FrequencyName" type="0002">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="000B" name="Identifier" type="0002">ZWA011-C</MetaDataItem>
+    <MetaDataItem name="Description">Aeotec Door/ Window Sensor 7 is built on the 700 series Z-Wave technology. 
+      Its a small window position sensor for your smart home, it monitors window and their exact opening position and lets your know when a window is tilted or completely opened. 
+      It also supports connecting external binary sensors with a dry contact through the dry binary contact of the Door/ Window sensor. 
+      Using the latest technology it supports the highest Z-Wave security level of S2 and SmartStart. 
+    </MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Press the tamper once</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Open the housing.
+      2. Remove the battery protection.
+      3. Press the tamper on the side of the appliance three times quickly.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Open the housing.
+      2. Press the tamper on the side of the appliance three times quickly.
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset to factory default
+      This device also allows to be reset without any involvement of a Z-Wave controller. This procedure should only be used when the primary controller is inoperable.
+      Once Cover is removed and the tamper switch is tripped, push the tamper for 5 seconds until the RED LED
+      blinks once. Then release tamper and push it again for 5 seconds while the RED LED is blinking until the
+      GREEN LED blinks once.
+    </MetaDataItem>
+    <MetaDataItem name="ProductManual">https://aeotec.freshdesk.com/support/solutions/folders/6000237099</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://aeotec.freshdesk.com/support/solutions/folders/6000237099</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond" date="06 July 2020" revision="1">Initial Config File taken from ZWA012</Entry>
+      <Entry author="GizMoCuz" date="13 April 2021" revision="1">Initial Config File taken from https://help.aeotec.com/support/solutions/articles/6000218764-door-windows-sensor-7-user-guide</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Basic set as report -->
+  <CommandClass id="32">
+    <Compatibility>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Operation mode" max="1" min="0" size="1" type="list" value="0">
+      <Help>Parameter defines device operation mode.</Help>
+      <Item label="Built-in hall sensor" value="0"/>
+      <Item label="External Input" value="1"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Door/Window or alarm status" max="1" min="0" size="1" type="list" value="0">
+      <Help>
+                Parameter defines state of the sensor when the magnet is close.
+                If the alarm sensor is connected, it determines the output type.
+                Parameter inactive in external button mode (parameter Operation Mode set to 1).
+            </Help>
+      <Item label="Closed" value="0"/>
+      <Item label="Opened" value="1"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Visual LED indications" max="7" min="0" size="1" type="byte" value="7">
+      <Help>
+                This parameter defines events indicated by the visual LED indicator. Disabling events might extend battery life.
+                Values of parameters may be combined, e.g. 1+2=3 means opening/closing and wake up will be indicated by the visual indicator.
+                0 - No indications.
+                1 - Indication of opening/closing status change (input In).
+                2 - Indication of wake up (1 x click or periodical).
+                4 - Indication of device tampering.
+            </Help>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Range test after double click" max="1" min="0" size="1" type="list" value="0">
+      <Help>
+                Allows to enable activation of Z-Wave range test with double click of a Tamper Switch 2.
+            </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="2nd Association Group triggers" max="1" min="0" size="1" type="list" value="0">
+      <Help>
+                Parameter defines events which result in sending On/Off commands to devices added to the 2nd Association Group.
+                These commands are sent alternately to switch the devices On and Off.
+                Commands represent the values of BASIC SET command frames.
+                Parameter is inactive in external dry-contact mode (parameter Operation Mode set to 1).
+            </Help>
+      <Item label="Switch after opening and closing" value="0"/>
+      <Item label="Switch after opening" value="1"/>
+      <Item label="Switch after closing" value="2"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Commands sent to 2nd Association Group" max="1" min="0" size="1" type="list" value="2">
+      <Help>
+                Command frames sent to devices added to the 2nd association group.
+            </Help>
+      <Item label="On" value="0"/>
+      <Item label="Off" value="1"/>
+      <Item label="On and Off" value="2"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Value of ON command frame sent to 2nd Association Group" max="255" min="0" size="1" type="byte" value="255">
+      <Help>
+                The value of 0 turns OFF the device, 255 turns it On.
+                In case of associating the Dimmer or Roller Shutter module, values 1-99 allow to set an Associated device to a specified level.
+            </Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="Value of OFF command frame sent to 2nd Association Group" max="255" min="0" size="1" type="byte" value="0">
+      <Help>
+                The value of 0 turns OFF the device, 255 turns it On.
+                In case of associating the Dimmer or Roller Shutter module, values 1-99 allow to set an Associated device to a specified level.
+            </Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Time delay of ON command frame" max="32400" min="0" size="2" type="short" units="seconds" value="0">
+      <Help>
+                Time period after which On command frame will be sent.
+            </Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Time delay of OFF command frame" max="32400" min="0" size="2" type="short" units="seconds" value="0">
+      <Help>
+                Time period after which Off command frame will be sent.
+            </Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Delay of tamper alarm cancellation" max="32400" min="0" size="2" type="short" units="seconds" value="5">
+      <Help>
+                Time period after which a tamper alarm will be cancelled.
+            </Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Reporting tamper alarm cancellation" max="1" min="0" size="1" type="list" value="1">
+      <Help>
+                Reporting cancellation of tamper alarm to the controller and 5th Association Group.
+            </Help>
+      <Item label="Do not send tamper cancellation report" value="0"/>
+      <Item label="Send tamper cancellation report" value="1"/>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Scene activation functionality" max="1" min="0" size="1" type="list" value="0">
+      <Help>
+                The device can trigger scenes via Dry Input Terminal (external contact) using scene IDs assigned to different events.
+            </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="Tilt Sensor functionality" max="1" min="0" size="1" type="list" value="1">
+      <Help>
+                The device can report Tilt Window events.
+                This functionality can be disabled if the device is mounted on a door or windows without tilt functionality.To disable tilt detection set the value to 0.
+            </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="15" instance="1" label="Tilt sensitivity" max="100" min="0" size="1" type="byte" units="" value="50">
+      <Help>You can use this parameter to adjust the tilt sensitivity if the tilt is too low or too high.
+      </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Control" max_associations="5"/>
+      <Group index="3" label="Alarm sensor" max_associations="5"/>
+      <Group index="4" label="Alarm tamper" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/aeotec/zwa012.xml b/config/aeotec/zwa012.xml
new file mode 100644
index 00000000..6e722635
--- /dev/null
+++ b/config/aeotec/zwa012.xml
@@ -0,0 +1,151 @@
+<!-- ZWA012 Door Window Sensor 7 Pro -->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0371:0002:000C</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/aeotec/zwa012.png</MetaDataItem>
+    <MetaDataItem id="0002" name="ZWProductPage" type="000C">https://products.z-wavealliance.org/products/3866/</MetaDataItem>
+    <MetaDataItem name="Name">Door / Window Sensor 7 Pro</MetaDataItem>
+    <MetaDataItem id="0002" name="FrequencyName" type="000C">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="0002" name="Identifier" type="000C">ZWA012-C</MetaDataItem>
+    <MetaDataItem name="Description">Aeotec Door/ Window Sensor 7 Pro is built on the 700 series Z-Wave technology. 
+      Its a small window position sensor for your smart home, it monitors window and their exact opening position and lets your know when a window is tilted or completely opened. 
+      It also supports connecting external binary sensors with a dry contact through the dry binary contact of the Door/ Window sensor. 
+      Using the latest technology it supports the highest Z-Wave security level of S2 and SmartStart. 
+    </MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Press the tamper once</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Open the housing.
+      2. Remove the battery protection.
+      3. Press the tamper on the side of the appliance three times quickly.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Open the housing.
+      2. Press the tamper on the side of the appliance three times quickly.
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset to factory default
+      This device also allows to be reset without any involvement of a Z-Wave controller. This procedure should only be used when the primary controller is inoperable.
+      Once Cover is removed and the tamper switch is tripped, push the tamper for 5 seconds until the RED LED
+      blinks once. Then release tamper and push it again for 5 seconds while the RED LED is blinking until the
+      GREEN LED blinks once.
+    </MetaDataItem>
+    <MetaDataItem name="ProductManual">https://aeotec.freshdesk.com/support/solutions/folders/6000237099</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://aeotec.freshdesk.com/support/solutions/folders/6000237099</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond" date="06 July 2020" revision="1">Initial Config File</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Basic set as report -->
+  <CommandClass id="32">
+    <Compatibility>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Sensor Operation Mode" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter defines if the internal magnet sensor or the external terminal input is detected and used to issue alarm notification. 
+      There is always one input active only. 
+      The other sensor input the deactivated.
+      </Help>
+      <Item label="Internal Magnet Sensor Used" value="0"/>
+      <Item label="External Terminal Inputs Used" value="1"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Sensor State Polarity" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter defines the polarity of the magnet sensor.
+      </Help>
+      <Item label="Closed when Magnet in proximity" value="0"/>
+      <Item label="Opened when Magnet in proximity" value="1"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Visual LED indications" max="7" min="0" size="1" type="bitset" value="7" bitmask="23">
+      <Help>This parameter defines when the red LED will indicate events. Disabling all indications may extend battery life.
+      </Help>
+      <BitSet id="1">
+        <Label>No Indications</Label>
+        <Help>No Indications</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Open/Close Status Change</Label>
+        <Help>Open/Close Status Change</Help>
+      </BitSet>
+      <BitSet id="3">
+        <Label>Wake Up</Label>
+        <Help>Wake Up</Help>
+      </BitSet>
+      <BitSet id="5">
+        <Label>Device Tampering</Label>
+        <Help>Device Tampering</Help>
+      </BitSet>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Range test after double click" max="1" min="0" size="1" type="list" value="0">
+      <Help>Allows to enable activation of Z-Wave range test with double click of a Tamper Switch.
+      </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="2nd Association Group triggers" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter defines the status of the magnet switch that causes sending a BASIC command to all devices of Association Group 2.
+      </Help>
+      <Item label="Switch after opening and closing" value="0"/>
+      <Item label="Switch after opening" value="1"/>
+      <Item label="Switch after closing" value="2"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Commands sent to 2nd Association Group" max="1" min="0" size="1" type="list" value="2">
+      <Help>Command frames sent to devices added to the 2nd association group.
+      </Help>
+      <Item label="On" value="0"/>
+      <Item label="Off" value="1"/>
+      <Item label="On and Off" value="2"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="BASIC command value sent to 2nd Association Group on On event" max="255" min="0" size="1" type="byte" value="255">
+      <Help>The value of 0 turns OFF the device, 255 turns it On.
+            In case of associating the Dimmer or Roller Shutter module, values 1-99 allow to set an Associated device to a specified level.
+      </Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="BASIC command value sent to 2nd Association Group on Off event" max="255" min="0" size="1" type="byte" value="0">
+      <Help>The value of 0 turns OFF the device, 255 turns it On.
+            In case of associating the Dimmer or Roller Shutter module, values 1-99 allow to set an Associated device to a specified level.
+      </Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Time delay of ON command frame" max="32400" min="0" size="2" type="short" units="seconds" value="0">
+      <Help>Time period after which On command frame will be sent.
+      </Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Time delay of OFF command frame" max="32400" min="0" size="2" type="short" units="seconds" value="0">
+      <Help>Time period after which Off command frame will be sent.
+      </Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Delay of tamper alarm cancellation" max="32400" min="0" size="2" type="short" units="seconds" value="5">
+      <Help>Time period after which a tamper alarm will be cancelled.
+      </Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Reporting tamper alarm cancellation" max="1" min="0" size="1" type="list" value="1">
+      <Help>Reporting cancellation of tamper alarm to the controller and 5th Association Group.
+      </Help>
+      <Item label="Do not send tamper cancellation report" value="0"/>
+      <Item label="Send tamper cancellation report" value="1"/>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Scene activation functionality" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter enables/disables the central scene function.
+      </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="Tilt Sensor Functionality" max="1" min="0" size="1" type="list" value="1">
+      <Help>This parameter enables/disables the tilt function.
+      </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="15" instance="1" label="Tilt sensitivity" max="100" min="0" size="1" type="byte" units="" value="50">
+      <Help>You can use this parameter to adjust the tilt sensitivity if the tilt is too low or too high.
+      </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Control" max_associations="5"/>
+      <Group index="3" label="Alarm sensor" max_associations="5"/>
+      <Group index="4" label="Alarm tamper" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/aeotec/zwa019.xml b/config/aeotec/zwa019.xml
new file mode 100644
index 00000000..f9cda345
--- /dev/null
+++ b/config/aeotec/zwa019.xml
@@ -0,0 +1,136 @@
+<!-- ZWA019 Water Sensor 7 Pro -->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0371:0002:0013</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/aeotec/zwa019.png</MetaDataItem>
+    <MetaDataItem id="0002" name="ZWProductPage" type="0013">https://products.z-wavealliance.org/products/3872/</MetaDataItem>
+    <MetaDataItem name="Name">Water Sensor 7 Pro</MetaDataItem>
+    <MetaDataItem id="0002" name="FrequencyName" type="0013">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="0002" name="Identifier" type="0013">ZWA019-C</MetaDataItem>
+    <MetaDataItem name="Description">The Water Sensor 7 pro brings more safety into your home. 
+      With its flexible sensor probe and the sensitive sensor point it detects the presence and absence of water at any given location. 
+      Furthermore the Watersensor 7 pro is enabled to accurately measure the temperature and humidity of its environment, so you are always informed about your room climate.
+      Thanks to the latest Z-Wave 700 series technology, the Water Sensor 7 is distinguished with and increased range, S2 Security, OTA FW update and SmartStart.
+    </MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Press the tamper once</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Open the housing.
+      2. Remove the battery protection.
+      3. Press the tamper on the side of the appliance three times quickly.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Open the housing.
+      2. Press the tamper on the side of the appliance three times quickly.
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset to factory default
+      This device also allows to be reset without any involvement of a Z-Wave controller. This procedure should only be used when the primary controller is inoperable.
+      Once Cover is removed and the tamper switch is tripped, push the tamper for 5 seconds until the RED LED
+      blinks once. Then release tamper and push it again for 5 seconds while the RED LED is blinking until the
+      GREEN LED blinks once.
+    </MetaDataItem>
+    <MetaDataItem name="ProductManual">https://aeotec.freshdesk.com/support/solutions/folders/6000236794</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://aeotec.freshdesk.com/support/solutions/folders/6000236794</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond" date="06 July 2020" revision="1">Initial Config File</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Basic set as report -->
+  <CommandClass id="32">
+    <Compatibility>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="3" instance="1" label="Visual LED indications" max="7" min="0" size="1" type="bitset" value="7" bitmask="23">
+      <Help>This parameter defines when the red LED will indicate events. Disabling all indications may extend battery life.
+      </Help>
+      <BitSet id="1">
+        <Label>No Indications</Label>
+        <Help>No Indications</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Water Leakage Status Change</Label>
+        <Help>Water Leakage Status Change</Help>
+      </BitSet>
+      <BitSet id="3">
+        <Label>Wake Up</Label>
+        <Help>Wake Up</Help>
+      </BitSet>
+      <BitSet id="5">
+        <Label>Device Tampering</Label>
+        <Help>Device Tampering</Help>
+      </BitSet>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Range test after double click" max="1" min="0" size="1" type="list" value="0">
+      <Help>Allows to enable activation of Z-Wave range test with double click of a Tamper Switch.
+      </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="2nd Association Group triggers" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter defines the status of the water leakage that causes sending a BASIC command to all devices of Association Group 2.
+      </Help>
+      <Item label="Switch after Water Leakage Start and Stop" value="0"/>
+      <Item label="Switch after Water Leakage Start" value="1"/>
+      <Item label="Switch after Water Leakage Stop" value="2"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Commands sent to 2nd Association Group" max="1" min="0" size="1" type="list" value="2">
+      <Help>Command frames sent to devices added to the 2nd association group.
+      </Help>
+      <Item label="On" value="0"/>
+      <Item label="Off" value="1"/>
+      <Item label="On and Off" value="2"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="BASIC command value sent to 2nd Association Group on On event" max="255" min="0" size="1" type="byte" value="255">
+      <Help>The value of 0 turns OFF the device, 255 turns it On.
+            In case of associating the Dimmer or Roller Shutter module, values 1-99 allow to set an Associated device to a specified level.
+      </Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="BASIC command value sent to 2nd Association Group on Off event" max="255" min="0" size="1" type="byte" value="0">
+      <Help>The value of 0 turns OFF the device, 255 turns it On.
+            In case of associating the Dimmer or Roller Shutter module, values 1-99 allow to set an Associated device to a specified level.
+      </Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Time delay of ON command frame" max="32400" min="0" size="2" type="short" units="seconds" value="0">
+      <Help>Time period after which On command frame will be sent.
+      </Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Time delay of OFF command frame" max="32400" min="0" size="2" type="short" units="seconds" value="0">
+      <Help>Time period after which Off command frame will be sent.
+      </Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Delay of tamper alarm cancellation" max="32400" min="0" size="2" type="short" units="seconds" value="5">
+      <Help>Time period after which a tamper alarm will be cancelled.
+      </Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Reporting tamper alarm cancellation" max="1" min="0" size="1" type="list" value="1">
+      <Help>This parameter defines if the alarm cancellation event is reported.
+      </Help>
+      <Item label="Do not send Report" value="0"/>
+      <Item label="Send Report" value="1"/>
+    </Value>
+    <Value genre="config" index="16" instance="1" label="Minimum Temperature change to report" max="100" min="0" size="1" type="byte" units="" value="20">
+      <Help>This value defines the minimum change of temperature to cause an unsolicited report of humidity to the central controller using Lifeline.
+      If the value is set to 0, there will be no reports sent to the controller, when the temperature changes. However, periodic reports, managed by configuration parameter 18, may still be active.
+      </Help>
+    </Value>
+    <Value genre="config" index="17" instance="1" label="Minimum humidity change to report" max="20" min="0" size="1" type="byte" units="" value="5">
+      <Help>This value defines the minimum change of humidity to cause an unsolicited report of humidity to the central controller using Lifeline.
+      If the value is set to 0, there will be no reports sent to the controller, when the humidity changes. However, periodic reports, managed by configuration parameter 18, may still be active.
+      </Help>
+    </Value>
+    <Value genre="config" index="18" instance="1" label="Periodic Reports" max="65535" min="900" size="4" type="int" units="seconds" value="43200">
+      <Help>This parameter defines the time interval to send an unsolicited report.
+      If the value is set to 0, there will be no periodic reports sent to the controller. However, reports on temperature/humidity changes, managed by configuration parameters 16 and 17, may still be active.
+      </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Control" max_associations="5"/>
+      <Group index="3" label="Alarm sensor" max_associations="5"/>
+      <Group index="4" label="Alarm tamper" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/aeotec/zwa023.xml b/config/aeotec/zwa023.xml
new file mode 100644
index 00000000..d5213e1f
--- /dev/null
+++ b/config/aeotec/zwa023.xml
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+    <MetaData>
+        <MetaDataItem name="Name">ZWA023 Smart Switch 7</MetaDataItem>
+        <MetaDataItem name="Description">
+		Aeotec Smart Switch 7 is a Z-Wave Switch plug-in module specifically used to enable Z-Wave command and control (on/off) of any plug-in tool. It can report immediate wattage consumption or kWh energy usage over a period of time. In the event of power failure, non-volatile memory retains all programmed information relating to the unit’s operating status.
+		The Plug is also a security S2 Z-Wave device, it supports Over The Air (OTA) feature for the products firmware upgrade and SmartStart network pairing feature.
+        </MetaDataItem>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0371:0017:0103</MetaDataItem>
+        <MetaDataItem name="ProductPage">https://products.z-wavealliance.org/products/3844</MetaDataItem>
+        <MetaDataItem name="ProductSupport">https://products.z-wavealliance.org/products/3844</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/aeotec/zwa023.png</MetaDataItem>
+        <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/products/3844</MetaDataItem>
+        <MetaDataItem name="WakeupDescription">N/A</MetaDataItem>
+        <MetaDataItem name="InclusionDescription">
+		1. Set your Z-Wave Controller into its 'Add Device' mode.  Refer to the Controller's manual if you are unsure of how to perform this step.
+		2. Power your Smart Switch to any outlet; its LED will slowly fade in and out slowly with a blue color to indicate it is ready to pair.
+		3. Tap the action button once. The LED will turn solid yellow when it enters pair mode.
+		4. If your Z-Wave Controller supports S2 encryption, enter the first 5 digits of DSK into your Controller's interface if it is requested. The DSK is printed on Smart Switch.
+		a. If pairing succeeds, it will flash white/green 4 times. 
+		b. If pairing fails, it will light a solid bright red light for 2 seconds and then return to a breathing blue light; repeat steps 1 to 4 if this happens.
+	</MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">
+		1. Set your Z-Wave Controller into 'Remove Device' / 'Unpair Device' mode.  Refer to the Controller's manual if you are unsure of how to perform this step.
+		2. Make sure the product is powered. If not, plug it into a wall socket and power it on.
+		3. Click Action Button 2 times quickly; it will bright violet light up to 2s.
+		a. If Removing fails, it will light a bright red color for 2 seconds and then turn back to Load Indicator Mode; repeat steps 1 to 3. Contact us for further support if needed.
+		b. If Removing succeeds, it will become breathing blue light. Smart Switch is removed from the Z-Wave network successfully and is ready to be paired again.
+        </MetaDataItem>
+	<MetaDataItem name="ResetDescription">
+		If the primary controller is missing or inoperable, you may need to reset the device to factory settings.
+
+		Make sure the product is powered. If not, plug it into a wall socket and power on. To complete the reset process manually: 
+
+		    1. Press and hold the Action Button for at least 20 seconds and then release.
+		    2. The LED indicator will fade its blue light in and out slowly, which indicates the reset operation is successful.
+	</MetaDataItem>
+        <MetaDataItem id="0017" name="ZWProductPage" type="0103">https://products.z-wavealliance.org/products/3844</MetaDataItem>
+	<MetaDataItem id="0017" name="FrequencyName" type="0103">U.S. / Canada / Mexico</MetaDataItem>
+        <MetaDataItem id="0017" name="Identifier" type="0103">ZWA023-A</MetaDataItem>
+        <ChangeLog>
+            <Entry author="Kris Knigga - kris@knigga.com" date="09 June 2021" revision="1">Add ZWA023 Smart Switch 7 - Info from Aeotec's engineering sheet</Entry>
+            <Entry author="Kris Knigga - kris@knigga.com" date="11 June 2021" revision="2">Fixed missing config params 1-9 - Info from Aeotec's engineering sheet</Entry>
+        </ChangeLog>
+    </MetaData>
+    <!-- Configuration Parameters -->
+    <CommandClass id="112">
+        <Value genre="config" index="1" label="LED Setting" max="2" min="0" size="1" type="list" units="" value="2">
+            <Help>
+		    This parameter is used to change the reaction of LED setting. 
+
+		    0 - Disable LED completely. LED will only be used for network operation indicator, such as inclusion, exclusion, factory reset.
+		    1 - Turn on between particular times only (act as night light). The default color is red, color can be changed by Color CC.
+		    2 - Display On/Off Status. The default color is white at 50% lightness. Color can be changed by Color CC. 
+            </Help>
+	    <Item label="Disable LED completely." value="0" />
+	    <Item label="Turn on between particular times only (act as night light)." value="1" />
+	    <Item label="Display On/Off Status." value="2" />
+        </Value>
+        <Value genre="config" index="2" label="Night Light On Time" max="4294967295" min="0" size="4" type="int" units="" value="1572864">
+            <Help>
+		    This parameter is used to configure the Night Light on time. User can use Color CC to change the Night Light color(default Red). Only useful when parameter 1 is set to 1. 
+
+		    Value is of the pattern 0xRRHHMMSS. Where:
+		    RR = Reserved
+		    HH = Hours
+		    MM = Minutes
+		    SS = Seconds
+		    Default = 0x00180000 means 6pm.
+		    0x00180000 = 1572864 dec
+            </Help>
+        </Value>
+        <Value genre="config" index="3" label="Night Light Off Time" max="4294967295" min="0" size="4" type="int" units="" value="393216">
+            <Help>
+		    This parameter is used to configure the Night Light off time. Only useful when parameter 1 is set to 1. 
+
+		    Value is of the pattern 0xRRHHMMSS. Where:
+		    RR = Reserved
+		    HH = Hours
+		    MM = Minutes
+		    SS = Seconds
+		    Default = 0x00060000 means 6am.
+		    0x00060000 = 393216 dec
+            </Help>
+        </Value>
+        <Value genre="config" index="4" label="LED Blink Duration" max="255" min="0" size="1" type="byte" units="S" value="0">
+            <Help>
+		    Set the duration of blink, unit second.
+		    0 - indicates that it is not blinking
+		    1~255 - set the duration
+            </Help>
+        </Value>
+        <Value genre="config" index="5" label="LED Blink Speed" max="24" min="1" size="1" type="byte" units="" value="5">
+            <Help>
+		    Set amount of blinks per second.
+                    i.e. If set to 5, it should blink 5 times per second. 
+            </Help>
+        </Value>
+        <Value genre="config" index="6" label="Send Alert When In Use" max="3000" min="0" size="2" type="short" units="W" value="100">
+            <Help>
+		    Send alert when in use. A Scene Activation Set command will be sent when energy draw is above this setting value. 
+		    0 - disable
+		    1~3000 - enable, unit W
+            </Help>
+        </Value>
+        <Value genre="config" index="7" label="Plug Always On" max="2" min="0" size="1" type="list" units="" value="0">
+            <Help>
+		    Prevents the plug from being turned off via its button. 
+
+		    0 - the plug will operate as normal and can be turned on or off.
+		    1 - the button on the plug will be disabled for on and off commands, but still work for network inclusion and exclusion.
+		    2 - the plug will ignore any commands to turn it off and it will ignore any use of the button (but still work for network inclusion and exclusion) 
+            </Help>
+	    <Item label="the plug will operate as normal and can be turned on or off." value="0" />
+	    <Item label="the button on the plug will be disabled for on and off commands, but still work for network inclusion and exclusion." value="1" />
+	    <Item label="the plug will ignore any commands to turn it off and it will ignore any use of the button (but still work for network inclusion and exclusion)" value="2" />
+        </Value>
+        <Value genre="config" index="8" label="Power Out Action" max="2" min="0" size="1" type="list" units="" value="0">
+            <Help>
+		    Set the plug’s action in case of power out. 
+
+		    0 - last status
+		    1 - power on
+		    2 - power off
+            </Help>
+	    <Item label="last status" value="0" />
+	    <Item label="power on" value="1" />
+	    <Item label="power off" value="2" />
+        </Value>
+        <Value genre="config" index="9" label="Group3 Scene Id" max="255" min="1" size="1" type="byte" units="" value="255">
+            <Help>
+		    Set the scene id when Scene Activation Set Command sent through group3. Refer parameter 6 for more information. 
+            </Help>
+        </Value>
+        <Value genre="config" index="10" label="Over-load protection" max="1800" min="0" size="2" type="short" units="W" value="1800">
+            <Help>
+		    Turn off switch when current of load connected bypasses the maximum allowed power regardless of always on setting.
+		    0 - disable overload protection 
+		    1~1800 - When watt detected above this setting value, the switch will be turned off immediately. And an over-load notification will be sent.
+            </Help>
+        </Value>
+        <Value genre="config" index="11" label="Over-voltage protection" max="255" min="0" size="1" type="byte" units="V" value="135">
+            <Help>
+		    This parameter is used to set the over-voltage protect value, unit V.
+		    0 - disable over-voltage protection
+		    1~94 - The device will set value to 95 instead.
+		    95~255 - When voltage detected above this setting value, the switch will be turned off immediately.  And an over-voltage notification will be sent.
+            </Help>
+        </Value>
+        <Value genre="config" index="19" label="Threshold Check Time" max="255" min="0" size="1" type="byte" units="S" value="5">
+            <Help>
+		    Set the period of threshold check. Unit second. 
+		    0 - disable all threshold settings
+		    1~255 - set in seconds on how fast device checks for threshold settings 
+            </Help>
+        </Value>
+        <Value genre="config" index="20" label="kWh Report Threshold" max="10000" min="0" size="2" type="short" units="kWh" value="100">
+            <Help>
+		    Energy kWh threshold reporting enable/disable. Unit kWh. 
+            </Help>
+        </Value>
+        <Value genre="config" index="21" label="Watt Report Threshold" max="2500" min="0" size="2" type="short" units="W" value="0">
+            <Help>
+		    Threshold setting for Watt for inducing automatic report. Unit W.
+            </Help>
+        </Value>
+        <Value genre="config" index="22" label="Current Report Threshold" max="150" min="0" size="1" type="byte" units="A" value="0">
+            <Help>
+		    Threshold settings for current for inducing automatic report. Unit A. 
+            </Help>
+        </Value>
+        <Value genre="config" index="23" label="Watt Automatic Report Time" max="65535" min="0" size="2" type="short" units="S" value="600">
+            <Help>
+		    Set the automatic report time of Watt. Unit second.
+		    0 - disable 
+		    1~30 = 30s.
+		    31-65535 = 31-65535s.
+            </Help>
+        </Value>
+        <Value genre="config" index="24" label="kWh Automatic Report Time" max="65535" min="0" size="2" type="short" units="S" value="600">
+            <Help>
+		    Set the automatic report time of kWh. Unit second. 
+		    0 - disable 
+		    1~30 = 30s.
+		    31-65535 = 31-65535s.
+            </Help>
+        </Value>
+        <Value genre="config" index="25" label="Voltage Automatic Report Time" max="65535" min="0" size="2" type="short" units="S" value="600">
+            <Help>
+		    Set the automatic report time of Voltage. Unit second. 
+		    0 - disable 
+		    1~30 = 30s.
+		    31-65535 = 31-65535s.
+            </Help>
+        </Value>
+        <Value genre="config" index="26" label="Current Automatic Report Time" max="65535" min="0" size="2" type="short" units="S" value="600">
+            <Help>
+		    Set the automatic report time of Current. Unit second.
+		    0 - disable 
+		    1~30 = 30s.
+		    31-65535 = 31-65535s.
+            </Help>
+        </Value>
+        <Value genre="config" index="30" label="Alarm Settings" max="255" min="0" size="1" type="bitset" bitmask="255" units="" value="0">
+            <Help>
+		    Bitfield.  Determines if alarms are enabled in Switch, and what Switch will react to which alarms.
+
+		    0 - Disable all alarm settings
+		    1 - Smoke Alarm
+		    2 - CO Alarm
+		    4 - CO2 Alarm
+		    8 - Heat Alarm
+		    16 - Water Alarm
+		    32 - Access Control (DW Sensor open)
+		    64 - Home Security (intrusion)
+		    128 - Motion Sensor trigger
+            </Help>
+	    <BitSet id="1">
+		    <Label>Smoke Alarm</Label>
+		    <Help>Smoke Alarm</Help>
+	    </BitSet>
+	    <BitSet id="2">
+		    <Label>CO Alarm</Label>
+		    <Help>CO Alarm</Help>
+	    </BitSet>
+	    <BitSet id="3">
+		    <Label>CO2 Alarm</Label>
+		    <Help>CO2 Alarm</Help>
+	    </BitSet>
+	    <BitSet id="4">
+		    <Label>Heat Alarm</Label>
+		    <Help>Heat Alarm</Help>
+	    </BitSet>
+	    <BitSet id="5">
+		    <Label>Water Alarm</Label>
+		    <Help>Water Alarm</Help>
+	    </BitSet>
+	    <BitSet id="6">
+		    <Label>Access Control (DW Sensor open)</Label>
+		    <Help>Access Control (DW Sensor open)</Help>
+	    </BitSet>
+	    <BitSet id="7">
+		    <Label>Home Security (intrusion)</Label>
+		    <Help>Home Security (intrusion)</Help>
+	    </BitSet>
+	    <BitSet id="8">
+		    <Label>Motion Sensor trigger</Label>
+		    <Help>Motion Sensor trigger</Help>
+	    </BitSet>
+        </Value>
+        <Value genre="config" index="31" label="Alarm Response" max="255" min="0" size="1" type="byte" units="" value="0">
+            <Help>
+		    Enabled by Alarm Settings, and determines what the switch does in the case an alarm is triggered. 
+
+		    0 - disable, no reaction to alarm settings
+		    1 - Switch is ON
+		    2 - Switch is OFF
+		    3~255 - Sets rate at which Switch turns ON and OFF in seconds. (i.e. If set to 3, then Switch will turn ON in 0.3 seconds, and then turn OFF in 0.3 seconds in a cycle until user disables the alarm manually. If set to 255, then it will cycle every 25.5 seconds)
+            </Help>
+        </Value>
+        <Value genre="config" index="32" label="Alarm Disable Setting" max="255" min="0" size="1" type="byte" units="" value="1">
+            <Help>
+		    Determines the method of disabling the alarm of the device. 
+
+		    0 - Can be disabled by 1 tapping Switches action button once.
+		    1 - Can be disabled by 2 tapping Switches action button within 1 second.
+		    2 - Can be disabled by 4 tapping Switches action button within 2 seconds.
+		    4 - Can be disabled by pressing and holding Switches action button about 4 seconds.
+		    5~255 - Sets the duration of the alarm in seconds (i.e Sets this setting to 50, the alarm state of the switch will disable after 50 seconds)
+		    Note:  when the device receives the corresponding Notification State Idle Event, which can also dismiss the current alarm.
+            </Help>
+        </Value>
+        <Value genre="config" index="40" label="Automatic Off Timer" max="86400" min="0" size="4" type="int" units="S" value="0">
+            <Help>
+		    Acts as auto off after as soon as the switch turns ON, setting is set in seconds. 
+
+		    0 - no auto off with timer
+		    1~86400 - seconds
+            </Help>
+        </Value>
+        <Value genre="config" index="41" label="Automatic On Timer" max="86400" min="0" size="4" type="int" units="S" value="0">
+            <Help>
+		    Acts as auto on after as soon as the switch turns OFF, setting is set in seconds. 
+
+		    0 - no auto on with timer
+		    1~86400 - seconds
+            </Help>
+        </Value>
+        <Value genre="config" index="42" label="Report Command Setting" max="2" min="0" size="1" type="list" units="" value="2">
+            <Help>
+		    Which report will be sent to lifeline group when the output state is changed. 
+
+		    0 - Send nothing
+		    1 - Send Basic Report
+		    2 - Send Switch Binary Report
+            </Help>
+	    <Item label="Send nothing" value="0" />
+	    <Item label="Send Basic Report" value="1" />
+	    <Item label="Send Switch Binary Report" value="2" />
+        </Value>
+    </CommandClass>
+    <!-- Association Groups -->
+    <CommandClass id="133">
+        <Associations num_groups="3">
+            <Group index="1" label="LifeLine" max_associations="5"/>
+            <Group index="2" label="Retransmit" max_associations="5"/>
+            <Group index="3" label="Alert" max_associations="5"/>
+        </Associations>
+    </CommandClass>
+</Product>
diff --git a/config/assa_abloy/ProSLKey-FreeDeadbolt.xml b/config/assa_abloy/ProSLKey-FreeDeadbolt.xml
new file mode 100644
index 00000000..77e1c21b
--- /dev/null
+++ b/config/assa_abloy/ProSLKey-FreeDeadbolt.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2"
+  xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Yale Pro SL Key-Free Deadbolt (YRD136 or YRD156)</MetaDataItem>
+    <MetaDataItem name="Description">Never worry about the hassle of carrying around or losing your keys again. Lock and unlock your home with ease from the back-lit keypad. Create unique entry codes for friends, family, service providers, and renters. The YRD136 has Z-Wave Plus built in so you can easily integrate it into a compatible smart home or alarm system with one-touch enrollment. </MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0129:803b:0508</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://us.yalehome.com/en/yalehome-products/yale-pro-sl-yrd156yrd136/yale-pro-sl-yrd156yrd136/prosl/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/assa_abloy/ProSLKey-FreeDeadbolt.png</MetaDataItem>
+	<MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/3446/YRD136%20FINAL-compressed%20(1).pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">
+	1. Remove the battery cover.
+	2. Press button and hold until unit beeps two (2) times.
+	3. Release button and network joining automatically begins.
+	4. Replace battery cover.
+	</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">
+	1. Remove the battery cover.
+	2. Press button and hold until unit beeps five (5) times.
+	3. Release button and network removal automatically begins.
+	4. Replace battery cover.
+	</MetaDataItem>
+    <MetaDataItem id="0508" name="ZWProductPage" type="803b">https://products.z-wavealliance.org/products/3446/</MetaDataItem>
+    <MetaDataItem id="0508" name="FrequencyName" type="803b">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0508" name="Identifier" type="803b">YRD136</MetaDataItem>
+	<ChangeLog>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="18 January 2021" revision="1">Initial product configuration</Entry>
+	  <Entry author="Jean-François Auger - nechry@gmail.com" date="22 January 2021" revision="2">Fix metadata</Entry>	 
+  	</ChangeLog>
+  </MetaData>
+ 
+
+    <!-- Configuration -->
+    <CommandClass id="112">
+		<Value type="list" size="1" genre="config" instance="1" index="1" label="Audio Mode" value="3">
+			<Help>Disable the door sensor alarm function.</Help>
+			<Item label="On" value="1" />
+			<Item label="Off" value="3" />
+		</Value>
+		<Value type="list" size="1" genre="config" instance="1" index="2" label="Auto Relock" value="0">
+			<Help></Help>
+			<Item label="Off" value="0" />
+			<Item label="On" value="255" />
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="3" label="Re-lock Time" size="1" min="10" max="180" units="seconds" value="30">
+			<Help>seconds; after successful code entry and unit unlocks, it will automatically re-lock after specified time (30 = default value)</Help>
+		</Value>
+		<Value type="list" size="1" genre="config" instance="1" index="4" label="Wrong Code Entry Limit" min="3" max="10" value="5">
+			<Help>
+			The number of invalid code entries lock will accept before sending TAMPER Alarm. 
+			When number of wrong code entries is exceeded, lock will disable keypad for the time specified by Shutdown Time parameter. (5 = default)
+			</Help>
+			<Item label="3" value="3" />
+			<Item label="4" value="4" />
+			<Item label="5" value="5" />
+			<Item label="6" value="6" />
+			<Item label="7" value="7" />
+			<Item label="8" value="8"/>
+			<Item label="9" value="9"/>
+			<Item label="10" value="10"/>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="7" label="Shutdown Time" size="1" min="10" max="180" units="seconds" value="60">
+			<Help>number of seconds unit will be inoperable after number of wrong code entries is exceeded (60 = default)</Help>
+		</Value>
+		<Value type="list" size="1" genre="config" instance="1" index="8" label="Operating Mode" min="0" max="1" value="0">
+			<Help>
+			Normal Mode: Master code and all user codes enabled (default).
+            Vacation Mode: Master code enabled, all user codes disabled.
+		    </Help>
+			<Item label="Normal" value="0" />
+			<Item label="Vacation" value="1" />			
+		</Value>
+		<Value type="list" size="1" genre="config" instance="1" index="11" label="One Touch Locking" value="255">
+			<Help></Help>
+			<Item label="Off" value="0"/>
+			<Item label="On" value="255"/>
+		</Value>
+		<Value type="list" size="1" genre="config" instance="1" index="13" label="Lock Status LED" value="0">
+			<Help></Help>
+			<Item label="Off" value="0"/>
+			<Item label="On" value="255"/>
+		</Value>
+		<Value type="list" size="1" genre="config" instance="1" index="15" label="Reset to Factory Defaults" value="0">
+			<Help></Help>
+			<Item label="Off" value="0"/>
+			<Item label="On" value="255"/>
+		</Value>
+	</CommandClass>
+	<CommandClass id="113">
+		<!-- These Door Locks don't send a DoorLockReport when the
+		Lock Status is Changed, but instead send a Alarm Message -
+		So we trigger a Refresh of the DoorLock Command Class when
+		we recieve a Alarm Message Instead -->
+		<TriggerRefreshValue Genre="user" Index="6" Instance="1">
+			<RefreshClassValue CommandClass="98" Index="0" Instance="1" RequestFlags="0"/>
+			<RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
+		</TriggerRefreshValue>
+	</CommandClass>
+	<!-- Association Groups -->
+	<CommandClass id="133">
+		<Associations num_groups="1">
+			<Group index="1" max_associations="5" label="Lifeline"/>			
+		</Associations>
+	</CommandClass>
+</Product>
diff --git a/config/assa_abloy/PushButtonDeadbolt.xml b/config/assa_abloy/PushButtonDeadbolt.xml
index 0c8fbcd6..04bf00fc 100644
--- a/config/assa_abloy/PushButtonDeadbolt.xml
+++ b/config/assa_abloy/PushButtonDeadbolt.xml
@@ -1,4 +1,4 @@
-<Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="7" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0129:0000:0004</MetaDataItem>
     <MetaDataItem name="ProductPic">images/assa_abloy/PushButtonDeadbolt.png</MetaDataItem>
@@ -13,6 +13,7 @@
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1039/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1971/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3239/xml</Entry>
+      <Entry author="Matt Belhorn - matt.belhorn@gmail.com" date="26 Jun 2020" revision="7">Fixed index of alarm message to trigger lock status refresh</Entry>
     </ChangeLog>
     <MetaDataItem id="0800" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/1039/</MetaDataItem>
     <MetaDataItem id="0800" name="Identifier" type="0004">YRD110-ZW-US</MetaDataItem>
@@ -113,7 +114,8 @@ http://ozw.my-ho.st/Yale/Yale%20ZWave%20Developer%20Guide.pdf
 		Lock Status is Changed, but instead send a Alarm Message -
 		So we trigger a Refresh of the DoorLock Command Class when
 		we recieve a Alarm Message Instead -->
-    <TriggerRefreshValue Genre="user" Index="0" Instance="1">
+    <TriggerRefreshValue Genre="user" Index="6" Instance="1">
+      <RefreshClassValue CommandClass="98" Index="0" Instance="1" RequestFlags="0"/>
       <RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
     </TriggerRefreshValue>
   </CommandClass>
diff --git a/config/assa_abloy/TouchDeadbolt.xml b/config/assa_abloy/TouchDeadbolt.xml
index 2d8c6056..733f870d 100644
--- a/config/assa_abloy/TouchDeadbolt.xml
+++ b/config/assa_abloy/TouchDeadbolt.xml
@@ -1,4 +1,4 @@
-<Product Revision="12" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="13" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0129:0000:0002</MetaDataItem>
     <MetaDataItem name="ProductPic">images/assa_abloy/TouchDeadbolt.png</MetaDataItem>
@@ -20,6 +20,7 @@
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="10">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2403/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="11">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3211/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="12">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3251/xml</Entry>
+	  <Entry author="Brett Daugherty" date="17 Jun 2020" revision="13">Fixed index of alarm message to trigger lock status refresh</Entry>
     </ChangeLog>
     <MetaDataItem id="0800" name="ZWProductPage" type="0002">https://products.z-wavealliance.org/products/1040/</MetaDataItem>
     <MetaDataItem id="0800" name="FrequencyName" type="0002">U.S. / Canada / Mexico</MetaDataItem>
@@ -134,7 +135,7 @@ http://products.z-wavealliance.org/products/1973/configs
 		Lock Status is Changed, but instead send a Alarm Message -
 		So we trigger a Refresh of the DoorLock Command Class when
 		we recieve a Alarm Message Instead -->
-    <TriggerRefreshValue Genre="user" Index="0" Instance="1">
+    <TriggerRefreshValue Genre="user" Index="6" Instance="1">
       <RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
     </TriggerRefreshValue>
   </CommandClass>
diff --git a/config/assa_abloy/TouchLever.xml b/config/assa_abloy/TouchLever.xml
index a86e97ea..eda996da 100644
--- a/config/assa_abloy/TouchLever.xml
+++ b/config/assa_abloy/TouchLever.xml
@@ -1,4 +1,4 @@
-<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0129:0000:0001</MetaDataItem>
     <MetaDataItem name="ProductPic">images/assa_abloy/TouchLever.png</MetaDataItem>
@@ -10,8 +10,11 @@
     <MetaDataItem name="Description">Yale Real Living deadbolt and lever locks are the first products in the Yale Real Living™ (www.yalerealliving.com) portfolio of home control and security solutions.  Available in both durable acrylic touchscreen or simple, elegant, tamper-resistant keypad, Yale's new platform of intelligent locks support Z-Wave, allowing them to integrate seamlessly into a wide range of home control and security systems.  
 
 Regardless of the home control system employed, users will have access to a high degree of functionality, including the ability to lock and unlock doors from web-enabled devices or create customized entry scenes for family members, neighbors and guests. Features of Yale Real Living locks include personalized access-control scenes for up to 250 users; access to all user programmable settings via select user interfaces; plus the touchscreen versions employ voice assisted programming in English, Spanish and French.  The new intelligent locks offer an elegant, next-generation home control solution for entryways and protected interior doors to make everyday living easier and safer.</MetaDataItem>
+    <MetaDataItem id="0f00" name="ZWProductPage" type="800c">https://products.z-wavealliance.org/products/3114/</MetaDataItem>
+    <MetaDataItem id="0f00" name="Identifier" type="800c">YRL226-ZW2</MetaDataItem>  
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/686/xml</Entry>
+      <Entry author="Mike Dahlgren" date="19 Nov 2020" revision="3"> Added Yale YRL226</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Yale Touchscreen Lever (YRL220)
diff --git a/config/assa_abloy/yrd1x0.xml b/config/assa_abloy/yrd1x0.xml
new file mode 100644
index 00000000..f1104e6e
--- /dev/null
+++ b/config/assa_abloy/yrd1x0.xml
@@ -0,0 +1,115 @@
+<Product Revision="14" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">YRD110/YRD120 Keyless Deadbolt</MetaDataItem>
+    <MetaDataItem name="Description">Yale Real Living® keyless deadbolt.  These push button and touchscreen deadbolts are designed to seamlessly integrate into your smart home to provide you and your family with security and convenience.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0129:0800:0004</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://us.yalehome.com/en/products/yale-assure-lock-and-levers/b1l-and-t1l-lock</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://support.shopyalehome.com/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/assa_abloy/yrd1x0.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://us.yalehome.com/Yale/Yale%20US/Support/B1L%20and%20T1L%20Locks/AYRD_110_INST_FUL%20Rev%20G%20WEB.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Method 1:
+Remove the battery cover
+Press zwave buttton (right side near top) and hold until beeps 2 times
+Release button and network joining automatically begins
+Replace battery cover
+Method 2:
+Enter the master Pin code followed by the gear key.
+Press the 7 key followed by the gear key
+Press the 1 key followed by the gear key</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Method 1:
+Remove the battery cover
+Press zwave buttton (right side near top) and hold until beeps 5 times
+Release button and network removal automatically begins
+Replace battery cover
+Method 2:
+Enter the master Pin code followed by the gear key.
+Press the 7 key followed by the gear key
+Press the 3 key followed by the gear key</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Remove the battery cover and batteries
+While pressing the reset button (left side near top) for a minimum of 3 seconds, reinstall batteries
+Release reset button.
+Replace battery cover
+Please use this procedure only when the network primary controller is missing or otherwise inoperable</MetaDataItem>
+    <MetaDataItem id="0800" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/1039/</MetaDataItem>
+    <MetaDataItem id="0800" name="Identifier" type="0004">YRD110-ZW-US</MetaDataItem>
+    <MetaDataItem id="0800" name="FrequencyName" type="0004">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0000" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/1040/</MetaDataItem>
+    <MetaDataItem id="0000" name="FrequencyName" type="0004">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0000" name="Identifier" type="0004">YRD120-ZW-US</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Keith Laidlaw - laidlaw1546@gmail.com" date="25 Sep 2020" revision="14">Split out from PushButtonDeadbolt.xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Audio Mode" size="1" type="list" value="3">
+      <Help>(On = default)</Help>
+      <Item label="Off" value="1"/>
+      <Item label="On" value="3"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Auto Relock" size="1" type="list" value="0">
+      <Help>(Off = default)</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Re-lock Time" max="180" min="5" size="1" type="byte" units="seconds" value="30">
+      <Help>after successful code entry and unit unlocks, it will automatically re-lock after specified number of seconds (30 = default)</Help>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Wrong Code Entry Limit" max="7" min="1" size="1" type="list" value="5">
+      <Help>
+			The number of invalid code entries lock will accept before sending TAMPER Alarm. 
+			When number of wrong code entries is exceeded, lock will disable keypad for the time specified by Shutdown Time parameter. (5 = default)
+			</Help>
+      <Item label="1" value="1"/>
+      <Item label="2" value="2"/>
+      <Item label="3" value="3"/>
+      <Item label="4" value="4"/>
+      <Item label="5" value="5"/>
+      <Item label="6" value="6"/>
+      <Item label="7" value="7"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Shutdown Time" max="255" min="1" size="1" type="byte" units="seconds" value="60">
+      <Help>number of seconds unit will be inoperable after number of wrong code entries is exceeded (60 = default)</Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="Operating Mode" max="2" min="0" size="1" type="list" value="0">
+      <Help>Normal Mode: Master code and all user codes enabled (default).
+Vacation Mode: Master code enabled, all user codes disabled.
+Privacy Mode: Master code and all user codes disabled.</Help>
+      <Item label="Normal" value="0"/>
+      <Item label="Vacation" value="1"/>
+      <Item label="Privacy" value="2"/>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="One Touch Locking" size="1" type="list" value="255">
+      <Help>(On = default)</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Privacy Button" size="1" type="list" value="0">
+      <Help>(Off = default)</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Lock Status LED" size="1" type="list" value="0">
+      <Help>(Off = default)</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+  </CommandClass>
+  <!-- Notification Command Class -->
+  <CommandClass id="113">
+    <!-- These Door Locks don't send a DoorLockReport when the
+		Lock Status is Changed, but instead send a Alarm Message -
+		So we trigger a Refresh of the DoorLock Command Class when
+		we recieve a Alarm Message Instead -->
+    <TriggerRefreshValue Genre="user" Index="512" Instance="1">
+      <RefreshClassValue CommandClass="98" Index="0" Instance="1" RequestFlags="0"/>
+      <RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
+    </TriggerRefreshValue>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/assa_abloy/yrm276.xml b/config/assa_abloy/yrm276.xml
new file mode 100644
index 00000000..888a298b
--- /dev/null
+++ b/config/assa_abloy/yrm276.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Yale Assure Lock for Andersen Patio Doors</MetaDataItem>
+    <MetaDataItem name="Description">Yale Assure Lock® is a secure, keyless lock developed by Yale exclusively available with Andersen Patio Doors (E-Series and A-Series hinged patio doors). Monitor, lock and unlock from anywhere with your Yale Assure Lock featuring Andersen’s VeriLock™ sensor technology and integrate into a compatible home automation or security system.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0129:1604:8014</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://shopyalehome.com/products/assure-lock-for-andersen-patio-doors-z-wave-plus-in-satin-nickel?_pos=9&amp;_sid=9cc5e3274&amp;_ss=r</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://support.shopyalehome.com/en_us/categories/getting-started-Sy5xA1Wyw</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/assa_abloy/yrm276.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2911/YRM276_YRM476-INST-FUL%20Rev%20A%20WEB_SystemGuide.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Enter the 4-8 digit master PIN code followed by the gear key.
+2. Press the 7 key followed by the gear key.
+3. Press the 1 key followed by the gear key.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Enter the 4-8 digit master PIN code followed by the gear key.
+2. Press the 7 key followed by the gear key.
+3. Press the 3 key followed by the gear key.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Please use this procedure only when the network primary controller is missing or otherwise inoperable.
+When resetting the lock, all user codes, including the Master code, are deleted. All programming features are reset to the original default settings.
+1. Remove the battery cover and batteries.
+2. Remove the interior lock to access the reset button.
+3. The reset button is located above the cable connectors. PCB
+4. Re-insert 3 batteries and hold the reset button for 3 seconds.
+5. While still holding the reset button, insert the 4th battery, and hold the reset button for an additional 3 seconds.
+6. Release the reset button.</MetaDataItem>
+    <MetaDataItem id="1604" name="ZWProductPage" type="8014">https://products.z-wavealliance.org/products/2925</MetaDataItem>
+    <MetaDataItem id="1604" name="FrequencyName" type="8014">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="1604" name="Identifier" type="8014">YRM276</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Nathan Spencer - natekspencer@gmail.com" date="17 January 2022" revision="1">Initial entry with data obtained from https://products.z-wavealliance.org/products/2925</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="Volume Mode" max="3" min="1" size="1" type="list" value="2">
+      <Help>Default is Low Volume</Help>
+      <Item label="High Volume" value="1"/>
+      <Item label="Low Volume" value="2"/>
+      <Item label="Silent" value="3"/>
+    </Value>
+    <Value genre="config" index="2" label="Auto Relock" max="255" min="0" size="1" type="list" value="0">
+      <Help>Default is Off</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+    <Value genre="config" index="3" label="Auto Relock Time" max="180" min="1" size="1" type="byte" units="seconds" value="30">
+      <Help>1 to 180 seconds (default is 30)</Help>
+    </Value>
+    <Value genre="config" index="4" label="Wrong Code Entry Limit" max="10" min="3" size="1" type="byte" value="5">
+      <Help>3 to 10 (default is 5)</Help>
+    </Value>
+    <Value genre="config" index="5" label="Language" max="3" min="1" size="1" type="list" value="2">
+      <Help>Default is English</Help>
+      <Item label="English" value="1"/>
+      <Item label="Spanish" value="2"/>
+      <Item label="French" value="3"/>
+    </Value>
+    <Value genre="config" index="7" label="Shutdown Time (after wrong code entries)" max="180" min="10" size="1" type="byte" units="seconds" value="60">
+      <Help>10 to 180 seconds (default is 60)</Help>
+    </Value>
+    <Value genre="config" index="8" label="Operating Mode" max="2" min="0" size="1" type="list" value="0">
+      <Help>Normal (default)
+Vacation = keypad lockout
+Privacy = no keypad, RF Unlock will work</Help>
+      <Item label="Normal" value="0"/>
+      <Item label="Vacation" value="1"/>
+      <Item label="Privacy" value="2"/>
+    </Value>
+    <Value genre="config" index="11" label="One Touch Locking" max="255" min="0" size="1" type="list" value="255">
+      <Help>Default is On</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+    <Value genre="config" index="12" label="Privacy Button" max="255" min="0" size="1" type="list" value="0">
+      <Help>Default is Off</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+    <Value genre="config" index="13" label="Lock Status LED" max="255" min="0" size="1" type="list" value="0">
+      <Help>Default is Off</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+    <Value genre="config" index="15" label="Reset To Factory Defaults" max="1" min="0" size="1" type="list">
+      <Help>No default value</Help>
+      <Item label="Lock will execute Reset To Factory" value="1"/>
+    </Value>
+    <Value genre="config" index="18" label="Door Propped Timer**" max="254" min="0" size="1" type="byte" units="seconds x 10" value="0">
+      <Help>10 to 2540 second. This value is represented as seconds X 10 (ie a value of 4 would mean a door propped timer of 40 seconds). Set to 0 to disable (default).
+
+**Optional Door Position Switch must hvae been installed with the lock.</Help>
+    </Value>
+    <Value genre="config" index="19" label="DPS Alarms**" max="255" min="0" size="1" type="list" value="0">
+      <Help>Used to enable/disable door condition alarms for locks that support a door position sensor. Any lock that does not support DPS will always report Off. Default is Off
+
+**Optional Door Position Switch must hvae been installed with the lock.</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+    <Value genre="config" index="24" label="DPS Locking Protection**" max="255" min="0" size="1" type="list" value="0">
+      <Help>Off (default) = The lock will always lock regardless of DPSstate
+On = Check DPS before motorized lock function
+
+**Optional Door Position Switch must hvae been installed with the lock.</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="255"/>
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="LifeLine" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
\ No newline at end of file
diff --git a/config/building36/b36-t10.xml b/config/building36/b36-t10.xml
new file mode 100644
index 00000000..3ab2d79c
--- /dev/null
+++ b/config/building36/b36-t10.xml
@@ -0,0 +1,253 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+    <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+    <MetaData>
+        <MetaDataItem name="Name">Building 36 Intelligent Thermostat</MetaDataItem>
+        <MetaDataItem name="Description">The Building 36 Intelligent Thermostat gives you remote access and control of your thermostat. Enjoy effortless energy management, climate and ambiance control, custom automation and measurable results. Create custom smart schedules that automate your thermostat. Receive critical temperature alerts to know instantly when your thermostat reaches preset limits. Save energy by using location-based automation to have your thermostat adjust itself while you're out.</MetaDataItem>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0190:0001:0001</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/building36/b36-t10.png</MetaDataItem>
+        <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/1161/Product_Manual_11_25_14-spreads_B36.pdf</MetaDataItem>
+        <MetaDataItem name="WakeupDescription">Short press any button</MetaDataItem>
+        <MetaDataItem name="InclusionDescription">Press and hold the DOWN button on the thermostat to begin inclusion mode. Release the button when the RADIO icon lights up.</MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">Set the thermostat to OFF mode. Press and hold the DOWN button on the thermostat to enter exclusion mode. Release the button when the RADIO icon lights up.</MetaDataItem>
+        <MetaDataItem id="0001" name="ZWProductPage" type="0001">https://products.z-wavealliance.org/products/1161</MetaDataItem>
+        <MetaDataItem id="0001" name="FrequencyName" type="0001">U.S. / Canada / Mexico</MetaDataItem>
+        <MetaDataItem id="0001" name="Identifier" type="0001">B36-T10</MetaDataItem>
+        <ChangeLog>
+            <Entry author="bachya1208@gmail.com" date="08 September 2020" revision="1">Added device</Entry>
+            <Entry author="nechry@gmail.com" date="23 September 2020" revision="2">Bump revision</Entry>
+        </ChangeLog>
+    </MetaData>
+    <CommandClass id="32">
+        <Compatibility>
+            <Mapping>64</Mapping>
+        </Compatibility>
+        <Instance index="1" />
+    </CommandClass>
+    <CommandClass id="49">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="decimal" genre="user" instance="1" index="1" label="Air Temperature" units="C" read_only="true" write_only="false" verify_changes="false">
+            <Help>Air Temperature Sensor Value</Help>
+        </Value>
+        <Value type="decimal" genre="user" instance="1" index="5" label="Humidity" units="%" read_only="true" write_only="false" verify_changes="false">
+            <Help>Humidity Sensor Value</Help>
+        </Value>
+        <Value type="list" genre="system" instance="1" index="256" label="Air Temperature Units" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>Air Temperature Sensor Available Units</Help>
+            <Item label="Celsius" value="0" />
+            <Item label="Fahrenheit" value="1" />
+        </Value>
+        <Value type="list" genre="system" instance="1" index="260" label="Humidity Units" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>Humidity Sensor Available Units</Help>
+            <Item label="Percent" value="0" />
+        </Value>
+    </CommandClass>
+    <CommandClass id="64">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="list" genre="user" instance="1" index="0" label="Mode" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>Set the Thermostat Mode</Help>
+            <Item label="Off" value="0" />
+            <Item label="Heat" value="1" />
+            <Item label="Cool" value="2" />
+            <Item label="Auto" value="3" />
+        </Value>
+        <SupportedModes>
+            <Mode index="0" label="Off" />
+            <Mode index="1" label="Heat" />
+            <Mode index="2" label="Cool" />
+            <Mode index="3" label="Auto" />
+        </SupportedModes>
+    </CommandClass>
+    <CommandClass id="66">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="string" genre="user" instance="1" index="0" label="Operating State" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Set the Thermostat Operating State</Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="67">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="decimal" genre="user" instance="1" index="1" label="Heating 1" units="C" read_only="false" write_only="false" verify_changes="false">
+            <Help>Set the Thermostat target heating temperature</Help>
+        </Value>
+        <Value type="decimal" genre="user" instance="1" index="2" label="Cooling 1" units="C" read_only="false" write_only="false" verify_changes="false">
+            <Help>Set the Thermostat target cooling temperature</Help>
+        </Value>
+        <Value type="decimal" genre="user" instance="1" index="101" label="Heating 1_minimum" units="C" read_only="false" write_only="false" verify_changes="false">
+            <Help></Help>
+        </Value>
+        <Value type="decimal" genre="user" instance="1" index="102" label="Cooling 1_minimum" units="C" read_only="false" write_only="false" verify_changes="false">
+            <Help></Help>
+        </Value>
+        <Value type="decimal" genre="user" instance="1" index="201" label="Heating 1_maximum" units="C" read_only="false" write_only="false" verify_changes="false">
+            <Help></Help>
+        </Value>
+        <Value type="decimal" genre="user" instance="1" index="202" label="Cooling 1_maximum" units="C" read_only="false" write_only="false" verify_changes="false">
+            <Help></Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="68">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="list" genre="user" instance="1" index="0" label="Fan Mode" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>Set the Fan Mode</Help>
+            <Item label="Auto Low" value="0" />
+            <Item label="On Low" value="1" />
+            <Item label="Circulate" value="6" />
+        </Value>
+        <SupportedModes>
+            <Mode index="0" label="Auto Low" />
+            <Mode index="1" label="On Low" />
+            <Mode index="6" label="Circulate" />
+        </SupportedModes>
+    </CommandClass>
+    <CommandClass id="69">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="string" genre="user" instance="1" index="0" label="Fan State" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Set the Fan State</Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="90">
+        <Compatibility />
+        <Instance index="1" />
+    </CommandClass>
+    <CommandClass id="94">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="byte" genre="system" instance="1" index="0" label="ZWave+ Version" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>ZWave+ Version Supported on the Device</Help>
+        </Value>
+        <Value type="short" genre="system" instance="1" index="1" label="InstallerIcon" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Icon File to use for the Installer Application</Help>
+        </Value>
+        <Value type="short" genre="system" instance="1" index="2" label="UserIcon" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Icon File to use for the User Application</Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="112">
+        <Compatibility />
+        <Instance index="1" />
+    </CommandClass>
+    <CommandClass id="114">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="int" genre="system" instance="1" index="0" label="Loaded Config Revision" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Revision of the Config file currently loaded</Help>
+        </Value>
+        <Value type="int" genre="system" instance="1" index="1" label="Config File Revision" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Revision of the Config file on the File System</Help>
+        </Value>
+        <Value type="int" genre="system" instance="1" index="2" label="Latest Available Config File Revision" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Latest Revision of the Config file available for download</Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="115">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="list" genre="system" instance="1" index="0" label="Powerlevel" units="dB" read_only="false" write_only="false" verify_changes="false">
+            <Help>Output RF PowerLevel</Help>
+            <Item label="Normal" value="0" />
+            <Item label="-1dB" value="1" />
+            <Item label="-2dB" value="2" />
+            <Item label="-3dB" value="3" />
+            <Item label="-4dB" value="4" />
+            <Item label="-5dB" value="5" />
+            <Item label="-6dB" value="6" />
+            <Item label="-7dB" value="7" />
+            <Item label="-8dB" value="8" />
+            <Item label="-9dB" value="9" />
+        </Value>
+        <Value type="byte" genre="system" instance="1" index="1" label="Timeout" units="seconds" read_only="false" write_only="false" verify_changes="false">
+            <Help>Timeout till the PowerLevel is reset to Normal</Help>
+        </Value>
+        <Value type="button" genre="system" instance="1" index="2" label="Set Powerlevel" units="" read_only="false" write_only="true" verify_changes="false">
+            <Help>Apply the Output PowerLevel and Timeout Values</Help>
+        </Value>
+        <Value type="byte" genre="system" instance="1" index="3" label="Test Node" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>Node to Perform a test against</Help>
+        </Value>
+        <Value type="list" genre="system" instance="1" index="4" label="Test Powerlevel" units="dB" read_only="false" write_only="false" verify_changes="false">
+            <Help>PowerLevel to use for the Test</Help>
+            <Item label="Normal" value="0" />
+            <Item label="-1dB" value="1" />
+            <Item label="-2dB" value="2" />
+            <Item label="-3dB" value="3" />
+            <Item label="-4dB" value="4" />
+            <Item label="-5dB" value="5" />
+            <Item label="-6dB" value="6" />
+            <Item label="-7dB" value="7" />
+            <Item label="-8dB" value="8" />
+            <Item label="-9dB" value="9" />
+        </Value>
+        <Value type="short" genre="system" instance="1" index="5" label="Frame Count" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>How Many Messages to send to the Node for the Test</Help>
+        </Value>
+        <Value type="button" genre="system" instance="1" index="6" label="Test" units="" read_only="false" write_only="true" verify_changes="false">
+            <Help>Perform a PowerLevel Test against the a Node</Help>
+        </Value>
+        <Value type="button" genre="system" instance="1" index="7" label="Report" units="" read_only="false" write_only="true" verify_changes="false">
+            <Help>Get the results of the latest PowerLevel Test against a Node</Help>
+        </Value>
+        <Value type="list" genre="system" instance="1" index="8" label="Test Status" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>The Current Status of the last PowerNode Test Executed</Help>
+            <Item label="Failed" value="0" />
+            <Item label="Success" value="1" />
+            <Item label="In Progress" value="2" />
+        </Value>
+        <Value type="short" genre="system" instance="1" index="9" label="Acked Frames" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Number of Messages successfully Acked by the Target Node</Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="128">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="byte" genre="user" instance="1" index="0" label="Battery Level" units="%" read_only="true" write_only="false" verify_changes="false">
+            <Help>Current Battery Level</Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="129">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="list" genre="user" instance="1" index="0" label="Day" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>Day of Week</Help>
+            <Item label="Monday" value="1" />
+            <Item label="Tuesday" value="2" />
+            <Item label="Wednesday" value="3" />
+            <Item label="Thursday" value="4" />
+            <Item label="Friday" value="5" />
+            <Item label="Saturday" value="6" />
+            <Item label="Sunday" value="7" />
+        </Value>
+        <Value type="byte" genre="user" instance="1" index="1" label="Hour" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>Hour</Help>
+        </Value>
+        <Value type="byte" genre="user" instance="1" index="2" label="Minute" units="" read_only="false" write_only="false" verify_changes="false">
+            <Help>Minute</Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="133">
+        <Compatibility />
+        <Instance index="1" />
+        <Associations num_groups="1">
+            <Group index="1" max_associations="4" label="Group 1" auto="false">
+                <Node id="1" />
+            </Group>
+        </Associations>
+    </CommandClass>
+    <CommandClass id="134">
+        <Compatibility />
+        <Instance index="1" />
+        <Value type="string" genre="system" instance="1" index="0" label="Library Version" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Z-Wave Library Version</Help>
+        </Value>
+        <Value type="string" genre="system" instance="1" index="1" label="Protocol Version" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Z-Wave Protocol Version</Help>
+        </Value>
+        <Value type="string" genre="system" instance="1" index="2" label="Application Version" units="" read_only="true" write_only="false" verify_changes="false">
+            <Help>Application Version</Help>
+        </Value>
+    </CommandClass>
+</Product>
diff --git a/config/connecthome/ch-201.xml b/config/connecthome/ch-201.xml
new file mode 100644
index 00000000..27f19e46
--- /dev/null
+++ b/config/connecthome/ch-201.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">CH-201 Thermostat</MetaDataItem>
+    <MetaDataItem name="Description">CH-201 thermostat is a Z-Wave device designed to maintain the set temperature. The thermostat can control the heating element directly (electric floor heating, electric heater, etc.) or with additional equipment (thermoelectric drive, etc.) The thermostat is equipped with a digital temperature sensor, but can work with any other temperature sensor if necessary Your Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0179:0001:0001</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://connecthome.com.ua/product/ch201</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://connecthome.com.ua/index.php?route=information/contact</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/connecthome/CH_201.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://connecthome.com.ua/product/ch201</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">To include the thermostat in a Z-Wave network, place the controller in the inclusion mode (see the instructions of your controller) and apply power to the electrical network to which the device is connected. The device will be added automatically (NWI). If this does not happen automatically, briefly press the system button three times on the top cover of the device.
+If there are problems with connecting the device to your Z-Wave network, you must complete the Z-Wave network exclusion procedure, and then repeat the inclusion procedure.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To exclude the thermostat from the Z-Wave network, place the controller in the exclusion mode (see the controller instruction) and press the system button three times briefly.
+Please note that after excluding the device from the Z-Wave network, all settings you have made will be reset to the factory settings.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">To perform factory reset exclude the device form Z-Wave network and include it again.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Kostiantyn Khodykin - kostiantyn.khodykin@outlook.com" date="28 June 2020" revision="1">Initial configuration definition of CH-201</Entry>
+      <Entry author="Bogdan Pankiv - bogdan.pankiv@gmail.com" date="08 November 2020" revision="2">Setpoint feature fixed for CH-201</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="0" label="Relay mode" units="" size="1" min="0" max="1" type="list">
+      <Help>
+Relay mode. 
+Normal: Close the relay when the thermostat is in the "heating" mode and open when the set temperature is reached (Default). The most frequently used mode is used when the heater is directly connected through a thermostat.
+Reverse: Open the relay when the thermostat is in the "heating" mode, close - when the set temperature is reached. Can be used with a limited list of special equipment (normally closed valves, etc.).
+      </Help>
+      <Item value="0" label="Normal" />
+      <Item value="1" label="Reverse" />
+    </Value>
+    <Value genre="config" instance="1" index="2" value="1" label="Temperature threshold" units="Δ°С" size="1" min="1" max="7" type="byte">
+      <Help>
+Set temperature threshold
+To maintain the temperature, two values ​​are used: minimum and maximum. When the minimum value is reached, the heating will be turned on, when heating to the maximum value - the heating element will be turned off. For the convenience of the user, the controller assumes temperature adjustment with only one value, from which the thermostat will calculate the previously mentioned "minimum" and "maximum" values ​​of the temperature range. We recommend using a small range of 1 degree for more comfort and the most accurate match to the chosen temperature. If your heating element consumes a significant amount of energy at the moment of switching on, then it is recommended to reduce the number of on-off cycles by increasing this parameter. With our thermostat, you can always achieve the optimum operating mode by experiment or by contacting our specialists for help. The acceptable value is from 1 to 7 degrees:
+      </Help>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="2" label="Point mode" units="" size="1" min="0" max="2" type="list">
+      <Help>
+Set point mode. 
+0 Switch on the heating mode at set point, switch off at set point + Δt
+1 Switch on the heating mode at set point - Δt, switch off at set point
+2 Switching on the heating mode at set point - ½ Δt, switching off at set point - ½ Δt (Default)
+      </Help>
+      <Item value="0" label="Mode 0" />
+      <Item value="1" label="Mode 1" />
+      <Item value="2" label="Mode 2" />
+    </Value>
+    <Value genre="config" instance="1" index="4" value="1" label="Thermostat status at failure" units="" size="1" min="0" max="1" type="list">
+      <Help>Operating mode in case a thermostat doesn't receive data from a temp sensor</Help>
+      <Item value="0" label="Off" />
+      <Item value="1" label="On" />
+    </Value>
+    <Value genre="config" instance="1" index="5" value="30000" label="Max waiting time from temp sensor" units="sec" size="2" min="100" max="30000" type="short">
+      <Help>Max time of data expectation from room temperature sensor</Help>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="4" label="Minimum allowable temperature" units="°С" size="2" min="-127" max="127" type="short">
+      <Help>Set minimum allowable temperature</Help>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="4" label="Minimum allowable temperature" units="°С" size="2" min="-127" max="127" type="short">
+      <Help>Set minimum allowable temperature</Help>
+    </Value>
+    <Value genre="config" instance="1" index="7" value="30" label="Maximum alowable temperature" units="°С" size="2" min="-127" max="127" type="short">
+      <Help>Set maximum alowable temperature</Help>
+    </Value>
+    <Value genre="config" instance="1" index="8" value="120" label="Time turbo mode" units="sec" size="2" min="100" max="1200" type="short">
+      <Help>Set time turbo mode</Help>
+    </Value>
+    <Value genre="config" instance="1" index="9" value="0" label="Power on turbo mode" units="sec" size="1" min="0" max="1" type="byte">
+      <Help>Set power on turbo mode</Help>
+    </Value>
+    <Value genre="config" instance="1" index="10" value="0" label="Temperature sensor mode" units="" size="1" min="0" max="2" type="list">
+      <Help>Set temperature sensor mode</Help>
+      <Item value="0" label="Standard temperature sensor" />
+      <Item value="1" label="Polling the room temperature sensor" />
+      <Item value="2" label="Waiting for data from the room temperature sensor" />
+    </Value>
+    <Value genre="config" instance="1" index="11" value="300" label="Polling period of the room sensor" units="sec" size="2" min="15" max="600" type="short">
+      <Help>Set polling period of the room sensor</Help>
+    </Value>
+    <Value genre="config" instance="1" index="12" value="1" label="Temprature threshold to send data" units="Δ°С" size="1" min="1" max="16" type="byte">
+      <Help>The value that temprature should be changed to send data</Help>
+    </Value>
+    <Value genre="config" instance="1" index="13" value="300" label="Interval for forced sending data" units="" size="2" min="100" max="600" type="short">
+      <Help>Set Interval for forced sending data</Help>
+    </Value>
+    <Value genre="config" instance="1" index="15" value="0" label="Type of switch 1" units="" size="1" min="0" max="3" type="list">
+      <Help>Set Type of switch 1 (thermostat operating mode)</Help>
+      <Item value="0" label="Monostable" />
+      <Item value="1" label="Bistable, fixed position 1" />
+      <Item value="2" label="Bistable, fixed position 2" />
+      <Item value="3" label="Bistable" />
+    </Value>
+    <Value genre="config" instance="1" index="16" value="0" label="Type of switch 2" units="" size="1" min="0" max="3" type="list">
+      <Help>Set type of switch 2 (turbo mode)</Help>
+      <Item value="0" label="Monostable" />
+      <Item value="1" label="Bistable, fixed position 1" />
+      <Item value="2" label="Bistable, fixed position 2" />
+      <Item value="3" label="Bistable" />
+    </Value>
+    <Value genre="config" instance="1" index="40" value="0" label="Adjusment of a temperature sensor" units="" size="1" min="0" max="10" type="list">
+      <Help>Adjust temperature sensor if required.</Help>
+      <Item value="0" label="Send the actual temperature (further t);" />
+      <Item value="1" label=" t +1°С" />
+      <Item value="2" label=" t +2°С" />
+      <Item value="3" label=" t +3°С" />
+      <Item value="4" label=" t +4°С" />
+      <Item value="5" label=" t +5°С" />
+      <Item value="6" label=" t -1°С" />
+      <Item value="7" label=" t -2°С;" />
+      <Item value="8" label=" t -3°С;" />
+      <Item value="9" label=" t -4°С" />
+      <Item value="10" label=" t -5°С;" />
+    </Value>
+  </CommandClass>
+
+  <!-- This thermostat's setpoint descriptions are 0 based, not 1 -->
+  <CommandClass id="67">
+    <Compatibility>
+      <OverridePrecision>2</OverridePrecision>
+      <Base>0</Base>
+    </Compatibility>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Target for temperature and alarm reports" max_associations="10" />
+      <Group index="2" label="External temperature sensor" max_associations="1" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/cooper/RF9501.xml b/config/cooper/RF9501.xml
index 3bfa0d08..b5cb07cc 100644
--- a/config/cooper/RF9501.xml
+++ b/config/cooper/RF9501.xml
@@ -1,4 +1,4 @@
-<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001A:0000:534C</MetaDataItem>
     <MetaDataItem name="ProductPic">images/cooper/RF9501.png</MetaDataItem>
@@ -10,6 +10,7 @@
     <MetaDataItem name="ProductPage">http://www.cooperindustries.com/content/public/en/wiring_devices/products/lighting_controls/aspire_rf_wireless/switches/aspire_rf_15a_wireless_switch_rf9501.html</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/740/xml</Entry>
+      <Entry author="knightzac19" date="28 Jan 2021" revision="3">Removed Invalid RF9501 Group</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -52,9 +53,8 @@
   </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
-    <Associations num_groups="2">
+    <Associations num_groups="1">
       <Group index="1" label="Group #1" max_associations="5"/>
-      <Group index="255" label="Group #255" max_associations="1"/>
     </Associations>
   </CommandClass>
 </Product>
diff --git a/config/cooper/RF9540-N.xml b/config/cooper/RF9540-N.xml
index daf0ab7d..a0ca9264 100644
--- a/config/cooper/RF9540-N.xml
+++ b/config/cooper/RF9540-N.xml
@@ -1,4 +1,4 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001A:0101:4449</MetaDataItem>
     <MetaDataItem name="ProductPic">images/cooper/RF9540-N.png</MetaDataItem>
@@ -9,6 +9,8 @@
     <MetaDataItem name="Description">Aspire RF All load smart dimmer master</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/797/xml</Entry>
+      <Entry author="Tao Gong - gongtao0607@gmail.com" date="02 Nov 2020" revision="4">Remove group 255 as 0 associations is reported from the device</Entry>
+      <Entry author="Tao Gong - gongtao0607@gmail.com" date="08 Nov 2020" revision="5">Add VerifyChanged flags for Switch Multilevel V2</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -71,11 +73,16 @@
 		  </Help>
     </Value>
   </CommandClass>
+  <!-- Compatibility Flags -->
+  <CommandClass id="38">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
+  </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
-    <Associations num_groups="2">
+    <Associations num_groups="1">
       <Group index="1" label="Group #1" max_associations="5"/>
-      <Group index="255" label="Group #255" max_associations="1"/>
     </Associations>
   </CommandClass>
 </Product>
diff --git a/config/cooper/RF9601.xml b/config/cooper/RF9601.xml
new file mode 100644
index 00000000..e42ad00e
--- /dev/null
+++ b/config/cooper/RF9601.xml
@@ -0,0 +1,73 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001A:0503:534C</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/cooper/RF9601.png</MetaDataItem>
+    <MetaDataItem id="0503" name="ZWProductPage" type="534C">https://products.z-wavealliance.org/products/3038/</MetaDataItem>
+    <MetaDataItem id="0503" name="Identifier" type="534C">Eaton RF9601DW</MetaDataItem>
+    <MetaDataItem id="0503" name="FrequencyName" type="534C">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="Name">Eaton’s Z-Wave Plus Wireless Switch</MetaDataItem>
+    <MetaDataItem name="Description">Eaton’s Z-Wave plus wireless switch replaces regular switches (where a neutral is present) to provide local and remote ON/OFF control for most common residential lighting loads including LEDs and certain motor loads. Each switch can be manually and
+      remotely controlled by commands sent from your compatible Z-Wave certified controller. Features and Benefits: • Replaces standard switch to add local and wireless control • Single pole and 3-Way control: Use with standard 3-Way switch or Z-Wave
+      Plus Accessory RF9617 • Neutral is required for installation • Supports motors loads up to ½ HP • Features blue load indicating LED light that can be dimmed in ON or OFF state</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.eaton.com/us/en-us/skuPage.RF9601DW.html</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Zachary Knight" date="01 Jan 2021" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3038/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="Delayed OFF time" max="255" min="0" type="byte" units="seconds" value="0">
+      <Help>
+        The configuration value is a signed single byte number. This value may represent a value with no units or may represent a value such as time. 0 to 127 (decimal) represents 0 to 127 seconds of time. -128 to -1 (negative decimal numbers) represents 128
+        to 255 seconds as calculated by this formula. Config value = desired time in seconds (or desired value) -256 For an example of 172 seconds: config value = 172 - 256 = -84 (decimal) or 0xAC (hex)
+      </Help>
+    </Value>
+    <Value genre="config" index="2" label="Panic ON time" max="255" min="1" type="byte" units="seconds" value="0">
+      <Help>
+        The amount of time in seconds the switch will turn on for when panic mode is trigered. The configuration value is a signed single byte number. This value may represent a value with no units or may represent a value such as time. 0 to 127 (decimal) represents
+        0 to 127 seconds of time. -128 to -1 (negative decimal numbers) represents 128 to 255 seconds as calculated by this formula. Config value = desired time in seconds (or desired value) -256 For an example of 172 seconds: config value = 172 - 256
+        = -84 (decimal) or 0xAC (hex)
+      </Help>
+    </Value>
+    <Value genre="config" index="3" label="Panic OFF time" max="255" min="1" type="byte" units="seconds" value="0">
+      <Help>
+        The amount of time in seconds the switch will turn off for when panic mode is triggered. The configuration value is a signed single byte number. This value may represent a value with no units or may represent a value such as time. 0 to 127 (decimal) represents
+        0 to 127 seconds of time. -128 to -1 (negative decimal numbers) represents 128 to 255 seconds as calculated by this formula. Config value = desired time in seconds (or desired value) -256 For an example of 172 seconds: config value = 172 - 256
+        = -84 (decimal) or 0xAC (hex)
+      </Help>
+    </Value>
+    <Value genre="config" index="5" label="Power Up State" max="3" min="1" size="1" type="list" units="" value="3">
+      <Help>
+        Power up state of the device
+      </Help>
+      <Item label="OFF" value="1" />
+      <Item label="ON" value="2" />
+      <Item label="Last state" value="3" />
+    </Value>
+    <Value genre="config" index="6" label="Panic mode enable" max="2" min="1" size="1" type="list" units="" value="1">
+      <Help>
+        Enables this switch to participate in panic mode
+      </Help>
+      <Item label="OFF" value="1" />
+      <Item label="ON" value="2" />
+    </Value>
+    <Value genre="config" index="13" label="BLUE LED Brightness Level while the Switch is ON" max="4" min="0" size="1" type="byte" value="4">
+      <Help>
+        Adjust brightness of the blue indicator LED with Switch is ON - 0 = OFF 4 = Maximum brightness
+      </Help>
+    </Value>
+    <Value genre="config" index="14" label="BLUE LED Brightness Level while the Switch is OFF" max="4" min="0" size="1" type="byte" value="1">
+      <Help>
+        Adjust brightness of the blue indicator LED with Switch is OFF - 0 = OFF 4 = Maximum brightness
+      </Help>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="5" />
+      <Group index="2" label="Set" max_associations="5" />
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/device_configuration.xsd b/config/device_configuration.xsd
index d850a24a..99355349 100644
--- a/config/device_configuration.xsd
+++ b/config/device_configuration.xsd
@@ -86,8 +86,6 @@
 		   <xs:element name="AltTypeInterpretation" type="xs:boolean" minOccurs='0'/>
 		   <xs:element name="ExposeRawUserCodes" type="xs:boolean" minOccurs='0'/>
 		   <xs:element name="ClassGetVersionSupported" type="xs:boolean" minOccurs='0'/>
-		   <xs:element name="ForceUniqueEndpoints" type="xs:boolean" minOccurs='0'/>
-		   <xs:element name="ForceUniqueEndpoints" type="xs:boolean" minOccurs='0'/>
 		   <xs:element name="Base" type="xs:integer" minOccurs='0'/>
 		   <xs:element name="OverridePrecision" type="xs:integer" minOccurs='0'/>
 		   <xs:element name="ForceVersion" type="xs:integer" minOccurs='0'/>
diff --git a/config/dlink/dch-z210.xml b/config/dlink/dch-z210.xml
index 63a3d24b..26fe6150 100644
--- a/config/dlink/dch-z210.xml
+++ b/config/dlink/dch-z210.xml
@@ -1,4 +1,4 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="Description">This  plug-in  ON/OFF  switch  DCH-210 (aka Wenzhou TKB TZ88) is a security  enabled  wireless  switch,  based  on Z-Wave  Plus  technology.  Z-Wave  Plus™  enabled  devices  displaying  the  Z-Wave Plus™ logo can also be used with it regardless of the manufacturer, and can also be used in other manufacturer’s Z-Wave™ enabled networks. Remote On/Off control of the  connected  load  is  possible  with  other  manufacturer’s  wireless  Controller.  Each switch is designed to act as a repeater. Repeaters will re-transmit the RF signal to ensure  that  the  signal  is  received  by  its  intended  destination  by  routing  the  signal around obstacles and radio dead spots. Because TZ88 supports Security Command Class, it can learn with Secured controller. Its functionality and supported command classes is identical when included as a secure and non-secure device. 
 This  plug-in  ON/OFF  switch  is  able  to  detect  instance  wattage  (3000W/CE/CN, 1500W/UL/TW/JP)  and  overload  current  (14.5A)  of  connected  lights  or  appliances. When detecting overload state, the Switch will be disabled and its On/Off button will be  lockout  of  which  LED  will  flash  quickly.    However,  unplug  and  re-connect  the switch will reset its overload condition to normal status. 
@@ -6,8 +6,11 @@ This  plug-in  ON/OFF  switch  is  able  to  detect  instance  wattage  (3000W/C
     <MetaDataItem name="Name">Smart Energy Plug In Switch</MetaDataItem>
     <MetaDataItem id="0011" name="Identifier" type="0001">DCH-Z210</MetaDataItem>
     <MetaDataItem id="0011" name="FrequencyName" type="0001">CEPT (Europe) / U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/dlink/dch-z210.png</MetaDataItem>
     <ChangeLog>
       <Entry author="Jeff Thompson" date="27 April 2020" revision="1">Initial version - clone of Wenzhou (TKB) TZ88</Entry>
+      <Entry author="Justin Hammond" date="24 June 2020" revision="2">Add Product Pic</Entry>
+
     </ChangeLog>
     <MetaDataItem name="ResetDescription">Use this procedure only in the event that the primary controller is lost or otherwise inoperable.
 1. Pressing On/Off button three times within 2 seconds will enter inclusion mode. 
diff --git a/config/dome/0104.xml b/config/dome/0104.xml
new file mode 100644
index 00000000..a7e6ac0c
--- /dev/null
+++ b/config/dome/0104.xml
@@ -0,0 +1,95 @@
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/021F:0086:0003</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/dome/0086.png</MetaDataItem>
+    <MetaDataItem id="0104" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/1847/</MetaDataItem>
+    <MetaDataItem name="Description">The Dome™ Home Automation DMMZ1 Mouser is a powerful rodent electric trap with Z-Wave technology built-in. It kills mice, rats and other rodents quickly, cleanly and humanely with a powerful jolt of electricity. Simply set bait, turn on and place in desired location. When connected to Z-Wave Certified Hub, once the trap is full, it sends out a notification to your smarthome system. You can easily dispose of Mouser’s contents without ever having to touch them. Use the top handle and tip to dispose of caught rodents. Specially designed removable and washable bait tray will allow you to easily replace the bait and set it back up. It operates on 4 AA batteries (not included) and is optimised to last over 50 uses. Mouser features extra-long Z-Wave wireless range (up to 150 ft) and  Dome™ DMMZ1 Mouser comes with a 1-year limited warranty. Measurements in inches: 8.75 x 4.5 x 5. Dome™ Home Automation Z-Wave devices give your family peace of mind and security you can count on. With Dome™, you’re always connected and always covered.
+•	Humanely kills mice, rats and other rodents with a powerful electric shock and sends an alert to your smarthome system when the trap needs to be emptied
+•	Easy to use: set bait, turn on and place in desired location 
+Touch free: hold handle and tip to dispose of contents, then set it again
+•	Up to 150-foot Z-Wave range. Operating Temperature: 32°F - 112°F. Powered by 4 AA batteries (not included) enabling it to be triggered over 50 times  
+•	Z-Wave Plus Certified. Works as a stand alone electronic mouse trap  but requires a Z-Wave Certified Hub for notification functionality
+•	Tested to work with SmartThings, Vera, Staples Connect, HomeSeer, Nexia, Piper, URC, Harmony. Not supported by Wink, DSC, ADT Pulse, 2Gig, Napco, Interlogix, Honeywell (Dome is not associated with listed brands)
+</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Follow the instructions for your Z-Wave Certified controller to enter inclusion mode.  When prompted by the controller:
+1. Bring the Mouser to within 10’ of your Z-Wave controller for the inclusion process.  After successful pairing, the device can be brought to the desired location.
+2. Remove top cover by sliding it back and lifting up.
+3. Insert batteries.
+4. Press the CONNECT BUTTON quickly 3 times in a row.
+5. The LED INDICATOR will flash five times indicating inclusion
+</MetaDataItem>
+    <MetaDataItem name="ResetDescription">If needed, the Mouser can be reset locally by following these steps.  Only do this when your Z-Wave controller is disconnected or otherwise unreachable.  Beware that resetting your device will disconnect it from the system:
+1. Remove the TOP COVER and confirm that your Mouser is powered up.
+2. Press and hold the CONNECT BUTTON for at least 10 seconds then release.  A flashing LED INDICATOR indicates a successful factory reset. 
+3. The Mouser’s memory will be erased to factory settings.  
+</MetaDataItem>
+    <MetaDataItem id="0104" name="Identifier" type="0003">DMMZ1</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">If needed, the Mouser can be reset locally by following these steps.  Only do this when your Z-Wave controller is disconnected or otherwise unreachable.  Beware that resetting your device will disconnect it from the system:
+1. Remove the TOP COVER and confirm that your Mouser is powered up.
+2. Press and hold the CONNECT BUTTON for at least 10 seconds then release.  A flashing LED INDICATOR indicates a successful factory reset. 
+3. The Mouser’s memory will be erased to factory settings.  </MetaDataItem>
+    <MetaDataItem id="0104" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Follow the instructions for your Z-Wave Certified controller to enter exclusion mode.
+When prompted by the controller:
+1. Remove top cover by sliding it back and lifting up.
+2. Press the CONNECT BUTTON quickly 3 times in a row.
+The LED INDICATOR will flash five times indicating exclusion/disconnection.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/1847/Mouser API Manual.pdf</MetaDataItem>
+    <MetaDataItem name="Name">Dome Mouser</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1847/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!--
+  Dome Mouser
+  https://products.z-wavealliance.org/products/1847
+  -->
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="Basic Set Level" max="255" min="0" size="1" type="byte" value="255">
+      <Help>
+        This parameter defines the value sent by the BASIC_SET command to Association Group 2.
+        0 Turn Off Device.
+        1 to 99 Set Device to Value.
+        255 Turn On Device.
+      </Help>
+    </Value>
+    <Value genre="config" index="2" label="Set Firing Mode" max="2" min="1" size="1" type="list" value="2">
+      <Help>
+        This parameter sets firing mode of the Mouser.
+        Two firing modes are available: in the first (Continuous Fire,) electricity is passed continuously for the entire duration,
+        and in the second (Burst Fire,) electricity is passed continuously only for the first minute and it is pulsed at approximately 400 beats per minute for the remainder of the time.
+      </Help>
+      <Item label="Continuous Fire" value="1"/>
+      <Item label="Burst Fire" value="2"/>
+    </Value>
+    <Value genre="config" index="3" label="High Voltage Duration Time" max="360" min="100" size="2" type="short" units="Seconds" value="100">
+      <Help>
+        This parameter defines how long the Mouser will fire continuously before it starts to burst-fire
+      </Help>
+    </Value>
+    <Value genre="config" index="4" label="LED Alarm" max="1" min="0" size="1" type="list" value="1">
+      <Help>
+        This parameter enables or disables the indicator LED alarm when the trap is tripped.
+      </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="5" label="LED Alarm Duration" max="255" min="1" size="1" type="byte" units="Hours" value="0">
+      <Help>
+        This parameter sets the amount of time the LED Indicator blinks after the trap is tripped.
+        0 LED Blinks Until Trap is Reset.
+        1 to 255 in Hours.
+      </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Basic Set" max_associations="5"/>
+      <Group index="3" label="Notification Report" max_associations="5"/>
+      <Group index="4" label="Sensor Binary Report" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/dome/dmex1.xml b/config/dome/dmex1.xml
new file mode 100644
index 00000000..b43773da
--- /dev/null
+++ b/config/dome/dmex1.xml
@@ -0,0 +1,49 @@
+<!--
+Dome DMEX1 Range Extender
+--><Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/dome/dmex1.png</MetaDataItem>
+    <MetaDataItem id="0108" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2984/</MetaDataItem>
+    <MetaDataItem id="0108" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Turn the primary controller of Z-Wave network into inclusion mode, press the button on DMEX1 quickly 3 times in a row.</MetaDataItem>
+    <MetaDataItem name="Description">The Dome Range Extender is designed to improve communication between Z-Wave devices. It amplifies Z-Wave signals and increases the reach of your controller, ensuring your devices stay connected. The Extender has an LED light that works as a nightlight and can also act as an indicator in regular mode. The included suction cup lets you mount the Extender onto any smooth surface while using a micro USB power supply. All these features make the Dome Range extender the perfect choice for your home.</MetaDataItem>
+    <MetaDataItem name="Name">DMEX1 Range Extender</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press the button 6 times quickly, then immediately press and hold for 10 seconds. Use this procedure only in the event that your primary network controller is missing or inoperable.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2984/DomeExtenderAPIManual10-31.pdf</MetaDataItem>
+    <MetaDataItem id="0108" name="Identifier" type="0003">DMEX1</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Turn the primary controller of Z-Wave network into inclusion mode, press the button on DMEX1 quickly 3 times in a row.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Dybedahl - madj42@gmail.com" date="12 July 2020" revision="1">Initial Entry</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- COMMAND_CLASS_BASIC -->
+  <CommandClass id="32">
+    <Compatibility>
+      <GetSupported>false</GetSupported>
+    </Compatibility>
+  </CommandClass>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" type="byte" size="1" index="1" label="Night Light “Off” Threshold " min="0" max="10" value="5">
+      <Help>
+      This parameter sets the luminance (brightness) level at which night light is turned off. This is a unitless value that can be set to any value from 0 - 10, with a default value of 5. The higher this value, the brighter the ambient light must be to turn off the night light.
+      Range:0-10
+      Default: 5
+      </Help>
+    </Value>
+	<Value genre="config" type="byte" size="1" index="2" label="Night Light “On” Threshold " min="0" max="10" value="5">
+      <Help>
+	  This parameter sets the luminance (brightness) level at which night light is turned on. This is a unitless value that can be set to any value from 0 - 10, with a default value of 5. The lower this value, the dimmer the ambient light must be to turn on the night light.
+      Range:0-10
+      Default: 5
+      </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Retransmit" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/duco/DucoBox.xml b/config/duco/DucoBox.xml
new file mode 100644
index 00000000..9868e130
--- /dev/null
+++ b/config/duco/DucoBox.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2"
+	xmlns="https://github.com/OpenZWave/open-zwave">
+	<!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+	<MetaData>
+		<MetaDataItem name="Name">DucoBox</MetaDataItem>
+		<MetaDataItem name="Description">The ducBox is a Z-wave controlled mechenical ventilation unit</MetaDataItem>
+		<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/XXXX:XXXX:XXXX</MetaDataItem>
+		<MetaDataItem name="ProductPage">https://www.duco.eu/nl-nl-gearchiveerde-systemen</MetaDataItem>
+		<MetaDataItem name="ProductSupport">https://www.duco.eu/nl-nl-gearchiveerde-systemen</MetaDataItem>
+		<MetaDataItem name="ProductPic">images/DefaultProductImage.png</MetaDataItem>
+		<MetaDataItem name="ProductManual">https://www.duco.eu/Wes/CDN/1/Attachments/GH_DucoTronic%20System%20Z-wave_(nl)_online%20garantie_LowRes_635500206155264045.pdf</MetaDataItem>
+		<MetaDataItem name="WakeupDescription">			<!-- Short description on how to wake up the device if its battery powered --></MetaDataItem>
+		<MetaDataItem name="InclusionDescription">Press all 4 buttons to enter installer mode. Next pres button 1 to add the device to a z-wave network.</MetaDataItem>
+		<MetaDataItem name="ExclusionDescription">			<!-- Short Description on how to exclude the device --></MetaDataItem>
+		<MetaDataItem name="ResetDescription">Press all 4 buttons to enter installer mode. Next press and hold button 1 and 2 to remove the device from a z-wave network.</MetaDataItem>
+		<MetaDataItem id="0001" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/49</MetaDataItem>
+		<MetaDataItem id="0001" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+		<MetaDataItem id="0001" name="Identifier" type="0003">00001801/G12809</MetaDataItem>
+		<ChangeLog>
+			<Entry author="Mark van Kemenade - mark@kemdo.nl" date="29 Januari 2020" revision="1">Created the config file from scratch based on information from https://products.z-wavealliance.org/products/49 and http://devel.pepper1.net/zwavedb/device/156</Entry>
+			<Entry author="Jean-Francois Auger" date="23 Sept 2020" revision="2">Remove auto on group 1, cleanup MetaDataItem</Entry>
+		</ChangeLog>
+	</MetaData>
+
+	<CommandClass id="133">		<!-- Association -->
+		<Associations num_groups="7">
+			<Group index="1" label="Duco control" max_associations="20"/>
+			<!-- This is the control group used by the DUCO products to talk to each other. Only DUCO products should be added to this group. -->
+			<Group auto="true" index="2" label="Temp Basic set (on)" max_associations="20"/>
+			<!-- This is the temperature ON group. When the temperature goes above the temperature high set point, then the sensor will send BASIC SET( ON ) to all the nodes in the group. And when the temperature goes below the temperature low set point, then the sensor will send BASIC SET( OFF ) to all the nodes in the group. -->
+			<Group auto="true" index="3" label="Temp Basic set (off)" max_associations="20"/>
+			<!-- This is the temperature OFF group. When the temperature goes above the temperature high set point, then the sensor will send BASIC SET( OFF ) to all the nodes in the group. And when the temperature goes below the temperature low set point, then the sensor will send BASIC SET( ON ) to all the nodes in the group. -->
+			<Group auto="true" index="4" label="Temperature delta" max_associations="20"/>
+			<!-- This is the temperature DELTA group. When the temperature has changed more than the Delta temperature value, then the sensor will send a MULTI SENSOR REPORT with the temperature value to all the nodes in the group. -->
+			<Group auto="true" index="5" label="RH Basic set (on)" max_associations="20"/>
+			<!-- This is the RH ON group. When the RH goes above the RH high set point, then the sensor will send BASIC SET( ON ) to all the nodes in the group. And when the RH goes below the RH low set point, then the sensor will send BASIC SET( OFF ) to all the nodes in the group. -->
+			<Group auto="true" index="6" label="RH Basic set (off)" max_associations="20"/>
+			<!-- This is the RH OFF group. When the RH goes above the RH high set point, then the sensor will send BASIC SET( OFF ) to all the nodes in the group. And when the RH goes below the RH low set point, then the sensor will send BASIC SET( ON ) to all the nodes in the group. -->
+			<Group auto="true" index="7" label="RH delta" max_associations="20"/>
+			<!-- This is the RH DELTA group. When the RH has changed more than the Delta RH value, then the sensor will send a MULTI SENSOR REPORT with the RH value to all the nodes in the group. -->
+		</Associations>
+	</CommandClass>
+	<CommandClass id="112">		<!-- Configuration -->
+		<!-- Measure Level -->
+		<Value genre="config" index="1" label="Measure Level" size="1" type="byte" value="60" min="1" max="127" units="sec">
+			<Help>How often the value is measured(example: if value=60, the sensor value is measured every 60 seconds)</Help>
+		</Value>
+		<!-- CO² set point -->
+		<Value genre="config" index="2" label="CO² set point" size="2" type="short" value="1000" min="1" max="32767" units="PPM">
+			<Help>	Set point CO2: Used in ‘automatic mode’. (button 4) if the device is a CO2 sensor. The CO2 level in a room is a good indication of the air quality in this room. 
+			When the CO2 level is above this set point, the room needs more ventilation. Consequently, the CO2 sensor will open the associated grating unit.</Help>
+		</Value>
+
+		<!-- Humidity set point -->
+		<Value genre="config" index="3" label="CO² set point" size="1" type="byte" value="70" min="1" max="127" units="%">
+			<Help>	Set point CO2: Used in ‘automatic mode’. (button 4) if the device is a CO2 sensor. The CO2 level in a room is a good indication of the air quality in this room. 
+			When the CO2 level is above this set point, the room needs more ventilation. Consequently, the CO2 sensor will open the associated grating unit.</Help>
+		</Value>
+
+		<!-- Button 1 -->
+		<Value genre="config" index="4" label="Button 1" size="1" type="byte" value="15" min="1" max="127" units="%">
+			<Help>	The value when button1 is pressed. Values above 99 will be capped to 99 (maximum) used in association group 1</Help>
+		</Value>
+
+		<!-- Button 2 -->
+		<Value genre="config" index="5" label="Button 2" size="1" type="byte" value="50" min="1" max="127" units="%">
+			<Help>	The value when button2 is pressed. Values above 99 will be capped to 99 (maximum) used in association group 1</Help>
+		</Value>
+
+		<!-- Button 3 -->
+		<Value genre="config" index="6" label="Button 3" size="1" type="byte" value="99" min="1" max="127" units="%">
+			<Help>The value when button3 is pressed. Values above 99 will be capped to 99 (maximum) used in association group 1</Help>
+		</Value>
+
+		<!-- Min automatic level -->
+		<Value genre="config" index="7" label="Min automatic level" size="1" type="byte" value="15" min="1" max="127" units="%">
+			<Help>The minimum value that can be send by the CO2 sensor when it is in automatic mode.</Help>
+		</Value>
+
+		<!-- Temperature high setpoint -->
+		<Value genre="config" index="8" label="Temperature high setpoint" size="2" type="short" value="0" min="1" max="32767" units="°C">
+			<Help>Temperature high set point: used in association group 2 or 3</Help>
+		</Value>
+
+		<!-- Temperature low setpoint -->
+		<Value genre="config" index="9" label="Temperature low setpoint" size="2" type="short" value="0" min="1" max="32767" units="°C">
+			<Help>Temperature low set point: used in association group 2 or 3</Help>
+		</Value>
+
+		<!-- Temperature delta setpoint -->
+		<Value genre="config" index="10" label="Temperature delta setpoint" size="2" type="short" value="2" min="1" max="32767" units="°C">
+			<Help>Temperature delta set point: used in association group 4</Help>
+		</Value>
+
+		<!-- RH high setpoint -->
+		<Value genre="config" index="11" label="RH high setpoint" size="2" type="short" value="0" min="1" max="32767" units="%">
+			<Help>RH high set point: used in association group 5 or 6</Help>
+		</Value>
+
+		<!-- RH low setpoint -->
+		<Value genre="config" index="12" label="RH low setpoint" size="2" type="short" value="0" min="1" max="32767" units="%">
+			<Help>RH low set point: used in group5 or 6</Help>
+		</Value>
+
+		<!-- RH delta setpoint -->
+		<Value genre="config" index="13" label="RH delta setpoint" size="2" type="short" value="0" min="1" max="32767" units="%">
+			<Help>RH delta set point: used in group7</Help>
+		</Value>
+
+		<!-- CO2 high setpoint -->
+		<Value genre="config" index="14" label="CO2 high setpoint" size="2" type="short" value="0" min="1" max="32767" units="%">
+			<Help>CO2 high set point: not available in RH sensor</Help>
+		</Value>
+
+		<!-- CO2 low setpoint -->
+		<Value genre="config" index="15" label="CO2 low setpoint" size="2" type="short" value="0" min="1" max="32767" units="%">
+			<Help>CO2 low set point: not available in RH sensor</Help>
+		</Value>
+
+		<!-- CO2 delta setpoint -->
+		<Value genre="config" index="16" label="CO2 delta setpoint" size="2" type="short" value="500" min="1" max="32767" units="%">
+			<Help>	CO2 delta set point: not available in RH sensor</Help>
+		</Value>
+	</CommandClass>
+
+</Product>
diff --git a/config/duco/Ducotronic_CO-RH_sensor.xml b/config/duco/Ducotronic_CO-RH_sensor.xml
new file mode 100644
index 00000000..22957b15
--- /dev/null
+++ b/config/duco/Ducotronic_CO-RH_sensor.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2"
+	xmlns="https://github.com/OpenZWave/open-zwave">
+	<!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+	<MetaData>
+		<MetaDataItem name="Name">Duco CO2/RH sensor</MetaDataItem>
+		<MetaDataItem name="Description">The DUCO CO2 sensor measures the indoor CO2 levels and temperature. This is a good indication for the indoor air quality.Duco Tronic System 
+		The Duco Tronic System is a demand-driven natural ventilation system that always provides a balance between controlled natural ventilation and a central mechanical extraction. 
+		The demand for ventilation is determined based on air quality (CO 2 ) in the living spaces, the relative humidity (RH) in the 'wet' rooms and outdoor temperature readings. 
+		These values ​​are measured by means of various sensors in different rooms. The sensors communicate wirelessly via the Z-wave protocol with the electronically controlled by the air supply 
+		grilles and DucoBox the mechanical removal of the polluted and humid air controls. This electronic control ensures that only where a ventilation when needed, so the energy loss is limited. 
+		Moreover, the Duco Tronic System takes into account the temperature and adjusts to the weather conditions. If it gets colder outside, it will automatically schedule a higher CO 2 target gain. T
+		his opens it progresses less rapidly and less far. When the weather warms up, the opposite is true. In extreme heat is ventilated only by those grids where the lowest temperature measured, for example, 
+		on the shady side of the building. The measurement of the outside temperature is done by means of a sensor located in the control unit of the air vents situated. Thanks to the electronically controlled grids 
+		within the 'Duco Tronic System requires the user to do anything. The system ventilates automatically . Still, the resident boss and he may, if necessary or desired, the air supply and exhaust manually. 
+		Over time, the system automatically switches back to the most optimal position. All components, sensors, DucoBox and grills are aesthetically designed, fast and easy to install, use and maintenance.</MetaDataItem>
+		<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/XXXX:XXXX:XXXX</MetaDataItem>
+		<MetaDataItem name="ProductPage">https://www.duco.eu/nl-nl-gearchiveerde-systemen</MetaDataItem>
+		<MetaDataItem name="ProductSupport">https://www.duco.eu/nl-nl-gearchiveerde-systemen</MetaDataItem>
+		<MetaDataItem name="ProductPic">images/DefaultProductImage.png</MetaDataItem>
+		<MetaDataItem name="ProductManual">https://www.duco.eu/Wes/CDN/1/Attachments/GH_DucoTronic%20System%20Z-wave_(nl)_online%20garantie_LowRes_635500206155264045.pdf</MetaDataItem>
+		<MetaDataItem name="WakeupDescription">			<!-- Short description on how to wake up the device if its battery powered --></MetaDataItem>
+		<MetaDataItem name="InclusionDescription">Press all 4 buttons to enter installer mode. Next pres button 1 to add the device to a z-wave network.</MetaDataItem>
+		<MetaDataItem name="ExclusionDescription">			<!-- Short Description on how to exclude the device --></MetaDataItem>
+		<MetaDataItem name="ResetDescription">Press all 4 buttons to enter installer mode. Next press and hold button 1 and 2 to remove the device from a z-wave network.</MetaDataItem>
+		<MetaDataItem id="0001" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/49</MetaDataItem>
+		<MetaDataItem id="0001" name="FrequencyName" type="0004">CEPT (Europe)</MetaDataItem>
+		<MetaDataItem id="0001" name="Identifier" type="0004">00001801/G12809</MetaDataItem>
+		<ChangeLog>
+			<Entry author="Mark van Kemenade - mark@kemdo.nl" date="29 Januari 2020" revision="1">Created the config file from scratch based on information from https://products.z-wavealliance.org/products/49 and http://devel.pepper1.net/zwavedb/device/156</Entry>
+			<Entry author="Jean-Francois Auger" date="23 Sept 2020" revision="2">Remove auto on group 1, cleanup MetaDataItem</Entry>
+		</ChangeLog>
+	</MetaData>
+
+	<CommandClass id="133">		<!-- Association -->
+		<Associations num_groups="7">
+			<Group index="1" label="Duco control" max_associations="20"/>
+			<!-- This is the control group used by the DUCO products to talk to each other. Only DUCO products should be added to this group. -->
+			<Group auto="true" index="2" label="Temp Basic set (on)" max_associations="20"/>
+			<!-- This is the temperature ON group. When the temperature goes above the temperature high set point, then the sensor will send BASIC SET( ON ) to all the nodes in the group. And when the temperature goes below the temperature low set point, then the sensor will send BASIC SET( OFF ) to all the nodes in the group. -->
+			<Group auto="true" index="3" label="Temp Basic set (off)" max_associations="20"/>
+			<!-- This is the temperature OFF group. When the temperature goes above the temperature high set point, then the sensor will send BASIC SET( OFF ) to all the nodes in the group. And when the temperature goes below the temperature low set point, then the sensor will send BASIC SET( ON ) to all the nodes in the group. -->
+			<Group auto="true" index="4" label="Temperature delta" max_associations="20"/>
+			<!-- This is the temperature DELTA group. When the temperature has changed more than the Delta temperature value, then the sensor will send a MULTI SENSOR REPORT with the temperature value to all the nodes in the group. -->
+			<Group auto="true" index="5" label="RH Basic set (on)" max_associations="20"/>
+			<!-- This is the RH ON group. When the RH goes above the RH high set point, then the sensor will send BASIC SET( ON ) to all the nodes in the group. And when the RH goes below the RH low set point, then the sensor will send BASIC SET( OFF ) to all the nodes in the group. -->
+			<Group auto="true" index="6" label="RH Basic set (off)" max_associations="20"/>
+			<!-- This is the RH OFF group. When the RH goes above the RH high set point, then the sensor will send BASIC SET( OFF ) to all the nodes in the group. And when the RH goes below the RH low set point, then the sensor will send BASIC SET( ON ) to all the nodes in the group. -->
+			<Group auto="true" index="7" label="RH delta" max_associations="20"/>
+			<!-- This is the RH DELTA group. When the RH has changed more than the Delta RH value, then the sensor will send a MULTI SENSOR REPORT with the RH value to all the nodes in the group. -->
+		</Associations>
+	</CommandClass>
+
+	<CommandClass id="112">		<!-- Configuration -->
+
+		<!-- Measure Level -->
+		<Value genre="config" index="1" label="Measure Level" size="1" type="byte" value="60" min="1" max="127" units="sec">
+			<Help>How often the value is measured(example: if value=60, the sensor value is measured every 60 seconds)</Help>
+		</Value>
+
+		<!-- CO² set point -->
+		<Value genre="config" index="2" label="CO² set point" size="2" type="short" value="1000" min="1" max="32767" units="PPM">
+			<Help>Set point CO2: Used in ‘automatic mode’. (button 4) if the device is a CO2 sensor. The CO2 level in a room is a good indication of the air quality in this room. 
+			When the CO2 level is above this set point, the room needs more ventilation. Consequently, the CO2 sensor will open the associated grating unit.</Help>
+		</Value>
+
+		<!-- Humidity set point -->
+		<Value genre="config" index="3" label="CO² set point" size="1" type="byte" value="70" min="1" max="127" units="%">
+			<Help>Set point RH: Used in ‘automatic mode’. (button 4) if the device is a humidity sensor. The humidity level in a room is a good indication of the air quality in this room. 
+			When the RH level is above this set point, the room needs more ventilation. Consequently, the RH sensor will open the associated grating unit.</Help>
+		</Value>
+
+		<!-- Button 1 -->
+		<Value genre="config" index="4" label="Button 1" size="1" type="byte" value="15" min="1" max="127" units="%">
+			<Help>	The value when button1 is pressed. Values above 99 will be capped to 99 (maximum) used in association group 1</Help>
+		</Value>
+
+		<!-- Button 2 -->
+		<Value genre="config" index="5" label="Button 2" size="1" type="byte" value="50" min="1" max="127" units="%">
+			<Help>	The value when button2 is pressed. Values above 99 will be capped to 99 (maximum) used in association group 1</Help>
+		</Value>
+
+		<!-- Button 3 -->
+		<Value genre="config" index="6" label="Button 3" size="1" type="byte" value="99" min="1" max="127" units="%">
+			<Help>The value when button3 is pressed. Values above 99 will be capped to 99 (maximum) used in association group 1</Help>
+		</Value>
+
+		<!-- Min automatic level -->
+		<Value genre="config" index="7" label="Min automatic level" size="1" type="byte" value="15" min="1" max="127" units="%">
+			<Help>The minimum value that can be send by the CO2 sensor when it is in automatic mode.</Help>
+		</Value>
+
+		<!-- Temperature high setpoint -->
+		<Value genre="config" index="8" label="Temperature high setpoint" size="2" type="short" value="0" min="1" max="32767" units="°C">
+			<Help>Temperature high set point: used in association group 2 or 3</Help>
+		</Value>
+
+		<!-- Temperature low setpoint -->
+		<Value genre="config" index="9" label="Temperature low setpoint" size="2" type="short" value="0" min="1" max="32767" units="°C">
+			<Help>Temperature low set point: used in association group 2 or 3</Help>
+		</Value>
+
+		<!-- Temperature delta setpoint -->
+		<Value genre="config" index="10" label="Temperature delta setpoint" size="2" type="short" value="2" min="1" max="32767" units="°C">
+			<Help>Temperature delta set point: used in association group 4</Help>
+		</Value>
+
+		<!-- RH high setpoint -->
+		<Value genre="config" index="11" label="RH high setpoint" size="2" type="short" value="0" min="1" max="32767" units="%">
+			<Help>RH high set point: used in association group 5 or 6</Help>
+		</Value>
+
+		<!-- RH low setpoint -->
+		<Value genre="config" index="12" label="RH low setpoint" size="2" type="short" value="0" min="1" max="32767" units="%">
+			<Help>RH low set point: used in group5 or 6</Help>
+		</Value>
+
+		<!-- RH delta setpoint -->
+		<Value genre="config" index="13" label="RH delta setpoint" size="2" type="short" value="0" min="1" max="32767" units="%">
+			<Help>RH delta set point: used in group7</Help>
+		</Value>
+
+		<!-- CO2 high setpoint -->
+		<Value genre="config" index="14" label="CO2 high setpoint" size="2" type="short" value="0" min="1" max="32767" units="PPM">
+			<Help>CO2 high set point: not available in RH sensor</Help>
+		</Value>
+
+		<!-- CO2 low setpoint -->
+		<Value genre="config" index="15" label="CO2 low setpoint" size="2" type="short" value="0" min="1" max="32767" units="PPM">
+			<Help>CO2 low set point: not available in RH sensor</Help>
+		</Value>
+
+		<!-- CO2 delta setpoint -->
+		<Value genre="config" index="16" label="CO2 delta setpoint" size="2" type="short" value="500" min="1" max="32767" units="PPM">
+			<Help>	CO2 delta set point: not available in RH sensor</Help>
+		</Value>
+
+	</CommandClass>
+
+</Product>
diff --git a/config/ecodim/0.7.xml b/config/ecodim/0.7.xml
new file mode 100644
index 00000000..5fee8ee9
--- /dev/null
+++ b/config/ecodim/0.7.xml
@@ -0,0 +1,99 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+  <MetaData>
+    <MetaDataItem name="Name">ECO-DIM.07 Z-Wave LED dimmer</MetaDataItem>
+    <MetaDataItem name="Description">ECO-DIM.07 Z-Wave is a push/rotary dimmer for LED lights.
+The dimmer has a range of 0-200W LED, and is able to dim 230V halogen and incandescent bulds, dimable LED-drivers and electronic transfomers.
+The minimum and maximum light level of the dimmer can be adjusted via a potentiometer. It is protected against overload and interference signals.
+Installation can be done via 2 wires, there is no need for a neutral wire!
+It is suitable for most popular smarthome systems, and the frame systems of the most popular brands can be used: Busch-Jaeger, Merten by Schneider, Berker by Hager, Niko, Gira, Jung and Peha.
+The dimmer is compatible with 95% of all dimmable LED lights.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0431:0001:0202</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.ecodim.nl/eco-dim07-z-wave-druk-draai-led-dimmer-fase-afsnij.html</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.ecodim.nl/service/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ecodim/0.7.jpg</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3796/Z-Wave%20Dimmer%20Controller%20V1.4%20(1).pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Double press the reset button on the device then initiate inclusion on your z-wave controller.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Press the reset button three times on the device then initiate exclusion on your z-wave controller.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Push reset button for 5 seconds.</MetaDataItem>
+    <MetaDataItem id="0001" name="ZWProductPage" type="0202">https://products.z-wavealliance.org/products/3796/</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="0202">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="0202">ECO-DIM.07 Z-Wave</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Lukas Söder - lukas.l.soder@gmail.com" date="2020-07-02" revision="1">Information from manufacturer website and manual</Entry>
+      <Entry author="Lukas Söder - lukas.l.soder@gmail.com" date="2020-07-24" revision="2">Change ProductManual link format</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+    <!-- Here is a Byte/Int/Short Value Sample -->
+    <Value genre="config" index="1" label="State after power restore" max="2" min="0" type="byte" units="" value="0">
+      <Help>
+        State After Power Restored: The state the switch should return to once power is restored after power failure.
+        Default value: 0
+        0 - Off.
+        1 - On.
+        2 - Returns to level before Power Outage
+      </Help>
+    </Value>
+    <Value genre="config" index="2" label="Notification when Load status change" type="bool" value="1">
+      <Help>
+        Notification when Load status change: The Dimmer will send notification to associated device (Group Lifeline) when the status of Dimmer load is changed.
+        Default value: 1
+        0 - The function is disabled.
+        1 - Send Switch Multilevel Report.
+      </Help>
+    </Value>
+    <Value genre="config" index="3" label="Dimming speed" max="100" min="0" type="byte" units="seconds" value="5">
+      <Help>
+        Default dimming speed，unit is second. Valid values: 0-100.
+        Default value: 5
+        0 - Instanly.
+        1 - Fast.
+        ...
+        100 - Slow.
+      </Help>
+    </Value>
+    <!-- 4 got lost along the way? Doesn't exist in manual. -->
+    <Value genre="config" index="5" label="Enable or Disable external switch to pair network"  type="bool" value="0">
+      <Help>
+        Enable or Disable external switch to pair network.
+        Default value: 0
+        0 - Disable.
+        1 - Enable.
+      </Help>
+    </Value>
+    <Value genre="config" index="6" label="Dimming algorithm"  type="bool" value="0">
+      <Help>
+        Setting dimming way.
+        Default value: 0
+        0 - Linear dimming.
+        1 - Logarithmic dimming.
+      </Help>
+    </Value>
+    <Value genre="config" index="7" label="Default brightness" max="100" min="0" type="byte" units="" value="0">
+      <Help>
+        Setting default brightness when turn on the dimmer from off status.
+        Setting of 0 means that the dimmer will use parameter 1.
+        Default value: 0
+        Valid values: 0-99
+      </Help>
+    </Value>
+    <Value genre="config" index="8" label="Turn off delay" max="60" min="0" type="byte" units="seconds" value="0">
+      <Help>
+        Setting delay time when turn off, unit is second.
+        Default value: 0
+        Valid values: 0-60
+      </Help>
+    </Value>
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" label="LifeLine" max_associations="5"/>
+      <Group index="2" label="Basic Set" max_associations="5"/>
+      <Group index="3" label="Switch Multilevel" max_associations="5"/>
+      <Group index="4" label="External Button" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/ecolink/doorwindow.xml b/config/ecolink/doorwindow.xml
index 3b3bc44a..7194b497 100644
--- a/config/ecolink/doorwindow.xml
+++ b/config/ecolink/doorwindow.xml
@@ -1,7 +1,7 @@
 <!--
 Ecolink Door Window Sensor (DWZWAVE2.5-ECO)
 http://products.z-wavealliance.org/products/1498
---><Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/014A:0002:0001</MetaDataItem>
     <MetaDataItem name="ProductPic">images/ecolink/doorwindow.png</MetaDataItem>
@@ -21,6 +21,7 @@ Includes white and brown cases</MetaDataItem>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="4">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/790/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1498/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2927/xml</Entry>
+      <Entry author="Jean-François Auger - nechry@gmail.com" date="03 Jan 2021" revision="8">Add parameter 1 and 2</Entry>
     </ChangeLog>
     <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2927/EU Z-wave Door Window Sensor H114101 ZWAVE_Ver03.pdf</MetaDataItem>
     <MetaDataItem name="WakeupDescription">The sensor will wake up every so often and when the case is closed to send a Wake-Up Notification to allow the life line master node controller that the sensor is now available for any queued messages that the controller may have for the sensor. The time between Wake-Up Notifications can be configured with the Wake-Up Notification command class to be between 1 hour and 1 week with interval steps of 200 seconds. </MetaDataItem>
@@ -48,6 +49,24 @@ STEP THREE    Test the sensor.  Place the magnet next to the sensor to represent
       <SetAsReport>true</SetAsReport>
     </Compatibility>
   </CommandClass>
+  <!-- Configuration Parameters -->
+<CommandClass id="112">
+  <Value type="list" index="1" genre="config" label="Basic Set Report when sensor is restored" units="" max="1" min="0" size="1" value="0">
+    <Help>
+	Configures the sensor to send or not send Basic Sets to nodes IDs in Association group 2 when the sensor is in a restored state (i.e. Door/Window Closed).  
+	By default the sensor does NOT send Basic Set commands.
+    </Help>
+    <Item label="Disable" value="0"/>
+    <Item label="Enable" value="255"/>
+  </Value>
+  <Value type="list" index="2" genre="config" label="Sensor Binary / Notification Reports" units="" max="1" min="0" size="1" value="0">
+    <Help>
+	Configures the sensor to either send Sensor Binary Report and Notification Reports or only Notification Reports when the sensor is faulted and restored.  
+    </Help>
+    <Item label="Enable" value="0"/>
+    <Item label="Disable" value="255"/>
+  </Value>
+</CommandClass>
   <!-- Refresh Battery Level on wakeup-->
   <CommandClass id="128">
     <Compatibility>
diff --git a/config/econet/ezw1204.xml b/config/econet/ezw1204.xml
new file mode 100644
index 00000000..f067ef17
--- /dev/null
+++ b/config/econet/ezw1204.xml
@@ -0,0 +1,37 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">EcoNet Z-Wave Plus Water Leak Sensor</MetaDataItem>
+    <MetaDataItem name="Description">Damage from water leaks can be both devastating and costly, leading to both unnecessary expenses and stress. Protect your home from water damage with EcoNet’s EZW1204 Z-Wave leak sensor. This sleek and compact leak sensor can be placed below dishwashers, in laundry rooms, beside hot water tanks, on a wall close a sump pump and more. It comes with an optional snap-in wall mount piece.
+Z-Wave Plus technology allows this sensor to communicate with any Z-Wave enabled network and controller so notifications can be sent to your smartphone or other enabled smart devices. Its compatible with most popular Smart Home systems including Samsung’s SmartThings, Wink, Vera and Homeseer. It has a wireless range of 30 meters in a clear line of sight.
+</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/015D:C41C:2003</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.econetshop.com/products.html</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.econetshop.com/support</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/econet/ezw1204.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2748/EZW1204-Manual-Guide%C2%A0171220.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Open the shell, wake up immediately</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Press the inclusion switch 3 or more times rapidly (within 0.5s).  It is recommended to keep the EZW1204 within 1M/3ft of the controller.
+(Set controller to inclusion mode first)</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Press the inclusion switch 3 or more times rapidly (within 0.5s).  It is recommended to keep the EZW1204 within 1M/3ft of the controller.
+(Set controller to exclusion mode first)</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down the inclusion switch for 5 or more seconds.
+Note: this should only be used in the event your network's primary controller is missing or otherwise inoperable</MetaDataItem>
+    <MetaDataItem id="c41c" name="ZWProductPage" type="2003">https://products.z-wavealliance.org/products/2748/</MetaDataItem>
+    <MetaDataItem id="c41c" name="FrequencyName" type="2003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="c41c" name="Identifier" type="2003">EZW1204</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Keith Laidlaw - laidlaw1546@gmail.com" date="16 Sep 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2748/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Water leak send basic Set" max_associations="5"/>
+      <Group index="3" label="Cover plate open send basic Set" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/enerwave/zwnrsm2plus.xml b/config/enerwave/zwnrsm2plus.xml
index e519f27a..b6774b81 100644
--- a/config/enerwave/zwnrsm2plus.xml
+++ b/config/enerwave/zwnrsm2plus.xml
@@ -1,20 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--    
-        Enerwave ZWN-RSM2 Smart Dual Relay Switch Module 
-        Enerwave ZWN-RSM2-PLUS Smart Dual Relay Switch Module 
-
-        Note:  the two devices share the same device ID but have different configuration parameters.
-
-        Z-Wave Alliance Product Database info: 
-        https://products.z-wavealliance.org/products/2242
--->
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
-	<!-- Configuration Parameters -->
-        <CommandClass id="112">
-                <Value type="short" genre="config" index="3" label="Unsolicited Report Configuration" units="" min="0" max="255" value="0">
-                        <Help>ZWN-RSM2 and ZWN-RSM2-PLUS can send unsolicited status reports to the primary controller (Node ID 0x1) when the switch is toggled if the controller is designed as a gateway.  If your controller is not a gateway or does not need the status reported or you think it could confuse your Z-Wave network, you can use Command_Class_Configuration to disable this function.  By default this function is disabled. ZWM-RSM2 disabled=0, enabled=255.  ZWN-RSM2-PLUS disabled=0, enabled=1</Help>
-                </Value>
-        </CommandClass>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">ZWN-RSM2-PLUS Smart Dual Relay Switch Module</MetaDataItem>
+    <MetaDataItem name="Description">ZWN-RSM2-Plus Transform any home into a connected home with the Enerwave Z-Wave Plus Smart Dual Relay Wireless Lighting Control Module. The lighting control enables wireless control of on/off functions for standard table and floor lamps, and is compatible with incandescent, LED, Xenon, Halogen, fluorescent and compact fluorescent bulbs.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/011A:0606:0111</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://enerwaveautomation.com/products/zwnrsm2/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://enerwaveautomation.com/products/zwnrsm2/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/enerwave/zwnrsm2plus.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=%26filename=MarketCertificationFiles/2242/ZWN-RSM2%202017-2-28.pdf</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Once program button is pressed and hold for 10 second, the device will send a device reset locally notification to controller. Then clear all of information for the network, and restore factory defaults, and reset the module. Use this procedure only in the event that the network primary controller is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">When the controller is in remove mode,Press and release the program button of ZWN-RSM2 module, or Flick 3 times of the connected switch with Aux1 line (or Aux2 line) in 1.5 second. Then the controller will remove the module from current Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">When the controller is in add mode,Press and release the program button of ZWN-RSM2 module,or Flick 3 times of the connected switch with Aux1 line(or Aux 2 line) in 1.5 second. Then the controller will add the module into current Z-Wave network.</MetaDataItem>
+    <MetaDataItem id="0606" name="FrequencyName" type="0111">U.S. / Canada / Mexico</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="2">Original file was placeholder - had not revision entry</Entry>
+      <Entry author="Steve28" date="03 Jul 2020" revision="2">Wholesale replacement of placeholder file. Added information from mfg site</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+  <CommandClass id="112">
+    <Value type="short" genre="config" index="3" label="Unsolicited Report Configuration" units="" min="0" max="255" value="0">
+      <Help>ZWN-RSM2-PLUS can send unsolicited status reports to the primary controller (Node ID 0x1) when the switch is toggled if the controller is designed as a gateway.  If your controller is not a gateway or does not need the status reported or you think it could confuse your Z-Wave network, you can use Command_Class_Configuration to disable this function.  By default this function is disabled. ZWM-RSM2 disabled=0, enabled=255.  ZWN-RSM2-PLUS disabled=0, enabled=1</Help>
+    </Value>
+  </CommandClass>
 	<CommandClass id="133">
 		<Associations num_groups="3">
 			<Group index="1" max_associations="1" label="Lifeline" />
diff --git a/config/eurotronic/eur_spiritz.xml b/config/eurotronic/eur_spiritz.xml
index 8c0d6640..aa7237be 100644
--- a/config/eurotronic/eur_spiritz.xml
+++ b/config/eurotronic/eur_spiritz.xml
@@ -2,7 +2,7 @@
 Eurotronic Spirit Z-Wave Plus Thermostat
 Product website: https://www.eurotronic.org/produkte/spirit-z-wave-plus.html
 Tech manual: https://www.eurotronic.org/fileadmin/user_upload/eurotronic.org/Produktbilder/spirit_z_wave_plus/Spirit_Z-Wave_BAL_web_EN_view_04.pdf
---><Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0148:0001:0003</MetaDataItem>
     <MetaDataItem name="ProductPic">images/eurotronic/eur_spiritz.png</MetaDataItem>
@@ -39,6 +39,7 @@ To perform the factory reset press boost button.
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2543/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2650/xml</Entry>
+      <Entry author="Jasper Plantinga - jplantinga@gmail.com" date="10 Feb 2021" revision="6">Updated changed default behavior backlight</Entry>
     </ChangeLog>
     <MetaDataItem id="0003" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2650/</MetaDataItem>
     <MetaDataItem id="0003" name="Identifier" type="0003">4250848804063</MetaDataItem>
@@ -101,9 +102,9 @@ To perform the factory reset press boost button.
                 Default: 0 (LCD always on)
             </Help>
     </Value>
-    <Value genre="config" index="3" instance="1" label="Backlight" max="1" min="0" size="1" type="list" units="" value="1">
+    <Value genre="config" index="3" instance="1" label="Backlight" max="1" min="0" size="1" type="list" units="" value="0">
       <Help>
-                Default: Backlight enabled
+                Default: Backlight disabled
             </Help>
       <Item label="Backlight disabled" value="0"/>
       <Item label="Backlight enabled" value="1"/>
diff --git a/config/evolve/t-100.xml b/config/evolve/t-100.xml
new file mode 100644
index 00000000..e7dbc2ae
--- /dev/null
+++ b/config/evolve/t-100.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+	<MetaData>
+		<MetaDataItem name="Name">Evolve Guest Controls T-100 Thermostat</MetaDataItem>
+		<MetaDataItem name="Description">The T-100H is a Z-Wave wireless digital thermostat, designed to control the majority of HVAC systems. The T-100H contains a robust thermostat interface and is designed for use with communicating systems where remote monitoring and/or remote control are desired.</MetaDataItem>
+		<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0113:5434:4556</MetaDataItem>
+		<MetaDataItem name="ProductPic">images/evolve/t-100.png</MetaDataItem>
+		<MetaDataItem id="5434" name="ZWProductPage" type="4556">https://products.z-wavealliance.org/products/81</MetaDataItem>
+		<ChangeLog>
+		  <Entry author="Eric Yeargan - eric@yeargan.org" date="22 December 2020" revision="1">Initial config with 'Heating 1' setpoint missing from discovered config</Entry>
+		</ChangeLog>
+	</MetaData>
+	<CommandClass id="32">
+		<Compatibility>
+			<Mapping>64</Mapping>
+		</Compatibility>
+		<Instance index="1" />
+	</CommandClass>
+	<CommandClass id="43">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="int" genre="user" instance="1" index="0" label="Scene" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0">
+			<Help></Help>
+		</Value>
+		<Value type="int" genre="user" instance="1" index="1" label="Duration" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0">
+			<Help></Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="49">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="decimal" genre="user" instance="1" index="1" label="Air Temperature" units="F" read_only="true" write_only="false" verify_changes="false" min="0" max="0" value="72">
+			<Help>Air Temperature Sensor Value</Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="64">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="list" genre="user" instance="1" index="0" label="Mode" units="" read_only="false" write_only="false" verify_changes="false" min="0" max="0" vindex="1" size="1">
+			<Help>Set the Thermostat Mode</Help>
+			<Item label="Off" value="0" />
+			<Item label="Heat" value="1" />
+			<Item label="Cool" value="2" />
+			<Item label="Auto" value="3" />
+			<Item label="Aux Heat" value="4" />
+		</Value>
+		<SupportedModes>
+			<Mode index="0" label="Off" />
+			<Mode index="1" label="Heat" />
+			<Mode index="2" label="Cool" />
+			<Mode index="3" label="Auto" />
+			<Mode index="4" label="Aux Heat" />
+		</SupportedModes>
+	</CommandClass>
+	<CommandClass id="66">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="string" genre="user" instance="1" index="0" label="Operating State" units="" read_only="true" write_only="false" verify_changes="false" min="0" max="0" value="Idle">
+			<Help>Set the Thermostat Operating State</Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="67">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="decimal" genre="user" instance="1" index="1" label="Heating 1" units="F" read_only="false" write_only="false" verify_changes="false" min="0" max="0" value="72">
+			<Help>Set the Thermostat Setpoint Heating 1</Help>
+		</Value>
+		<Value type="decimal" genre="user" instance="1" index="2" label="Cooling 1" units="F" read_only="false" write_only="false" verify_changes="false" min="0" max="0" value="77">
+			<Help>Set the Thermostat Setpoint Cooling 1</Help>
+		</Value>
+		<Value type="decimal" genre="user" instance="1" index="3" label="Unused 3" units="C" read_only="false" write_only="false" verify_changes="false" min="0" max="0" value="0.0">
+			<Help>Set the Thermostat Setpoint Unused 3</Help>
+		</Value>
+		<Value type="decimal" genre="user" instance="1" index="12" label="Cooling Econ" units="F" read_only="false" write_only="false" verify_changes="false" min="0" max="0" value="80">
+			<Help>Set the Thermostat Setpoint Cooling Econ</Help>
+		</Value>
+		<Value type="decimal" genre="user" instance="1" index="13" label="Away Heating" units="C" read_only="false" write_only="false" verify_changes="false" min="0" max="0" value="0.0">
+			<Help>Set the Thermostat Setpoint Away Heating</Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="68">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="list" genre="user" instance="1" index="0" label="Fan Mode" units="" read_only="false" write_only="false" verify_changes="false" min="0" max="0" vindex="0" size="1">
+			<Help>Set the Fan Mode</Help>
+			<Item label="Auto Low" value="0" />
+			<Item label="On Low" value="1" />
+		</Value>
+		<SupportedModes>
+			<Mode index="0" label="Auto Low" />
+			<Mode index="1" label="On Low" />
+		</SupportedModes>
+	</CommandClass>
+	<CommandClass id="69">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="string" genre="user" instance="1" index="0" label="Fan State" units="" read_only="true" write_only="false" verify_changes="false" min="0" max="0" value="Idle">
+			<Help>Set the Fan State</Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="112">
+		<Compatibility />
+		<Instance index="1" />
+	</CommandClass>
+	<CommandClass id="114">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="int" genre="system" instance="1" index="0" label="Loaded Config Revision" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0">
+			<Help>Revision of the Config file currently loaded</Help>
+		</Value>
+		<Value type="int" genre="system" instance="1" index="1" label="Config File Revision" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0">
+			<Help>Revision of the Config file on the File System</Help>
+		</Value>
+		<Value type="int" genre="system" instance="1" index="2" label="Latest Available Config File Revision" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0">
+			<Help>Latest Revision of the Config file available for download</Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="115">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="list" genre="system" instance="1" index="0" label="Powerlevel" units="dB" read_only="false" write_only="false" verify_changes="false" min="0" max="0" vindex="0" size="1">
+			<Help>Output RF PowerLevel</Help>
+			<Item label="Normal" value="0" />
+			<Item label="-1dB" value="1" />
+			<Item label="-2dB" value="2" />
+			<Item label="-3dB" value="3" />
+			<Item label="-4dB" value="4" />
+			<Item label="-5dB" value="5" />
+			<Item label="-6dB" value="6" />
+			<Item label="-7dB" value="7" />
+			<Item label="-8dB" value="8" />
+			<Item label="-9dB" value="9" />
+		</Value>
+		<Value type="byte" genre="system" instance="1" index="1" label="Timeout" units="seconds" read_only="false" write_only="false" verify_changes="false" min="0" max="255" value="0">
+			<Help>Timeout till the PowerLevel is reset to Normal</Help>
+		</Value>
+		<Value type="button" genre="system" instance="1" index="2" label="Set Powerlevel" units="" read_only="false" write_only="true" verify_changes="false" min="0" max="0">
+			<Help>Apply the Output PowerLevel and Timeout Values</Help>
+		</Value>
+		<Value type="byte" genre="system" instance="1" index="3" label="Test Node" units="" read_only="false" write_only="false" verify_changes="false" min="0" max="255" value="0">
+			<Help>Node to Perform a test against</Help>
+		</Value>
+		<Value type="list" genre="system" instance="1" index="4" label="Test Powerlevel" units="dB" read_only="false" write_only="false" verify_changes="false" min="0" max="0" vindex="0" size="1">
+			<Help>PowerLevel to use for the Test</Help>
+			<Item label="Normal" value="0" />
+			<Item label="-1dB" value="1" />
+			<Item label="-2dB" value="2" />
+			<Item label="-3dB" value="3" />
+			<Item label="-4dB" value="4" />
+			<Item label="-5dB" value="5" />
+			<Item label="-6dB" value="6" />
+			<Item label="-7dB" value="7" />
+			<Item label="-8dB" value="8" />
+			<Item label="-9dB" value="9" />
+		</Value>
+		<Value type="short" genre="system" instance="1" index="5" label="Frame Count" units="" read_only="false" write_only="false" verify_changes="false" min="-32768" max="32767" value="0">
+			<Help>How Many Messages to send to the Node for the Test</Help>
+		</Value>
+		<Value type="button" genre="system" instance="1" index="6" label="Test" units="" read_only="false" write_only="true" verify_changes="false" min="0" max="0">
+			<Help>Perform a PowerLevel Test against the a Node</Help>
+		</Value>
+		<Value type="button" genre="system" instance="1" index="7" label="Report" units="" read_only="false" write_only="true" verify_changes="false" min="0" max="0">
+			<Help>Get the results of the latest PowerLevel Test against a Node</Help>
+		</Value>
+		<Value type="list" genre="system" instance="1" index="8" label="Test Status" units="" read_only="true" write_only="false" verify_changes="false" min="0" max="0" vindex="0" size="1">
+			<Help>The Current Status of the last PowerNode Test Executed</Help>
+			<Item label="Failed" value="0" />
+			<Item label="Success" value="1" />
+			<Item label="In Progress" value="2" />
+		</Value>
+		<Value type="short" genre="system" instance="1" index="9" label="Acked Frames" units="" read_only="true" write_only="false" verify_changes="false" min="-32768" max="32767" value="0">
+			<Help>Number of Messages successfully Acked by the Target Node</Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="129">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="list" genre="user" instance="1" index="0" label="Day" units="" read_only="false" write_only="false" verify_changes="false" min="0" max="0" vindex="0" size="1">
+			<Help>Day of Week</Help>
+			<Item label="Monday" value="1" />
+			<Item label="Tuesday" value="2" />
+			<Item label="Wednesday" value="3" />
+			<Item label="Thursday" value="4" />
+			<Item label="Friday" value="5" />
+			<Item label="Saturday" value="6" />
+			<Item label="Sunday" value="7" />
+		</Value>
+		<Value type="byte" genre="user" instance="1" index="1" label="Hour" units="" read_only="false" write_only="false" verify_changes="false" min="0" max="255" value="7">
+			<Help>Hour</Help>
+		</Value>
+		<Value type="byte" genre="user" instance="1" index="2" label="Minute" units="" read_only="false" write_only="false" verify_changes="false" min="0" max="255" value="37">
+			<Help>Minute</Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="133">
+		<Compatibility />
+		<Instance index="1" />
+		<Associations num_groups="3">
+			<Group index="1" max_associations="5" label="Group 1"/>
+			<Group index="2" max_associations="5" label="Group 2"/>
+			<Group index="3" max_associations="5" label="Group 3"/>
+		</Associations>
+	</CommandClass>
+	<CommandClass id="134">
+		<Compatibility />
+		<Instance index="1" />
+		<Value type="string" genre="system" instance="1" index="0" label="Library Version" units="" read_only="true" write_only="false" verify_changes="false" min="0" max="0" value="6">
+			<Help>Z-Wave Library Version</Help>
+		</Value>
+		<Value type="string" genre="system" instance="1" index="1" label="Protocol Version" units="" read_only="true" write_only="false" verify_changes="false" min="0" max="0" value="3.40">
+			<Help>Z-Wave Protocol Version</Help>
+		</Value>
+		<Value type="string" genre="system" instance="1" index="2" label="Application Version" units="" read_only="true" write_only="false" verify_changes="false" min="0" max="0" value="2.39">
+			<Help>Application Version</Help>
+		</Value>
+	</CommandClass>
+</Product>
diff --git a/config/fakro/arzsolar.xml b/config/fakro/arzsolar.xml
new file mode 100644
index 00000000..b047c4eb
--- /dev/null
+++ b/config/fakro/arzsolar.xml
@@ -0,0 +1,15 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0085:0012:0003</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fakro/arz.png</MetaDataItem>
+    <MetaDataItem id="0012" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/677/</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://www.fakro.com/htmlen/379.php</MetaDataItem>
+    <MetaDataItem name="Description">The ARZ SOLAR external roller shutters, powered by 12VDC, have been adapted for wireless cooperation with the Z-Wave system. The shutter is designed for FAKRO roof windows and its installation is possible at any time after roof window installation. It is also possible to use the shutter for roof windows of other manufactures. Installed on the outside of the window, the roller shutter constitutes an optimum solution against overheating and provides additional protection of the window e.g. against falling tree branches etc. The roller shutter enables complete blackout and good sound reduction. It is also good protection from glazing excessive cooling during the winter. The roller shutter also means increased security. It has built-in overload protection and can be controlled by using standard Z-Wave controller.</MetaDataItem>
+    <MetaDataItem name="Name">ARZ SOLAR Roof Window Roller Shutter</MetaDataItem>
+    <MetaDataItem id="0012" name="Identifier" type="0003">ARZ</MetaDataItem>
+    <MetaDataItem id="0012" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/677/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+</Product>
diff --git a/config/fakro/zrh12.xml b/config/fakro/zrh12.xml
new file mode 100644
index 00000000..7f12113d
--- /dev/null
+++ b/config/fakro/zrh12.xml
@@ -0,0 +1,15 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0085:0012:0003</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fakro/arz.png</MetaDataItem>
+    <MetaDataItem id="0004" name="ZWProductPage" type="0001">https://products.z-wavealliance.org/products/677/</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://www.fakro.com/htmlen/379.php</MetaDataItem>
+    <MetaDataItem name="Description">Fakro ZRH12 Portable Remote Controller</MetaDataItem>
+    <MetaDataItem name="Name">Fakro ZRH12 Portable Remote Controller</MetaDataItem>
+    <MetaDataItem id="0004" name="Identifier" type="0001">ZRH12</MetaDataItem>
+    <MetaDataItem id="0004" name="FrequencyName" type="0001">CEPT (Europe)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Michalux" date="11 May 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/677/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+</Product>
diff --git a/config/fibaro/fgdw2.xml b/config/fibaro/fgdw2.xml
index 3156ecbc..2336063e 100644
--- a/config/fibaro/fgdw2.xml
+++ b/config/fibaro/fgdw2.xml
@@ -1,13 +1,15 @@
-<!-- Fibaro: FGK101 Door Opening Sensor --><Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
+<!-- Fibaro: FGK101 Door Opening Sensor --><Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010F:1000:0702</MetaDataItem>
     <MetaDataItem name="ProductPic">images/fibaro/fgdw2.png</MetaDataItem>
     <MetaDataItem id="1000" name="ZWProductPage" type="0702">https://products.z-wavealliance.org/products/2181/</MetaDataItem>
+	<MetaDataItem id="2000" name="ZWProductPage" type="0702">https://products.z-wavealliance.org/products/2279/</MetaDataItem>
     <MetaDataItem name="Name">FIBARO Door/Window Sensor 2</MetaDataItem>
     <MetaDataItem name="Description">FIBARO Door/Window Sensor 2 is a wireless, battery powered, Z-Wave Plus compatible magnetic contact sensor. Changing the device’s status will automatically send signal to the Z-Wave controller and associated devices. In addition the FIBARO Door/Window Sensor 2 is equipped with a built-in temperature sensor.
 Sensor can be used to trigger scenes and wherever there is a need for information about opening or closing of doors, windows, garage doors, etc. Opening is detected by separating the sensor’s body and the magnet.
 </MetaDataItem>
     <MetaDataItem id="1000" name="Identifier" type="0702">FGDW-002</MetaDataItem>
+	<MetaDataItem id="2000" name="Identifier" type="0702">FGDW-002-1</MetaDataItem>
     <MetaDataItem name="InclusionDescription">1)	Place the Door/Window Sensor 2 within the direct range of your Z-Wave controller.
 2)	Set the main controller in (security/non-security) add mode (see the controller’s manual).
 3)	Click the Button at least six times.
@@ -37,9 +39,11 @@ Sensor can be used to trigger scenes and wherever there is a need for informatio
 
 *Resetting the device is not the recommended way of removing the device from the Z-Wave network. Use reset procedure only if the primary controller is missing or inoperable.</MetaDataItem>
     <MetaDataItem id="1000" name="FrequencyName" type="0702">CEPT (Europe)</MetaDataItem>
+	<MetaDataItem id="2000" name="FrequencyName" type="0702">U.S. / Canada / Mexico</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2181/xml</Entry>
-    </ChangeLog>
+      <Entry author="Justin Dybedahl - madj42@gmail.com" date="12 July 2020" revision="5">Add support for US Model.</Entry>
+	</ChangeLog>
   </MetaData>
   <!-- Configuration -->
   <CommandClass id="112">
diff --git a/config/fibaro/fgfs101.xml b/config/fibaro/fgfs101.xml
index bc8d21e2..d5585552 100644
--- a/config/fibaro/fgfs101.xml
+++ b/config/fibaro/fgfs101.xml
@@ -1,4 +1,55 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010f:1001:0b00</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgfs101.png</MetaDataItem>
+    <MetaDataItem id="1002" name="ZWProductPage" type="0B00">https://products.z-wavealliance.org/products/994/</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1) Open the cover by turning it counter-clockwise.
+2) Make sure the device is powered (either by a battery or a DC power supply).
+3) Press and hold the TMP button for 15-20 seconds until LED glows yellow (4th menu position).
+4) Release and click the TMP button to start the reset procedure.
+5) Successful reset will be confirmed with the LED indicator changing colour to red and an acoustic signal.
+Use reset procedure only if the primary controller is missing or inoperable.
+</MetaDataItem>
+    <MetaDataItem id="1002" name="Identifier" type="0B01">FGFS-101</MetaDataItem>
+    <MetaDataItem name="ProductManual">http://www.fibaro.com/manuals/en/FGFS-101-Flood-Sensor/FGFS-101-Flood-Sensor-en-2.1-2.3.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">FIBARO Flood Sensor will wake up at a defined time interval and will always try to communicate with the main controller. There is a possibility to wake up the device manually by triple click on the TMP button (version 2.6 or lower) or single click on the TMP button (version 3.2 or higher)</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1) Open the cover by turning it counter-clockwise.
+2) Make sure the device is powered (either by a battery or a DC power supply).
+3) Place the device within the direct range of your Z-Wave controller.
+4) Set the main controller in remove mode (see the controller’s manual).
+5) Quickly, triple click the TMP button located inside the casing.
+6) Wait for the removing process to end.
+7) Successful removing will be confirmed by the Z-Wave controller’s message.
+</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1) Open the cover by turning it counter-clockwise.
+2) Remove battery blocker.
+3) Place the device within the direct range of your Z-Wave controller.
+4) Set the main controller in (security/non-security) add mode (see the controller’s manual).
+5) Quickly, triple click the TMP button located inside the casing.
+6) Wait for the adding process to end.
+7) Successful adding will be confirmed by the Z-Wave controller’s message.
+8) Close the cover by turning it clockwise.
+9) Place the sensor onto a surface prone to flooding. Three electrodes underneath the device should evenly touch the surface.
+</MetaDataItem>
+    <MetaDataItem name="Description">Fibaro Flood Sensor is a universal, Z-Wave compatible, flood and temperature
+sensor. Device can be battery (ca. 2 years battery life) or VDC powered (12 or 24
+VDC). Flood alarm is sent to the Z-Wave network devices or additionally to any
+alarm system controller, through opening a NC contact.
+The device has built in temperature sensor, monitoring temperature of e.g. floor.
+Fibaro Flood Sensor is designed to be placed on the floor or on a wall with a flood
+sensor probe extended by connected wire. The device has built in LED indicator
+and acoustic alarm. In addition, the sensor is equipped with a tilt sensor reporting
+tilt or movement to the main controller e.g. when someone has taken the Sensor
+from its original location. LED diode signals flood, operating mode or the Z-Wave
+network communication range. Fibaro Flood Sensor is sink-proof, which means it
+drifts on the water surface and keeps on sending alarm signal in case of
+substantial inundation of water.</MetaDataItem>
+    <MetaDataItem id="1001" name="FrequencyName" type="0B00">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="Name">FIBARO Flood Sensor</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Nouknouk - nouknouk@gmail.com" date="08 Dec 2020" revision="4">Initial Metadata</Entry>
+    </ChangeLog>
+  </MetaData>
   <!-- Configuration -->
   <CommandClass id="112">
     <Value genre="config" index="1" instance="1" label="IN1 Alarm Cancellation Delay" max="3600" min="0" type="short" value="0">
@@ -40,11 +91,11 @@ Possible parameter settings:1 to 1000 [each 0.01oC] [0.01oC to 10.00oC].</Help>
       <Item label="Flood ACTIVE, tamper ACTIVE" value="3"/>
     </Value>
     <Value genre="config" index="50" instance="1" label="Low temperature alarm threshold." max="10000" min="-10000" type="short" value="1500">
-      <Help>The parameter stores a temperature value, below which LED indicator blinks with a colour determined by Parameter 61 settings. By default the LED indicator blinks blue. 
+      <Help>The parameter stores a temperature value, below which LED indicator blinks with a colour determined by Parameter 61 settings. By default the LED indicator blinks blue.
 Possible parameter settings:-10000 to 10000 [each 0.01oC] [-100oC to 100oC].</Help>
     </Value>
     <Value genre="config" index="51" instance="1" label="High temperature alarm threshold." max="10000" min="-10000" type="short" value="3500">
-      <Help>The parameter stores a temperature value, above which LED indicator blinks with a colour determined by Parameter 62 settings. By default the LED indicator blinks red. 
+      <Help>The parameter stores a temperature value, above which LED indicator blinks with a colour determined by Parameter 62 settings. By default the LED indicator blinks red.
 Possible parameter settings:-10000 to 10000 [each 0.01oC] [-100oC to 100oC].</Help>
     </Value>
     <Value genre="config" index="61" instance="1" label="Low temperature alarm indicator colour." max="16777215" min="0" type="int" value="255">
diff --git a/config/fibaro/fgmszw5.xml b/config/fibaro/fgmszw5.xml
index 6453714b..c3e01919 100644
--- a/config/fibaro/fgmszw5.xml
+++ b/config/fibaro/fgmszw5.xml
@@ -1,4 +1,4 @@
-<Product Revision="10" 
+<Product Revision="11" 
   xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010F:1001:0801</MetaDataItem>
@@ -37,6 +37,7 @@ Use reset procedure only if the primary controller is missing or inoperable.</Me
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="8">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3336/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="9">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3379/xml</Entry>
       <Entry author="Peter Gebruers - peter.gebruers@gmail.com" date="11 Jun 2019" revision="10">Force Association Single Channel on Lifeline - https://github.com/OpenZWave/open-zwave/issues/1830</Entry>
+      <Entry author="Glenn Gillen - me@glenngillen.com" date="22 Jun 2020" revision="11">Updated Metadata Import from Z-Wave Allian Database - https://products.z-wavealliance.org/products/3513/xml</Entry>	 
     </ChangeLog>
     <MetaDataItem id="2001" name="ZWProductPage" type="0801">https://products.z-wavealliance.org/products/2763/</MetaDataItem>
     <MetaDataItem id="2001" name="FrequencyName" type="0801">U.S. / Canada / Mexico</MetaDataItem>
@@ -47,6 +48,10 @@ Use reset procedure only if the primary controller is missing or inoperable.</Me
     <MetaDataItem id="2002" name="ZWProductPage" type="0801">https://products.z-wavealliance.org/products/3379/</MetaDataItem>
     <MetaDataItem id="2002" name="FrequencyName" type="0801">U.S. / Canada / Mexico</MetaDataItem>
     <MetaDataItem id="2002" name="Identifier" type="0801">FGMS-001</MetaDataItem>
+    <MetaDataItem id="3002" name="ZWProductPage" type="0801">https://products.z-wavealliance.org/products/3513/</MetaDataItem>
+    <MetaDataItem id="3002" name="FrequencyName" type="0801">Australia / New Zealand</MetaDataItem>
+    <MetaDataItem id="3002" name="Identifier" type="0801">FGMS-001</MetaDataItem>
+
   </MetaData>
   <!--
 	Fibaro Motion Sensor FGMS-001-ZW5
diff --git a/config/fibaro/fgrgbw442.xml b/config/fibaro/fgrgbw442.xml
new file mode 100644
index 00000000..f049bd39
--- /dev/null
+++ b/config/fibaro/fgrgbw442.xml
@@ -0,0 +1,313 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">RGBW Controller 2</MetaDataItem>
+    <MetaDataItem name="Description">FIBARO RGBW Controller 2 is a universal, Z-Wave Plus compatible RGB/RGBW controller.
+FIBARO RGBW Controller 2 uses PWM output signal, allowing it to control LED, RGB, RGBW strips, halogen lights and other resistive loads. It can also measure active power and energy consumed by the load. Controlled devices may be powered by 12 or 24V DC.
+Inputs support momentary/toggle switches and 0-10V analog sensors, like temperature sensors, humidity sensors, light sensors etc.
+
+Main features of FIBARO RGBW Controller:
+- Compatible with any certified Z-Wave or Z-Wave Plus controller.
+- Supports Z-Wave network Security Modes: S0 with AES-128 encryption and S2 Authenticated with PRNG-based encryption.
+- Works as a Z-Wave signal repeater.
+- Allows for controlling: » RGB/RGBW LED strip,
+- one-color LED strips,
+- halogen lights,
+- other compliant resistive loads.
+- Allows for connecting to inputs:
+- switches/buttons,
+- 0-10V analog sensors or potentiometers.
+- Active power and energy metering.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010F:1000:0902</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.fibaro.com/en/products/rgbw-controller/</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://manuals.fibaro.com/rgbw-2/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgrgbw442.png</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">The FIBARO RGBW Controller 2 is powered with mains voltage so it is always awake.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Power the device.
+2. Set the main controller in (Security/non-Security Mode) add mode (see the controller’s manual).
+3. Quickly, three times click the service button.
+4. If you are adding in Security S2 Authenticated, input the underlined part of the DSK (label on the box).
+5. LED will start blinking yellow, wait for the adding process to end.
+6. Adding result will be confirmed by the Z-Wave controller’s message and the LED:
+  - Green - successful (non-secure, S0, S2 Unauthenticated),
+  - Magenta - successful (Security S2 Authenticated),
+  - Red - not successful.
+</MetaDataItem>
+   <MetaDataItem name="ExclusionDescription">1. Power the device.
+2. Set the main controller into remove mode (see the controller’s manual).
+3. Quickly, three times click the service button.
+4. LED will start blinking yellow, wait for the removing process to end.
+5. Successful removing will be confirmed by the Z-Wave controller’s message and red LED colour.
+</MetaDataItem>
+   <MetaDataItem name="ResetDescription">1. Press and hold the service button to enter the menu.
+2. Release service button when the device glows yellow.
+3. Quickly click the service button to confirm.
+4. After few seconds the device will be restarted, which is signalled with the red colour.
+</MetaDataItem>
+    <ChangeLog>
+      <Entry author="nouknouk" date="08 September 2020" revision="1">Initial version</Entry>
+    </ChangeLog>
+    <MetaDataItem id="1000" name="ZWProductPage" type="0902">https://products.z-wavealliance.org/products/3589/</MetaDataItem>
+    <MetaDataItem id="1000" name="FrequencyName" type="0902">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="1000" name="Identifier" type="092">FGRGBW-442</MetaDataItem>
+    <MetaDataItem id="2000" name="ZWProductPage" type="0902">https://products.z-wavealliance.org/products/3656/</MetaDataItem>
+    <MetaDataItem id="2000" name="FrequencyName" type="0902">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="2000" name="Identifier" type="0902">FGRGBW-442</MetaDataItem>
+    <MetaDataItem id="3000" name="ZWProductPage" type="0902">https://products.z-wavealliance.org/products/3655/</MetaDataItem>
+    <MetaDataItem id="3000" name="FrequencyName" type="0902">Australia / New Zealand</MetaDataItem>
+    <MetaDataItem id="3000" name="Identifier" type="0902">FGRGBW-442</MetaDataItem>
+    <MetaDataItem id="4000" name="ZWProductPage" type="0902">https://products.z-wavealliance.org/products/3654/</MetaDataItem>
+    <MetaDataItem id="4000" name="FrequencyName" type="0902">Russia</MetaDataItem>
+    <MetaDataItem id="4000" name="Identifier" type="0902">FGRGBW-442</MetaDataItem>
+  </MetaData>
+  <CommandClass id="32">
+    <Compatibility>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
+  <CommandClass id="51">
+    <Value genre="user" index="0" instance="1" label="Color" type="string" units="#RRGGBBWW" value="#00000000" verify_changes="false"/>
+    <Compatibility>
+      <ColorIndexBug>true</ColorIndexBug>
+    </Compatibility>
+  </CommandClass>
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Remember device status before the power failure" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter determines how the device will react in the event of power supply failure (e.g. power outage or taking out from the electrical outlet). After the power supply is back on, the device can be restored to previous state or remain switched off. Default 0.</Help>
+      <Item label="device remains switched off" value="0"/>
+      <Item label="device restores the state from before the power failure" value="1"/>
+    </Value>
+    <Value genre="config" index="20" instance="1" label="Input 1 - operating mode" size="1" type="list" value="2">
+      <Help>This parameter allows to choose mode of 1st input (IN1). Change it depending on connected device. Default 2 (momentary switch).</Help>
+      <Item label="Analog input without internal pull-up (Sensor Multilevel)" value="0"/>
+      <Item label="Analog input with internal pull-up (Sensor Multilevel)" value="1"/>
+      <Item label="Momentary switch (Central Scene)" value="2"/>
+      <Item label="Toggle switch: switch state on every input change (Central Scene)" value="3"/>
+      <Item label="Toggle switch: contact closed - ON, contact opened - OFF (Central Scene)" value="4"/>
+    </Value>
+    <Value genre="config" index="21" instance="1" label="Input 2 - operating mode" size="1" type="list" value="2">
+      <Help>This parameter allows to choose mode of 2nd input (IN2). Change it depending on connected device. Default 2 (momentary switch).</Help>
+      <Item label="Analog input without internal pull-up (Sensor Multilevel)" value="0"/>
+      <Item label="Analog input with internal pull-up (Sensor Multilevel)" value="1"/>
+      <Item label="Momentary switch (Central Scene)" value="2"/>
+      <Item label="Toggle switch: switch state on every input change (Central Scene)" value="3"/>
+      <Item label="Toggle switch: contact closed - ON, contact opened - OFF (Central Scene)" value="4"/>
+    </Value>
+    <Value genre="config" index="22" instance="1" label="Input 3 - operating mode" size="1" type="list" value="2">
+      <Help>This parameter allows to choose mode of 3rd input (IN3). Change it depending on connected device. Default 2 (momentary switch).</Help>
+      <Item label="Analog input without internal pull-up (Sensor Multilevel)" value="0"/>
+      <Item label="Analog input with internal pull-up (Sensor Multilevel)" value="1"/>
+      <Item label="Momentary switch (Central Scene)" value="2"/>
+      <Item label="Toggle switch: switch state on every input change (Central Scene)" value="3"/>
+      <Item label="Toggle switch: contact closed - ON, contact opened - OFF (Central Scene)" value="4"/>
+    </Value>
+    <Value genre="config" index="23" instance="1" label="Input 4 - operating mode" size="1" type="list" value="2">
+      <Help>This parameter allows to choose mode of 4th input (IN4). Change it depending on connected device. Default 2 (momentary switch).</Help>
+      <Item label="Analog input without internal pull-up (Sensor Multilevel)" value="0"/>
+      <Item label="Analog input with internal pull-up (Sensor Multilevel)" value="1"/>
+      <Item label="Momentary switch (Central Scene)" value="2"/>
+      <Item label="Toggle switch: switch state on every input change (Central Scene)" value="3"/>
+      <Item label="Toggle switch: contact closed - ON, contact opened - OFF (Central Scene)" value="4"/>
+    </Value>
+    <Value genre="config" index="30" instance="1" label="Alarm configuration - 1st slot" size="4" type="int" value="0">
+      <Help>This parameter determines to which alarm frames and how the device should react.
+The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B [MSB] - notification Type.
+2B - notification Status.
+3B - Event/State Parameters.
+4B [LSB] action:
+    0x00 - no reaction
+    0x0X - turn off selected channel
+    0x1X - turn on selected channel
+    0x2X - blink selected channel
+    0x3Y - activate alarm sequence
+Default setting: [0x00, 0x00, 0x00, 0x00]</Help>
+    </Value>
+    <Value genre="config" index="31" instance="1" label="Alarm configuration - 2nd slot" size="4" type="int" value="1358888960">
+      <Help>This parameter determines to which alarm frames and how the device should react.
+The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B [MSB] - notification Type.
+2B - notification Status.
+3B - Event/State Parameters.
+4B [LSB] action:
+    0x00 - no reaction
+    0x0X - turn off selected channel
+    0x1X - turn on selected channel
+    0x2X - blink selected channel
+    0x3Y - activate alarm sequence
+Default setting: [0x05, 0xFF, 0x00, 0x00] (Water Alarm, any notification, no action)</Help>
+    </Value>
+    <Value genre="config" index="32" instance="1" label="Alarm configuration - 3rd slot" size="4" type="int" value="33488896">
+      <Help>This parameter determines to which alarm frames and how the device should react.
+The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B [MSB] - notification Type.
+2B - notification Status.
+3B - Event/State Parameters.
+4B [LSB] action:
+    0x00 - no reaction
+    0x0X - turn off selected channel
+    0x1X - turn on selected channel
+    0x2X - blink selected channel
+    0x3Y - activate alarm sequence
+Default setting: [0x01, 0xFF, 0x00, 0x00] (Smoke Alarm, any notification, no action)</Help>
+    </Value>
+    <Value genre="config" index="33" instance="1" label="Alarm configuration - 4th slot" size="4" type="int" value="50266112">
+      <Help>This parameter determines to which alarm frames and how the device should react.
+The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B [MSB] - notification Type.
+2B - notification Status.
+3B - Event/State Parameters.
+4B [LSB] action:
+    0x00 - no reaction
+    0x0X - turn off selected channel
+    0x1X - turn on selected channel
+    0x2X - blink selected channel
+    0x3Y - activate alarm sequence
+Default setting: [0x02, 0xFF, 0x00, 0x00] (CO Alarm, any notification, no action)</Help>
+    </Value>
+    <Value genre="config" index="34" instance="1" label="Alarm configuration - 5th slot" size="4" type="int" value="83820544">
+      <Help>This parameter determines to which alarm frames and how the device should react.
+The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B [MSB] - notification Type.
+2B - notification Status.
+3B - Event/State Parameters.
+4B [LSB] action:
+    0x00 - no reaction
+    0x0X - turn off selected channel
+    0x1X - turn on selected channel
+    0x2X - blink selected channel
+    0x3Y - activate alarm sequence
+Default setting: [0x04, 0xFF, 0x00, 0x00] (Heat Alarm, any notification, no action)</Help>
+    </Value>
+    <Value genre="config" index="35" instance="1" label="Duration of alarm signalization" max="32400" min="0" size="2" type="short" units="sec" value="600">
+      <Help>This parameter determines the duration of alarm signaling (flashing mode and/or alarm sequence). Available values:
+0 - infinite signalization
+1-32400 (1s-9h, 1s step)
+Default 600 (10min).</Help>
+    </Value>
+    <Value genre="config" index="40" instance="1" label="Input 1 - sent scenes" max="15" min="0" type="byte" value="15">
+      <Help>This parameter defines which actions result in sending scene ID and attribute assigned to them. Parameter is relevant only if parameter 20 is set to 2, 3 or 4. Actions can be summed up, e.g. 1+2+4+8=15 and entered as a value for the parameter. Available values:
+1 - Key pressed 1 time
+2 - Key pressed 2 times
+4 - Key pressed 3 times
+8 - Key hold down and key released
+Default 15.</Help>
+    </Value>
+    <Value genre="config" index="41" instance="1" label="Input 2 - sent scenes" max="15" min="0" type="byte" value="15">
+      <Help>This parameter defines which actions result in sending scene ID and attribute assigned to them. Parameter is relevant only if parameter 20 is set to 2, 3 or 4. Actions can be summed up, e.g. 1+2+4+8=15 and entered as a value for the parameter. Available values:
+1 - Key pressed 1 time
+2 - Key pressed 2 times
+4 - Key pressed 3 times
+8 - Key hold down and key released
+Default 15.</Help>
+    </Value>
+    <Value genre="config" index="42" instance="1" label="Input 3 - sent scenes" max="15" min="0" type="byte" value="15">
+      <Help>This parameter defines which actions result in sending scene ID and attribute assigned to them. Parameter is relevant only if parameter 20 is set to 2, 3 or 4. Actions can be summed up, e.g. 1+2+4+8=15 and entered as a value for the parameter. Available values:
+1 - Key pressed 1 time
+2 - Key pressed 2 times
+4 - Key pressed 3 times
+8 - Key hold down and key released
+Default 15.</Help>
+    </Value>
+    <Value genre="config" index="43" instance="1" label="Input 4 - sent scenes" max="15" min="0" type="byte" value="15">
+      <Help>This parameter defines which actions result in sending scene ID and attribute assigned to them. Parameter is relevant only if parameter 20 is set to 2, 3 or 4. Actions can be summed up, e.g. 1+2+4+8=15 and entered as a value for the parameter. Available values:
+1 - Key pressed 1 time
+2 - Key pressed 2 times
+4 - Key pressed 3 times
+8 - Key hold down and key released
+Default 15.</Help>
+    </Value>
+    <Value genre="config" index="62" instance="1" label="Power reports - periodic" max="32400" min="0" size="2" type="short" units="sec" value="3600">
+      <Help>This parameter determines in what time intervals the periodic power reports are sent to the main controller. Periodic reports do not depend of power change (parameter 61). Available values:
+0 - periodic reports are disabled
+30-32400 (30-32400s) - report interval
+Default 3600 (1h).</Help>
+    </Value>
+    <Value genre="config" index="63" instance="1" label="Analog inputs reports and output change on input change" max="100" min="0" size="2" type="short" value="5">
+      <Help>This parameter defines minimal change (from the last reported) of analog input voltage that results in sending new report and change in the output value. Parameter is relevant only for analog inputs (parameter 20, 21, 22 or 23 set to 0 or 1). Available values:
+0 - reporting on change disabled
+1-100 (0.1-10V, 0.1V step)
+Default 5 (0.5V).</Help>
+    </Value>
+    <Value genre="config" index="64" instance="1" label="Analog inputs reports - periodic" max="32400" min="0" size="2" type="short" units="sec" value="0">
+      <Help>This parameter defines reporting period of analog inputs value. Periodical reports are independent from changes in value (parameter 63). Parameter is relevant only for analog inputs (parameter 20, 21, 22 or 23 set to 0 or 1). Available values:
+0 - periodical reports disabled
+30-32400 (30-32400s, 1s step)
+Default 0 (periodical reports disabled).</Help>
+    </Value>
+    <Value genre="config" index="65" instance="1" label="Energy reports - on change" max="500" min="0" size="2" type="short" value="10">
+      <Help>This parameter determines the minimum change in consumed energy that will result in sending new energy report to the main controller. Energy reports are sent no often than every 30 seconds. Available values:
+0 - reports are disabled
+1-500 (0.01 - 5 kWh) - change in energy
+Default 10 (0.1 kWh).</Help>
+    </Value>
+    <Value genre="config" index="66" instance="1" label="Energy reports - periodic" max="32400" min="0" size="2" type="short" units="sec" value="3600">
+      <Help>This parameter determines in what time intervals the periodic energy reports are sent to the main controller. Periodic reports do not depend of energy change (parameter 65) Available values:
+0 - periodic reports are disabled
+30-32400 (30-32400s) - report interval
+Default 3600 (1h).
+</Help>
+    </Value>
+    <Value genre="config" index="150" instance="1" label="Inputs - LED colour control mode" size="1" type="list" value="0">
+      <Help>This parameter determines how connected switches control LED strips. Default 0.</Help>
+      <Item label="RGBW mode (every input controls output with the same number, IN1‑OUT1, IN2‑OUT2, IN3‑OUT3, IN4‑OUT4)" value="0"/>
+      <Item label="HSB and White mode (inputs works in HSB color model, IN1‑H (Hue), IN2‑S (Saturation), IN3‑B (Brightness), IN4‑White (OUT4)" value="1"/>
+    </Value>
+    <Value genre="config" index="151" instance="1" label="Local control - transition time" max="254" min="0" size="2" type="short" units="sec" value="3">
+      <Help>This parameter determines time of smooth transition between 0% and 100% when controlling with connected switches. Available values:
+0 - instantly
+1-127 (1s-127s, 1s step)
+128-254 (1min-127min, 1min step)
+Default 3.</Help>
+    </Value>
+    <Value genre="config" index="152" instance="1" label="Remote control - transition time" max="254" min="0" size="2" type="short" units="sec" value="3">
+      <Help>This parameter determines time of smooth transition between initial and target state when controlling via Z-Wave network. Available values:
+0 - instantly
+1-127 (1s-127s, 1s step)
+128-254 (1min-127min, 1min step)
+Default 3.</Help>
+    </Value>
+    <Value genre="config" index="154" instance="1" label="ON frame value for single click" max="4294967295" min="0" type="int" value="4294967295">
+      <Help>This parameter defines value sent to devices in association groups. The parameters consist of 4 bytes, each byte reserved for separate channel, from least significant (IN1) to most significant (IN4). Applicable for Basic Set and Switch Multilevel Set commands. Available values:
+For every byte: 0-99, 255.
+Default 4294967295 (0xFF FF FF FF - 255 for all channels).</Help>
+    </Value>
+    <Value genre="config" index="155" instance="1" label="OFF frame value for single click" max="4294967295" min="0" type="int" value="0">
+      <Help>This parameter defines value sent to devices in association groups. The parameters consist of 4 bytes, each byte reserved for separate channel, from least significant (IN1) to most significant (IN4). Applicable for Basic Set and Switch Multilevel Set commands. Available values:
+For every byte: 0-99, 255.
+Default 0 (0x00 00 00 00 - 0 for all channels).</Help>
+    </Value>
+    <Value genre="config" index="156" instance="1" label="ON frame value for double click" max="0" min="0" type="int" value="4294967295">
+      <Help>This parameter defines value sent to devices in association groups. The parameters consist of 4 bytes, each byte reserved for separate channel, from least significant (IN1) to most significant (IN4). Applicable for Basic Set and Switch Multilevel Set commands. Available values:
+For every byte: 0-99, 255.
+Default 0 (0x63 63 63 63 - 99 for all channels).</Help>
+    </Value>
+    <Value genre="config" index="157" instance="1" label="Start programmed sequence" size="1" type="list" value="0">
+      <Help>Setting this parameter will start programmed sequence with selected number. User can define own sequences via controller. Default 0.</Help>
+      <Item label="sequence inactive" value="0"/>
+      <Item label="user-defined sequence 1" value="1"/>
+      <Item label="user-defined sequence 2" value="2"/>
+      <Item label="user-defined sequence 3" value="3"/>
+      <Item label="user-defined sequence 4" value="4"/>
+      <Item label="user-defined sequence 5" value="5"/>
+      <Item label="Fireplace sequence" value="6"/>
+      <Item label="Storm sequence" value="7"/>
+      <Item label="Rainbow sequence" value="8"/>
+      <Item label="Aurora sequence" value="9"/>
+      <Item label="Police (red-white-blue) sequence" value="10"/>
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="10">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="RGBW Sync" max_associations="5"/>
+      <Group index="3" label="On/Off (IN1)" max_associations="5"/>
+      <Group index="4" label="Dimmer (IN1)" max_associations="5"/>
+      <Group index="5" label="On/Off (IN2)" max_associations="5"/>
+      <Group index="6" label="Dimmer (IN2)" max_associations="5"/>
+      <Group index="7" label="On/Off (IN3)" max_associations="5"/>
+      <Group index="8" label="Dimmer (IN3)" max_associations="5"/>
+      <Group index="9" label="On/Off (IN4)" max_associations="5"/>
+      <Group index="10" label="Dimmer (IN4)" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/fibaro/fgrm222.xml b/config/fibaro/fgrm222.xml
index 29d98a3b..fcaef010 100644
--- a/config/fibaro/fgrm222.xml
+++ b/config/fibaro/fgrm222.xml
@@ -1,5 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="5">
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="6">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010F:1000:0302</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgrm222.png</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">FIBARO Roller Shutter 2 is powered with mains voltage so it is always awake.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset procedure clears the modules’ EPROM memory, including all information about the Z-Wave network controller, calibration and power consumption data.
+1) Make sure the module is connected to the power supply.
+2) Press and hold the B-button for ca. 14 seconds.
+3) LED indicator will glow yellow.
+4) Release the B-button and press it again, briefly.
+5) The Roller Shutter memory is now empty.
+6) The module goes into the auto inclusion mode, until any button is pushed.
+</MetaDataItem>
+    <MetaDataItem id="1000" name="Identifier" type="0302">FGRM222</MetaDataItem>
+    <MetaDataItem name="Name">Roller Shutter 2</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Fibaro Roller Shutter may be included into the Z-Wave network via the B-button or a push button connected to the S1 terminal. In addition, the module may be included in auto inclusion mode, by simply connecting the power supply.
+Automatic Z-Wave network inclusion:
+1) Make sure the power supply is disconnected and a Roller Shutter is located within a direct Z-Wave network’s main controller communication range.
+2) Set the main controller into the learn mode (see main controllers operating manual).
+3) Connect the power supply to include the Roller Shutter in auto inclusion mode.
+4) Fibaro Roller Shutter will be automatically detected and included into the Z-Wave network.To disable the auto inclusion mode, press the B-button briefly, after connecting the module to the power supply.Manual
+Z-Wave network inclusion:
+1) Connect the power supply.
+2) Set the main controller into the learn mode (see main controllers operating manual).
+3) Triple click the B-button or a push button connected to the S1 terminal.
+4) Fibaro Roller Shutter will be detected and included into the Z-Wave network.
+</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://manuals.fibaro.com/content/manuals/en/FGR-222/FGR-222-EN-A-v1.2.pdf</MetaDataItem>
+    <MetaDataItem id="1000" name="FrequencyName" type="0302">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To remove the device from the Z-Wave network:
+1) Make sure the module is connected to the power supply.
+2) Set the main controller into the learn mode (see main controllers operating manual).
+3) Triple click the B-button or a push button connected to the S1 terminal.
+</MetaDataItem>
+    <MetaDataItem name="Description">FIBARO Roller Shutter 2 is a universal, Z-Wave compatible, electric motor controller.
+The device allows for controlling motors of roller blinds, awnings, venetian blinds, gates and others, which are single phase AC powered.
+FIBARO Roller Shutter 2 allows for precise positioning of a roller blind or venetian blind slats.
+Precise positioning is available for the motors equipped with mechanic and electronic end switches.
+The module may be controlled wirelessly, through the Z-Wave network main controller, or through the switch keys connected to it.
+It’s also possible to combine few devices into groups of devices, which then can be controlled simultaneously.
+In addition, FIBARO Roller Shutter 2 is equipped with Power Metering.
+</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Nouknouk - nouknouk@gmail.com" date="08 Dec 2020" revision="6">Initial Metadata</Entry>
+    </ChangeLog>
+  </MetaData>
   <!-- Configuration -->
   <CommandClass id="112">
     <!-- Protection -->
@@ -7,14 +52,14 @@
       <Help>Once the Local Protection is activated, the module stops responding to S1 and S2 push buttons. SCENE ID and association commands will not be sent as well. The only exception is the B-button. Menu and Z-Wave network inclusion, after the B-button or S1 push button triple click, are still active.</Help>
       <Item label="No protection. Roller Shutter responds to push buttons" value="0" />
       <Item label="Not supported" value="1" />
-      <Item label="Local protection active. Roller Shutter does not respond to push buttons" value="2" />      
+      <Item label="Local protection active. Roller Shutter does not respond to push buttons" value="2" />
     </Value>
-	
+
     <Value type="list" genre="config" instance="1" index="2" label="RF Protection (radio protection)" value="0" size="1">
       <Help>Once the RF Protection is activated, the module stops responding to command frames setting the blind position. It's still possible however to configure the device (advanced configuration parameters, protection modes) and checking it's current state through polling (position, power, energy).</Help>
       <Item label="No protection. Roller Shutter responds to command frames" value="0" />
       <Item label="RF Protection active. Roller Shutter does not respond to the Z-Wave control frames" value="1" />
-      <Item label="Not supported" value="2" />      
+      <Item label="Not supported" value="2" />
     </Value>
 
      <!-- GENERAL SETTINGS -->
@@ -22,9 +67,9 @@
        <Help>Parameters value shoud be set to 1 if the module operates in Venetian Blind mode.
 	       Default setting: 0</Help>
        <Item label="Blind position reports sent to the main controller using Z-Wave Command Class" value="0" />
-       <Item label="Blind position reports sent to the main controller using Fibaro Command Class" value="1" />      
-     </Value>	
-    
+       <Item label="Blind position reports sent to the main controller using Fibaro Command Class" value="1" />
+     </Value>
+
     <Value type="list" genre="config" instance="1" index="10" label="Roller Shutter operating modes" value="0" size="1">
       <Help>Default setting: 1</Help>
       <Item label="0 - Roller Blind Mode, without positioning" value="0"/>
@@ -33,15 +78,15 @@
 	    <Item label="3 - Gate Mode, without positioning" value="3"/>
 	    <Item label="4 - Gate Mode, with positioning" value="4"/>
     </Value>
-	
+
 	  <Value type="short" genre="config" instance="1" index="12" label="In Venetian Blind mode the parameter determines time of full turn of the lamellas" value="150" min="0" max="65535">
       <Help>In Venetian Blind mode (parameter 10 set to 2) the parameter determines time of full turn of the lamellas.
-	      In Gate Mode (parameter 10 set to 3 or 4) the parameter defines the COUNTDOWN time, i.e. the time period after which an open gate starts closing. 
+	      In Gate Mode (parameter 10 set to 3 or 4) the parameter defines the COUNTDOWN time, i.e. the time period after which an open gate starts closing.
 	      In any other operating mode the parameter value is irrelevant. Value of 0 means the gate will not close automatically
 	      Available settings: 0-65535 (0 - 655,35s)
-	      Default setting: 150 (1,5 s)</Help>      
+	      Default setting: 150 (1,5 s)</Help>
     </Value>
-	
+
 	<Value type="list" genre="config" instance="1" index="13" label="Set lamellas back to previous position" value="1" size="1">
       <Help>In Venetian Blind Mode (parameter 10 set to 2) the parameter influences lamellas positioning in various situations. In any other operating mode the parameter value is irrelevant.
 	      Default setting: 1</Help>
@@ -49,42 +94,42 @@
       <Item label="1 - Lamellas return to previously set position in case of the main controller operation, momentary switch operation, or when the limit switch is reached" value="1"/>
 	  <Item label="2 - Lamellas return to previously set position in case of the main controller operation, momentary switch operation, when the limit switch is reached or after receiving a STOP control frame (Switch Multilevel Stop)." value="2"/>
     </Value>
-    
+
     <Value type="list" genre="config" instance="1" index="14" label="Switch type" value="0" size="1">
       <Help>The parameter settings are relevant for Roller Blind Mode and Venetian Blind Mode (parameter 10 set to 0, 1, 2).</Help>
       <Item label="Momentary switches" value="0"/>
       <Item label="Toggle switches" value="1"/>
       <Item label="Single, momentary switch." value="2"/>
     </Value>
-	
+
 	  <Value type="byte" genre="config" instance="1" index="17" label="In Roller Blind Mode or Venetian Blind mode the parameter determines when the Roller Shutter relays are turned off after reaching a limit switch" value="10"  min="0" max="255">
       <Help>In Roller Blind Mode or Venetian Blind mode (parameter 10 set to 0, 1, 2) the parameter determines when the Roller Shutter relays are turned off after reaching a limit switch.
 	      In Gate Mode (parameter 10 set to 3 or 4) the parameter determines a time period after which a gate will start closing after a S2 contact has been disconnected. In this mode, time to turn off the Roller Shutter relays after reaching a limit switch is set to 3 seconds and cannot be modified.
 	      Value of 0 means the gate will note close automatically.
 	      Available settings: 0 - 255 (0,1-25,5s).
-	      Default setting: 10 (1s).</Help>      
+	      Default setting: 10 (1s).</Help>
     </Value>
-	
+
 	  <Value type="byte" genre="config" instance="1" index="18" label="Motor operation detection" value="10" min="0" max="255">
       <Help>Power threshold to be interpreted as reaching a limit switch.
 	      Available settings: 0 - 255 (1-255 W)
 	      The value of 0 means reaching a limit switch will not be detected
-	      Default setting: 10 (10W).</Help>      
+	      Default setting: 10 (10W).</Help>
     </Value>
-    
+
     <Value type="short" genre="config" instance="1" index="22" label="Motor operation time" value="240" min="0" max="65535">
       <Help>Time period for the motor to continue operation.
 	      Available settings: 0 - 65535 (0 - 65535s)
 	      The value of 0 means the function is disabled.
-	      Default setting: 240 (240s. - 4 minutes)</Help>      
+	      Default setting: 240 (240s. - 4 minutes)</Help>
     </Value>
-	
+
 	  <Value type="list" genre="config" instance="1" index="29" label="Forced Roller Shutter calibration" value="0" size="1" write_only="true">
       <Help>By modifying the parameters setting from 0 to 1 a Roller Shutter enters the calibration mode. The parameter relevant only if a Roller Shutter is set to work in positioning mode (parameter 10 set to 1, 2 or 4).</Help>
 	    <Item label="Default" value="0"/>
-      <Item label="Start calibration process" value="1"/>	  
+      <Item label="Start calibration process" value="1"/>
     </Value>
-	
+
 	  <!-- ALARM SETTINGS -->
     <Value type="list" genre="config" instance="1" index="30" label="Response to general alarm" value="2" size="1">
       <Help>Default setting: 2-Close blind</Help>
@@ -99,64 +144,64 @@
       <Item label="Open blind" value="1"/>
       <Item label="Close blind" value="2"/>
     </Value>
-	
+
 	  <Value type="list" genre="config" instance="1" index="32" label="Response to smoke, CO or CO2 alarm" value="1" size="1">
       <Help>Default setting: 1-Open blind</Help>
       <Item label="No reaction" value="0"/>
       <Item label="Open blind" value="1"/>
       <Item label="Close blind" value="2"/>
     </Value>
-	
+
 	  <Value type="list" genre="config" instance="1" index="33" label="Response to temperature alarm" value="1" size="1">
       <Help>Default setting: 1-Open blind</Help>
       <Item label="No reaction" value="0"/>
       <Item label="Open blind" value="1"/>
       <Item label="Close blind" value="2"/>
     </Value>
-	
+
   	<Value type="list" genre="config" instance="1" index="35" label="Managing lamellas in response to alarm" value="1" size="1">
       <Help>In Venetian Blind Mode (parameter 10 set to 2), the parameter determines how the lamellas will react upon alarm detection. In any other modes, the parameter value is not relevant.
 	      Default setting: 1 Set lamellas to their extreme position</Help>
       <Item label="Do not change lamellas position - lamellas return to the last set position" value="0"/>
-      <Item label="Set lamellas to their extreme position" value="1"/>      
+      <Item label="Set lamellas to their extreme position" value="1"/>
     </Value>
-	
+
 	  <!-- POWER AND ENERGY REPORTS SETTINGS -->
 	  <Value type="byte" genre="config" instance="1" index="40" label="Power reports" value="10"  min="0" max="100">
       <Help>Power level change that will result in new power value report being sent. The parameter defines a change that needs to occur in order to trigger the report. The value is a percentage of the previous report.
 	      Power report threshold available settings: 1-100 (1-100%).
 	      Value of 0 means the reports are turned off.
-	      Default setting: 10 (10%).</Help>      
+	      Default setting: 10 (10%).</Help>
     </Value>
-	
+
 	  <Value type="short" genre="config" instance="1" index="42" label="Periodic power or energy reports" value="3600" min="1" max="65534">
       <Help>The parameter defines a time period between consecutive reports.
 	      Available settings: 1-65534 (1-65534 seconds)
 	      Value of 0 means the reports are turned off.
-	      Default setting: 3600 (3600 seconds / 60 minutes).</Help>      
+	      Default setting: 3600 (3600 seconds / 60 minutes).</Help>
     </Value>
-	
+
 	  <Value type="byte" genre="config" instance="1" index="43" label="Energy reports" value="10" min="1" max="254">
       <Help>Energy level change which will result in new energy value report being sent. The parameter defines a change that needs to occur in order to trigger the report.
 	      Energy threshold available settings: 1-254 (0,01 - 2,54kWh).
 	      Value of 0 means the reports are turned off.
-	      Default setting 10 (0,1kWh).</Help>      
+	      Default setting 10 (0,1kWh).</Help>
     </Value>
-	
+
 	  <Value type="list" genre="config" instance="1" index="44" label="Self-measurement." value="1" size="1">
       <Help>A Roller Shutter may include power and energy used by itself in reports sent to the main controller
 	      Default setting: 0-Self-measurement inactive</Help>
       <Item label="Self-measurement inactive" value="0"/>
-      <Item label="Self-measurement active" value="1"/>      
+      <Item label="Self-measurement active" value="1"/>
     </Value>
-    
+
 	  <!-- SCENES AND ASSOCIATIONS SETTINGS -->
     <Value type="list" genre="config" instance="1" index="50" label="Scenes / Associations activation" value="0" size="1">
       <Help>Parameter determines whether scenes or associations are activated by the switch keys.
 	      Default setting: 0-Associations activation</Help>
       <Item label="Associations activation" value="0"/>
       <Item label="Scenes activation" value="1"/>
-    </Value>    
+    </Value>
   </CommandClass>
   <!--
   <CommandClass id="96" mapping="endpoints" />
diff --git a/config/fibaro/fgs214.xml b/config/fibaro/fgs214.xml
new file mode 100644
index 00000000..4d0cfb4f
--- /dev/null
+++ b/config/fibaro/fgs214.xml
@@ -0,0 +1,147 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010F:1000:0204</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgs224.png</MetaDataItem>
+    <MetaDataItem id="1000" name="ZWProductPage" type="0404">https://products.z-wavealliance.org/products/3949/</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To remove the device from the Z-Wave network:
+1. Power the device.
+2. Set the main controller into remove mode (see the controller’s
+manual).
+3. Quickly, three times click the maintenance button.
+4. LED will start blinking yellow, wait for the removing process to
+end.
+5. Successful removing will be confirmed by the Z-Wave controller’s
+message and red LED colour.
+</MetaDataItem>
+    <MetaDataItem name="Description">The remotely operated FIBARO Double Smart Module is designed to turn electrical devices or circuits on and off. Double Smart Module allows to control two devices or circuits. The compact size of the device allows for the product to be installed in the housings of other devices. The devices can be controlled either via the Z-Wave™ network or with buttons connected directly to them.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/3980/FGS-2x4-T-EN-1.0.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">To add the device to the Z-Wave network manually:
+1. Power the device.
+2. Set the main controller in (Security/non-Security Mode) add mode
+(see the controller’s manual).
+3. Quickly, three times click button connected to S1/S2 or the
+maintenance button.
+4. LED will start blinking yellow, wait for the adding process to end.
+5. If you are adding in Security S2 Authenticated, input the underlined
+part of the DSK (label on the bottom of the box).
+6. Adding result will be confirmed by the Z-Wave controller’s message
+and the LED:
+• Green – successful (non-secure, S0, S2 non-authenticated),
+• Magenta – successful (Security S2 Authenticated),
+• Red – not successful.
+</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset procedure allows to restore the device back to its factory settings, which means all information about the Z-Wave controller and user configuration will be deleted. In order to reset the device:
+1. Press and hold the maintenance button to enter the menu.
+2. Release button when the device glows yellow.
+3. Quickly click the button to confirm.
+4. After few seconds the device will be restarted, which is signalled
+with red LED colour.
+
+Use reset procedure only if the primary controller is missing or inoperable.
+</MetaDataItem>
+    <MetaDataItem id="1000" name="Identifier" type="0404">FGS-214</MetaDataItem>
+    <MetaDataItem name="Name">FIBARO Single Smart Module</MetaDataItem>
+    <MetaDataItem id="1000" name="FrequencyName" type="0404">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">The FIBARO Single Smart Module is powered with the mains voltage so it is always awake.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Mickaël PICAUD - mobile@mpicaud.fr" date="18 Dec 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/3980/XML</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Remember relays state" max="2" min="0" size="1" type="list" value="1">
+      <Help>This parameter determines the state of relays power supply failure (e.g. power outage). auto OFF and flashing modes the parameter not relevant and the relay will always remain off.</Help>
+      <Item label="Relays remain switched off after restoring power" value="0"/>
+      <Item label="Restore remembered state of relays after restoring power" value="1"/>
+      <Item label="Restore remembered state of relays after restoring power, but for toggle switches (parameter 20/21 set to 1) set the same state as the current state of the switches" value="2"/>
+    </Value>
+    <Value genre="config" index="150" instance="1" label="First channel - operating mode" max="3" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows to choose operating for channel controlled with Q/Q1 output. timed modes (value 1, 2 or 3), time is set parameter 154 and reaction to input is set with parameter 152.</Help>
+      <Item label="Standard operation" value="0"/>
+      <Item label="Delay Off" value="1"/>
+      <Item label="Auto Off" value="2"/>
+      <Item label="Flashing" value="3"/>
+    </Value>
+    <Value genre="config" index="152" instance="1" label="First channel - reaction to input change in delayed/auto OFF modes" max="2" min="0" size="1" type="list" value="0">
+      <Help>This parameter determines how the device when changing state of S1 input in timed for first channel.</Help>
+      <Item label="Cancel mode and set default state" value="0"/>
+      <Item label="No reaction, mode runs until it ends" value="1"/>
+      <Item label="Reset timer, start counting time from the beginning" value="2"/>
+    </Value>
+    <Value genre="config" index="154" instance="1" label="First channel – time parameter for delayed/auto OFF and flashing modes" max="32000" min="0" size="2" type="short" value="5">
+      <Help>This parameter allows to set time parameter used in timed modes. (s)</Help>
+    </Value>
+    <Value genre="config" index="156" instance="1" label="S1 Switch ON value sent to 2nd association group" max="255" min="0" size="2" type="short" value="255">
+      <Help>This parameter determines value sent with Switch On command to devices associated in 2nd association group.</Help>
+    </Value>
+    <Value genre="config" index="157" instance="1" label="S1 Switch OFF value sent to 2nd association group" max="255" min="0" size="2" type="short" value="0">
+      <Help>This parameter determines value sent with Switch Off command to devices associated in 2nd association group.</Help>
+    </Value>
+    <Value genre="config" index="158" instance="1" label="S1 Switch Double Click value sent to 2nd association groups" max="255" min="0" size="2" type="short" value="99">
+      <Help>This parameter determines value sent with Double Click command to devices associated in 2nd  association group.</Help>
+    </Value>
+    <Value genre="config" index="162" instance="1" label="Q/Q1 output type" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter determines type of Q/Q1 output.</Help>
+      <Item label="Normally Open (relay contacts opened turned off, closed when turned on)" value="0"/>
+      <Item label="Normally Closed (relay contacts closed turned off, opened when turned on)" value="1"/>
+    </Value>
+    <Value genre="config" index="20" instance="1" label="S1 input – switch type" max="2" min="0" size="1" type="list" value="2">
+      <Help>S1 - Inputs type configuration</Help>
+      <Item label="Momentary switch" value="0"/>
+      <Item label="Toggle switch (contact closed - On, contact opened - OFF)" value="1"/>
+      <Item label="Toggle switch (device changes status when switch changes status)" value="2"/>
+    </Value>
+    <Value genre="config" index="21" instance="1" label="S2 input – switch type" max="2" min="0" size="1" type="list" value="2">
+      <Help>S2 - Inputs type configuration</Help>
+      <Item label="Momentary switch" value="0"/>
+      <Item label="Toggle switch (contact closed - On, contact opened - OFF)" value="1"/>
+      <Item label="Toggle switch (device changes status when switch changes status)" value="2"/>
+    </Value>
+    <Value genre="config" index="24" instance="1" label="Inputs orientation" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows reversing operation of S1 and S2 inputs changing the wiring. Use in case of incorrect wiring.</Help>
+      <Item label="default (S1 - 1st channel, S2 - 2nd channel)" value="0"/>
+      <Item label="reversed (S1 - 2nd channel, S2 - 1st channel)" value="1"/>
+    </Value>
+    <Value genre="config" index="40" instance="1" label="S1 input – scenes sent" max="15" min="0" size="1" type="byte" value="0">
+      <Help>
+        This parameter determines which actions result in sending scene IDs assigned to them.
+        1 - Key pressed 1 time.
+        2 - Key pressed 2 times.
+        4 - Key pressed 3 times.
+        8 - Key Hold Down and Key Released.
+        15 - All active (Default)
+        Default setting: 0 (none)
+      </Help>
+    </Value>
+    <Value genre="config" index="41" instance="1" label="S2 input – scenes sent" max="15" min="0" size="1" type="byte" value="0">
+      <Help>
+        This parameter determines which actions result in sending scene IDs assigned to them.
+        1 - Key pressed 1 time.
+        2 - Key pressed 2 times.
+        4 - Key pressed 3 times.
+        8 - Key Hold Down and Key Released.
+        15 - All active (Default)
+        Default setting: 0 (none)
+      </Help>
+    </Value>      
+  </CommandClass>
+  <!-- -->
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="On/Off S1" max_associations="5"/>
+      <Group index="3" label="On/Off S2" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>true</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+</Product>
\ No newline at end of file
diff --git a/config/fibaro/fgs222.xml b/config/fibaro/fgs222.xml
index 0b9e1ed1..34443f74 100644
--- a/config/fibaro/fgs222.xml
+++ b/config/fibaro/fgs222.xml
@@ -1,4 +1,43 @@
-<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010f:1002:0202</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgs222.png</MetaDataItem>
+    <MetaDataItem id="1002" name="ZWProductPage" type="0202">https://products.z-wavealliance.org/products/2731/</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To remove the device from the Z-Wave network:
+1. Place the device within the direct range of your Z-Wave controller
+2. Identify switch no. 1 (turns the light on) or the B-button (located on the device’s housing)
+3. Set the main controller in remove mode (see the controller's manual).
+4. Quickly, three times press switch no. 1 or the B-button
+5. Wait for the removing process to end
+6. Successful removing will be confirmed by the Z-Wave controller’s message
+</MetaDataItem>
+    <MetaDataItem name="Description">FIBARO Double Relay Switch is designed to be installed in standard wall switch boxes or anywhere else where it is necessary to control two independent devices drawing up to 1500W each.
+As with all other Actors, FIBARO Double Relay Switch allows to control connected devices either via the Z-Wave network or via a switch connected directly to it.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://manuals.fibaro.com/content/manuals/en/FGS-222/FGS-222-EN-A-v1.1.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">To add the device to the Z-Wave network:
+1. Place the device within the direct range of your Z-Wave controller
+2. Identify switch no. 1 (turns the light on) or the B-button (located on the device’s housing)
+3. Set the main controller into the adding mode (see the controller’s manual).
+4. Quickly, three times press switch no. 1 or the B-button
+5. Wait for the adding process to end
+6. Successful adding will be confirmed by the Z-Wave controller’s message
+</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset procedure erases memory of the device, including all information on the Z-Wave network and the main controller.
+1. Disconnect the power supply
+2. Remove the device from the wall switch box
+3. Connect the power supply
+4. Locate the B-button on the housing
+5. Press and hold the B-button for 3 seconds
+6. After few seconds the device will be reset
+</MetaDataItem>
+    <MetaDataItem id="1002" name="Identifier" type="0202">FGS-223</MetaDataItem>
+    <MetaDataItem name="Name">FIBARO Double Switch 2</MetaDataItem>
+    <MetaDataItem id="1002" name="FrequencyName" type="0202">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">The FIBARO Double Switch 2 is powered with the mains voltage so it is always awake.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Nouknouk - nouknouk@gmail.com" date="08 Dec 2020" revision="6">Initial Metadata</Entry>
+    </ChangeLog>
+  </MetaData>
   <!-- Configuration -->
   <CommandClass id="112">
     <Value genre="config" index="1" instance="1" label="Enable/Disable ALL ON/OFF" size="1" type="list" value="255">
@@ -35,8 +74,8 @@
       <Item label="Map OFF status to all devices in group 1, Double click on key 1 will send ON to all devices in group 1, all dimmers set to 100%" value="2"/>
     </Value>
     <Value genre="config" index="7" instance="1" label="Control key #2 behaviour" size="1" type="list" value="1">
-      <Help>Key no.2 is not represented by any physical device except of devices on association list. 
-        This functionality prevents of lack of reaction on pressing key no.2 through polling devices 
+      <Help>Key no.2 is not represented by any physical device except of devices on association list.
+        This functionality prevents of lack of reaction on pressing key no.2 through polling devices
         from association list one by one and checking their actual statuses.
       </Help>
       <Item label="Device status is not checked" value="0"/>
diff --git a/config/fibaro/fgs224.xml b/config/fibaro/fgs224.xml
new file mode 100644
index 00000000..b5d4c143
--- /dev/null
+++ b/config/fibaro/fgs224.xml
@@ -0,0 +1,166 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010F:1000:0204</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgs224.png</MetaDataItem>
+    <MetaDataItem id="1000" name="ZWProductPage" type="0204">https://products.z-wavealliance.org/products/3980/</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To remove the device from the Z-Wave network:
+1. Power the device.
+2. Set the main controller into remove mode (see the controller’s
+manual).
+3. Quickly, three times click the maintenance button.
+4. LED will start blinking yellow, wait for the removing process to
+end.
+5. Successful removing will be confirmed by the Z-Wave controller’s
+message and red LED colour.
+</MetaDataItem>
+    <MetaDataItem name="Description">The remotely operated FIBARO Double Smart Module is designed to turn electrical devices or circuits on and off. Double Smart Module allows to control two devices or circuits. The compact size of the device allows for the product to be installed in the housings of other devices. The devices can be controlled either via the Z-Wave™ network or with buttons connected directly to them.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/3980/FGS-2x4-T-EN-1.0.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">To add the device to the Z-Wave network manually:
+1. Power the device.
+2. Set the main controller in (Security/non-Security Mode) add mode
+(see the controller’s manual).
+3. Quickly, three times click button connected to S1/S2 or the
+maintenance button.
+4. LED will start blinking yellow, wait for the adding process to end.
+5. If you are adding in Security S2 Authenticated, input the underlined
+part of the DSK (label on the bottom of the box).
+6. Adding result will be confirmed by the Z-Wave controller’s message
+and the LED:
+• Green – successful (non-secure, S0, S2 non-authenticated),
+• Magenta – successful (Security S2 Authenticated),
+• Red – not successful.
+</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset procedure allows to restore the device back to its factory settings, which means all information about the Z-Wave controller and user configuration will be deleted. In order to reset the device:
+1. Press and hold the maintenance button to enter the menu.
+2. Release button when the device glows yellow.
+3. Quickly click the button to confirm.
+4. After few seconds the device will be restarted, which is signalled
+with red LED colour.
+
+Use reset procedure only if the primary controller is missing or inoperable.
+</MetaDataItem>
+    <MetaDataItem id="1000" name="Identifier" type="0204">FGS-224</MetaDataItem>
+    <MetaDataItem name="Name">FIBARO Double Smart Module</MetaDataItem>
+    <MetaDataItem id="1000" name="FrequencyName" type="0204">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">The FIBARO Double Smart Module is powered with the mains voltage so it is always awake.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Raffaele Fanizzi - vifani@gmail.com" date="15 Oct 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/3980/XML</Entry>
+      <Entry author="Romke10" date="2 January 2021" revision="2">Added parameter 151</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Remember relays state" max="2" min="0" size="1" type="list" value="1">
+      <Help>This parameter determines the state of relays power supply failure (e.g. power outage). auto OFF and flashing modes the parameter not relevant and the relay will always remain off.</Help>
+      <Item label="Relays remain switched off after restoring power" value="0"/>
+      <Item label="Restore remembered state of relays after restoring power" value="1"/>
+      <Item label="Restore remembered state of relays after restoring power, but for toggle switches (parameter 20/21 set to 1) set the same state as the current state of the switches" value="2"/>
+    </Value>
+    <Value genre="config" index="150" instance="1" label="First channel - operating mode" max="3" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows to choose operating for channel controlled with Q/Q1 output. timed modes (value 1, 2 or 3), time is set parameter 154 and reaction to input is set with parameter 152.</Help>
+      <Item label="Standard operation" value="0"/>
+      <Item label="Delay Off" value="1"/>
+      <Item label="Auto Off" value="2"/>
+      <Item label="Flashing" value="3"/>
+    </Value>
+    <Value genre="config" index="151" instance="1" label="Second channel - operating mode" max="3" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows to choose operating for channel controlled with Q/Q2 output. timed modes (value 1, 2 or 3), time is set parameter 155 and reaction to input is set with parameter 153.</Help>
+      <Item label="Standard operation" value="0"/>
+      <Item label="Delay Off" value="1"/>
+      <Item label="Auto Off" value="2"/>
+      <Item label="Flashing" value="3"/>
+    </Value>    
+    <Value genre="config" index="152" instance="1" label="First channel - reaction to input change in delayed/auto OFF modes" max="2" min="0" size="1" type="list" value="0">
+      <Help>This parameter determines how the device when changing state of S1 input in timed for first channel.</Help>
+      <Item label="Cancel mode and set default state" value="0"/>
+      <Item label="No reaction, mode runs until it ends" value="1"/>
+      <Item label="Reset timer, start counting time from the beginning" value="2"/>
+    </Value>
+    <Value genre="config" index="153" instance="1" label="Second channel - reaction to input change in delayed/auto OFF modes" max="2" min="0" size="1" type="list" value="0">
+      <Help>This parameter determines how the device when changing state of S2 input in timed for second channel.</Help>
+      <Item label="Cancel mode and set default state" value="0"/>
+      <Item label="No reaction, mode runs until it ends" value="1"/>
+      <Item label="Reset timer, start counting time from the beginning" value="2"/>
+    </Value>
+    <Value genre="config" index="154" instance="1" label="First channel – time parameter for delayed/auto OFF and flashing modes" max="32000" min="0" size="2" type="short" value="5">
+      <Help>This parameter allows to set time parameter used in timed modes. (s)</Help>
+    </Value>
+    <Value genre="config" index="155" instance="1" label="Second channel – time parameter for delayed/auto OFF and flashing modes" max="32000" min="0" size="2" type="short" value="5">
+      <Help>This parameter allows to set time parameter used in timed modes. (s)</Help>
+    </Value>
+    <Value genre="config" index="156" instance="1" label="S1 Switch ON value sent to 2nd association group" max="255" min="0" size="2" type="short" value="255">
+      <Help>This parameter determines value sent with Switch On command to devices associated in 2nd association group.</Help>
+    </Value>
+    <Value genre="config" index="157" instance="1" label="S1 Switch OFF value sent to 2nd association group" max="255" min="0" size="2" type="short" value="0">
+      <Help>This parameter determines value sent with Switch Off command to devices associated in 2nd association group.</Help>
+    </Value>
+    <Value genre="config" index="158" instance="1" label="S1 Switch Double Click value sent to 2nd association groups" max="255" min="0" size="2" type="short" value="99">
+      <Help>This parameter determines value sent with Double Click command to devices associated in 2nd  association group.</Help>
+    </Value>
+    <Value genre="config" index="159" instance="1" label="S2 Switch ON value sent to 3rd association group" max="255" min="0" size="2" type="short" value="255">
+      <Help>This parameter determines value sent with Switch On command to devices associated in 3rd association group.</Help>
+    </Value>
+    <Value genre="config" index="160" instance="1" label="S2 Switch OFF value sent to 3rd association group" max="255" min="0" size="2" type="short" value="0">
+      <Help>This parameter determines value sent with Switch Off command to devices associated in 3rd association group.</Help>
+    </Value>
+    <Value genre="config" index="161" instance="1" label="S2 Switch Double Click value sent to 3rd association groups" max="255" min="0" size="2" type="short" value="99">
+      <Help>This parameter determines value sent with Double Click command to devices associated in 3rd  association group.</Help>
+    </Value>
+    <Value genre="config" index="162" instance="1" label="Q/Q1 output type" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter determines type of Q/Q1 output.</Help>
+      <Item label="Normally Open (relay contacts opened turned off, closed when turned on)" value="0"/>
+      <Item label="Normally Closed (relay contacts closed turned off, opened when turned on)" value="1"/>
+    </Value>
+    <Value genre="config" index="163" instance="1" label="Q2 output type" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter determines type of Q2 output.</Help>
+      <Item label="Normally Open (relay contacts opened turned off, closed when turned on)" value="0"/>
+      <Item label="Normally Closed (relay contacts closed turned off, opened when turned on)" value="1"/>
+    </Value>
+    <Value genre="config" index="164" instance="1" label="Lock simultaneous switching of Q1 and Q2 outputs" max="1" min="0" size="1" type="list" value="0">
+      <Help>When the lock is enabled, both outputs cannot turned on at the same time.</Help>
+      <Item label="Lock disabled" value="0"/>
+      <Item label="Lock enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="20" instance="1" label="S1 input – switch type" max="2" min="0" size="1" type="list" value="2">
+      <Help>S1 - Inputs type configuration</Help>
+      <Item label="Momentary switch" value="0"/>
+      <Item label="Toggle switch (contact closed - On, contact opened - OFF)" value="1"/>
+      <Item label="Toggle switch (device changes status when switch changes status)" value="2"/>
+    </Value>
+    <Value genre="config" index="21" instance="1" label="S2 input – switch type" max="2" min="0" size="1" type="list" value="2">
+      <Help>S2 - Inputs type configuration</Help>
+      <Item label="Momentary switch" value="0"/>
+      <Item label="Toggle switch (contact closed - On, contact opened - OFF)" value="1"/>
+      <Item label="Toggle switch (device changes status when switch changes status)" value="2"/>
+    </Value>
+    <Value genre="config" index="25" instance="1" label="Inputs orientation" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows reversing operation of S1 and S2 inputs changing the wiring. Use in case of incorrect wiring.</Help>
+      <Item label="default (S1 - 1st channel, S2 - 2nd channel)" value="0"/>
+      <Item label="reversed (S1 - 2nd channel, S2 - 1st channel)" value="1"/>
+    </Value>
+    <Value genre="config" index="26" instance="1" label="Outputs orientation" max="1" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows reversing operation of Q1 and Q2 outputs changing the wiring. Use in case of incorrect wiring.</Help>
+      <Item label="default (Q1 - 1st channel, Q2 - 2nd channel)" value="0"/>
+      <Item label="reversed (Q1 - 2nd channel, Q2 - 1st channel)" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- -->
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="On/Off S1" max_associations="5"/>
+      <Group index="3" label="On/Off S2" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>true</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+</Product>
diff --git a/config/fibaro/fgt001.xml b/config/fibaro/fgt001.xml
index 63f90101..aa290488 100644
--- a/config/fibaro/fgt001.xml
+++ b/config/fibaro/fgt001.xml
@@ -1,4 +1,4 @@
-<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010F:1000:1301</MetaDataItem>
     <MetaDataItem name="ProductPic">images/fibaro/fgt001.png</MetaDataItem>
@@ -51,6 +51,7 @@ Main features:
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2586/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2971/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3194/xml</Entry>
+      <Entry author="Mark Ruys - mark@paracas.nl" date="05 Feb 2021" revision="6">Add new configuration settings for firmware 4.7</Entry>
     </ChangeLog>
   </MetaData>
   <!--
@@ -87,11 +88,16 @@ Main features:
     </Value>
     <Value genre="config" index="2" instance="1" label="Additional functions" size="4" type="int" value="1">
       <Help>This parameter allows to enable different additional functions of the device.
-                1) Enable open window detector
-                2) Enable fast open window detector
+                1) Enable open window detector (normal)
+                2) Enable open window detector (rapid)
                 4) Increase receiver sensitivity (shortens battery life)
                 8) Enable LED indications when controlling remotely
                 16) Protect from setting Full ON and Full OFF mode by turning the knob manually
+                32) Device mounted in vertical position (firmware 4.7+)
+                64) Moderate regulator behaviour (instead of rapid, firmware 4.7+))
+                128) Inverted knob operation (firmware 4.7+)
+                256) Heating medium demand reports (firmware 4.7+)
+                512) Detecting heating system failures (firmware 4.7+)
                 NOTE: Parameter values may be combined, e.g. 1+8=9 means than open window detector and LED indications when controlling remotely are enabled.
             </Help>
     </Value>
diff --git a/config/fibaro/fgwceu201.xml b/config/fibaro/fgwceu201.xml
new file mode 100644
index 00000000..1fc813a5
--- /dev/null
+++ b/config/fibaro/fgwceu201.xml
@@ -0,0 +1,158 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+  <MetaData>
+    <MetaDataItem name="Name">FGWCEU-201 Walli Controller</MetaDataItem>
+    <MetaDataItem name="Description">FIBARO Walli Controller is a smart wall, battery powered, switch.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010f:1000:2301</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://manuals.fibaro.com/document-category/fgwceu-201/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://manuals.fibaro.com/document-category/fgwceu-201/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgwceu201.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://manuals.fibaro.com/content/manuals/en/FGWCEU-201/FGWCEU-201-T-EN-1.1.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">When on battery power, the device needs to be woken up to receive 
+		information about the new configuration from the Z-Wave controller, like parameters and associations. 
+		By default the device is woken up automatically every 6 hours.
+		You can wake up the device manually using first menu position (white).</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">To add the device to the Z-Wave network manually:
+		1. Set the main controller in (Security/non-Security Mode) add mode (see the controller's manual).
+		2. Quickly, three times click one of the buttons.
+		3. If you are adding in Security S2 Authenticated, input the underlined part of the DSK (label on the box).
+		4. LED will start blinking yellow, wait for the adding process to end.
+		5. Adding result will be confirmed by the Z-Wave controller's message and the LED frame:
+  		- Green: successful (non-secure, S0, S2 non-authenticated),
+	  	- Magenta: successful (Security S2 Authenticated),
+		  - Red: not successful.
+		</MetaDataItem>
+    <MetaDataItem id="1000" name="ZWProductPage" type="2301">https://products.z-wavealliance.org/products/3883</MetaDataItem>
+    <MetaDataItem id="1000" name="Identifier" type="2301">FGWCEU-201</MetaDataItem>
+    <MetaDataItem id="1000" name="FrequencyName" type="2301">CEPT (Europe)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Nouknouk - nouknouk@gmail.com" date="30 May 2022" revision="1">Initial Creation of config file</Entry>
+      <Entry author="Nouknouk - nouknouk@gmail.com" date="30 May 2022" revision="2">fix numgroups</Entry>
+		</ChangeLog>
+  </MetaData>
+  
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+
+    <Value genre="config" index="1" label="Remember device state" max="1" min="0" size="1" type="byte" value="1">
+		<Help>This parameter determines how the device will react in the event of power supply failure (e.g. power outage). The parameter is not relevant for outputs set to pulse mode (parameter 150/151 set to 2).
+		0 - remains switched off after restoring power
+		1 - restores remembered state after restoring power
+		</Help>
+    </Value>
+
+	<Value genre="config" index="2" label="Overload safety switch" max="5000" min="0" size="4" type="int" value="3500">
+		<Help>This function allows to turn off the controlled device in case of exceeding the defined power. Controlled device can be turned back on via the button or sending a control frame.
+		0 - function disabled
+		10-5000 - (1.0-500.0W, step 0.1W) – power threshold
+		</Help>
+    </Value>
+	
+	<Value genre="config" index="10" label="LED frame – power limit" max="5000" min="100" size="4" type="int" value="3500">
+		<Help>This parameter determines maximum active power. Exceeding it results in the LED frame flashing violet. Function is active only when parameter 11 is set to 8 or 9.
+		100-5000 - (10.0-500.0W, step 0.1W) – power threshold
+		</Help>
+    </Value>
+	
+	<Value genre="config" index="11" label="LED frame – colour when ON" max="9" min="0" size="1" type="list" value="1">
+		<Help>This parameter defines the LED colour when thedevice is ON. When set to 8 or 9, LED frame colour will change depending on he measured power and parameter 10. Other colours are set permanently and do not depend on power consumption.
+		</Help>
+		<Item label="LED disabled" value="0"/>
+		<Item label="White" value="1"/>
+		<Item label="Red" value="2"/>
+		<Item label="Green" value="3"/>
+		<Item label="Blue" value="4"/>
+		<Item label="Yellow" value="5"/>
+		<Item label="Cyan" value="6"/>
+		<Item label="Magenta" value="7"/>
+		<Item label="Colour changes smoothly depending on measured power" value="8"/>
+		<Item label="Colour changes in steps depending on measured power" value="9"/>
+    </Value>
+	
+	<Value genre="config" index="12" label="LED frame – colour when OFF" max="7" min="0" size="1" type="list" value="1">
+		<Help>This parameter defines the LED colour when the device is OFF.
+		</Help>
+		<Item label="LED disabled" value="0"/>
+		<Item label="White" value="1"/>
+		<Item label="Red" value="2"/>
+		<Item label="Green" value="3"/>
+		<Item label="Blue" value="4"/>
+		<Item label="Yellow" value="5"/>
+		<Item label="Cyan" value="6"/>
+		<Item label="Magenta" value="7"/>
+    </Value>
+	
+	<Value genre="config" index="13" label="LED frame – brightness" max="100" min="0" size="1" type="byte" value="100">
+		<Help>This parameter allows to adjust the LED frame brightness.
+		0 - LED disabled
+		1-100 - (1-100% brightness)
+		</Help>
+    </Value>
+	
+	<Value genre="config" index="20" label="Operation mode" max="1" min="0" size="1" type="list" value="0">
+		<Help>This parameter defines operation of the device.</Help>
+		<Item label="scene controller mode" value="0"/>
+		<Item label="double button mode" value="1"/>
+		<Item label="single button mode" value="2"/>
+		<Item label="switch controller mode" value="3"/>
+		<Item label="dimmer / roller shutter controller mode" value="4"/>
+		<Item label="roller shutter controller mode (step-by-step)" value="5"/>
+		<Item label="venetian blinds controller mode (step-by-step)" value="6"/>
+    </Value>
+
+	<Value genre="config" index="150" label="LED ring - first button" max="8" min="0" size="2" type="list" value="1">
+		<Help>This parameter defines the colour of first button indicator (upper part of the LED ring) for indications using Indicator CC.</Help>
+		<Item label="0 - LED disabled" value="0"/>
+		<Item label="1 - White" value="1"/>
+		<Item label="2 - Red" value="2"/>
+		<Item label="3 - Green" value="3"/>
+		<Item label="4 - Blue" value="4"/>
+		<Item label="5 - Yellow" value="5"/>
+		<Item label="6 - Cyan" value="6"/>
+		<Item label="7 - Magenta" value="7"/>
+		<Item label="8 + Blinking red-white-blue" value="8"/>
+    </Value>
+	
+	<Value genre="config" index="151" label="LED ring - second button" max="8" min="0" size="2" type="list" value="1">
+		<Help>This parameter defines the colour of second button indicator (lower part of the LED ring) for indications using Indicator CC.</Help>
+		<Item label="0 - LED disabled" value="0"/>
+		<Item label="1 - White" value="1"/>
+		<Item label="2 - Red" value="2"/>
+		<Item label="3 - Green" value="3"/>
+		<Item label="4 - Blue" value="4"/>
+		<Item label="5 - Yellow" value="5"/>
+		<Item label="6 - Cyan" value="6"/>
+		<Item label="7 - Magenta" value="7"/>
+		<Item label="8 + Blinking red-white-blue" value="8"/>
+    </Value>
+	
+	<Value genre="config" index="152" label="1st button - double click value" max="255" min="0" size="2" type="short" value="99">
+		<Help>This parameter defines value of Basic Set or Multilevel Set frame 
+		(depending on selected mode) sent to associated devices after double click. 
+		This parameter is not relevant for Scene Controller Mode.
+		0-99 or 255
+		</Help>
+    </Value>
+
+	<Value genre="config" index="153" label="2nd button - double click value" max="255" min="0" size="2" type="short" value="99">
+		<Help>This parameter defines value of Basic Set or Multilevel Set frame 
+		(depending on selected mode) sent to associated devices after double click. 
+		This parameter is used only in Double Button Mode.
+		0-99 or 255
+		</Help>
+    </Value>
+	
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="7">
+      <Group index="1" label="LifeLine" max_associations="1"/>
+      <Group index="2" label="On/Off (1)" max_associations="5"/>
+      <Group index="3" label="Dimmer (1)" max_associations="5"/>
+      <Group index="4" label="On/Off (2)" max_associations="5"/>
+      <Group index="5" label="Dimmer (2)" max_associations="5"/>
+      <Group index="6" label="Multidevice" max_associations="5"/>
+      <Group index="7" label="Slats" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/fibaro/fgwds221.xml b/config/fibaro/fgwds221.xml
index 0d3e876a..6bfecfd8 100644
--- a/config/fibaro/fgwds221.xml
+++ b/config/fibaro/fgwds221.xml
@@ -1,4 +1,4 @@
-<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
   <MetaData>
     <MetaDataItem name="Name">FGWDSEU-221 Walli Double Switch</MetaDataItem>
@@ -6,7 +6,7 @@
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010f:1000:1B01</MetaDataItem>
     <MetaDataItem name="ProductPage">https://www.fibaro.com/en/products/smart-switches-and-outlets-walli-switch/</MetaDataItem>
     <MetaDataItem name="ProductSupport">https://manuals.fibaro.com/walli-switch/</MetaDataItem>
-    <MetaDataItem name="ProductPic"><!-- path to images/vendor/product.png --></MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgwds221.png</MetaDataItem>
     <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=Manuals/3395/FGWDSEU-221-T-EN-0.19.pdf</MetaDataItem>
     <MetaDataItem name="WakeupDescription">FIBARO Walli Double Switch is powered using DC power supply unit so it is always awake.</MetaDataItem>
     <MetaDataItem name="InclusionDescription">To add the device to the Z-Wave network manually:
@@ -35,9 +35,11 @@
     <ChangeLog>
       <Entry author="Makooy - marc@makooy.nl" date="07 July 2019" revision="1">Initial Creation of config file - https://products.z-wavealliance.org/Products/3395/XML</Entry>
 	  <Entry author="Peter Gebruers - peter.gebruers@gmail.com" date="06 September 2019" revision="2">Change definition of params 30-34 to fix https://github.com/domoticz/domoticz/issues/3557</Entry>
+	  <Entry author="Justin Hammond" date="24 June 2020" revision="3">Add Product Picture</Entry>
+    <Entry author="Florent Coquelet" date="27 February 2021" revision="4">Typo corrections / default value for LED frame – colour when OFF</Entry>
     </ChangeLog>
   </MetaData>
-  
+
   <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
   <CommandClass id="112">
 
@@ -47,27 +49,27 @@
 		1 - restores remembered state after restoring power
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="2" label="First channel – overload safety switch" max="36200" min="0" size="4" type="int" value="0">
 		<Help>This function allows to turn off the controlled device in case of exceeding the defined power. Controlled device can be turned back on via button or sending a control frame.
 		0 - Function disabled
 		10-36200 - (1.0-3620.0W, step 0.1W) – Power threshold
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="3" label="Second channel – overload safety switch" max="36200" min="0" size="4" type="int" value="0">
 		<Help>This function allows to turn off the controlled device in case of exceeding the defined power. Controlled device can be turned back on via button or sending a control frame.
 		0 - Function disabled
 		10-36200 - (1.0-3620.0W, step 0.1W) – Power threshold
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="10" label="LED frame – power limit" max="30000" min="500" size="4" type="int" value="30000">
 		<Help>This parameter determines maximum active power. Exceeding it results in the LED frame flashing violet. Function is active only when parameter 11 is set to 8 or 9.
 		(50.0-3000.0W, step 0.1W) – power threshold
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="11" label="LED frame – colour when ON" max="9" min="0" size="1" type="list" value="1">
 		<Help>This parameter defines the LED colour when thedevice is ON. When set to 8 or 9, LED frame colour will change depending on he measured power and parameter 10. Other colours are set permanently and do not depend on power consumption.
 		</Help>
@@ -82,8 +84,8 @@
 		<Item label="Colour changes smoothly depending on measured power" value="8"/>
 		<Item label="Colour changes in steps depending on measured power" value="9"/>
     </Value>
-	
-	<Value genre="config" index="12" label="LED frame – colour when OFF" max="7" min="0" size="1" type="list" value="1">
+
+	<Value genre="config" index="12" label="LED frame – colour when OFF" max="7" min="0" size="1" type="list" value="0">
 		<Help>This parameter defines the LED colour when thedevice is ON. When set to 8 or 9, LED frame colour will change depending on he measured power and parameter 10. Other colours are set permanently and do not depend on power consumption.
 		</Help>
 		<Item label="LED disabled" value="0"/>
@@ -95,16 +97,16 @@
 		<Item label="Cyan" value="6"/>
 		<Item label="Magenta" value="7"/>
     </Value>
-	
+
 	<Value genre="config" index="13" label="LED frame – brightness" max="102" min="0" size="1" type="byte" value="100">
 		<Help>This parameter allows to adjust the LED frame brightness.
 		0 - LED disabled
 		1-100 - (1-100% brightness)
 		101 - brightness directly proportional to measured power
-		102 - brightness inversely proportional asured powerto me
+		102 - brightness inversely proportional to measured power
 		</Help>
     </Value>
-		
+
     <Value genre="config" index="20" label="Buttons operation" max="4" min="1" size="1" type="list" value="3">
 		<Help>This parameter defines how device buttons should control the channels.</Help>
 		<Item label="1st and 2nd button toggle both channels" value="1"/>
@@ -112,19 +114,19 @@
 		<Item label="1st button toggles 1st channel, 2nd button toggles 2nd channel" value="3"/>
 		<Item label="1st button single click turns 1st channel ON, 1st button double click turns 2nd channel ON, 2nd button single click turns both channels OFF" value="4"/>
 	</Value>
-		
+
     <Value genre="config" index="24" label="Buttons orientation" max="1" min="0" size="1" type="list" value="0">
 		<Help>This parameter allows reversing the operation of the buttons.</Help>
 		<Item label="Default (1st button controls 1st channel, 2nd button controls 2nd channel)" value="0"/>
 		<Item label="Reversed (1st button controls 2nd channel, 2nd button controls 1st channel)" value="1"/>
 	</Value>
-		
+
     <Value genre="config" index="25" label="Outputs orientation" max="1" min="0" size="1" type="list" value="0">
 		<Help>This parameter allows reversing the operation of Q1 and Q2 without changing the wiring (e.g. in case of invalid connection). Changing orientation turns both outputs off.</Help>
 		<Item label="Default (Q1 - 1st channel, Q2 - 2nd channel)" value="0"/>
 		<Item label="Reversed (Q1 - 2nd channel, Q2 - 1st channel)" value="1"/>
 	</Value>
-		
+
 	<Value type="int" index="30" genre="config" label="Alarm configuration - 1st slot" value="0" min="0" max="4294967295">
 		<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
 1B:  [MSB] Notification Type, 2B:  Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
@@ -162,7 +164,7 @@
 		1-32400 - (1s-9h, 1s step) – Duration
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="40" label="First button – scenes sent" max="8" min="0" size="1" type="byte" value="0">
 		<Help>This parameter determines which actions result in sending scene IDs assigned to them. Values can be combined (e.g. 1+2=3 means that scenes for single and double click are sent). Enabling scenes for triple click disables entering the device in learn mode by triple clicking.
 				1 - Key pressed 1 time
@@ -171,7 +173,7 @@
 				8 - Key hold down and key released
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="41" label="Second button – scenes sent" max="8" min="0" size="1" type="byte" value="0">
 		<Help>This parameter determines which actions result in sending scene IDs assigned to them. Values can be combined (e.g. 1+2=3 means that scenes for single and double click are sent). Enabling scenes for triple click disables entering the device in learn mode by triple clicking.
 		1 - Key pressed 1 time
@@ -180,70 +182,70 @@
 		8 - Key hold down and key released
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="60" label="Power reports – include self-consumption" max="1" min="0" size="1" type="list" value="0">
 		<Help>This parameter determines whether the power measurements should include power consumed by the device itself.
 		</Help>
 		<Item label="Self-consumption not included" value="0"/>
 		<Item label="Self-consumption included" value="1"/>
     </Value>
-	
+
 	<Value genre="config" index="61" label="Power reports for first channel – on change" max="500" min="0" size="2" type="short" value="15">
 		<Help>This parameter defines minimal change (from the last reported) in measured power that results in sending new report. For loads under 50W the parameter is irrelevant, report are sent every 5W change.
 		0 - Reporting on change disabled
 		1-500 - (1-500%, 1% step) – Minimal change
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="62" label="Power reports for first channel – periodic" max="32400" min="0" size="2" type="short" value="3600">
 		<Help>This parameter defines reporting interval for measured power. Periodic reports are independent from changes in value (parameter 61).
 		0 - periodic reports disabled
 		30-32400 - (30s-9h, 1s step) – time interval
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="63" label="Power reports for second channel – on change" max="500" min="0" size="2" type="short" value="15">
 		<Help>This parameter defines minimal change (from the last reported) in measured power that results in sending new report. For loads under 50W the parameter is irrelevant, report are sent every 5W change.
 		0 - Reporting on change disabled
 		1-500 - (1-500%, 1% step) – Minimal change
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="64" label="Power reports for second channel – periodic" max="32400" min="0" size="2" type="short" value="3600">
 		<Help>This parameter defines reporting interval for measured power. Periodic reports are independent from changes in value (parameter 63).
 		0 - periodic reports disabled
 		30-32400 - (30s-9h, 1s step) – time interval
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="65" label="Energy reports for first channel – on change" max="500" min="0" size="2" type="short" value="10">
 		<Help>This parameter defines minimal change (from the last reported) in measured energy that results in sending new report.
 		0 - reporting on change disabled
 		1-500 - (0.01-5kWh, 0.01kWh step) – minimal change
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="66" label="Energy reports for first channel – periodic" max="32400" min="0" size="2" type="short" value="3600">
 		<Help>This parameter defines reporting interval for measured energy. Periodic reports are independent from changes in value (parameter 66).
 		0 - periodic reports disabled
 		30-32400 - (30s-9h, 1s step) – time interval
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="67" label="Energy reports for second channel – on change" max="500" min="0" size="4" type="int" value="10">
 		<Help>This parameter defines minimal change (from the last reported) in measured energy that results in sending new report.
 		0 - reporting on change disabled
 		1-500 - (0.01-5kWh, 0.01kWh step) – minimal change
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="68" label="Energy reports for second channel – periodic" max="32400" min="0" size="2" type="short" value="3600">
 		<Help>This parameter defines reporting interval for measured energy. Periodic reports are independent from changes in value (parameter 67).
 		0 - periodic reports disabled
 		30-32400 - (30s-9h, 1s step) – time interval
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="150" label="First channel – operating mode" max="2" min="0" size="1" type="list" value="0">
 		<Help>This parameter allows to choose operating for the 1st channel.
 		</Help>
@@ -251,7 +253,7 @@
 		<Item label="Delayed OFF" value="1"/>
 		<Item label="Single pulse" value="2"/>
     </Value>
-	
+
 	<Value genre="config" index="151" label="Second channel – operating mode" max="2" min="0" size="1" type="list" value="0">
 		<Help>This parameter allows to choose operating for the 2nd channel.
 		</Help>
@@ -259,15 +261,15 @@
 		<Item label="Delayed OFF" value="1"/>
 		<Item label="Single pulse" value="2"/>
     </Value>
-	
+
 	<Value genre="config" index="152" label="First channel - reaction to switch for delayed OFF / pulse modes" max="2" min="0" size="1" type="list" value="0">
 		<Help>This parameter determines how the device in timed mode reacts to pushing the button for 1st channel. The parameter is relevant only for button toggles modes (parameter 20 set to 1 or 3).
 		</Help>
 		<Item label="Cancel mode and set default state" value="0"/>
 		<Item label="No reaction - mode runs until it ends" value="1"/>
 		<Item label="Reset timer - start counting from the beginning" value="2"/>
-    </Value>	
-	
+    </Value>
+
 	<Value genre="config" index="153" label="Second channel - reaction to switch for delayed OFF / pulse modes" max="2" min="0" size="1" type="list" value="0">
 		<Help>This parameter determines how the device in timed mode reacts to pushing the button for 2nd channel. The parameter is relevant only for button toggles modes (parameter 20 set to 1 or 3).
 		</Help>
@@ -275,21 +277,21 @@
 		<Item label="No reaction - mode runs until it ends" value="1"/>
 		<Item label="Reset timer - start counting from the beginning" value="2"/>
     </Value>
-	
+
 	<Value genre="config" index="154" label="First channel - time parameter for delayed OFF / pulse modes" max="32000" min="1" size="2" type="short" value="50">
 		<Help>This parameter allows to set time parameter used in timed modes for 1st channel (parameter 150). Delay time for switching off or duration of the pulse.
 		0 - 0.1 second
 		1-32000 - 1-32000s, 1s step – time parameter
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="155" label="Second channel - time parameter for delayed OFF / pulse modes" max="32000" min="1" size="2" type="short" value="50">
 		<Help>This parameter allows to set time parameter used in timed modes for 2nd channel (parameter 151). Delay time for switching off or duration of the pulse.
 		0 - 0.1 second
 		1-32000 - 1-32000s, 1s step – time parameter
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="156" label="First channel – Switch ON value sent to 2nd and 3rd association groups" max="255" min="0" size="2" type="short" value="255">
 		<Help>This parameter defines value sent with Switch ON command to devices associated in 2nd and 3rd association group for manual changes of Endpoint 1 state.
 		0-99 - 2nd association group
@@ -317,14 +319,14 @@
 		255 - 5th association group
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="160" label="Second channel – Switch OFF value sent to 4th and 5th association groups" max="255" min="0" size="2" type="short" value="0">
 		<Help>This parameter defines value sent with Switch OFF command to devices associated in 4th and 5th association group for manual changes of Endpoint 2 state.
 		0-99 - 4th association group
 		255 - 5th association group
 		</Help>
     </Value>
-	
+
 	<Value genre="config" index="161" label="Second channel – Double Click value sent to 4th and 5th association groups" max="255" min="0" size="2" type="short" value="99">
 		<Help>This parameter defines value sent with Double Click command to devices associated in 4th and 5th association group for manual changes of Endpoint 2 state.
 		0-99 - 4th association group
@@ -339,8 +341,8 @@
       <Group index="1" label="LifeLine" max_associations="1"/>
       <Group index="2" label="On/Off S1" max_associations="5"/>
       <Group index="3" label="Dimmer S1" max_associations="5"/>
-	  <Group index="4" label="On/Off S1" max_associations="5"/>
-      <Group index="5" label="Dimmer S1" max_associations="5"/>
+      <Group index="4" label="On/Off S2" max_associations="5"/>
+      <Group index="5" label="Dimmer S2" max_associations="5"/>
     </Associations>
   </CommandClass>
 </Product>
diff --git a/config/fibaro/fgwds221ss.xml b/config/fibaro/fgwds221ss.xml
new file mode 100755
index 00000000..2264983a
--- /dev/null
+++ b/config/fibaro/fgwds221ss.xml
@@ -0,0 +1,262 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+  <MetaData>
+    <MetaDataItem name="Name">FGWDSEU-221 Walli Double Switch</MetaDataItem>
+    <MetaDataItem name="Description">FIBARO Walli Double Switch is a smart wall switch designed to control one or two light sources via Z-Wave network. It measures active power and energy consumed by the controlled load.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010f:1000:1A01</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.fibaro.com/en/products/smart-switches-and-outlets-walli-switch/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://manuals.fibaro.com/walli-switch/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgwds221.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=Manuals/3395/FGWDSEU-221-T-EN-0.19.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">FIBARO Walli Double Switch is powered using DC power supply unit so it is always awake.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">To add the device to the Z-Wave network manually:
+1. Power the device.
+2. Set the main controller in add mode(see the controller’s manual).
+3. Quickly, three times click one of the buttons.
+4. LED will start blinking yellow, wait for the adding process to end.
+5. Adding result will be confirmed by the Z-Wave controller’s message and the LED frame:
+• Green – successful (non-secure, S0, S2 non-authenticated),
+• Magenta – successful (Security S2 Authenticated),
+• Red – not successful.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To remove the device from the Z-Wave network:
+1. Power the device.
+2. Set the main controller into remove mode (see the controller’s manual).
+3. Quickly, three times click one of the buttons.
+4. LED will start blinking yellow, wait for the removing process to end.
+5. Successful removing will be confirmed by the Z-Wave controller’s message and red LED colour.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset procedure allows to restore the device back to its factory settings, which means all information about the Z-Wave controller and user configuration will be deleted. Resetting to factory defaults does not reset energy consumption memory.
+1. Quickly, three times click, then press and hold one of the buttons to enter the menu.
+2. Release button when the device glows yellow.
+3. Quickly click the button to confirm.
+4. After few seconds the device will be restarted, which is signalled with red LED colour.</MetaDataItem>
+    <MetaDataItem id="1000" name="ZWProductPage" type="1A01">https://products.z-wavealliance.org/products/3395</MetaDataItem>
+    <MetaDataItem id="1000" name="Identifier" type="1A01">FGWDSEU-221</MetaDataItem>
+    <MetaDataItem id="1000" name="FrequencyName" type="1A01">CEPT (Europe)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Florent Coquelet" date="27 February 2021" revision="1">Initial Creation of config file - Copied over from Double switch mode (fgwds221)</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+
+    <Value genre="config" index="1" label="Remember device state" max="1" min="0" size="1" type="byte" value="1">
+		<Help>This parameter determines how the device will react in the event of power supply failure (e.g. power outage). The parameter is not relevant for outputs set to pulse mode (parameter 150/151 set to 2).
+		0 - remains switched off after restoring power
+		1 - restores remembered state after restoring power
+    For parameter "Buttons operation" (20) set to 2-way/3-way switch configuration (3), value 0 is not supported.
+		</Help>
+    </Value>
+
+	<Value genre="config" index="2" label="First channel – overload safety switch" max="45000" min="0" size="4" type="int" value="0">
+		<Help>This function allows to turn off the controlled device in case of exceeding the defined power. Controlled device can be turned back on via button or sending a control frame.
+		0 - Function disabled
+		10-45000 (1.0-4500.0W, step 0.1W) – power  threshold
+		</Help>
+    </Value>
+
+	<Value genre="config" index="10" label="LED frame – power limit" max="36800" min="500" size="4" type="int" value="36800">
+		<Help>This parameter determines maximum active power. Exceeding it results in the LED frame flashing violet. Function is active only when parameter 11 is set to 8 or 9.
+		500-36800 (50.0-3680.0W, step 0.1W) – power  threshold
+		</Help>
+    </Value>
+
+	<Value genre="config" index="11" label="LED frame – colour when ON" max="9" min="0" size="1" type="list" value="1">
+		<Help>This parameter defines the LED colour when thedevice is ON. When set to 8 or 9, LED frame colour will change depending on he measured power and parameter 10. Other colours are set permanently and do not depend on power consumption.
+		</Help>
+		<Item label="LED disabled" value="0"/>
+		<Item label="White" value="1"/>
+		<Item label="Red" value="2"/>
+		<Item label="Green" value="3"/>
+		<Item label="Blue" value="4"/>
+		<Item label="Yellow" value="5"/>
+		<Item label="Cyan" value="6"/>
+		<Item label="Magenta" value="7"/>
+		<Item label="Colour changes smoothly depending on measured power" value="8"/>
+		<Item label="Colour changes in steps depending on measured power" value="9"/>
+    </Value>
+
+	<Value genre="config" index="12" label="LED frame – colour when OFF" max="7" min="0" size="1" type="list" value="0">
+		<Help>This parameter defines the LED colour when thedevice is ON. When set to 8 or 9, LED frame colour will change depending on he measured power and parameter 10. Other colours are set permanently and do not depend on power consumption.
+		</Help>
+		<Item label="LED disabled" value="0"/>
+		<Item label="White" value="1"/>
+		<Item label="Red" value="2"/>
+		<Item label="Green" value="3"/>
+		<Item label="Blue" value="4"/>
+		<Item label="Yellow" value="5"/>
+		<Item label="Cyan" value="6"/>
+		<Item label="Magenta" value="7"/>
+    </Value>
+
+	<Value genre="config" index="13" label="LED frame – brightness" max="102" min="0" size="1" type="byte" value="100">
+		<Help>This parameter allows to adjust the LED frame brightness.
+		0 - LED disabled
+		1-100 - (1-100% brightness)
+		101 - brightness directly proportional to measured power
+		102 - brightness inversely proportional to measured power
+		</Help>
+    </Value>
+
+    <Value genre="config" index="20" label="Buttons operation" max="3" min="1" size="1" type="list" value="1">
+		<Help>This parameter defines how device buttons should control the channels.</Help>
+		<Item label="1st and 2nd button toggle the load" value="1"/>
+		<Item label="1st button turns the load ON, 2nd button turns the load OFF" value="2"/>
+		<Item label="device works in 2-way/3-way switch configuration" value="3"/>
+	</Value>
+
+    <Value genre="config" index="24" label="Buttons orientation" max="1" min="0" size="1" type="list" value="0">
+		<Help>This parameter allows reversing the operation of the buttons.
+    For parameter "Buttons operation" (20) set to 2-way/3-way switch configuration (3), value 1 is not supported.</Help>
+		<Item label="Default (1st button controls 1st channel, 2nd button controls 2nd channel)" value="0"/>
+		<Item label="Reversed (1st button controls 2nd channel, 2nd button controls 1st channel)" value="1"/>
+	</Value>
+
+	<Value type="int" index="30" genre="config" label="Alarm configuration - 1st slot" value="0" min="0" max="4294967295">
+		<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B:  [MSB] Notification Type, 2B:  Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
+0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
+		</Help>
+	</Value>
+	<Value type="int" index="31" genre="config" label="Alarm configuration - 2nd slot" value="0" min="0" max="4294967295">
+		<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B:  [MSB] Notification Type, 2B:  Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
+0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
+		</Help>
+	</Value>
+	<Value type="int" index="32" genre="config" label="Alarm configuration - 3rd slot" value="0" min="0" max="4294967295">
+		<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B:  [MSB] Notification Type, 2B:  Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
+0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
+		</Help>
+	</Value>
+	<Value type="int" index="33" genre="config" label="Alarm configuration - 4th slot" value="0" min="0" max="4294967295">
+		<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B:  [MSB] Notification Type, 2B:  Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
+0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
+		</Help>
+	</Value>
+	<Value type="int" index="34" genre="config" label="Alarm configuration - 5th slot" value="0" min="0" max="4294967295">
+		<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
+1B:  [MSB] Notification Type, 2B:  Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
+0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
+		</Help>
+	</Value>
+
+	<Value genre="config" index="35" label="Alarm configuration – duration" max="32400" min="0" size="2" type="short" value="600">
+		<Help>This parameter defines duration of alarm sequence.  When time set in this parameter elapses, alarm is cancelled, LED frame and relay restore normal operation, but do not recover state from before the alarm.
+		0 - Infinite
+		1-32400 - (1s-9h, 1s step) – Duration
+		</Help>
+    </Value>
+
+	<Value genre="config" index="40" label="First button – scenes sent" max="8" min="0" size="1" type="byte" value="0">
+		<Help>This parameter determines which actions result in sending scene IDs assigned to them. Values can be combined (e.g. 1+2=3 means that scenes for single and double click are sent). Enabling scenes for triple click disables entering the device in learn mode by triple clicking.
+				1 - Key pressed 1 time
+				2 - Key pressed 2 time
+				4 - Key pressed 3 time
+				8 - Key hold down and key released
+		</Help>
+    </Value>
+
+	<Value genre="config" index="41" label="Second button – scenes sent" max="8" min="0" size="1" type="byte" value="0">
+		<Help>This parameter determines which actions result in sending scene IDs assigned to them. Values can be combined (e.g. 1+2=3 means that scenes for single and double click are sent). Enabling scenes for triple click disables entering the device in learn mode by triple clicking.
+		1 - Key pressed 1 time
+		2 - Key pressed 2 time
+		4 - Key pressed 3 time
+		8 - Key hold down and key released
+		</Help>
+    </Value>
+
+	<Value genre="config" index="60" label="Power reports – include self-consumption" max="1" min="0" size="1" type="list" value="0">
+		<Help>This parameter determines whether the power measurements should include power consumed by the device itself.
+		</Help>
+		<Item label="Self-consumption not included" value="0"/>
+		<Item label="Self-consumption included" value="1"/>
+    </Value>
+
+	<Value genre="config" index="61" label="Power reports for first channel – on change" max="500" min="0" size="2" type="short" value="15">
+		<Help>This parameter defines minimal change (from the last reported) in measured power that results in sending new report. For loads under 50W the parameter is irrelevant, report are sent every 5W change.
+		0 - Reporting on change disabled
+		1-500 - (1-500%, 1% step) – Minimal change
+		</Help>
+    </Value>
+
+	<Value genre="config" index="62" label="Power reports for first channel – periodic" max="32400" min="0" size="2" type="short" value="3600">
+		<Help>This parameter defines reporting interval for measured power. Periodic reports are independent from changes in value (parameter 61).
+		0 - periodic reports disabled
+		30-32400 - (30s-9h, 1s step) – time interval
+		</Help>
+    </Value>
+
+	<Value genre="config" index="65" label="Energy reports for first channel – on change" max="500" min="0" size="2" type="short" value="10">
+		<Help>This parameter defines minimal change (from the last reported) in measured energy that results in sending new report.
+		0 - reporting on change disabled
+		1-500 - (0.01-5kWh, 0.01kWh step) – minimal change
+		</Help>
+    </Value>
+
+	<Value genre="config" index="66" label="Energy reports for first channel – periodic" max="32400" min="0" size="2" type="short" value="3600">
+		<Help>This parameter defines reporting interval for measured energy. Periodic reports are independent from changes in value (parameter 66).
+		0 - periodic reports disabled
+		30-32400 - (30s-9h, 1s step) – time interval
+		</Help>
+    </Value>
+
+	<Value genre="config" index="150" label="First channel – operating mode" max="2" min="0" size="1" type="list" value="0">
+		<Help>This parameter allows to choose operating for the 1st channel.
+    For parameter "Buttons operation" (20) set to 2-way/3-way switch configuration (3), delayed OFF (value 1) is not supported.
+		</Help>
+		<Item label="Standard operation" value="0"/>
+		<Item label="Delayed OFF" value="1"/>
+		<Item label="Single pulse" value="2"/>
+    </Value>
+
+	<Value genre="config" index="152" label="First channel - reaction to switch for delayed OFF / pulse modes" max="2" min="0" size="1" type="list" value="0">
+		<Help>This parameter determines how the device in timed mode reacts to pushing the button for 1st channel. The parameter is relevant only for button toggles modes (parameter 20 set to 1 or 3).
+      For parameter "Buttons operation" (20) set to 2-way/3-way switch configuration (3), only value 0 (set default state) is supported.
+		</Help>
+		<Item label="Cancel mode and set default state" value="0"/>
+		<Item label="No reaction - mode runs until it ends" value="1"/>
+		<Item label="Reset timer - start counting from the beginning" value="2"/>
+    </Value>
+
+	<Value genre="config" index="154" label="First channel - time parameter for delayed OFF / pulse modes" max="32000" min="1" size="2" type="short" value="50">
+		<Help>This parameter allows to set time parameter used in timed modes for 1st channel (parameter 150). Delay time for switching off or duration of the pulse.
+		0 - 0.1 second
+		1-32000 - 1-32000s, 1s step – time parameter
+    For parameter "Buttons operation" (20) set to 2-way/3-way switch configuration (3) and parameter "First channel – operating mode" (150) set to single pulse (2), this parameter should not be lower than 5 (5s).
+		</Help>
+    </Value>
+
+	<Value genre="config" index="156" label="First channel – Switch ON value sent to 2nd and 3rd association groups" max="255" min="0" size="2" type="short" value="255">
+		<Help>This parameter defines value sent with Switch ON command to devices associated in 2nd and 3rd association group for manual changes of Endpoint 1 state.
+		0-99 - 2nd association group
+		255 - 3rd association group
+		</Help>
+    </Value>
+
+	<Value genre="config" index="157" label="First channel – Switch OFF value sent to 2nd and 3rd association groups" max="255" min="0" size="2" type="short" value="0">
+		<Help>This parameter defines value sent with Switch OFF command to devices associated in 2nd and 3rd association group for manual changes of Endpoint 1 state.
+		0-99 - 2nd association group
+		255 - 3rd association group
+		</Help>
+    </Value>
+
+	<Value genre="config" index="158" label="First channel – Double Click value sent to 2nd and 3rd association groups" max="255" min="0" size="2" type="short" value="99">
+		<Help>This parameter defines value sent with Double Click command to devices associated in 2nd and 3rd association group for manual changes of Endpoint 1 state.
+		0-99 - 2nd association group
+		255 - 3rd association group
+		</Help>
+    </Value>
+
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="LifeLine" max_associations="1"/>
+      <Group index="2" label="On/Off S1" max_associations="5"/>
+      <Group index="3" label="Dimmer S1" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/fibaro/fgwpb121.xml b/config/fibaro/fgwpb121.xml
new file mode 100644
index 00000000..94fe8221
--- /dev/null
+++ b/config/fibaro/fgwpb121.xml
@@ -0,0 +1,252 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">FIBARO Wall Plug</MetaDataItem>
+    <MetaDataItem name="Description">FIBARO Wall Plug is a remotely controlled plug-in switch with the ability to measure power and energy consumption. It uses a LED frame to visualize the current load and operating mode with color changing illumination. FIBARO Wall Plug makes it possible to control electrical devices in a convenient and maintenance-free way. It is also equipped with a USB charging port with power metering.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/010f:2000:1401</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.fibaro.com/us/products/wall-plug/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://manuals.fibaro.com/wall-plug-us/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/fibaro/fgwpb121.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://manuals.fibaro.com/content/manuals/en/FGWPB-121/FGWPB-121-EN-T-v1.0.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">To add the device to the Z-Wave network:
+1. Plug the device into a socket nearby the main Z-Wave controller.
+2. The LED frame will glow red signaling not being added (reset or
+remove the device otherwise).
+3. Set the main controller in (Security/non-Security Mode) add mode
+(see the controller’s manual).
+4. Quickly, triple click the button located on the casing
+5. If you are adding in S2 authenticated mode, type in the device pin
+code (underlined part of the public key available on the device or
+in the manual).
+6. Wait for the adding process to end.
+7. Successful adding will be confirmed by the Z-Wave controller’s
+message.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To remove the device from the Z-Wave network:
+1. Plug the device into a socket nearby the main Z-Wave controller.
+2. The LED frame will glow green signaling being added (removing
+is not necessary otherwise).
+3. Set the main controller into remove mode (see the controller’s
+manual).
+4. Quickly, triple click the button located on the casing.
+5. Wait for the removing process to end.
+6. Successful 
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset procedure allows to restore the device back to its factory settings, which means all information about the Z-Wave controller and user configuration will be deleted. In order to reset the device:
+1. Make sure the device is powered.
+2. Press and hold the button.
+3. Wait for the LED frame to glow yellow (3rd menu position).
+4. Release the button.
+5. Click the button once to confirm selection.
+6. After few seconds the device will restart with factory settings,
+which is signaled with the red frame color.
+    </MetaDataItem>
+    <MetaDataItem id="2000" name="ZWProductPage" type="1401">https://products.z-wavealliance.org/products/2622/</MetaDataItem>
+    <MetaDataItem id="2000" name="FrequencyName" type="1401">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="2000" name="Identifier" type="1401">FGWPM-121</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Matt Peterson - matt@peterson.org" date="14 Dec 2020" revision="1">Initial Metadata Import</Entry>
+    </ChangeLog>
+    <MetaDataItem name="WakeupDescription">The FIBARO Wall Plug is powered with the mains voltage so it is always awake.</MetaDataItem>
+  </MetaData>
+    <CommandClass id="112">
+        <Value type="list" genre="config" instance="1" index="2" label="Remember device status after a power failure" value="1" size="1">
+            <Help>This parameter determines how the Wall Plug will react in the event of power supply failure (e.g. taking out from the electrical outlet).
+                After the power supply is back on, the Wall Plug can be restored to previous state or remain switched off.
+                This parameter is ignored in Always On mode - the device automatically turns ON after plugging it into the socket.
+                Default setting: 1
+            </Help>
+            <Item label="Device remains switched off" value="0"/>
+            <Item label="Device restores the state from before the power failure" value="1"/>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="3" label="Overload safety switch" value="0" min="0" max="30000" size="2">
+            <Help>This function allows to turning off the controlled device in case of exceeding the defined power.
+                Controlled device can be turned back on via button or sending a control frame.
+                Available settings: 10 - 30000 (1,0W - 3000,0W step 0,1W).
+                Default setting: 0 (function inactive)
+            </Help>
+        </Value>
+
+        <Value type="byte" genre="config" instance="1" index="11" label="Power reporting" value="15" min="0" max="100" size="1">
+            <Help>This parameter determines the minimum percentage change inactive power consumption (in relation to the previously reported) that will result in sending new power report.
+                Available settings: 1-100. 0 - power reports inactive.
+                Default Setting: 15 (%)
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="12" label="Energy reporting threshold" value="10" min="0" max="500" size="2">
+            <Help>This parameter determines the minimum change in energy consumption (in relation to the previously reported), that will result in sending a new report.
+                Available settings: 1-500 (0,01kWh - 5kWh). 0 - energy reports inactive.
+                Default Setting: 10 (0,1 kWh)
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="13" label="Periodic power reporting" min="0" max="32400" value="3600" size="2">
+            <Help>This parameter defines time period between reports sent when changes in power load have not been record if changes are smaller than defined in parameter 11.
+                By default reports are sent every hour.
+                Available settings: 0 - 32400 (s). 0 - periodic reports inactive.
+                Default setting: 3600
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="14" label="Periodic energy reporting" min="0" max="32400" value="3600" size="2">
+            <Help>This parameter defines time period between reports sent when changes in power load have not been recorded or if changes are smaller than in paramater 11.
+                By default reports are sent every hour.
+                Available settings: 0 - 32400 (s). 0 - periodic reports inactive.
+                Default setting: 3600
+            </Help>
+        </Value>
+
+        <Value type="list" genre="config" instance="1" index="15" label="Measuring energy consumed by the Wall Plug itself" value="0" size="1">
+            <Help>This parameter determines whether power metering should include the amount of power consumed by the Wall Plug itself.
+                Results are being added to the value of power consumed by controlled device.
+                Default setting: 0 Inactive
+            </Help>
+            <Item label="Inactive" value="0"/>
+            <Item label="Active" value="1"/>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="21" label="UP value association group 3" value="500" min="100" max="30000" size="2">
+            <Help>Upper power threshold, used in parameter 23. Up value cannot be lower than a value specified in parameter 22.
+                Available settings: 100 - 30000 (10,0W - 30000,0W).
+                Default setting: 500 (50W)
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="22" label="DOWN value association group 3" value="300" min="0" max="29900" size="2">
+            <Help>Lower power threshold, used in parameter 23.
+                DOWN value cannot be higher than a value specified in parameter 21.
+                Available settings: 0 - 29900 (0,0W - 2990,0W step 0,1W).
+                Default setting: 300 (30W)
+            </Help>
+        </Value>
+
+        <Value type="list" genre="config" instance="1" index="23" label="Controlling association group 3" value="3" size="1">
+            <Help>This parameter defines the way that 3rd association group devices are controlled.
+                Depends on the actual measured power(according to parameters 21 and 22 settings).
+                Default setting: 3
+            </Help>
+            <Item label="Send frame (with value set in parameter 26) only if power exceeded value of parameter 21 turn the associated devices ON, once the power drops below DOWN value (parameter 21)"
+                  value="1"/>
+            <Item label="Send frame (with value set in parameter 27) only if power dropped below value of paramater 22"
+                  value="2"/>
+            <Item label="Send frame in both cases" value="3"/>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="24" label="Switch ON value - association group 2" value="255" min="0" max="255" size="2">
+            <Help>The value of BASIC SET command frame sent to the devices associated in 2nd group On/Off (Button) when turning the device ON using the button.
+                Available settings: 0-99 or 255.
+                Default setting: 255
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="25" label="Switch OFF value - association group 2" value="255" min="0" max="255" size="2">
+            <Help>The value of BASIC SET command frame sent to the devices associated in 2nd group On/Off (Button) when turning the device OFF using the button.
+                Available settings: 0-99 or 255.
+                Default setting: 0
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="26" label="THRESHOLD UP value - association group 3" value="255" min="0" max="255" size="2">
+            <Help>The value of BASIC SET command frame sent to the devices associated in 3rd group On/Off (Power) if power exceeded value of parameter 21.
+                Available settings: 0-99 or 255.
+                Default setting: 255
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="27" label="THRESHOLD DOWN value - association group 3" value="255" min="0" max="255" size="2">
+            <Help>The value of BASIC SET command frame sent to the devices associated in 3rd group On/Off (Power) if power dropped below value of parameter 22.
+                Available settings: 0-99 or 255.
+                Default setting: 0
+            </Help>
+        </Value>
+
+        <Value type="list" genre="config" instance="1" index="30" label="Active Alarms" value="63" min="1" max="63" size="1">
+            <Help>Define Z-Wave network alarms to which the Wall Plug will respond.</Help>
+            <Item label="General alarm" value="1"/>
+            <Item label="Smoke alarm" value="2"/>
+            <Item label="CO alarm" value="4"/>
+            <Item label="CO2 alarm" value="8"/>
+            <Item label="High temperature alarm" value="16"/>
+            <Item label="Flood alarm" value="32"/>
+            <Item label="All alarms" value="63"/>
+        </Value>
+
+        <Value type="byte" genre="config" instance="1" index="31" label="Response to alarm frames" value="0" min="0" max="50" size="1">
+            <Help>This parameter defines how the Wall Plug will respond to alarms (device's status change).
+                In case of values 1 or 2 the Wall Plug is operating normally and LED frame signals an alarm through time defined in parameter 32 or until the alarm is cancelled.
+                In case of values 5 to 50 the Wall Plug does not report status change, power changes, ignores BASIC SET command frames.
+                After time defined in parameter 32 or after the alarm cancellation, connected device is set to the previous state.
+                0 - no reaction 1-turn connected device on 2-turn connected device off 5-50(0,5-50,0s step 0,1s)-cyclically change device state with set period.
+                Default setting:0-no reaction
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="32" label="Alarm state duration" value="600" min="1" max="32400" size="2">
+            <Help>This parameter specifies the duration of alarm state.
+                If a device sending an alarm frame through the Z-Wave network sets alarm duration as well, this settings are ignored.
+                Available settings 1-32400(s)
+                Default setting: 600
+            </Help>
+        </Value>
+
+        <Value type="short" genre="config" instance="1" index="40" label="Power load for violet colour" value="30000" min="1000" max="30000" size="2">
+            <Help>This parameter determines maximum active power value, which when exceeded, causes the LED frame to flash violet. Function is active only when parameter 41 is set to 1 or 2.
+                Available settings: 1000 - 30000 (100,0W - 3000,0W, step 0,1W).
+                Default setting: 30000 (3000W)
+            </Help>
+        </Value>
+
+        <Value type="list" genre="config" instance="1" index="41" label="LED frame colour when controlled device is on" value="1" size="1">
+            <Help>When set to 1 or 2, LED frame colour will change depending on active power and parameter 40.
+                Other colours are set permanently and do not depend on power consumption
+            </Help>
+            <Item label="Illumination turned off completely" value="0"/>
+            <Item label="Colour changes smoothly depending on active power" value="1"/>
+            <Item label="Colour changes in steps depending on active power" value="2"/>
+            <Item label="White illumination" value="3"/>
+            <Item label="Red illumination" value="4"/>
+            <Item label="Green illumination" value="5"/>
+            <Item label="Blue illumination" value="6"/>
+            <Item label="Yellow illumination" value="7"/>
+            <Item label="Cyan illumination" value="8"/>
+            <Item label="Magenta illumination" value="9"/>
+        </Value>
+
+        <Value type="list" genre="config" instance="1" index="42" label="LED frame colour when controlled device is off" value="0" size="1">
+            <Help>This parameter defines the illumination colour after turning off.</Help>
+            <Item label="illumination turned off completely" value="0"/>
+            <Item label="LED frame is illuminated with a colour corresponding to the last measured power, before the controlled device was turned off" value="1"/>
+            <Item label="White illumination" value="3"/>
+            <Item label="Red illumination" value="4"/>
+            <Item label="Green illumination" value="5"/>
+            <Item label="Blue illumination" value="6"/>
+            <Item label="Yellow illumination" value="7"/>
+            <Item label="Cyan illumination" value="8"/>
+            <Item label="Magenta illumination" value="9"/>
+        </Value>
+
+        <Value type="list" genre="config" instance="1" index="43" label="LED frame colour at the Z-Wave network alarm detection" value="2" size="1">
+            <Help>This parameter defines the illumination colour in case of Z-Wave alarm.</Help>
+            <Item label="Illumination turned off completely" value="0"/>
+            <Item label="No change in colour. LED frame colour is determined by settings of parameters 41 or 42" value="1"/>
+            <Item label="LED frame flashes red / blue / white" value="2"/>
+            <Item label="White illumination" value="3"/>
+            <Item label="Red illumination" value="4"/>
+            <Item label="Green illumination" value="5"/>
+            <Item label="Blue illumination" value="6"/>
+            <Item label="Yellow illumination" value="7"/>
+            <Item label="Cyan illumination" value="8"/>
+            <Item label="Magenta illumination" value="9"/>
+        </Value>
+    </CommandClass>
+
+    <!-- Association Groups -->
+    <CommandClass id="133">
+        <Associations num_groups="3">
+            <Group index="1" max_associations="1" label="Lifeline"/>
+            <Group index="2" max_associations="5" label="BasicSet forward relay status on local Button event"/>
+            <Group index="3" max_associations="5" label="BasicSet base on Plug power"/>
+        </Associations>
+    </CommandClass>
+</Product>
diff --git a/config/firstalert/zcombo-g.xml b/config/firstalert/zcombo-g.xml
new file mode 100644
index 00000000..e32434b3
--- /dev/null
+++ b/config/firstalert/zcombo-g.xml
@@ -0,0 +1,48 @@
+<Product Revision="1"
+  xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">ZCombo-G Smoke/CO Alarm</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0138:0003:0001</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://products.z-wavealliance.org/products/3886</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/firstalert/zcombo-g.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3886/User_Manual_M08-0456-173833_D2.pdf</MetaDataItem>
+    <MetaDataItem name="Description">The Z-Wave Smoke/CO alarm can be implemented in residential and institutional applications. Installation settings include sleeping areas within hospitals, hotels, motels, dormitories and other multi-family dwellings that are defined in standard NFPA 101. The First Alert ZCOMBO-G Smoke and Carbon Monoxide Detector has been fully tested and complies with UL217, UL2034, CSFM, NFPA 720, NFPA 101 and other agencies that model their codes after the above agencies. The combination alarm meets building codes that require the use of a battery operated Z-Wave wireless Smoke and CO detector. This First Alert Z-Wave Combination Alarm includes silence features and meets the model building codes published by the ICC.
+    The First Alert Z-Wave Combo Alarm includes: an insect screened photoelectric smoke sensing chamber, electrochemical carbon monoxide sensor, 85dB horn, supervised 3V (2 AA batteries) power supply, full function test switch and a silence feature.
+    The First Alert Z-Wave Enabled Battery Smoke &amp; Carbon Monoxide Combo Alarm includes a battery drawer that prevents battery removal and tamper resistant locking pins that lock the alarm to the mounting bracket. This First Alert Combination Alarm is an ideal fit for any number of applications that include apartments, dormitories, and hotels. Designed for wall or ceiling mounting, this alarm includes all of the required mounting anchors and screws needed for easy installation.
+    </MetaDataItem>
+    <MetaDataItem name="WakeupDescription">To manual wake-up the device, slide the battery door open wait for ~5 seconds and then slide the battery drawer closed. Upon power-up, the device will send the wake-up notification.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Slide battery door open.
+2. Insert batteries checking the correct orientation.
+3. Press and hold the test button. Keep it held down as you slide the battery drawer closed. You may then release the button.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Slide battery door open.
+2. Insert batteries checking the correct orientation.
+3. Press and hold the test button. Keep it held down as you slide the battery drawer closed. You may then release the button.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">If the device is powered up with the test button held down for 10+ seconds, the device will reset all Z-Wave settings and leave the network.
+Upon completion of the Reset operation, the LED will glow and the horn will sound for ~1 second.
+Please use this procedure only when the network primary controller is missing or otherwise inoperable.
+    </MetaDataItem>
+    <MetaDataItem id="0003" name="ZWProductPage" type="0001">https://products.z-wavealliance.org/products/3886/</MetaDataItem>
+    <MetaDataItem id="0003" name="FrequencyName" type="0001">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0003" name="Identifier" type="0001">ZCOMBO</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Richard Tallent - richard@tallent.us" date="11 Oct 2020" revision="1">Copy from ZCOMBO, update based on Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3886/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="SuperVision report timeout" size="2" type="short" value="1500" units="ms" min="500" max="5000">
+      <Help>ZCOMBO will send the message over SuperVision Command Class and it will wait for the SuperVision report from the Controller for the SuperVision report timeout time.</Help>
+    </Value>
+    <Value genre="config" index="2" label="SuperVision retry count" size="2" type="short" value="1" units="" min="0" max="5">
+      <Help>If the SuperVision report is not received within the SuperVision report timeout time, the ZCOMBO will retry sending the message again. Upon exceeding the max retry, the ZCOMBO device will send the next message available in the queue.</Help>
+    </Value>
+    <Value genre="config" index="3" label="SuperVision wait time" size="2" type="short" value="5" units="sec" min="1" max="60">
+      <Help>Before retrying the message, ZCOMBO will wait for the SuperVision wait time. Actual wait time is calculated using the formula: Wait Time = SuperVision wait time base-value + random-value + (attempt-count x 5 seconds). The random value will be between 100 and 1100 milliseconds.
+      </Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/firstalert/zsmoke.xml b/config/firstalert/zsmoke.xml
new file mode 100644
index 00000000..d086080b
--- /dev/null
+++ b/config/firstalert/zsmoke.xml
@@ -0,0 +1,29 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/firstalert/zsmoke.png</MetaDataItem>
+    <MetaDataItem id="0002" name="ZWProductPage" type="0001">https://products.z-wavealliance.org/products/863/</MetaDataItem>
+    <MetaDataItem name="Description">Smoke Alarm</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="0001">ZSMOKE</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="0001">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="Name">Smoke Alarm</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Steve28" date="31 Jul 2020" revision="1">Initial release - modified from zcombo</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- First Alert ZSmoke Smoke Detector -->
+ 
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Send double alarm messages" size="1" type="list" value="0">
+      <Help>Causes the device to send double alarm messages.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/ge/12720.xml b/config/ge/12720.xml
new file mode 100644
index 00000000..b47200a2
--- /dev/null
+++ b/config/ge/12720.xml
@@ -0,0 +1,22 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3130:6363</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ge/14284.png</MetaDataItem>
+    <MetaDataItem id="3130" name="ZWProductPage" type="6363">https://products.z-wavealliance.org/products/1194/</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1. If plugged in, unplug the Switch from the receptacle. 
+2. Press and hold the top button for at least 3 seconds while you plug the switch into a receptacle. </MetaDataItem>
+    <MetaDataItem id="3130" name="Identifier" type="6363">12720/ZW4201</MetaDataItem>
+    <MetaDataItem name="ProductManual">http://z-wave-assets.s3-us-west-2.amazonaws.com/docs/138/B0013V8K3O_GE_Jasco_Z-Wave_Plug-in_Outdoor_Smart_Switch_12720_Manual.pdf</MetaDataItem>
+    <MetaDataItem name="Description">Transform any home into a smart home with the GE Z-Wave Outdoor Smart Switch. The lighting control enables wireless control of on/off functions for outdoor applications, and is compatible with incandescent, LED, Xenon, Halogen, fluorescent and compact fluorescent bulbs. The weather-resistant housing with a protective outlet cover safeguards the outlet from dirt and debris when not in use. The discreet black color blends in with any outdoor environment. Perfect for decorative or seasonal lighting, fountains and other outdoor plug-in appliances. Take control of your home lighting with GE Z-Wave Smart Lighting Controls! </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Follow the instructions for your Z-Wave certified controller to exclude a device from the Z-Wave network. 
+2. Once the controller is ready to Exclude your device, press and release the manual/program button on the smart switch to exclude it from the network. </MetaDataItem>
+    <MetaDataItem name="Name">Plug-in Outdoor Smart Switch</MetaDataItem>
+    <MetaDataItem id="3032" name="FrequencyName" type="6363">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Follow the instructions for you Z-Wave certified controller to include the smart switch to the Z-Wave network. 
+2. Once the controller is ready to include your outdoor smart switch, press and release the manual/program button on the smart switch to include it in the network.
+3. Once your controller has confirmed that the smart switch has been included, refresh the Z-Wave network to optimize performance. </MetaDataItem>
+    <ChangeLog>
+      <Entry author="mike240se" date="26 June 2020" revision="1">Initial Metadata added - https://products.z-wavealliance.org/products/1194/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+</Product>
diff --git a/config/ge/12724-dimmer.xml b/config/ge/12724-dimmer.xml
index a40b21a8..dd1d3755 100644
--- a/config/ge/12724-dimmer.xml
+++ b/config/ge/12724-dimmer.xml
@@ -1,4 +1,4 @@
-<!-- GE(Jasco) 12724 3-Way Dimmer Switch --><Product Revision="9" xmlns="https://github.com/OpenZWave/open-zwave">
+<!-- GE(Jasco) 12724 3-Way Dimmer Switch --><Product Revision="11" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3031:4944</MetaDataItem>
     <MetaDataItem name="ProductPic">images/ge/12724-dimmer.png</MetaDataItem>
@@ -12,13 +12,15 @@
     <MetaDataItem id="3032" name="FrequencyName" type="4944">U.S. / Canada / Mexico</MetaDataItem>
     <MetaDataItem id="3032" name="Identifier" type="4944">12725 / ZW3006</MetaDataItem>
     <ChangeLog>
-       <Entry author="Shaun Feakes" date="04 Sep 2019" revision="9">Update for 3032</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1197/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1201/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1202/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1221/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="7">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2103/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="8">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2506/xml</Entry>
+      <Entry author="Shaun Feakes" date="04 Sep 2019" revision="9">Update for 3032</Entry>
+      <Entry author="Justin Hammond" date="26 June 2020" revision="10">Add Verifed Change Flag</Entry>
+      <Entry author="Brian France" date="23 Nov 2020" revision="11">Added COMMAND_CLASS_BASIC block to set Value type instead of Node Event for Basic Set, Added COMMAND_CLASS_ASSOCIATION block for double tap with double tap defauled to auto</Entry>
     </ChangeLog>
     <MetaDataItem id="3033" name="ZWProductPage" type="4944">https://products.z-wavealliance.org/products/1201/</MetaDataItem>
     <MetaDataItem id="3033" name="FrequencyName" type="4944">U.S. / Canada / Mexico</MetaDataItem>
@@ -71,4 +73,24 @@ Note: This should only be used in the event your network’s primary controller
       <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
     </Value>
   </CommandClass>
+  <CommandClass id="38">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Basic - Local Load" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5" auto="true" />
+    </Associations>
+  </CommandClass>
+  <!-- COMMAND_CLASS_BASIC -->
+  <CommandClass id="32">
+    <Compatibility>
+      <IgnoreMapping>true</IgnoreMapping>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
 </Product>
diff --git a/config/ge/14280-plugin-dimmer.xml b/config/ge/14280-plugin-dimmer.xml
new file mode 100644
index 00000000..b8407476
--- /dev/null
+++ b/config/ge/14280-plugin-dimmer.xml
@@ -0,0 +1,58 @@
+<Product Revision="0" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">none</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ge/14280-plugin-dimmer.png</MetaDataItem>
+    <MetaDataItem id="3033" name="ZWProductPage" type="5044">https://products.z-wavealliance.org/products/2139/</MetaDataItem>
+    <MetaDataItem name="Name">Plug-in Smart Dimmer, Dual Plug With Simultaneous Control</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=%26filename=MarketCertificationFiles/2139/Binder1.pdf</MetaDataItem>
+    <MetaDataItem id="3033" name="FrequencyName" type="5044">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ResetDescription"></MetaDataItem>
+    <MetaDataItem name="InclusionDescription"></MetaDataItem>
+    <MetaDataItem name="Description"></MetaDataItem>
+    <MetaDataItem id="3033" name="Identifier" type="5044">14280/ZW3107</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription"></MetaDataItem>
+    <ChangeLog>
+      <Entry author="Travis Geis - travis@travisgeis.com" date="27 August 2020" revision="0">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2139/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="LED Light" max="2" min="0" size="1" type="list" value="0">
+      <Help>Sets when the LED on the switch is lit.</Help>
+      <Item label="LED on when light off" value="0"/>
+      <Item label="LED on when light on" value="1"/>
+      <Item label="LED always off" value="2"/>
+    </Value>
+    <!-- Both the number of steps (or levels) that the dimmer will change and the timing of the steps can be modified to suit personal preferences. The timing of the steps can be adjusted in 10 millisecond intervals. As an example, the default setting for parameter 8 is 3. This means that the lighting level will change every 30 milliseconds when the Dim Command is received. A value of 255 would mean that the level would change every 2.55 seconds. Combined, the two parameters allow dim rate adjustments from 10 milliseconds to 4.2 minutes to go from maximum-to-minimum or minimum-to-maximum brightness levels. -->
+    <Value genre="config" index="7" label="Z-Wave Command Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="8" label="Z-Wave Command Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="9" label="Local Control Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="10" label="Local Control Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="11" label="ALL ON/ALL OFF Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="12" label="ALL ON/ALL OFF Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="38">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Basic - Load" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/ge/14285.xml b/config/ge/14285.xml
new file mode 100644
index 00000000..b923bae7
--- /dev/null
+++ b/config/ge/14285.xml
@@ -0,0 +1,58 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3032:4F44</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ge/14285.png</MetaDataItem>
+    <MetaDataItem id="3032" name="ZWProductPage" type="4F44">https://products.z-wavealliance.org/products/2939/</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1.  Place the device into ON mode (upper position of Operating Mode Switch)
+2.  Press and hold the programming button.
+3.  While holding programming button, place device into OFF mode (middle position of Operating Mode Switch).
+4.  While holding programming button, place device back into ON mode (upper position of Operating Mode Switch).
+5.  After three (3) seconds, release programming button.  Green LED will flash 3 times when completed successfully.
+
+Note: This should only be used in the event your networks primary controller is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem id="3032" name="Identifier" type="4F44">14285/ZW4007</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2939/14285%20QSG.pdf</MetaDataItem>
+    <MetaDataItem name="Description">Transform any home into a smart home with the GE 40 Amp Z-Wave Direct-Wire Indoor/Outdoor Smart Switch. When added to a Z-Wave network, the heavy duty switch enables wireless control of on/off functions for large load, hard-wired applications such as waters heaters, landscape lighting, spas, pool pumps and heaters. The Smart Switch can be used indoors or outdoors and features an easy access wire connection block, front mounted LED lights indicating power and on/off status, and an override switch to turn connected devices on or off manually. The Smart Switch is housed in a lockable, tamper-resistant case to ensure settings and wiring are secure. The rugged, weather-resistant design will keep out dirt and debris while being suitable for use in extreme weather conditions. The GE Z-Wave Direct-Wire Outdoor Smart Switch is also equipped with state-of-the-art energy monitoring capability, allowing you to monitor watts and kilowatt hours, helping you keep your energy costs to a minimum. Take control of your home lighting and large load devices with GE Z-Wave Smart Lighting Controls!</MetaDataItem>
+    <MetaDataItem name="Name">Direct-Wire Outdoor Smart Switch</MetaDataItem>
+    <MetaDataItem id="3032" name="FrequencyName" type="4F44">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1.  Follow the instructions for your Z-Wave certified controller to add a device to the Z-Wave network.
+2.  Once the controller is ready to add your device, press and release the programming button to add it to the network.  If prompted by the controller to enter the S2 security code, refer to the QR code/security number on the back of the box, or the QR code label on the product.
+3.  Once your controller has confirmed that the device has been added, refresh the Z-Wave network to optimize performance.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1.  Follow the instructions for your Z-Wave certified controller to remove a device from the Z-Wave network.
+2.  Once the controller is ready to remove your device press and release the programming button to remove it from the network.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="John Klimek - jklimek@gmail.com" date="8 June 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2939/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="0" label="Product State after Power Reset" units="" size="1" min="0" max="2" type="list">
+      <Help>Product State after Power Reset</Help>
+      <Item value="0" label="Return to last state"/>
+      <Item value="1" label="Return to off"/>
+      <Item value="2" label="Return to on"/>
+    </Value>
+    <Value genre="config" instance="1" index="2" value="0" label="Energy Report Mode" units="" size="1" min="0" max="2" type="list">
+      <Help>Energy Report Mode</Help>
+      <Item value="0" label="Once monthly"/>
+      <Item value="1" label="Reports based on Parameter 3 setting"/>
+      <Item value="2" label="Once daily"/>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="5" label="Energy Report Frequency" units="" size="1" min="5" max="60" type="byte">
+      <Help>Energy Report Frequency</Help>
+    </Value>
+    <Value genre="config" instance="1" index="19" value="0" label="Alternate Exclusion" units="" size="1" min="0" max="1" type="list">
+      <Help>Alternate Exclusion</Help>
+      <Item value="0" label="Default"/>
+      <Item value="1" label="Alternate Exclusion (3 button presses)"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5" />
+      <Group index="2" label="Basic Set, controlled by local load" max_associations="5" />
+      <Group index="3" label="Basic Set, controlled by pressing the On or Off button" max_associations="5" />
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/ge/14291-switch.xml b/config/ge/14291-switch.xml
index 21e73042..e768c1e6 100644
--- a/config/ge/14291-switch.xml
+++ b/config/ge/14291-switch.xml
@@ -1,4 +1,4 @@
-<!-- Configuration Parameters - per https://products.z-wavealliance.org/products/1879 --><Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+<!-- Configuration Parameters - per https://products.z-wavealliance.org/products/1879 --><Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3036:4952</MetaDataItem>
     <MetaDataItem name="ProductPic">images/ge/14291-switch.png</MetaDataItem>
@@ -19,6 +19,7 @@
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1438/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1879/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2501/xml</Entry>
+      <Entry author="Brian France" date="23 Nov 2020" revision="6">Added COMMAND_CLASS_BASIC block to set Value type instead of Node Event for Basic Set, default double tap association auto=true</Entry>
     </ChangeLog>
   </MetaData>
   <CommandClass id="112">
@@ -39,7 +40,14 @@
     <Associations num_groups="3">
       <Group index="1" label="Lifeline" max_associations="5"/>
       <Group index="2" label="Basic - Local Load" max_associations="5"/>
-      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5" auto="true" />
     </Associations>
   </CommandClass>
+  <!-- COMMAND_CLASS_BASIC -->
+  <CommandClass id="32">
+    <Compatibility>
+      <IgnoreMapping>true</IgnoreMapping>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
 </Product>
diff --git a/config/ge/14292-toggle-switch.xml b/config/ge/14292-toggle-switch.xml
index ee86bde3..117fa5b3 100644
--- a/config/ge/14292-toggle-switch.xml
+++ b/config/ge/14292-toggle-switch.xml
@@ -1,4 +1,4 @@
-<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3037:4952</MetaDataItem>
     <MetaDataItem name="ProductPic">images/ge/14292-toggle-switch.png</MetaDataItem>
@@ -18,6 +18,7 @@
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1856/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="3">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2055/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2502/xml</Entry>
+      <Entry author="Brian France" date="23 Nov 2020" revision="5">Added COMMAND_CLASS_BASIC block to set Value type instead of Node Event for Basic Set, default double tap association auto=true</Entry>
     </ChangeLog>
     <MetaDataItem id="3038" name="ZWProductPage" type="4952">https://products.z-wavealliance.org/products/2055/</MetaDataItem>
     <MetaDataItem id="3038" name="FrequencyName" type="4952">U.S. / Canada / Mexico</MetaDataItem>
@@ -36,7 +37,14 @@
     <Associations num_groups="3">
       <Group index="1" label="Lifeline" max_associations="5"/>
       <Group index="2" label="Basic - Local Load" max_associations="5"/>
-      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5" auto="true" />
     </Associations>
   </CommandClass>
+  <!-- COMMAND_CLASS_BASIC -->
+  <CommandClass id="32">
+    <Compatibility>
+      <IgnoreMapping>true</IgnoreMapping>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
 </Product>
diff --git a/config/ge/14294-dimmer.xml b/config/ge/14294-dimmer.xml
index 24a2ee8d..83b90d56 100644
--- a/config/ge/14294-dimmer.xml
+++ b/config/ge/14294-dimmer.xml
@@ -1,11 +1,11 @@
-<!-- GE(Jasco) 14294 Z-Wave Plus Dimmer Switch --><!-- Configuration Parameters - per
-             http://products.z-wavealliance.org/products/1442 --><Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+<!-- GE(Jasco) 14294 Z-Wave Plus Dimmer Switch -->
+<Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3038:4944</MetaDataItem>
     <MetaDataItem name="ProductPic">images/ge/14294-dimmer.png</MetaDataItem>
     <MetaDataItem id="3038" name="ZWProductPage" type="4944">https://products.z-wavealliance.org/products/2105/</MetaDataItem>
     <MetaDataItem name="Name">In-Wall Smart 1000W Dimmer </MetaDataItem>
-    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2168/Binder1.pdf</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2105/Binder1.pdf</MetaDataItem>
     <MetaDataItem id="3038" name="FrequencyName" type="4944">U.S. / Canada / Mexico</MetaDataItem>
     <MetaDataItem name="ResetDescription">Quickly press ON (Top) button three (3) times then immediately
 press the OFF (Bottom) button three (3) times. The LED will flash
@@ -31,11 +31,12 @@ and release the top or bottom of the wireless smart dimmer
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1442/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2105/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2168/xml</Entry>
+      <Entry author="Justin Hammond" date="26 Jun 2020" revision="6">Add Verified Change Flag </Entry>
+      <Entry author="Keith Pine" date="14 Sep 2020" revision="7">Fixed metadata, added undocumented configuration parameters</Entry>
+      <Entry author="Brian France" date="23 Nov 2020" revision="8">Added COMMAND_CLASS_BASIC block to set Value type instead of Node Event for Basic Set, default double tap association auto=true</Entry>
     </ChangeLog>
-    <MetaDataItem id="3039" name="ZWProductPage" type="4944">https://products.z-wavealliance.org/products/2168/</MetaDataItem>
-    <MetaDataItem id="3039" name="Identifier" type="4944">14299/ZW3006</MetaDataItem>
-    <MetaDataItem id="3039" name="FrequencyName" type="4944">U.S. / Canada / Mexico</MetaDataItem>
   </MetaData>
+  <!-- Configuration -->
   <CommandClass id="112">
     <Value genre="config" index="3" label="LED Light" max="2" min="0" size="1" type="list" value="0">
       <Help>Sets when the LED on the switch is lit.</Help>
@@ -48,6 +49,11 @@ and release the top or bottom of the wireless smart dimmer
       <Item label="No" value="0"/>
       <Item label="Yes" value="1"/>
     </Value>
+    <Value genre="config" index="6" label="Dim up/down rate" max="1" min="0" size="1" type="list" value="0">
+      <Help>Adjust the speed at which the light ramps to a specific value other than 0 and FF.</Help>
+      <Item label="Quickly" value="0"/>
+      <Item label="Slowly" value="1"/>
+    </Value>
     <!-- Both the number of steps (or levels) that the dimmer will change and the timing of the steps can be modified to suit personal preferences. The timing of the steps can be adjusted in 10 millisecond intervals. As an example, the default setting for parameter 8 is 3. This means that the lighting level will change every 30 milliseconds when the Dim Command is received. A value of 255 would mean that the level would change every 2.55 seconds. Combined, the two parameters allow dim rate adjustments from 10 milliseconds to 4.2 minutes to go from maximum-to-minimum or minimum-to-maximum brightness levels. -->
     <Value genre="config" index="7" label="Z-Wave Command Dim Step" max="99" min="1" type="byte" units="" value="1">
       <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
@@ -67,13 +73,33 @@ and release the top or bottom of the wireless smart dimmer
     <Value genre="config" index="12" label="ALL ON/ALL OFF Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
       <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
     </Value>
+    <Value genre="config" index="16" label="Switch Mode" max="1" min="0" size="1" type="list" value="0">
+      <Help>Turn your dimmer into an On/Off switch with switch mode.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="20" label="Minimum Dim Threshold" max="99" min="1" type="byte" units="" value="1">
+      <Help>Set the minimum dimmer threshold when manually or remotely controlled.</Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="38">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
   </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
     <Associations num_groups="3">
       <Group index="1" label="Lifeline" max_associations="5"/>
       <Group index="2" label="Basic - Load" max_associations="5"/>
-      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5" auto="true" />
     </Associations>
   </CommandClass>
+  <!-- COMMAND_CLASS_BASIC -->
+  <CommandClass id="32">
+    <Compatibility>
+      <IgnoreMapping>true</IgnoreMapping>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
 </Product>
diff --git a/config/ge/14298.xml b/config/ge/14298.xml
new file mode 100644
index 00000000..3cdd719e
--- /dev/null
+++ b/config/ge/14298.xml
@@ -0,0 +1,45 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3034:4F50</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ge/14298.png</MetaDataItem>
+    <MetaDataItem id="3034" name="ZWProductPage" type="4F50">https://products.z-wavealliance.org/products/3408/</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1. If plugged in, unplug the Switch from the receptacle. 
+2. Press and hold the top button for at least 3 seconds while you plug the switch into a receptacle. </MetaDataItem>
+    <MetaDataItem id="3034" name="Identifier" type="4F50">14298/ZW4202</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/3408/14298%20EnFrSp%20QSG%20v1.pdf</MetaDataItem>
+    <MetaDataItem name="Description">New Plug-in Outdoor Smart Switch is equipt with S2 and Smart Start which allows for easy and secure inclusion.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Follow the instructions for your Z-Wave certified controller to exclude a device from the Z-Wave network. 
+2. Once the controller is ready to Exclude your device, press and release the manual/program button on the smart switch to exclude it from the network. </MetaDataItem>
+    <MetaDataItem name="Name">Plug-in Outdoor Smart Switch</MetaDataItem>
+    <MetaDataItem id="3034" name="FrequencyName" type="4F50">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Follow the instructions for you Z-Wave certified controller to include the smart switch to the Z-Wave network. 
+2. Once the controller is ready to include your outdoor smart switch, press and release the manual/program button on the smart switch to include it in the network.
+3. Once your controller has confirmed that the smart switch has been included, refresh the Z-Wave network to optimize performance. If prompted by the controller to enter the S2 security code
+/security number on the side of the box or the QR code label on the product, enter the 5 digit code.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="mike240se" date="06 Jul 2020" revision="1">Initial metadata</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="LED Light" max="2" min="0" size="1" type="list" value="0">
+      <Help>Sets when the LED on the switch is lit.</Help>
+      <Item label="LED on when light off" value="0"/>
+      <Item label="LED on when light on" value="1"/>
+      <Item label="LED always off" value="2"/>
+    </Value>
+	<Value genre="config" index="19" label="Alternate Exclusion" max="1" min="0" size="1" type="list" value="0">
+      <Help>Default - normal exclusion
+        Active - perform a series of button presses to help eliminate accidental exclusion</Help>
+      <Item label="Press any button" value="0"/>
+      <Item label="Press two times ON, two times OFF" value="1"/>
+    </Value>
+  </CommandClass>
+   <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Basic - Load" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/ge/14322-dimmer-toggle.xml b/config/ge/14322-dimmer-toggle.xml
new file mode 100644
index 00000000..143e17d8
--- /dev/null
+++ b/config/ge/14322-dimmer-toggle.xml
@@ -0,0 +1,65 @@
+<!-- GE(Jasco) 14322 Z-Wave Plus Dimmer Toggle Switch -->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3137:4944</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ge/14322-dimmer-toggle.png</MetaDataItem>
+    <MetaDataItem id="3137" name="ZWProductPage" type="4944">https://products.z-wavealliance.org/products/2123/</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2123/Binder1.pdf</MetaDataItem>
+    <MetaDataItem name="Name">In-Wall Smart Toggle Dimmer</MetaDataItem>
+    <MetaDataItem id="3137" name="FrequencyName" type="4944">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Quickly press ON (up) button (3) times then immediately
+press the OFF (down) button (3) times.
+Note: This should only be used in the even your network's
+primary controller is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Follow the instructions for your Z-Wave certified controller to
+include a device to the Z-Wave network.
+2. Once the controller is ready to include your device,
+press and release the top or bottom of the wireless smart
+dimmer (rocker) to include it in the network.</MetaDataItem>
+    <MetaDataItem id="3137" name="Identifier" type="4944">14322/ZW3004</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Follow the instructions for your Z-Wave certified controller to
+exclude a device from the Z-Wave network.
+2. Once the controller is ready to Exclude your device,
+press and release the top or bottom of the wireless smart
+dimmer (rocker) to exclude it from the network.</MetaDataItem>
+    <MetaDataItem name="Description">Transform any home into a smart home with the Jasco Z-Wave In-Wall Smart Toggle Dimmer. The dimmer enables wireless control of on/off and dim functions of hard-wired dimmable LED/CFL and incandescent lighting. The dimmer replaces your current light switch, uses your existing wiring, and provides Z-Wave wireless and in-wall control of overhead lighting. Use the dimmer feature to customize the lighting output and create the perfect ambiance for any room. Providing ultimate flexibility, the In-Wall Smart Dimmer allows you to operate the switch by itself or easily integrate the switch three-way or four-way wiring configurations by adding the Jasco Add-On Switch. Single Pole wiring configuration controls the light from one location. Three-way wiring configuration controls the light from two separate locations. Four-way wiring configuration controls the light from three separate locations. The Jasco Add-On Switch is required for three-way or four-way installations. Take control of your home lighting with Jasco Z-Wave Wireless Lighting Controls!</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Brandon Clifford - brandon099@gmail.com" date="22 Nov 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2123/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters - per https://products.z-wavealliance.org/products/2048 -->
+  <CommandClass id="112">
+    <Value genre="config" index="4" label="Invert Switch" max="1" min="0" size="1" type="list" value="0">
+      <Help>Change the top of the switch to OFF and the bottom of the switch to ON, if the switch was installed upside down.</Help>
+      <Item label="No" value="0"/>
+      <Item label="Yes" value="1"/>
+    </Value>
+    <!-- Both the number of steps (or levels) that the dimmer will change and the timing of the steps can be modified to suit personal preferences. The timing of the steps can be adjusted in 10 millisecond intervals. As an example, the default setting for parameter 8 is 3. This means that the lighting level will change every 30 milliseconds when the Dim Command is received. A value of 255 would mean that the level would change every 2.55 seconds. Combined, the two parameters allow dim rate adjustments from 10 milliseconds to 4.2 minutes to go from maximum-to-minimum or minimum-to-maximum brightness levels. -->
+    <Value genre="config" index="7" label="Z-Wave Command Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="8" label="Z-Wave Command Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="9" label="Local Control Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="10" label="Local Control Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="11" label="ALL ON/ALL OFF Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="12" label="ALL ON/ALL OFF Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Basic - Load" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/ge/26931-motion-switch.xml b/config/ge/26931-motion-switch.xml
index 5fd6e0cd..eca2f64a 100644
--- a/config/ge/26931-motion-switch.xml
+++ b/config/ge/26931-motion-switch.xml
@@ -1,4 +1,5 @@
-<!-- GE(Jasco) 26931 Z-Wave Plus Smart Motion Switch --><Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+<!-- GE(Jasco) 26931 Z-Wave Plus Smart Motion Switch -->
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3032:494D</MetaDataItem>
     <MetaDataItem name="ProductPic">images/ge/26931-motion-switch.png</MetaDataItem>
@@ -26,6 +27,7 @@ on the smart switch to include it in the network.</MetaDataItem>
     <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2035/26931 EnFrSp QSG v1.3 and Parameters.pdf</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2035/xml</Entry>
+      <Entry author="Tao Gong - gongtao0607@gmail.com" date="11 Nov 2020" revision="3">Update ForceInstance flag</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters - per http://products.z-wavealliance.org/products/2035 -->
@@ -81,6 +83,13 @@ on the smart switch to include it in the network.</MetaDataItem>
       <Item label="Press X then press ON" value="1"/>
     </Value>
   </CommandClass>
+  <!-- Compatibility Flags -->
+  <!-- This flag is to fix OpenZWave unable to add association '1.0'. Without this flag, attempting to add assiciation '1.0' will become '1.1' -->
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>false</ForceInstances>
+    </Compatibility>
+  </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
     <Associations num_groups="3">
diff --git a/config/ge/26932-motion-dimmer.xml b/config/ge/26932-motion-dimmer.xml
new file mode 100644
index 00000000..6b7a4264
--- /dev/null
+++ b/config/ge/26932-motion-dimmer.xml
@@ -0,0 +1,141 @@
+<!-- GE(Jasco) 26932 Z-Wave Plus Smart Motion Dimmer. Identical to GE 26933 Z-Wave Plus Smart Motion Dimmer -->
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3033:494d</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ge/26933-motion-dimmer.png</MetaDataItem>
+    <MetaDataItem id="3033" name="ZWProductPage" type="494D">https://products.z-wavealliance.org/products/2093/</MetaDataItem>
+    <MetaDataItem id="3033" name="Identifier" type="494D">26932</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Follow the instructions for your Z-Wave certified
+controller to remove a device from the Z-Wave
+network.
+2. Once the controller is ready to remove your device,
+press and release the top button on the smart
+dimmer to remove it from the network.</MetaDataItem>
+    <MetaDataItem id="3033" name="FrequencyName" type="494D">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and release the top button ten times within 5
+seconds. The LED will flash 3 times quickly confirming
+change.
+Note: This should only be used in the event your
+network’s primary controller is missing or otherwise
+inoperable</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Follow the instructions for your Z-Wave certified
+controller to add the smart dimmer to the Z-Wave
+network.
+2. Once the controller is ready to add your smart
+dimmer, press and release the top or bottom
+button on the smart dimmer to include it in the
+network.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2093/26932 EnFrSp QSG v1.3 and Parameters.pdf</MetaDataItem>
+    <MetaDataItem name="Description">Transform any home into a smart home with the Jasco In-Wall Smart Motion Dimmer. This Z-Wave device replaces you current light switch using your existing wiring and provides Z-Wave wireless control of overhead lighting. The dimmer enables wireless control of On/Off functions of incandescent, LED, xenon, halogen and fluorescent lighting. Not only does it act as a dimmer but the Jasco In-Wall Smart Motion Dimmer has a built in PIR sensor which can control the local load and be set in occupancy or vacancy mode.
+
+</MetaDataItem>
+    <MetaDataItem name="Name">In-Wall Smart Motion Dimmer</MetaDataItem>
+    <ChangeLog>
+	    <Entry author="Tao Gong - gongtao0607@gmail.com" date="02 Nov 2020" revision="1">Initial Metadata Import from ge/26933-motion-dimmer.xml and https://products.z-wavealliance.org/products/2093/xml</Entry>
+	    <Entry author="Tao Gong - gongtao0607@gmail.com" date="05 Nov 2020" revision="2">Update VerifyChanged flag</Entry>
+	    <Entry author="Tao Gong - gongtao0607@gmail.com" date="11 Nov 2020" revision="3">Update ForceInstance flag</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters - per http://products.z-wavealliance.org/products/2093 -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="Timeout Duration" max="255" min="0" size="1" type="list" value="5">
+      <Help>Amount of time the light stays on after motion stops</Help>
+      <Item label="5 seconds" value="0"/>
+      <Item label="1 minute" value="1"/>
+      <Item label="5 minutes" value="5"/>
+      <Item label="15 minutes" value="15"/>
+      <Item label="30 minutes" value="30"/>
+      <Item label="Disable timeout" value="255"/>
+    </Value>
+    <Value genre="config" index="2" label="Brightness" max="255" min="1" type="byte" value="3">
+      <Help>Valid values are 0-99 or 255 for last dimming level</Help>
+    </Value>
+    <Value genre="config" index="3" label="Operation Mode" max="3" min="1" size="1" type="list" value="3">
+      <Help>Motion-sensing mode of operation.</Help>
+      <Item label="Manual" value="1"/>
+      <Item label="Vacancy" value="2"/>
+      <Item label="Occupancy" value="3"/>
+    </Value>
+    <Value genre="config" index="5" label="Invert Switch" max="1" min="0" size="1" type="list" value="0">
+      <Help>In a three-way configuration, change the top of the add-on switch to OFF and the bottom of the switch to ON, if the switch was installed upside down.</Help>
+      <Item label="No" value="0"/>
+      <Item label="Yes" value="1"/>
+    </Value>
+    <Value genre="config" index="6" label="Enable/Disable Motion Sensor" max="1" min="0" size="1" type="list" value="1">
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <!-- Both the number of steps (or levels) that the dimmer will change and the timing of the steps can be modified to suit personal preferences. The timing of the steps can be adjusted in 10 millisecond intervals. As an example, the default setting for parameter 8 is 3. This means that the lighting level will change every 30 milliseconds when the Dim Command is received. A value of 255 would mean that the level would change every 2.55 seconds. Combined, the two parameters allow dim rate adjustments from 10 milliseconds to 4.2 minutes to go from maximum-to-minimum or minimum-to-maximum brightness levels. -->
+    <Value genre="config" index="7" label="Z-Wave Command Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="8" label="Z-Wave Command Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="9" label="Local Control Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="10" label="Local Control Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="11" label="ALL ON/ALL OFF Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="12" label="ALL ON/ALL OFF Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="13" label="Motion sensing sensitivity" max="3" min="1" size="1" type="list" value="3">
+      <Item label="High" value="1"/>
+      <Item label="Medium" value="2"/>
+      <Item label="Low" value="3"/>
+    </Value>
+    <Value genre="config" index="14" label="Enable/Disable Light Sensing" max="1" min="0" size="1" type="list" value="0">
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="15" label="Reset cycle" max="110" min="0" type="short" units="" value="2">
+      <Help>0 = disable
+                  1 = 10 seconds
+                  2 = 20 seconds
+                  3 = 30 seconds
+                  4 = 45 seconds
+                  ...
+                  110 = 27 minutes 15 seconds 
+    	          </Help>
+    </Value>
+    <Value genre="config" index="16" label="Switch Mode" max="1" min="0" size="1" type="list" value="0">
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="17" label="Switch Level" max="99" min="0" type="byte" value="0"></Value>
+    <Value genre="config" index="18" label="Dim Up Rate" max="1" min="0" size="1" type="list" value="0">
+      <Item label="Slow" value="0"/>
+      <Item label="Fast" value="1"/>
+    </Value>
+    <Value genre="config" index="19" label="Exclusion Mode" max="1" min="0" size="1" type="list" value="0">
+      <Item label="Press any button" value="0"/>
+      <Item label="Press X then press ON" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- Compatibility Flags -->
+  <!-- This flag is to fix the issue with SwitchMultiLevel V2 not reporting target value. -->
+  <CommandClass id="38">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
+  </CommandClass>
+  <!-- This flag is to fix OpenZWave unable to add association '1.0'. Without this flag, attempting to add assiciation '1.0' will become '1.1' -->
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>false</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Basic Set" max_associations="5"/>
+      <Group index="3" label="Basic Set" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/ge/46201-switch.xml b/config/ge/46201-switch.xml
index 3d6ebc18..18fa0b55 100644
--- a/config/ge/46201-switch.xml
+++ b/config/ge/46201-switch.xml
@@ -1,4 +1,4 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3135:4952</MetaDataItem>
     <MetaDataItem name="ProductPic">images/ge/46201-switch.png</MetaDataItem>
@@ -17,6 +17,7 @@
 3. Once your controller has confirmed that the device has been included, refresh the Z-Wave network to optimize performance.</MetaDataItem>
     <ChangeLog>
       <Entry author="Caleb Mingle - caleb@mingle.cm" date="07 Sept 2019" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3317/xml</Entry>
+      <Entry author="Brian France" date="23 Nov 2020" revision="2">Added COMMAND_CLASS_BASIC block to set Value type instead of Node Event for Basic Set, Added COMMAND_CLASS_ASSOCIATION block for double tap with double tap defauled to auto</Entry>
     </ChangeLog>
   </MetaData>
   <CommandClass id="112">
@@ -38,7 +39,14 @@
     <Associations num_groups="3">
       <Group index="1" label="Lifeline" max_associations="5"/>
       <Group index="2" label="Basic - Local Load" max_associations="5"/>
-      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5" auto="true"/>
     </Associations>
   </CommandClass>
+  <!-- COMMAND_CLASS_BASIC -->
+  <CommandClass id="32">
+    <Compatibility>
+      <IgnoreMapping>true</IgnoreMapping>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
 </Product>
diff --git a/config/ge/46202-switch.xml b/config/ge/46202-switch.xml
new file mode 100644
index 00000000..0e0f07ca
--- /dev/null
+++ b/config/ge/46202-switch.xml
@@ -0,0 +1,44 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3137:4952</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ge/46202-switch.png</MetaDataItem>
+    <MetaDataItem id="3137" name="ZWProductPage" type="4952">https://products.z-wavealliance.org/products/3350/</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Follow the instructions for your Z-Wave certified controller to exclude a device from the Z-Wave network. 
+2. Once the controller is ready to exclude your device, press and release the top button of the wireless smart switch (rocker) to exclude it from the network.</MetaDataItem>
+    <MetaDataItem id="3137" name="Identifier" type="4952">14292/46202/ZW4009</MetaDataItem>
+    <MetaDataItem name="Description">In-Wall Smart Switch with QuickFit and SimpleWire enhancements. Revolutionary QuickFit design features a housing depth that is up to 20 percent smaller than the previous Z-Wave models. This reduced size coupled with the elimination of heat taps provides a better fit in older style boxes and multi-gang configurations. SimpleWire technology allows line and load to automatically be configured with auto-sensing line-load terminals. All of this is coupled with Z-Wave S2 and Smart Start allows for effortless installation while being safer than ever!</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1. Quickly press ON (Top) button 3 times then immediately press the OFF (Bottom) button 3 times. The LED will flash ON/OFF 5 times when completed successfully. 
+2. Please use this reset procedure only when the primary controller is missing or inoperable. </MetaDataItem>
+    <MetaDataItem id="3137" name="FrequencyName" type="4952">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="Name">In-Wall Smart Switch</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/3350/46202%20Binder.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Follow the instructions for your Z-Wave certified controller to include a device to the Z-Wave network.
+2. Once the controller is ready to include your device, press and release the top or bottom of the wireless smart switch(rocker) to include it in the network.
+3. Once your controller has confirmed that the device has been included, refresh the Z-Wave network to optimize performance.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Andrew Putnam - andrew@putnamnation.com" date="10 Sept 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3350/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="LED Light" max="3" min="0" size="1" type="list" value="0">
+      <Help>Sets when the LED on the switch is lit.</Help>
+      <Item label="LED on when light off" value="0"/>
+      <Item label="LED on when light on" value="1"/>
+      <Item label="LED always off" value="2"/>
+      <Item label="LED always on" value="3"/>
+    </Value>
+    <Value genre="config" index="19" label="Alternate Exclusion" max="1" min="0" size="1" type="list" value="0">
+      <Help>Default - normal exclusion
+        Active - perform a series of button presses to help eliminate accidental exclusion</Help>
+      <Item label="Press any button" value="0"/>
+      <Item label="Press two times ON, two times OFF" value="1"/>
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Basic - Local Load" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/ge/46204-dimmer-toggle.xml b/config/ge/46204-dimmer-toggle.xml
new file mode 100644
index 00000000..7af260fc
--- /dev/null
+++ b/config/ge/46204-dimmer-toggle.xml
@@ -0,0 +1,67 @@
+<!-- GE(Jasco) 46203 Z-Wave Plus Dimmer Switch -->
+<!-- Configuration Parameters - per http://products.z-wavealliance.org/products/3323 -->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0063:3237:4944</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ge/46204-dimmer-toggle.png</MetaDataItem>
+    <MetaDataItem id="3235" name="ZWProductPage" type="4944">https://products.z-wavealliance.org/products/3352/</MetaDataItem>
+    <MetaDataItem name="Name">In-Wall Smart Toggle Dimmer</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/3352/14295.46204%20Binder.pdf</MetaDataItem>
+    <MetaDataItem id="3235" name="FrequencyName" type="4944">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Quickly press ON (up) button three times then immediately press the OFF (down)  button three times. 
+    NOTE: This should only be used in the event your network’s
+    primary controller is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Follow the instructions for your Z-Wave certified controller to add a device to the Z-Wave network.
+    2. Once the controller is ready to add your device, press up and release the toggle. Please reference the controller’s manual for instructions.
+    Now, you have complete control to turn your fixture ON/OFF or dim according to groups, scenes, schedules and interactive automations programmed by your controller. If your Z-Wave certified controller features remote access, you can control your fixture from your mobile devices.</MetaDataItem>
+    <MetaDataItem name="Description">In-Wall Smart Toggle Dimmer with QuickFit and SimpleWire enhancements. Revolutionary QuickFit design features a housing depth that is up to 20 percent smaller than the previous Z-Wave models. This reduced size coupled with the elimination of heat taps provides a better fit in older style boxes and multi-gang configurations. SimpleWire technology allows line and load to automatically be configured with auto-sensing line-load terminals. All of this is coupled with Z-Wave S2 and Smart Start allows for effortless installation while being safer than ever!</MetaDataItem>
+    <MetaDataItem id="3237" name="Identifier" type="4944">14295/46204/ZW3011</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To remove and reset the device: 
+    1. Follow the instructions for your Z-Wave certified controller to remove a device from the Z-Wave network. 
+    2. Once the controller is ready to remove your device, press up and release the toggle.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Dejan Zelic" date="14 Jul 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/3352/XML</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="LED Indication Configuration" max="3" min="0" size="1" type="list" value="2">
+      <Help>Adjust the LED status to default, invert, always OFF or always ON</Help>
+      <Item label="Device is ON, LED is OFF; device is OFF, LED is ON" value="0"/>
+      <Item label="Device is ON, LED is ON; device is OFF, LED is OFF" value="1"/>
+      <Item label="LED always OFF" value="2"/>
+      <Item label="LED always ON" value="3"/>
+    </Value>
+    <Value genre="config" index="6" label="Dim up/down rate" max="1" min="0" size="1" type="list" value="0">
+      <Help>Adjust the speed at which the ramps to a specific value other than 0 and FF</Help>
+      <Item label="Dim up/down the light to the specified level quickly by command except value 0 and FF" value="0"/>
+      <Item label="Dim up/down the light to the specified level slowly by command except value 0 and ff" value="1"/>
+    </Value>
+    <Value genre="config" index="16" label="Switch Mode" max="1" min="0" size="1" type="list" value="0">
+      <Help>Turn your dimmer into an On/Off switch with switch mode</Help>
+      <Item label="Disable normal operation" value="0"/>
+      <Item label="Enable switch mode" value="1"/>
+    </Value>
+    <Value genre="config" index="19" label="Alternate Exclusion"  max="1" min="0" size="1" type="list" value="0">
+      <Help>Never accidentally remove a device during with alternate exclusion</Help>
+      <Item label="Normal operation, press any button on the device" value="0"/>
+      <Item label="Press two times ON button and two times OFF button, LED will flash 5 times if exclusion is successful" value="1"/>
+    </Value>
+    <Value genre="config" index="30" label="Minimum Dim Threshold" max="99" min="1" type="byte" units="" value="1">
+      <Help>Set the minimum dimmer threshold</Help>
+    </Value>
+    <Value genre="config" index="31" label="Maximum Brightness Threshold" max="99" min="1" type="byte" units="" value="99">
+      <Help>Set the brightness threshold</Help>
+    </Value>
+    <Value genre="config" index="32" label="Default Brightness Level" max="99" min="0" type="byte" units="" value="0">
+      <Help>Set the default brightness level that the dimmer will turn on when being controlled manually</Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Basic - Load" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/goodway/td14010.xml b/config/goodway/td14010.xml
new file mode 100644
index 00000000..73937158
--- /dev/null
+++ b/config/goodway/td14010.xml
@@ -0,0 +1,133 @@
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">RGBW Color LED Dimmer</MetaDataItem>
+    <MetaDataItem name="Description">Good Way RGBW module is used to control RGB/RGBW strips and LED strips or bulbs to create countless colour options and has 6 special scene effects. Its extremely small size allows for easy installation behind wall sockets and switches. Controlled devices may be powered by 12 or 24 VDC.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0068:000b:0003</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://www.goodway.com.tw/product3.asp?listid=9&amp;id=26&amp;subid=102&amp;id=1168&amp;typeid=</MetaDataItem>
+    <MetaDataItem name="ProductSupport"></MetaDataItem>
+    <MetaDataItem name="ProductPic">images/goodway/td14010.png</MetaDataItem>
+    <MetaDataItem name="ProductManual"></MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Connect the module to the power supply. Enable inclusion mode on your Z-Wave controller. Press and release the Include/Exclude button 3 times within 2 seconds.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Connect the module to the power supply. Make sure the module is within direct range of your Z-Wave controller or use a hand-held Z-Wave remote to perform exclusion. Press and release the Include/Exclude button 3 times within 2 seconds. NOTE: The module will be excluded from your network, but any custom configuration parameters will not be erased.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Connect the module to the power supply.  Press and hold the Include/Excude button for at least 10 seconds. NOTE: By resetting the module, all custom parameters previously set on the module will return to their default values and the owner ID will be deleted. Use this reset procedure only when the main controller is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem id="000b" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2466/features</MetaDataItem>
+    <MetaDataItem id="000b" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="000b" name="Identifier" type="0003">Good Way RGBW Dimmer</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Daniel Brunt - daniel@brunt.ca" date="31 July 2020" revision="1">Initial release</Entry>
+      <Entry author="Daniel Brunt - daniel@brunt.ca" date="2 Oct 2020" revision="2">Added indexes 8 and 9 to CC 112</Entry>
+      <Entry author="Daniel Brunt - daniel@brunt.ca" date="2 Oct 2020" revision="3">Removed indexes 8 and 9 to CC 112</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Input IN1 configuration" max="9" min="1" size="1" type="list" value="1">
+      <Help></Help>
+      <Item label="NORMAL mode – momentary switch type" value="1"/>
+      <Item label="NORMAL mode – toggle switch type" value="2"/>
+      <Item label="NORMAL mode – toggle with memory switch type" value="3"/>
+      <Item label="BRIGHTNESS mode – momentary switch type" value="4"/>
+      <Item label="BRIGHTNESS mode – toggle switch type" value="5"/>
+      <Item label="BRIGHTNESS mode – toggle with memory switch type" value="6"/>
+      <Item label="SCENE mode – momentary switch type" value="7"/>
+      <Item label="SCENE mode – toggle switch type" value="8"/>
+      <Item label="SCENE mode – toggle with memory switch type" value="9"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Input IN2 configuration" max="9" min="1" size="1" type="list" value="1">
+      <Help></Help>
+      <Item label="NORMAL mode – momentary switch type" value="1"/>
+      <Item label="NORMAL mode – toggle switch type" value="2"/>
+      <Item label="NORMAL mode – toggle with memory switch type" value="3"/>
+      <Item label="BRIGHTNESS mode – momentary switch type" value="4"/>
+      <Item label="BRIGHTNESS mode – toggle switch type" value="5"/>
+      <Item label="BRIGHTNESS mode – toggle with memory switch type" value="6"/>
+      <Item label="SCENE mode – momentary switch type" value="7"/>
+      <Item label="SCENE mode – toggle switch type" value="8"/>
+      <Item label="SCENE mode – toggle with memory switch type" value="9"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Input IN3 configuration" max="9" min="1" size="1" type="list" value="1">
+      <Help></Help>
+      <Item label="NORMAL mode – momentary switch type" value="1"/>
+      <Item label="NORMAL mode – toggle switch type" value="2"/>
+      <Item label="NORMAL mode – toggle with memory switch type" value="3"/>
+      <Item label="BRIGHTNESS mode – momentary switch type" value="4"/>
+      <Item label="BRIGHTNESS mode – toggle switch type" value="5"/>
+      <Item label="BRIGHTNESS mode – toggle with memory switch type" value="6"/>
+      <Item label="SCENE mode – momentary switch type" value="7"/>
+      <Item label="SCENE mode – toggle switch type" value="8"/>
+      <Item label="SCENE mode – toggle with memory switch type" value="9"/>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Input IN4 configuration" max="9" min="1" size="1" type="list" value="1">
+      <Help></Help>
+      <Item label="NORMAL mode – momentary switch type" value="1"/>
+      <Item label="NORMAL mode – toggle switch type" value="2"/>
+      <Item label="NORMAL mode – toggle with memory switch type" value="3"/>
+      <Item label="BRIGHTNESS mode – momentary switch type" value="4"/>
+      <Item label="BRIGHTNESS mode – toggle switch type" value="5"/>
+      <Item label="BRIGHTNESS mode – toggle with memory switch type" value="6"/>
+      <Item label="SCENE mode – momentary switch type" value="7"/>
+      <Item label="SCENE mode – toggle switch type" value="8"/>
+      <Item label="SCENE mode – toggle with memory switch type" value="9"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="Auto Scene Mode Set" max="7" min="0" size="1" type="list" value="1">
+      <Help></Help>
+      <Item label="Off" value="0"/>
+      <Item label="Ocean" value="1"/>
+      <Item label="Lightning" value="2"/>
+      <Item label="Rainbow" value="3"/>
+      <Item label="Snow" value="4"/>
+      <Item label="Sun" value="5"/>
+      <Item label="Dancing" value="6"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Auto Scene Mode – Duration between Colour change" max="1127" min="0" type="short" value="3">
+      <Help>
+        This parameter is used to adjust time between 2 Colours in the Scene.
+        1-127 – delay duration is 1 sec to 127 sec.
+        1001-1127 – delay duration is from 1 min to 127 min. This parameter has no effect on lighting and Dancing scenes.</Help>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Memorize device status at power cut" max="1" min="0" size="1" type="list" value="0">
+      <Help>Device will be set to status memorized before power cut.</Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="MAX dimming value" max="99" min="2" size="1" type="byte" units="%" value="99">
+      <Help></Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="MIN dimming value" max="98" min="1" size="1" type="byte" units="%" value="1">
+      <Help>NOTE: The minimum level may not be higher than the MAX dimming value.</Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Dimming time (soft on/off)" max="25" min="5" size="1" type="byte" units="0.1 seconds" value="10">
+      <Help>
+        Default value 10 = 1 s.
+        5–25 = from 0.5 to 2.5 seconds</Help>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Dimming time when key pressed" max="127" min="1" size="1" type="byte" units="seconds" value="5">
+      <Help>
+        1–127 = from 1 to 127 seconds.
+        NOTE: Dimming time depends also on Min and Max dimming value.
+      </Help>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="Dimmer mode" max="3" min="0" size="1" type="list" value="0">
+      <Help>
+        NOTE: If the parameter no. 14 is enabled, parameter no. 1,2,3,4 has no effect.
+        NOTE: After parameter change, first exclude device (without setting parameters to default value) and then re include the device.
+      </Help>
+      <Item label="4 dimmers mode disabled" value="0"/>
+      <Item label="4 dimmers mode enabled – momentary switch type" value="1"/>
+      <Item label="4 dimmers mode enabled – toggle switch type" value="2"/>
+      <Item label="4 dimmers mode enabled – toggle with memory switch type" value="3"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+    </Associations>
+  </CommandClass>
+  <!-- Map endpoints to instances -->
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+</Product>
diff --git a/config/graber/mcz1.xml b/config/graber/mcz1.xml
new file mode 100644
index 00000000..9fafd8ca
--- /dev/null
+++ b/config/graber/mcz1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Multi-Channel Remote</MetaDataItem>
+    <MetaDataItem name="Description">Enjoy the comfort, convenience and energy efficiency of beautiful custom motorized window treatments featuring Z-Wave protocol for easy integration. Lighting control has never been more simple. Window treatments can be automated using your favorite Z-Wave certified gateway or security system, or controlled by a remote control. Raise or lower the shades to control just the right amount of light, privacy and solar heat. Shades can be fully open, fully closed or anywhere in between, it’s up to you. In addition, some systems will also report back the state of the battery charge on battery operated versions.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/026e:5a31:4d43</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.baliblinds.com/globalassets/3.-documents/installation-instructions/bali-motorization-owners-manual-autoview.pdf</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.baliblinds.com/customer-support/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/graber/mcz1.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2819/P2_79083-01_18-8215_MotorizationManual.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Any button press will wake up the remote.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. From your home automation system’s user interface, select the option to enroll a new Z-Wave device. See your home automation system’s instructions for details.
+2. On the remote, press and hold the MENU/RIGHT button to enter the menu.
+3. Select ZWAVE > LEARN.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. From your home automation system’s user interface, select the option to exclue a Z-Wave device. See your home automation system’s instructions for details.
+2. On the remote, press and hold the MENU/RIGHT button to enter the menu.
+3. Select ZWAVE > LEARN.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1. Press and hold the MENU/RIGHT button for 2 seconds to enter the menu.
+2. Select ZWAVE > RESET.
+3. With LIKE NEW? selected, press and hold the MENU/RIGHT button until the screen no longer tells you to wait.</MetaDataItem>
+    <MetaDataItem id="5A31" name="ZWProductPage" type="4D43">https://products.z-wavealliance.org/products/2819</MetaDataItem>
+    <MetaDataItem id="5A31" name="FrequencyName" type="4D43">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="5A31" name="Identifier" type="4D43">MCZ1</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Nathan Spencer - natekspencer@gmail.com" date="23 July 2020" revision="1">Initial entry with data obtained from https://products.z-wavealliance.org/products/2819</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- No configuration parameters -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="Slave Shade Group" max_associations="12"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/hab/iblindsV2.xml b/config/hab/iblindsV2.xml
new file mode 100644
index 00000000..fdb0e620
--- /dev/null
+++ b/config/hab/iblindsV2.xml
@@ -0,0 +1,52 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0287:000D:0003</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/hab/iblinds.png</MetaDataItem>
+    <MetaDataItem id="000D" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2486/</MetaDataItem>
+    <MetaDataItem name="ResetDescription">The Device Reset Locally function is used to reset the device to fatory default.  The reset operation resets protocol data (HomeID, NodeID) as well as all application specific data to factory default values.
+NOTE: Please only use this function when the primary controller is missing or inoperable!
+1.      Press the INC / EXC button 3
+Press the INC / EXC button 3 times within 5 seconds to enable the device reset function.
+2.      Wait 30 Seconds Press CLBR button
+After device is reset wait 30 seconds and press the CLBR button to reboot the device and make it ready for Z-Wave Inclusion.  </MetaDataItem>
+    <MetaDataItem id="000D" name="Identifier" type="0003">iblindsV2</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2486/iBlind_User_Guide.pdf</MetaDataItem>
+    <MetaDataItem name="Description">An intelligent Z-Wave blind motor that installs out of sight in existing Horizontal (2" and 2 1/2" slatted-style) blind headrails. Use iBlinds to tilt the slats open, closed or use the value slider for precise positioning of the slat tilt angle.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Follow the directions for your Z-Wave device to place it in the exclusion mode.
+Press the exclude button once and wait for the device to be removed from the Z-Wave network.
+ </MetaDataItem>
+    <MetaDataItem name="Name">iblinds V2</MetaDataItem>
+    <MetaDataItem id="000D" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Follow the directions for your Z-Wave hub/controller to place it in the add for inclusion mode.
+Press the inclusion button once and wait for the device to be discovered and joined to the Z-Wave network.  Follow the directions of your Z-Wave controller to uniquely identify your iblinds device.   (Ex: Bedroom iblind)
+Note: If the device is not joined to the network.  Press the CLBR button Wait 1 minutes and repeat steps 1 and 2 again.  If you continue to have trouble joining the iblinds motor to the Z-Wave network follow the Z-Wave network Exclusion process below.
+</MetaDataItem>
+    <ChangeLog>
+      <Entry author="mike240se" date="10 Jul 2020" revision="1">Initial metadata</Entry>
+      <Entry author="chancehiblinds" date="16 Sept 2020" revision="2">Folder namechange to hab, minor typos</Entry>
+    </ChangeLog>
+  </MetaData>
+   <!-- Configuration Parameters -->
+        <CommandClass id="38">
+                <Compatibility>
+                        <NoRefreshAfterSet index="0">true</NoRefreshAfterSet>
+                </Compatibility>
+        </CommandClass>
+        <CommandClass id="112">
+                <Value type="list" genre="config" instance="1" index="1" label="Auto Calibration Torque" units="" read_only="false" write_only="false" verify_changes="false" min="1" max="5" vindex="0" size="1">
+                                <Help>Changing the Auto Calibration torque will allow you to change the initial calibration torque. Use at your own risk!</Help>
+                                <Item label="Calibrate using default torque " value="1" />
+                                <Item label="Reduce calibration torque by 1 factor" value="2" />
+                                <Item label="Reduce calibration torque by 2 factors" value="3" />
+                                <Item label="Increase calibration torque by .5 factor" value="4" />
+                                <Item label="Increase calibration torque by 1 factor" value="5" />
+                </Value>
+        </CommandClass>
+
+   <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/hab/iblindsV3.xml b/config/hab/iblindsV3.xml
new file mode 100644
index 00000000..b94e49a7
--- /dev/null
+++ b/config/hab/iblindsV3.xml
@@ -0,0 +1,71 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<MetaData>
+    <MetaDataItem name="Name">iblinds</MetaDataItem>
+    <MetaDataItem name="Description">An intelligent blind motor, a Z-Wave device designed for tilting Venetian (two inch slatted-style) blinds. Open and close the blinds and use a value slider for precise positioning of the tilt angle.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0287:0071:0004</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://myiblinds.com/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://support.myiblinds.com</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/hab/iblindsV3.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">http://support.myiblinds.com/wp-content/uploads/2019/06/User-Guide-v1.0.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Press Include/Exclude button</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Follow the directions for your Z-Wave hub/controller to place it into inclusion mode. Press the inclusion button three times and wait for the device to be discovered and joined to the Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Follow the directions for your Z-Wave device to place it in the exclusion mode. Press the exclude button three times and wait for the device to be removed from the Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Charge adapter button can be used to reset the device and perform manual auto calibration: press and hold the Charge Adapter button for 10 seconds.</MetaDataItem>
+    <MetaDataItem id="0071" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/2486/features</MetaDataItem>
+    <MetaDataItem id="0071" name="FrequencyName" type="0004">U.S. / Canada/ Mexico</MetaDataItem>
+    <MetaDataItem id="0071" name="FrequencyName" type="0004">CEPT</MetaDataItem>
+    <MetaDataItem id="0071" name="FrequencyName" type="0004">Australia / New Zealand</MetaDataItem>
+    <MetaDataItem id="0071" name="Identifier" type="0004">iblinds V3</MetaDataItem>
+  <!--TODO : Change Frequency to represent Global with new ZWave 700 Series-->
+    <ChangeLog>
+      <Entry author="Chance Huddleston chance@habhomeintel.com" date="8 Sept 2020" revision="1">Initial Release</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" type="byte" size="1" index="1" label="Close Interval" min="16" max="32" value="22">
+      <Help>
+	  Auto Calibration Tightness
+	  Lower value = tighter
+	  Higher value = looser
+	  MUST BE RECALIBRATED
+	  Range:16-32
+      Default: 22
+      </Help>
+    </Value>
+    <Value genre="config" type="list" size="1" index="2" label="Reverse Direction" min="0" max="1" value="0">
+      <Help>
+	   Reverse closing direction
+      </Help>
+ 	   <Item value="0" label="False"/>
+	   <Item value="1" label="True"/>
+    </Value>
+    <!--The 3rd Index Configuration Parameter is not used, DO NOT ADD-->
+    <Value genre="config" type="byte" size="1" index="4" label="Default ON Value" min="0" max="100" value="50">
+      <Help>
+	  Value that iblinds will open to by Default
+      Default: 50
+      </Help>
+    </Value>
+    <Value genre="config" type="list" size="1" index="5" label="Reset Button Disable" min="0" max="1" value="0">
+      <Help>
+	   Will disable the reset button on the motor, preventing it from accidentally being pressed
+      </Help>
+ 	   <Item value="0" label="False"/>
+	   <Item value="1" label="True"/>
+    </Value>
+    <Value genre="config" type="byte" size="1" index="6" label="Speed" min="0" max="100" value="0">
+      <Help>
+	  How fast iblinds will close in seconds
+      Default:0
+      </Help>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="1" />
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/hank/hkzw-so08-smartplug.xml b/config/hank/hkzw-so08-smartplug.xml
new file mode 100644
index 00000000..d6978cc5
--- /dev/null
+++ b/config/hank/hkzw-so08-smartplug.xml
@@ -0,0 +1,120 @@
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0208:0019:0100</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/hank/hkzw-so05-smartplug.png</MetaDataItem>
+    <MetaDataItem id="0019" name="ZWProductPage" type="0100">https://products.z-wavealliance.org/products/3202/</MetaDataItem>
+    <MetaDataItem name="Name">Smart Plug</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?filename=MarketCertificationFiles/3202/SmartPlug%20SO08P%20SpecificationEngineering.pdf</MetaDataItem>
+    <MetaDataItem id="0019" name="FrequencyName" type="0100">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1) Insert the Plug into a socket,
+2) Press and hold the Z button for more than 20 seconds,
+3) If holding time more than 20seconds, the RGB LED indicator will keep yellow for 2 seconds, which means resetting is completed. 
+Use this procedure only in the event that the network primary controller is missing or otherwise inoperable.
+</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1) Connect the power supply.
+2) Set the Z-Wave network main controller into inclusion mode (see Z-Wave network controller operating manual).
+3) Triple click the Z-button or power up the device , RGB LED indicator should blink fast in blue.
+4) Smart Plug should be recognized and included into the Z-Wave network.
+</MetaDataItem>
+    <MetaDataItem id="0019" name="Identifier" type="0100">HKZW-SO08</MetaDataItem>
+    <MetaDataItem name="Description">Smart plug is a Z-Wave Switch plugin module specifically used to enable Z-Wave command and control (on/off) of any plug-in tool. It can report wattage consumption or kWh energy usage, and can indicate the power level with a RGB LED. 
+Smart Plug is also a security Z-Wave device and supports the Over The Air (OTA) feature for the product’s firmware upgrade .
+</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1) Insert the Plug into a socket.
+2) Set the Z-Wave network controller into the exclusion mode (see Z-Wave controller operating manual).
+3) Triple click the Z button.
+4) RGB LED indicator will blink orange till the removing process is completed, than the indicator will keep orange for 3 seconds.
+</MetaDataItem>
+    <ChangeLog>
+      <Entry author="YL" date="23 May 2021" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3202/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!--
+      Hank HKZW-SO08
+      http://products.z-wavealliance.org/products/3202
+    -->
+    <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="20" instance="1" label="Overload Protection" max="1" min="0" size="1" type="list" value="1">
+      <Help>Smart Plug keep detecting the load power, once the current exceeds 11.5A for more than 5s, smart plug's relay will turn off</Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="21" instance="1" label="Device status after power failure" max="2" min="0" size="1" type="list" value="0">
+      <Help>Define how the plug reacts after the power supply is back on.
+                  0 - Smart Plug memorizes its state after a power failure.
+                  1 - Smart Plug does not memorize its state after a power failure. Connected device will be on after the power supply is reconnected.
+                  2 - Smart Plug does not memorize its state after a power failure. Connected device will be off after the power supply is reconnected.
+            </Help>
+      <Item label="Memorize" value="0"/>
+      <Item label="On" value="1"/>
+      <Item label="Off" value="2"/>
+    </Value>
+    <Value genre="config" index="24" instance="1" label="Notification when load status change" max="2" min="0" size="1" type="list" value="1">
+      <Help>
+              Smart Plug can send notifications to association device(Group Lifeline) when state of smart plug's load change
+              0 - The function is disabled
+              1 - Send Basic report.
+              2 - Send Basic report only when Load condition is not changed by Z-WAVE Command
+            </Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Basic" value="1"/>
+      <Item label="Basic without Z-WAVE Command" value="2"/>
+    </Value>
+    <Value genre="config" index="27" instance="1" label="Indicator Modes" max="1" min="0" size="1" type="list" value="0">
+      <Help>After smart plug being included into a Z-Wave network, the LED in the device will indicator the state of load.
+              0 - The LED will follow the status(on/off) of its load
+              1 - When the state of Switch's load changed, The LED will follow the status(on/off) of its load, but the red LED will turn off after 5 seconds if there is no any switch action.
+            </Help>
+      <Item label="Enabled" value="0"/>
+      <Item label="Disabled" value="1"/>
+    </Value>
+    <Value genre="config" index="151" instance="1" label="Threshold of power report" max="200" min="0" size="2" type="short" units="W" value="50">
+      <Help>
+            Power threshold to be interpereted, when the change value of load power exceeds the setting threshold, the smart plug will send meter report to association device(Group Lifeline)
+          </Help>
+    </Value>
+    <Value genre="config" index="152" instance="1" label="Percentage threshold of power report" max="100" min="0" size="1" type="byte" units="%" value="10">
+      <Help>
+            Power percentage threshold to be interpreted, when change value of the load power exceeds the setting threshold, the smart plug will send meter report to association device(Group Lifeline).
+          </Help>
+    </Value>
+    <Value genre="config" index="171" instance="1" label="Power report frequency" max="2678400" min="3600" size="4" type="int" units="seconds" value="3600">
+      <Help>
+            The interval of sending power report to association device(Group Lifeline).
+            0 - The function is disabled.
+          </Help>
+    </Value>
+    <Value genre="config" index="172" instance="1" label="Energy report frequency" max="2678400" min="3600" size="4" type="int" units="seconds" value="7200">
+      <Help>
+            The interval of sending power report to association device(Group Lifeline).
+            0 - The function is disabled.
+          </Help>
+    </Value>
+    <Value genre="config" index="173" instance="1" label="Voltage report frequency" max="2678400" min="3600" size="4" type="int" units="seconds" value="0">
+      <Help>
+            The interval of sending voltage report to association device(Group Lifeline).
+            0 - The function is disabled.
+          </Help>
+    </Value>
+    <Value genre="config" index="174" instance="1" label="Electricity report frequency" max="2678400" min="3600" size="4" type="int" units="seconds" value="0">
+      <Help>
+            The interval of sending electricity report to association device(Group Lifeline).
+            0 - The function is disabled.
+          </Help>
+    </Value>
+    <Value genre="config" index="254" instance="1" label="Enable/disable the configuration command" max="2678400" min="3600" size="1" type="list" value="0">
+      <Help>
+            Lock/unlock all configuration parameters.
+          </Help>
+      <Item label="Unlock" value="0"/>
+      <Item label="Lock" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/homeseer/hs-fs100plus.xml b/config/homeseer/hs-fs100plus.xml
index 18f62bdf..ec183cc8 100644
--- a/config/homeseer/hs-fs100plus.xml
+++ b/config/homeseer/hs-fs100plus.xml
@@ -1,5 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+    <MetaData>
+        <MetaDataItem name="Name">Flex Sensor</MetaDataItem>
+        <MetaDataItem name="Description">HS-FS100+ (“Flex Sensor”) is a multifunction module that includes a temperature sensor, controllable buzzer and a port to connect optional external light or water sensors. It is designed to work with a variety of Z-Wave certified home controllers to launch automation events or scenes.
+
+- Use to trigger events based on changes in temperature
+- Use the built-in buzzer as an audible notification that triggers when things happen in your home
+- Use with optional light sensor to trigger events when indicator lights on applications turn on or off
+- Use with optional water sensor to trigger events when water is detected
+</MetaDataItem>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/000C:0001:0202</MetaDataItem>
+        <MetaDataItem id="0001" name="ProductPage" type="0202">https://products.z-wavealliance.org/products/3050</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/homeseer/hs-fs100plus.png</MetaDataItem>
+        <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=Manuals/3050/HS-FS100-Manual 081418.pdf</MetaDataItem>
+        <MetaDataItem name="WakeupDescription">When on battery power, the unit will stay awake for 5 minutes when the button is pressed to complete inclusion process. Once included, the unit will wake up every 60 seconds and detect for  water or light depending on which cable is plugged into it.
+
+Also, the unit will wake up every hour to report temperature to the controller.
+</MetaDataItem>
+        <MetaDataItem name="InclusionDescription">Inclusion: Add the device into your network by a Z-Wave certified controller. HS-FS100+ supports the latest S2 security offered by Z-Wave certified controllers. If your controller supports S2, please refer to the user guide of the controller for detailed instructions on adding devices to the network. The device can be added using the traditional method for Z-Wave as follows:
+1. Place your controller into Inclusion (Add) mode by following the controller manufacturer's instructions.
+2. When the controller is ready, single click the button of HS-FS100+. The controller should indicate that the new device was added successfully. If the controller shows it failed, repeat the procedure.
+</MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">Exclusion:  Remove the device from your network by a Z-Wave certified controller. HS-FS100+ supports the latest S2 security offered by Z-Wave certified controllers. If your controller supports S2, please refer to the user guide of the controller for detailed instructions on removing devices from the network. The device can be removed using the traditional method for Z-Wave as follows:
+1. Place your controller into Exclusion mode by following the controller manufacturer's instructions.
+2. When the controller is ready, single click the button of HS-FS100+. The controller should indicate that the device was removed successfully. If the controller shows it failed, repeat the procedure.
+</MetaDataItem>
+        <MetaDataItem name="ResetDescription">Use this procedure to reset Flex Sensor to factory settings when the Z-Wave controller is missing or otherwise inoperable.
+
+Press and hold the Z-Wave button on the sensor body for 10 seconds. If successful, the LED will flash 5 times.
+</MetaDataItem>
+        <MetaDataItem id="0001" name="FrequencyName" type="0202">U.S. / Canada / Mexico</MetaDataItem>
+        <MetaDataItem id="0001" name="Identifier" type="0202">HS-FS100+</MetaDataItem>
+        <ChangeLog>
+            <Entry author="Christopher Viel" date="31 December 2020" revision="2">Metadata Import from Z-Wave Alliance Database</Entry>
+        </ChangeLog>
+    </MetaData>
+
     <!--
       HomeSeer HS-FS100+ Flex Sensor
       https://products.z-wavealliance.org/products/3050
@@ -37,8 +72,9 @@
 
     <!-- Association Groups -->
     <CommandClass id="133">
-        <Associations num_groups="1">
+        <Associations num_groups="2">
             <Group index="1" max_associations="5" label="Lifeline"/>
+            <Group index="2" max_associations="5" label="Basic Set"/>
         </Associations>
     </CommandClass>
 </Product>
diff --git a/config/homeseer/hs-wd100plus.xml b/config/homeseer/hs-wd100plus.xml
index 2c39cd03..b751a26c 100644
--- a/config/homeseer/hs-wd100plus.xml
+++ b/config/homeseer/hs-wd100plus.xml
@@ -1,4 +1,4 @@
-<Product Revision="7" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/000C:3034:4447</MetaDataItem>
     <MetaDataItem name="ProductPic">images/homeseer/hs-wd100plus.png</MetaDataItem>
@@ -35,8 +35,15 @@ To manually reset, tap the ON button twice quickly and then tap the OFF button t
       <Entry author="Jean-Francois Auger- Nechry@gmail.com" date="25 May 2019" revision="5">Apply PR #1546 from kaburke</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2563/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="7">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2874/xml</Entry>
+      <Entry author="Jeremy M. Johnson" date="23 June 2020" revision="8">Added compatibility parameters to ensure correct dimming level is reported</Entry>
     </ChangeLog>
   </MetaData>
+  <!-- Compatibility Parameters -->
+  <CommandClass id="38">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
+  </CommandClass>
   <!-- Configuration Parameters -->
   <CommandClass id="112">
     <Value genre="config" index="4" label="Invert switch" max="1" min="0" size="1" type="list" value="0">
diff --git a/config/honeywell/2681-plugin-dimmer.xml b/config/honeywell/2681-plugin-dimmer.xml
new file mode 100644
index 00000000..5c43c56e
--- /dev/null
+++ b/config/honeywell/2681-plugin-dimmer.xml
@@ -0,0 +1,102 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0039:3038:5044</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/honeywell/2681-plugin-dimmer.png</MetaDataItem>
+    <MetaDataItem id="3038" name="ZWProductPage" type="5044">https://products.z-wavealliance.org/products/2681/</MetaDataItem>
+    <MetaDataItem id="3038" name="FrequencyName" type="5044">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="Name">Plug-in Smart Dimmer, Single Plug</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Follow the instructions for your Z-Wave certified controller to add
+the smart dimmer to the Z-Wave network.
+2. Once the controller is ready to add your smart dimmer, single
+press and release the manual/program button on the smart
+dimmer to add it in the network.
+Please reference the controller/gateway’s manual for instructions.</MetaDataItem>
+    <MetaDataItem id="3038" name="Identifier" type="5044">39336/ZW3104</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2681/39336-HQSG_v1.pdf</MetaDataItem>
+    <MetaDataItem name="ResetDescription">To return your dimmer to factory defaults:
+1. If plugged in, unplug the dimmer from the receptacle.
+2. Press and hold the top button for at least 3 seconds while you
+plug the dimmer into a receptacle.
+Note: This should only be used in the event your networks’ primary
+controller is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="Description">Transform any home into a smart home with the Honeywell Z-Wave Plug-In Smart Dimmer. The Smart Dimmer enables wireless control of on/off and dim functions for standard incandescent table and floor lamps, as well as dimmable fluorescent, LED and CFL fixtures and more! Use the dimmer control to customize the lighting output and create the perfect ambiance for any room. The space-saving horizontal module plugs into a standard wall receptacle without blocking the second outlet or obstructing placement of furniture. The Dimmer provides one Z-Wave enabled outlet for the lamp you would like to control. Take control of your home lighting with Honeywell Z-Wave Smart Lighting Controls! </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Follow the instructions for your Z-Wave certified controller to
+remove a device from the Z-Wave network.
+2. Once the controller is ready to remove your device, press and
+release the manual/program button on the smart dimmer to
+remove it from the network.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Brent Cohen - brentcohen@gmail.com" date="19 Aug 2020" revision="1">Copied from  28617/ZW3104 GE Plug-in Dimmer by Justin Hammond - Justin@dynam.ac</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!--
+
+Verify Changed to fix issues with update after power off
+  -->
+  
+  <CommandClass id="38">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
+  </CommandClass>
+  
+  <!--
+
+There are multiple sources of information for this product:
+
+[ZWave Alliance]: https://products.z-wavealliance.org/products/1433
+
+[EzZWave]: https://www.ezzwave.com/sites/jasco/uploads/documents/PDFs/part2/28167_Product_Page.pdf
+
+The sources above contradict each other on multiple points.
+  -->
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="LED Light" max="2" min="0" size="1" type="list" value="1">
+      <Help>Sets when the LED on the switch is lit.</Help>
+      <Item label="LED on when light off" value="0"/>
+      <Item label="LED on when light on" value="1"/>
+      <Item label="LED always off" value="2"/>
+    </Value>
+    <!--
+
+In [EzZWave], the configuration parameters from index 7 to 12 have a size of 1
+for the odd parameters and 2 for the even ones. (This translates to `byte` and
+`short` types.)
+
+[ZWave Alliance] shows a size of 1 for these parameters (i.e. all `byte`).
+
+[EzZWave] is correct. When I (@lddubeau) tested changing parameters with all
+types set to `byte`, I could not set the even-numbered parameters. After
+changing the even-numbered parameters to type `short`, I could set them.
+
+Neither source of documentation does a good job at describing the role of the
+dim step/rate parameters. I (@lddubeau) took a look at the other GE devices
+defined in this database and adopted the descriptions and explanations that fit
+best with the observed behavior.
+
+    -->
+    <Value genre="config" index="7" label="Z-Wave Command Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="8" label="Z-Wave Command Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="9" label="Local Control Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="10" label="Local Control Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="11" label="ALL ON/ALL OFF Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="12" label="ALL ON/ALL OFF Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/honeywell/3830-zw3107.xml b/config/honeywell/3830-zw3107.xml
new file mode 100644
index 00000000..f1bfeff9
--- /dev/null
+++ b/config/honeywell/3830-zw3107.xml
@@ -0,0 +1,70 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Plug-in Dimmer (Dual Plug Simultaneous Control)</MetaDataItem>
+    <MetaDataItem name="Description">Transform any home into a smart home with the Honeywell Z-Wave Smart Lighting Control Lamp Module with Dimmer Control. The lamp module enables wireless control of on/off and dim functions for standard incandescent table and floor lamps, as well as dimmable fluorescent, LED and CFL fixtures and more! Use the dimmer control to customize the lighting output and create the perfect ambiance for any room. The space-saving horizontal module plugs into a standard wall receptacle without blocking the second outlet or obstructing placement of furniture. It provides a Z-Wave enabled outlet for the lamp you would like to control and one always-on, simultaneous control AC outlet for other electrical appliances. Take control of your home lighting with Honeywell Z-Wave Smart Controls!</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0039:3033:5044</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/honeywell/3830-zw3107.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3830/39446-HQSG_v4.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Follow the instructions for your Z-Wave certified controller to add a device to the Z-Wave network. Once the controller is ready to add your device, press and release the manual/program button on the smart dimmer. Repeat as necessary to add the dimmer to the network.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Follow the instructions for your Z-Wave certified controller to remove a device from the Z-Wave network. Once the controller is ready to remove your device, press and release the manual/program button on the smart dimmer to remove it from the network.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">If plugged in, unplug the dimmer from the receptacle. Press and hold the top button, plug the device in and continue to hold for at least 3 seconds.</MetaDataItem>
+    <MetaDataItem id="3033" name="ZWProductPage" type="5044">https://products.z-wavealliance.org/products/3830</MetaDataItem>
+    <MetaDataItem id="3033" name="FrequencyName" type="5044">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="3033" name="Identifier" type="5044">39446 / ZW3107</MetaDataItem>
+    <ChangeLog>
+      <Entry author="AJ Schmidt - ajs4392@gmail.com" date="30 Aug 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/3830/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+
+
+  <CommandClass id="38">
+    <Compatibility>
+      <VerifyChanged index="0">true</VerifyChanged>
+    </Compatibility>
+  </CommandClass>
+
+
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="Invert/Disable LED" max="2" min="0" size="1" type="list" value="1">
+      <Help>Adjusts when the indicator LED is turned ON, OFF, or disabled</Help>
+      <Item label="LED ON/Device OFF" value="0"/>
+      <Item label="(Default) LED ON/Device ON" value="1"/>
+      <Item label="Disable LED" value="2"/>
+    </Value>
+    <Value genre="config" index="6" label="Dim up/down rate" max="1" min="0" size="1" type="list" value="0">
+      <Help>Adjusts when the indicator LED is turned ON, OFF, or disabled</Help>
+      <Item label="(Default) Dim up/down the light to the specified level quickly by command except value 0 and FF" value="0"/>
+      <Item label="Dim up/down the light to the specified level slowly by command except value 0 and FF" value="1"/>
+    </Value>
+
+    <Value genre="config" index="7" label="Z-Wave Command Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="8" label="Z-Wave Command Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="9" label="Local Control Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="10" label="Local Control Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+    <Value genre="config" index="11" label="ALL ON/ALL OFF Dim Step" max="99" min="1" type="byte" units="" value="1">
+      <Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
+    </Value>
+    <Value genre="config" index="12" label="ALL ON/ALL OFF Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
+      <Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
+    </Value>
+  </CommandClass>
+
+
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="LifeLine" max_associations="5"/>
+      <Group index="2" label="Supports Basic Set and is controlled with the local load" max_associations="5"/>
+      <Group index="3" label="Supports Basic Set and is controlled by double pressing the On or Off button" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/honeywell/39348-ZW4005.xml b/config/honeywell/39348-ZW4005.xml
index 3cf449fa..86749a7f 100644
--- a/config/honeywell/39348-ZW4005.xml
+++ b/config/honeywell/39348-ZW4005.xml
@@ -1,8 +1,8 @@
 <!-- Honeywell(Jasco) 39348 / ZW4005 In-Wall Smart Switch-->
-<Product Revision="1" 
+<Product Revision="2" 
   xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
-    <MetaDataItem name="ProductPic">images/honeywell/39348-ZW4005.jpg</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/honeywell/39348-ZW4005.png</MetaDataItem>
     <MetaDataItem id="3036" name="ZWProductPage" type="4952">https://products.z-wavealliance.org/products/2689/</MetaDataItem>
     <MetaDataItem id="3036" name="Identifier" type="4952">39348 / ZW4005</MetaDataItem>
     <MetaDataItem name="InclusionDescription">1. Follow the instructions for your Z-Wave certified controller to include a device to the Z-Wave network.
@@ -18,6 +18,7 @@ Note: Please use this reset procedure only when the primary controller is missin
     <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2689/39348-HQSG_v1.pdf</MetaDataItem>
     <ChangeLog>
       <Entry author="Dinko Bajric - dbajric@gmail.com" date="22 March 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/2689/XML</Entry>
+      <Entry author="Justin Hammond" date="24 June 2020" revision="2">Correct Product Pic Entry</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters - per https://products.z-wavealliance.org/Products/2689 -->
diff --git a/config/honeywell/39348-zw4008.xml b/config/honeywell/39348-zw4008.xml
index c34178e5..a1a50918 100644
--- a/config/honeywell/39348-zw4008.xml
+++ b/config/honeywell/39348-zw4008.xml
@@ -1,5 +1,5 @@
 <!-- Honeywell(Jasco) 39348 / ZW4008 In-Wall Smart Switch-->
-<Product Revision="1" 
+<Product Revision="2" 
   xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <!--<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/</MetaDataItem>-->
@@ -20,6 +20,7 @@ Note: This should only be used in the event your network’s primary controller
     <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/3599/39348%20Binder.pdf</MetaDataItem>
     <ChangeLog>
       <Entry author="Jeff Sanicola - jeff.sanicola@outlook.com" date="01 Jan 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/3599/xml</Entry>
+      <Entry author="Brian France" date="11 Dec 2020" revision="2">Added COMMAND_CLASS_BASIC block to set Value type instead of Node Event for Basic Set, Added COMMAND_CLASS_ASSOCIATION block for double tap with double tap defauled to auto</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters - per https://products.z-wavealliance.org/products/3599 -->
@@ -43,7 +44,14 @@ Note: This should only be used in the event your network’s primary controller
     <Associations num_groups="3">
       <Group index="1" label="Lifeline" max_associations="5"/>
       <Group index="2" label="Basic - Load" max_associations="5"/>
-      <Group index="3" label="Basic - Double Tap" max_associations="5"/>
+      <Group index="3" label="Basic - Double Tap" max_associations="5" auto="true"/>
     </Associations>
   </CommandClass>
+  <!-- COMMAND_CLASS_BASIC -->
+   <CommandClass id="32">
+     <Compatibility>
+       <IgnoreMapping>true</IgnoreMapping>
+       <SetAsReport>true</SetAsReport>
+     </Compatibility>
+   </CommandClass>
 </Product>
diff --git a/config/honeywell/39349-ZW1002.xml b/config/honeywell/39349-ZW1002.xml
new file mode 100644
index 00000000..165a806d
--- /dev/null
+++ b/config/honeywell/39349-ZW1002.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" 
+  xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/honeywell/39349-ZW1002.png</MetaDataItem>
+    <MetaDataItem id="3133" name="ZWProductPage" type="4952">https://products.z-wavealliance.org/products/2690</MetaDataItem>
+    <MetaDataItem id="3133" name="Identifier" type="4952">39349 / ZW1002</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Follow the instructions for your Z-Wave certified controller to add a device to the Z-Wave network. 2. Once the controller is ready to add your device, press and release the program button to add it in the network.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Quickly press the button three (3) times, then press and hold the button for at least three (3) seconds. The LED will blink five (5) times to confirm.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Follow the instructions for your Z-Wave certified controller to remove a device from the Z-Wave network. 2. Once the controller is ready to remove your device, press and release the manual/program button to remove it from the network.</MetaDataItem>
+    <MetaDataItem name="Name">In-Wall Tamper Resistant Outlet</MetaDataItem>
+    <MetaDataItem id="3133" name="FrequencyName" type="4952">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="Description">The Honeywell Z-Wave Tamper Resistant Outlet enables wireless control of on/off functions from the Z-Wave controlled outlet</MetaDataItem>
+	<MetaDataItem name="ProductPage">https://byjasco.com/products/ge-z-wave-plus-wall-tamper-resistant-smart-outlet</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2690/39349_HQSG_1.pdf</MetaDataItem>
+	<MetaDataItem name="ProductSupport">https://byjasco.com/support</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jeff Buss - jeff.buss.3477@gmail.com" date="5 AUG 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/2690/XML</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters - per https://products.z-wavealliance.org/Products/2690 -->
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="LED Light" max="2" min="0" size="1" type="list" value="1">
+      <Help>Sets when the LED on the outlet is lit.</Help>
+      <Item label="LED on when load off" value="0"/>
+      <Item label="LED on when load on (Default)" value="1"/>
+      <Item label="LED always off" value="2"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Z-Wave Plus Lifeline" max_associations="5"/>
+      <Group index="2" label="Supports Basic Set and is controlled with the local load" max_associations="5"/>
+      <Group index="3" label="Supports Basic Set and is controlled by pressing the On or Off button" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/honeywell/39358-ZW4002.xml b/config/honeywell/39358-ZW4002.xml
index 3af81788..3b08c2f1 100644
--- a/config/honeywell/39358-ZW4002.xml
+++ b/config/honeywell/39358-ZW4002.xml
@@ -1,4 +1,5 @@
-<!-- Honeywell(Jasco) 39358 / ZW4002 In-Wall Fan Control --><Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<!-- Honeywell(Jasco) 39358 / ZW4002 In-Wall Fan Control -->
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0039:3131:4944</MetaDataItem>
     <MetaDataItem name="ProductPic">images/honeywell/39358-ZW4002.png</MetaDataItem>
@@ -27,6 +28,7 @@ and release the top or bottom of the wireless smart dimmer
     <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2725/39358-HQSG-v1-para.pdf</MetaDataItem>
     <ChangeLog>
       <Entry author="Nathan Holben - nathan@holben.me" date="09 May 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2725/xml</Entry>
+      <Entry author="Bill Bagdon - bill@bagdon.io" date="14 Nov 2020" revision="2">Add LED config</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters - per https://products.z-wavealliance.org/products/2725 -->
@@ -36,6 +38,12 @@ and release the top or bottom of the wireless smart dimmer
       <Item label="No" value="0"/>
       <Item label="Yes" value="1"/>
     </Value>
+    <Value genre="config" index="3" label="LED Light" max="2" min="0" size="1" type="list" value="0">
+      <Help>Sets when the LED on the switch is lit.</Help>
+      <Item label="LED on when fan on" value="0"/>
+      <Item label="LED on when fan off" value="1"/>
+      <Item label="LED always off" value="2"/>
+    </Value>
   </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
diff --git a/config/honeywell/39449-ZW4106.xml b/config/honeywell/39449-ZW4106.xml
index aa337e4f..8f329dda 100644
--- a/config/honeywell/39449-ZW4106.xml
+++ b/config/honeywell/39449-ZW4106.xml
@@ -1,5 +1,5 @@
 <!-- Honeywell(Jasco) 39449 / ZW4106 Plug-in Smart Switch -->
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
   <MetaData>
     <MetaDataItem name="Name">39449 / ZW4106 Plug-in Smart Switch</MetaDataItem>
@@ -7,7 +7,7 @@
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0039:3033:5052</MetaDataItem>
     <MetaDataItem name="ProductPage">https://www.security.honeywellhome.com/product-repository/z5swpid</MetaDataItem>
     <!--<MetaDataItem name="ProductSupport"></MetaDataItem>-->
-    <MetaDataItem name="ProductPic">images/honeywell/39449-ZW4016.png</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/honeywell/39449-ZW4106.png</MetaDataItem>
     <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3740/39449-HQSG_v3.pdf</MetaDataItem>
     <!--<MetaDataItem name="WakeupDescription"></MetaDataItem>-->
     <MetaDataItem name="InclusionDescription">
@@ -27,6 +27,7 @@
     <MetaDataItem id="3033" name="Identifier" type="5052">39449 / ZW4106 </MetaDataItem>
     <ChangeLog>
       <Entry author="Alexander Bauer - sasha@linux.com" date="24 May 2020" revision="1">Initial metadata import from Z-Wave Alliance</Entry>
+      <Entry author="Justin Hammond" date="24 June 2020" revision="2">Correct Path to Image File</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
diff --git a/config/honeywell/th6320zw2003.xml b/config/honeywell/th6320zw2003.xml
index 3dddc775..96e98237 100644
--- a/config/honeywell/th6320zw2003.xml
+++ b/config/honeywell/th6320zw2003.xml
@@ -1,4 +1,4 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0039:0008:0011</MetaDataItem>
     <MetaDataItem name="ProductPic">images/honeywell/th6320zw2003.png</MetaDataItem>
@@ -36,12 +36,14 @@ Please use the reset procedure only when the primary controller is missing or in
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2583/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="3">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2893/xml</Entry>
+      <Entry author="Kyle Zimmerman" date="09 Sept 2020" revision="4">Thermostat requires 2 bytes for precision, not 1. Sending 1 results in decimal degrees (common in Celcius) setting the temperature to the minimum value.</Entry>
     </ChangeLog>
   </MetaData>
   <!-- This thermostat's setpoint descriptions are 1 based, not 0 -->
   <CommandClass id="67">
     <Compatibility>
       <Base>0</Base>
+      <OverridePrecision>2</OverridePrecision>
     </Compatibility>
   </CommandClass>
   <CommandClass id="112">
diff --git a/config/honeywell/th8320zw1000.xml b/config/honeywell/th8320zw1000.xml
index 46e439a5..dbd19296 100644
--- a/config/honeywell/th8320zw1000.xml
+++ b/config/honeywell/th8320zw1000.xml
@@ -1,4 +1,4 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0039:0001:0011</MetaDataItem>
     <MetaDataItem name="ProductPic">images/honeywell/th8320zw1000.png</MetaDataItem>
@@ -11,11 +11,13 @@
     <MetaDataItem name="ProductSupport">http://honeywell.com/Products-Services/Pages/consumer-home.aspx</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/44/xml</Entry>
+      <Entry author="automaton82" date="18 Aug 2020" revision="4">Thermostat requires 2 bytes for precision, not 1. Sending 1 results in all decimal sets returning back to minimum value.</Entry>
     </ChangeLog>
   </MetaData>
   <!-- This thermostat's setpoint descriptions are 1 based, not 0 -->
   <CommandClass id="67">
     <Compatibility>
+      <OverridePrecision>2</OverridePrecision>
       <Base>0</Base>
     </Compatibility>
   </CommandClass>
diff --git a/config/idlock/idlock150.xml b/config/idlock/idlock150.xml
index a9ebaa84..77efe3b6 100644
--- a/config/idlock/idlock150.xml
+++ b/config/idlock/idlock150.xml
@@ -1,4 +1,4 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="Name">ID Lock 150 Z-Wave module</MetaDataItem>
     <MetaDataItem name="Description">A module enabling your ID Lock digital door lock to a Z-Wave Plus enabled digital door Lock.
@@ -55,6 +55,7 @@ FACTORY RESET DOOR LOCK FIRMWARE:
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2780/xml</Entry>
       <Entry author="Eirik Hodne" date="25 Aug 2019" revision="3">Update as per the 1.4.9/1.6 firmware specification</Entry>
+      <Entry author="into-void" date="09 Sep 2020" revision="4">Update as per the 1.5.6/1.6 firmware specification</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -116,7 +117,7 @@ FACTORY RESET DOOR LOCK FIRMWARE:
       <Help>
         Service PIN Mode
         A configuration get command on this parameter returns the latest set parameter value (set by Z-wave).
-        This is a set only value, if changed locally on keypad these values are not changed on Z-wave module. Value 5 and 6 are for future use on door lock.
+        This is a set only value, if changed locally on keypad these values are not changed on Z-wave module. Value 5 and 6 will generate a random PIN in location 108.
         Disabled: Disables both PIN and Service PIN menu on door lock
 
         Default Value: 0 (Deactivated)
@@ -126,8 +127,8 @@ FACTORY RESET DOOR LOCK FIRMWARE:
       <Item label="2 times used" value="2"/>
       <Item label="5 times used" value="3"/>
       <Item label="10 times used" value="4"/>
-      <Item label="Not used (for future use)" value="5"/>
-      <Item label="Not used (for future use)" value="6"/>
+      <Item label="Random PIN 1x use" value="5"/>
+      <Item label="Random PIN 24hrs use" value="6"/>
       <Item label="Always valid" value="7"/>
       <Item label="12 Hours used" value="8"/>
       <Item label="24 Hours used" value="9"/>
@@ -159,15 +160,6 @@ FACTORY RESET DOOR LOCK FIRMWARE:
       <Item label="Disabled" value="0"/>
       <Item label="Enabled" value="1"/>
     </Value>
-    <Value genre="config" index="10" label="Retrieve RFID Information" type="int" units="">
-      <Help>
-        Configuration Report for retriving the RFID information
-        Byte 1: Para1 (msb)
-        Byte 2: Para2
-        Byte 3: Para3
-        Byte 4: Para4 (lsb)
-      </Help>
-    </Value>
   </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
diff --git a/config/images/2gig/ct200.png b/config/images/2gig/ct200.png
new file mode 100644
index 00000000..1fc8921e
Binary files /dev/null and b/config/images/2gig/ct200.png differ
diff --git a/config/images/BeNext/P1dongle.png b/config/images/BeNext/P1dongle.png
new file mode 100644
index 00000000..6f7fd67f
Binary files /dev/null and b/config/images/BeNext/P1dongle.png differ
diff --git a/config/images/DefaultProductImage.png b/config/images/DefaultProductImage.png
new file mode 100644
index 00000000..d13e1236
Binary files /dev/null and b/config/images/DefaultProductImage.png differ
diff --git a/config/images/abus/SHRM10000.jpg b/config/images/abus/SHRM10000.jpg
new file mode 100644
index 00000000..20fc7e2c
Binary files /dev/null and b/config/images/abus/SHRM10000.jpg differ
diff --git a/config/images/aeotec/zwa009.png b/config/images/aeotec/zwa009.png
new file mode 100644
index 00000000..c001db38
Binary files /dev/null and b/config/images/aeotec/zwa009.png differ
diff --git a/config/images/aeotec/zwa011.png b/config/images/aeotec/zwa011.png
new file mode 100644
index 00000000..1ebf0c02
Binary files /dev/null and b/config/images/aeotec/zwa011.png differ
diff --git a/config/images/aeotec/zwa012.png b/config/images/aeotec/zwa012.png
new file mode 100644
index 00000000..5930535c
Binary files /dev/null and b/config/images/aeotec/zwa012.png differ
diff --git a/config/images/aeotec/zwa019.png b/config/images/aeotec/zwa019.png
new file mode 100644
index 00000000..ebb9a1fe
Binary files /dev/null and b/config/images/aeotec/zwa019.png differ
diff --git a/config/images/aeotec/zwa023.png b/config/images/aeotec/zwa023.png
new file mode 100644
index 00000000..4286c453
Binary files /dev/null and b/config/images/aeotec/zwa023.png differ
diff --git a/config/images/assa_abloy/ProSLKey-FreeDeadbolt.png b/config/images/assa_abloy/ProSLKey-FreeDeadbolt.png
new file mode 100644
index 00000000..c674c186
Binary files /dev/null and b/config/images/assa_abloy/ProSLKey-FreeDeadbolt.png differ
diff --git a/config/images/assa_abloy/yrd1x0.png b/config/images/assa_abloy/yrd1x0.png
new file mode 100644
index 00000000..bbcf13d3
Binary files /dev/null and b/config/images/assa_abloy/yrd1x0.png differ
diff --git a/config/images/assa_abloy/yrm276.png b/config/images/assa_abloy/yrm276.png
new file mode 100644
index 00000000..0ea79eeb
Binary files /dev/null and b/config/images/assa_abloy/yrm276.png differ
diff --git a/config/images/building36/b36-t10.png b/config/images/building36/b36-t10.png
new file mode 100644
index 00000000..371cb591
Binary files /dev/null and b/config/images/building36/b36-t10.png differ
diff --git a/config/images/connecthome/CH_201.png b/config/images/connecthome/CH_201.png
new file mode 100644
index 00000000..004f5fe3
Binary files /dev/null and b/config/images/connecthome/CH_201.png differ
diff --git a/config/images/cooper/RF9601.png b/config/images/cooper/RF9601.png
new file mode 100644
index 00000000..c178ea9b
Binary files /dev/null and b/config/images/cooper/RF9601.png differ
diff --git a/config/images/dlink/dch-z210.png b/config/images/dlink/dch-z210.png
new file mode 100644
index 00000000..9093fdf9
Binary files /dev/null and b/config/images/dlink/dch-z210.png differ
diff --git a/config/images/dome/dmex1.png b/config/images/dome/dmex1.png
new file mode 100644
index 00000000..f5536b7a
Binary files /dev/null and b/config/images/dome/dmex1.png differ
diff --git a/config/images/ecodim/0.7.jpg b/config/images/ecodim/0.7.jpg
new file mode 100644
index 00000000..59893ce1
Binary files /dev/null and b/config/images/ecodim/0.7.jpg differ
diff --git a/config/images/econet/ezw1204.png b/config/images/econet/ezw1204.png
new file mode 100644
index 00000000..673703e8
Binary files /dev/null and b/config/images/econet/ezw1204.png differ
diff --git a/config/images/enerwave/zwnrsm2plus.png b/config/images/enerwave/zwnrsm2plus.png
new file mode 100644
index 00000000..5eaff109
Binary files /dev/null and b/config/images/enerwave/zwnrsm2plus.png differ
diff --git a/config/images/evolve/t-100.png b/config/images/evolve/t-100.png
new file mode 100644
index 00000000..066455a1
Binary files /dev/null and b/config/images/evolve/t-100.png differ
diff --git a/config/images/fibaro/fgfs101.png b/config/images/fibaro/fgfs101.png
new file mode 100644
index 00000000..5649316a
Binary files /dev/null and b/config/images/fibaro/fgfs101.png differ
diff --git a/config/images/fibaro/fgrgbw442.png b/config/images/fibaro/fgrgbw442.png
new file mode 100644
index 00000000..83011348
Binary files /dev/null and b/config/images/fibaro/fgrgbw442.png differ
diff --git a/config/images/fibaro/fgrm222.png b/config/images/fibaro/fgrm222.png
new file mode 100644
index 00000000..01e5c082
Binary files /dev/null and b/config/images/fibaro/fgrm222.png differ
diff --git a/config/images/fibaro/fgs222.png b/config/images/fibaro/fgs222.png
new file mode 100644
index 00000000..3cfd73d2
Binary files /dev/null and b/config/images/fibaro/fgs222.png differ
diff --git a/config/images/fibaro/fgs224.png b/config/images/fibaro/fgs224.png
new file mode 100644
index 00000000..efd39acc
Binary files /dev/null and b/config/images/fibaro/fgs224.png differ
diff --git a/config/images/fibaro/fgwceu201.png b/config/images/fibaro/fgwceu201.png
new file mode 100644
index 00000000..4efb5e1b
Binary files /dev/null and b/config/images/fibaro/fgwceu201.png differ
diff --git a/config/images/fibaro/fgwds221.png b/config/images/fibaro/fgwds221.png
new file mode 100644
index 00000000..a75b1e50
Binary files /dev/null and b/config/images/fibaro/fgwds221.png differ
diff --git a/config/images/fibaro/fgwpb121.png b/config/images/fibaro/fgwpb121.png
new file mode 100644
index 00000000..3b68a64b
Binary files /dev/null and b/config/images/fibaro/fgwpb121.png differ
diff --git a/config/images/firstalert/zcombo-g.png b/config/images/firstalert/zcombo-g.png
new file mode 100644
index 00000000..7ca9d478
Binary files /dev/null and b/config/images/firstalert/zcombo-g.png differ
diff --git a/config/images/firstalert/zsmoke.png b/config/images/firstalert/zsmoke.png
new file mode 100644
index 00000000..fd13cc7b
Binary files /dev/null and b/config/images/firstalert/zsmoke.png differ
diff --git a/config/images/ge/14280-plugin-dimmer.png b/config/images/ge/14280-plugin-dimmer.png
new file mode 100644
index 00000000..f51b7d1a
Binary files /dev/null and b/config/images/ge/14280-plugin-dimmer.png differ
diff --git a/config/images/ge/14285.png b/config/images/ge/14285.png
new file mode 100644
index 00000000..173e81cf
Binary files /dev/null and b/config/images/ge/14285.png differ
diff --git a/config/images/ge/14298.png b/config/images/ge/14298.png
new file mode 100755
index 00000000..0958f7f1
Binary files /dev/null and b/config/images/ge/14298.png differ
diff --git a/config/images/ge/14322-dimmer-toggle.png b/config/images/ge/14322-dimmer-toggle.png
new file mode 100644
index 00000000..9a36a694
Binary files /dev/null and b/config/images/ge/14322-dimmer-toggle.png differ
diff --git a/config/images/ge/46202-switch.png b/config/images/ge/46202-switch.png
new file mode 100644
index 00000000..64e6b762
Binary files /dev/null and b/config/images/ge/46202-switch.png differ
diff --git a/config/images/ge/46204-dimmer-toggle.png b/config/images/ge/46204-dimmer-toggle.png
new file mode 100644
index 00000000..016c679a
Binary files /dev/null and b/config/images/ge/46204-dimmer-toggle.png differ
diff --git a/config/images/goodway/td14010.png b/config/images/goodway/td14010.png
new file mode 100644
index 00000000..dd4e818f
Binary files /dev/null and b/config/images/goodway/td14010.png differ
diff --git a/config/images/graber/mcz1.png b/config/images/graber/mcz1.png
new file mode 100644
index 00000000..0846c83e
Binary files /dev/null and b/config/images/graber/mcz1.png differ
diff --git a/config/images/hab/iblinds.png b/config/images/hab/iblinds.png
new file mode 100644
index 00000000..0f25e3d6
Binary files /dev/null and b/config/images/hab/iblinds.png differ
diff --git a/config/images/hab/iblindsV3.png b/config/images/hab/iblindsV3.png
new file mode 100644
index 00000000..67285a7b
Binary files /dev/null and b/config/images/hab/iblindsV3.png differ
diff --git a/config/images/homeseer/hs-fs100plus.png b/config/images/homeseer/hs-fs100plus.png
new file mode 100644
index 00000000..18d85347
Binary files /dev/null and b/config/images/homeseer/hs-fs100plus.png differ
diff --git a/config/images/honeywell/2681-plugin-dimmer.png b/config/images/honeywell/2681-plugin-dimmer.png
new file mode 100644
index 00000000..ac29cab4
Binary files /dev/null and b/config/images/honeywell/2681-plugin-dimmer.png differ
diff --git a/config/images/honeywell/3830-zw3107.png b/config/images/honeywell/3830-zw3107.png
new file mode 100644
index 00000000..ec335b42
Binary files /dev/null and b/config/images/honeywell/3830-zw3107.png differ
diff --git a/config/images/honeywell/39348-zw4008.png b/config/images/honeywell/39348-ZW4008.png
similarity index 100%
rename from config/images/honeywell/39348-zw4008.png
rename to config/images/honeywell/39348-ZW4008.png
diff --git a/config/images/honeywell/39349-ZW1002.png b/config/images/honeywell/39349-ZW1002.png
new file mode 100644
index 00000000..2b69238c
Binary files /dev/null and b/config/images/honeywell/39349-ZW1002.png differ
diff --git a/config/images/inovelli/lzw36.png b/config/images/inovelli/lzw36.png
new file mode 100644
index 00000000..b3be5c38
Binary files /dev/null and b/config/images/inovelli/lzw36.png differ
diff --git a/config/images/inovelli/nzw30.png b/config/images/inovelli/nzw30.png
new file mode 100644
index 00000000..c8c9b5c9
Binary files /dev/null and b/config/images/inovelli/nzw30.png differ
diff --git a/config/images/kwikset/888.png b/config/images/kwikset/888.png
new file mode 100644
index 00000000..fa999146
Binary files /dev/null and b/config/images/kwikset/888.png differ
diff --git a/config/images/kwikset/916.jpg b/config/images/kwikset/916.jpg
new file mode 100644
index 00000000..185e958b
Binary files /dev/null and b/config/images/kwikset/916.jpg differ
diff --git a/config/images/kwikset/smartcode.png b/config/images/kwikset/smartcode.png
index be0e5522..d12f6edd 100644
Binary files a/config/images/kwikset/smartcode.png and b/config/images/kwikset/smartcode.png differ
diff --git a/config/images/leviton/dz15s.png b/config/images/leviton/dz15s.png
index c0b06054..2e283cdf 100644
Binary files a/config/images/leviton/dz15s.png and b/config/images/leviton/dz15s.png differ
diff --git a/config/images/leviton/dzpa1.png b/config/images/leviton/dzpa1.png
new file mode 100644
index 00000000..c0b06054
Binary files /dev/null and b/config/images/leviton/dzpa1.png differ
diff --git a/config/images/leviton/vrpa1.png b/config/images/leviton/vrpa1.png
new file mode 100644
index 00000000..c0b06054
Binary files /dev/null and b/config/images/leviton/vrpa1.png differ
diff --git a/config/images/leviton/vrpd3.png b/config/images/leviton/vrpd3.png
new file mode 100644
index 00000000..9fe34bf5
Binary files /dev/null and b/config/images/leviton/vrpd3.png differ
diff --git a/config/images/leviton/zw15r.png b/config/images/leviton/zw15r.png
new file mode 100644
index 00000000..19f9dfbd
Binary files /dev/null and b/config/images/leviton/zw15r.png differ
diff --git a/config/images/leviton/zw4sf.png b/config/images/leviton/zw4sf.png
new file mode 100644
index 00000000..ed5fd80a
Binary files /dev/null and b/config/images/leviton/zw4sf.png differ
diff --git a/config/images/linear/WT00Z5-1.png b/config/images/linear/WT00Z5-1.png
new file mode 100644
index 00000000..dcfbe115
Binary files /dev/null and b/config/images/linear/WT00Z5-1.png differ
diff --git a/config/images/mcohome/015f_5102_d411.png b/config/images/mcohome/015f_5102_d411.png
new file mode 100644
index 00000000..652e3a29
Binary files /dev/null and b/config/images/mcohome/015f_5102_d411.png differ
diff --git a/config/images/mcohome/mh8fceu0803.png b/config/images/mcohome/mh8fceu0803.png
new file mode 100644
index 00000000..fd45f3b2
Binary files /dev/null and b/config/images/mcohome/mh8fceu0803.png differ
diff --git a/config/images/mcohome/mhs513.png b/config/images/mcohome/mhs513.png
new file mode 100644
index 00000000..16ac3035
Binary files /dev/null and b/config/images/mcohome/mhs513.png differ
diff --git a/config/images/namron/1402756.png b/config/images/namron/1402756.png
new file mode 100644
index 00000000..48243580
Binary files /dev/null and b/config/images/namron/1402756.png differ
diff --git a/config/images/namron/4512710.png b/config/images/namron/4512710.png
new file mode 100644
index 00000000..39e940db
Binary files /dev/null and b/config/images/namron/4512710.png differ
diff --git a/config/images/namron/4512712.jpg b/config/images/namron/4512712.jpg
new file mode 100644
index 00000000..35389776
Binary files /dev/null and b/config/images/namron/4512712.jpg differ
diff --git a/config/images/namron/4512714.jpg b/config/images/namron/4512714.jpg
new file mode 100644
index 00000000..e98fc203
Binary files /dev/null and b/config/images/namron/4512714.jpg differ
diff --git a/config/images/namron/4512715.png b/config/images/namron/4512715.png
new file mode 100644
index 00000000..bd45bf44
Binary files /dev/null and b/config/images/namron/4512715.png differ
diff --git a/config/images/namron/4512720.jpg b/config/images/namron/4512720.jpg
new file mode 100644
index 00000000..3722c004
Binary files /dev/null and b/config/images/namron/4512720.jpg differ
diff --git a/config/images/namron/4512724.png b/config/images/namron/4512724.png
new file mode 100644
index 00000000..1e9b33b7
Binary files /dev/null and b/config/images/namron/4512724.png differ
diff --git a/config/images/nexia/th100nx.png b/config/images/nexia/th100nx.png
new file mode 100644
index 00000000..cd3e963f
Binary files /dev/null and b/config/images/nexia/th100nx.png differ
diff --git a/config/images/oomi/ft112.png b/config/images/oomi/ft112.png
new file mode 100644
index 00000000..4efcec75
Binary files /dev/null and b/config/images/oomi/ft112.png differ
diff --git a/config/images/oomi/ft118.png b/config/images/oomi/ft118.png
new file mode 100644
index 00000000..8094d4f0
Binary files /dev/null and b/config/images/oomi/ft118.png differ
diff --git a/config/images/q-light/q-light_puck.png b/config/images/q-light/q-light_puck.png
new file mode 100644
index 00000000..16182761
Binary files /dev/null and b/config/images/q-light/q-light_puck.png differ
diff --git a/config/images/q-light/q-light_zerodim.png b/config/images/q-light/q-light_zerodim.png
new file mode 100644
index 00000000..f6b374c3
Binary files /dev/null and b/config/images/q-light/q-light_zerodim.png differ
diff --git a/config/images/q-light/q-light_zerodim_2pol.png b/config/images/q-light/q-light_zerodim_2pol.png
new file mode 100644
index 00000000..f6b374c3
Binary files /dev/null and b/config/images/q-light/q-light_zerodim_2pol.png differ
diff --git a/config/images/qolsys/qz2140-840.png b/config/images/qolsys/qz2140-840.png
new file mode 100755
index 00000000..457909f2
Binary files /dev/null and b/config/images/qolsys/qz2140-840.png differ
diff --git a/config/images/qubino/ZMNHADx.png b/config/images/qubino/ZMNHADx.png
index af7137e2..dbc0fe43 100644
Binary files a/config/images/qubino/ZMNHADx.png and b/config/images/qubino/ZMNHADx.png differ
diff --git a/config/images/qubino/ZMNHCDx.png b/config/images/qubino/ZMNHCDx.png
index df3a1b70..3e33c931 100644
Binary files a/config/images/qubino/ZMNHCDx.png and b/config/images/qubino/ZMNHCDx.png differ
diff --git a/config/images/qubino/ZMNHDDx.png b/config/images/qubino/ZMNHDDx.png
index e7f9564e..382435eb 100644
Binary files a/config/images/qubino/ZMNHDDx.png and b/config/images/qubino/ZMNHDDx.png differ
diff --git a/config/images/qubino/ZMNHHDx.png b/config/images/qubino/ZMNHHDx.png
new file mode 100644
index 00000000..1998a303
Binary files /dev/null and b/config/images/qubino/ZMNHHDx.png differ
diff --git a/config/images/qubino/ZMNHQDx.png b/config/images/qubino/ZMNHQDx.png
new file mode 100644
index 00000000..aea7c6e6
Binary files /dev/null and b/config/images/qubino/ZMNHQDx.png differ
diff --git a/config/images/qubino/ZMNHTDx.png b/config/images/qubino/ZMNHTDx.png
index 308a4bb3..13ba0cfc 100644
Binary files a/config/images/qubino/ZMNHTDx.png and b/config/images/qubino/ZMNHTDx.png differ
diff --git a/config/images/qubino/ZMNHYDx.png b/config/images/qubino/ZMNHYDx.png
index 1e5fb1a7..54a19d52 100644
Binary files a/config/images/qubino/ZMNHYDx.png and b/config/images/qubino/ZMNHYDx.png differ
diff --git a/config/images/qubino/ZMNKADx.png b/config/images/qubino/ZMNKADx.png
new file mode 100644
index 00000000..aea7c6e6
Binary files /dev/null and b/config/images/qubino/ZMNKADx.png differ
diff --git a/config/images/qubino/zmnhxdx.png b/config/images/qubino/zmnhxdx.png
index e76f632e..6579bd03 100644
Binary files a/config/images/qubino/zmnhxdx.png and b/config/images/qubino/zmnhxdx.png differ
diff --git a/config/images/ring/contact-sensor-v2.png b/config/images/ring/contact-sensor-v2.png
new file mode 100644
index 00000000..249c88dc
Binary files /dev/null and b/config/images/ring/contact-sensor-v2.png differ
diff --git a/config/images/ring/motion-detector-v2.png b/config/images/ring/motion-detector-v2.png
new file mode 100644
index 00000000..2af9fc93
Binary files /dev/null and b/config/images/ring/motion-detector-v2.png differ
diff --git a/config/images/shenzen_neo/ls03ch.jpg b/config/images/shenzen_neo/ls03ch.jpg
new file mode 100644
index 00000000..63a7786b
Binary files /dev/null and b/config/images/shenzen_neo/ls03ch.jpg differ
diff --git a/config/images/shenzen_neo/nas-cs01z.jpg b/config/images/shenzen_neo/nas-cs01z.jpg
new file mode 100644
index 00000000..0a2bba05
Binary files /dev/null and b/config/images/shenzen_neo/nas-cs01z.jpg differ
diff --git a/config/images/shenzen_neo/nas-pd02z.png b/config/images/shenzen_neo/nas-pd02z.png
new file mode 100644
index 00000000..2ff6debb
Binary files /dev/null and b/config/images/shenzen_neo/nas-pd02z.png differ
diff --git a/config/images/shenzen_neo/nas-sc03ze.jpg b/config/images/shenzen_neo/nas-sc03ze.jpg
new file mode 100644
index 00000000..0a2bba05
Binary files /dev/null and b/config/images/shenzen_neo/nas-sc03ze.jpg differ
diff --git a/config/images/shenzen_neo/nas-wr01ze.png b/config/images/shenzen_neo/nas-wr01ze.png
new file mode 100644
index 00000000..cf405354
Binary files /dev/null and b/config/images/shenzen_neo/nas-wr01ze.png differ
diff --git a/config/images/shenzen_saykey/SK-3007-05.png b/config/images/shenzen_saykey/SK-3007-05.png
new file mode 100644
index 00000000..7a5676e1
Binary files /dev/null and b/config/images/shenzen_saykey/SK-3007-05.png differ
diff --git a/config/images/shenzhen-neo/eu-1.png b/config/images/shenzhen-neo/eu-1.png
new file mode 100644
index 00000000..0c68174c
Binary files /dev/null and b/config/images/shenzhen-neo/eu-1.png differ
diff --git a/config/images/shenzhen-neo/eu-2.png b/config/images/shenzhen-neo/eu-2.png
new file mode 100644
index 00000000..d7db1c2d
Binary files /dev/null and b/config/images/shenzhen-neo/eu-2.png differ
diff --git a/config/images/shenzhen-neo/eu-3.png b/config/images/shenzhen-neo/eu-3.png
new file mode 100644
index 00000000..162883c4
Binary files /dev/null and b/config/images/shenzhen-neo/eu-3.png differ
diff --git a/config/images/simon/10002020-13X.png b/config/images/simon/10002020-13X.png
new file mode 100755
index 00000000..390505db
Binary files /dev/null and b/config/images/simon/10002020-13X.png differ
diff --git a/config/images/simon/10002080-13X.png b/config/images/simon/10002080-13X.png
new file mode 100755
index 00000000..fbfec58e
Binary files /dev/null and b/config/images/simon/10002080-13X.png differ
diff --git a/config/images/sunricher/srzv9001k12dimz4.png b/config/images/sunricher/srzv9001k12dimz4.png
new file mode 100644
index 00000000..3ab90d22
Binary files /dev/null and b/config/images/sunricher/srzv9001k12dimz4.png differ
diff --git a/config/images/sunricher/srzv9001k12dimz5.png b/config/images/sunricher/srzv9001k12dimz5.png
new file mode 100644
index 00000000..4d59a7a5
Binary files /dev/null and b/config/images/sunricher/srzv9001k12dimz5.png differ
diff --git a/config/images/sunricher/srzv9001k2dim.png b/config/images/sunricher/srzv9001k2dim.png
new file mode 100644
index 00000000..78b38e8e
Binary files /dev/null and b/config/images/sunricher/srzv9001k2dim.png differ
diff --git a/config/images/sunricher/srzv9001k4dim.png b/config/images/sunricher/srzv9001k4dim.png
new file mode 100644
index 00000000..7513fb56
Binary files /dev/null and b/config/images/sunricher/srzv9001k4dim.png differ
diff --git a/config/images/sunricher/srzv9001k4dimg2.png b/config/images/sunricher/srzv9001k4dimg2.png
new file mode 100644
index 00000000..a22b3245
Binary files /dev/null and b/config/images/sunricher/srzv9001k4dimg2.png differ
diff --git a/config/images/sunricher/srzv9001tccteu.png b/config/images/sunricher/srzv9001tccteu.png
new file mode 100644
index 00000000..65a8c411
Binary files /dev/null and b/config/images/sunricher/srzv9001tccteu.png differ
diff --git a/config/images/sunricher/srzv9101facct.png b/config/images/sunricher/srzv9101facct.png
new file mode 100644
index 00000000..64e19406
Binary files /dev/null and b/config/images/sunricher/srzv9101facct.png differ
diff --git a/config/images/sunricher/srzv9101sachpswitch.png b/config/images/sunricher/srzv9101sachpswitch.png
new file mode 100644
index 00000000..52db0cbc
Binary files /dev/null and b/config/images/sunricher/srzv9101sachpswitch.png differ
diff --git a/config/images/sunricher/zv2835rac.png b/config/images/sunricher/zv2835rac.png
new file mode 100644
index 00000000..103210b3
Binary files /dev/null and b/config/images/sunricher/zv2835rac.png differ
diff --git a/config/images/sunricher/zv9100a.png b/config/images/sunricher/zv9100a.png
new file mode 100644
index 00000000..c44dd11c
Binary files /dev/null and b/config/images/sunricher/zv9100a.png differ
diff --git a/config/images/technisat/03009497.png b/config/images/technisat/03009497.png
new file mode 100644
index 00000000..190da74e
Binary files /dev/null and b/config/images/technisat/03009497.png differ
diff --git a/config/images/thermofloor/heatit0204.png b/config/images/thermofloor/heatit0204.png
new file mode 100644
index 00000000..47e5c522
Binary files /dev/null and b/config/images/thermofloor/heatit0204.png differ
diff --git a/config/images/thermofloor/heatit058.png b/config/images/thermofloor/heatit058.png
new file mode 100644
index 00000000..20204ead
Binary files /dev/null and b/config/images/thermofloor/heatit058.png differ
diff --git a/config/images/thermofloor/heatit20a.png b/config/images/thermofloor/heatit20a.png
new file mode 100644
index 00000000..34d1dac7
Binary files /dev/null and b/config/images/thermofloor/heatit20a.png differ
diff --git a/config/images/thermofloor/heatitzm.png b/config/images/thermofloor/heatitzm.png
new file mode 100755
index 00000000..40efc5da
Binary files /dev/null and b/config/images/thermofloor/heatitzm.png differ
diff --git a/config/images/vision/zm1701.png b/config/images/vision/zm1701.png
new file mode 100644
index 00000000..081de743
Binary files /dev/null and b/config/images/vision/zm1701.png differ
diff --git a/config/images/wenzhou/tz77.png b/config/images/wenzhou/tz77.png
new file mode 100755
index 00000000..146a2361
Binary files /dev/null and b/config/images/wenzhou/tz77.png differ
diff --git a/config/images/wenzhou/tze96.png b/config/images/wenzhou/tze96.png
new file mode 100644
index 00000000..dc7449a9
Binary files /dev/null and b/config/images/wenzhou/tze96.png differ
diff --git a/config/images/wink/wnk-mot1.png b/config/images/wink/wnk-mot1.png
new file mode 100644
index 00000000..54e4f547
Binary files /dev/null and b/config/images/wink/wnk-mot1.png differ
diff --git a/config/images/wink/wnk-sir1p.png b/config/images/wink/wnk-sir1p.png
new file mode 100644
index 00000000..2736796a
Binary files /dev/null and b/config/images/wink/wnk-sir1p.png differ
diff --git a/config/images/zen17.png b/config/images/zen17.png
new file mode 100644
index 00000000..fffe10b5
Binary files /dev/null and b/config/images/zen17.png differ
diff --git a/config/images/zooz/zen17.png b/config/images/zooz/zen17.png
new file mode 100644
index 00000000..90dded33
Binary files /dev/null and b/config/images/zooz/zen17.png differ
diff --git a/config/images/zooz/zen23v3.png b/config/images/zooz/zen23v3.png
new file mode 100644
index 00000000..db4187cb
Binary files /dev/null and b/config/images/zooz/zen23v3.png differ
diff --git a/config/images/zooz/zen32.png b/config/images/zooz/zen32.png
new file mode 100644
index 00000000..729b88f5
Binary files /dev/null and b/config/images/zooz/zen32.png differ
diff --git a/config/images/zooz/zen34.png b/config/images/zooz/zen34.png
new file mode 100644
index 00000000..f863ddb2
Binary files /dev/null and b/config/images/zooz/zen34.png differ
diff --git a/config/images/zooz/zen71.png b/config/images/zooz/zen71.png
new file mode 100644
index 00000000..2d2ff408
Binary files /dev/null and b/config/images/zooz/zen71.png differ
diff --git a/config/images/zooz/zen72.png b/config/images/zooz/zen72.png
new file mode 100755
index 00000000..f04aa605
Binary files /dev/null and b/config/images/zooz/zen72.png differ
diff --git a/config/images/zooz/zen76.png b/config/images/zooz/zen76.png
new file mode 100644
index 00000000..2d2ff408
Binary files /dev/null and b/config/images/zooz/zen76.png differ
diff --git a/config/images/zooz/zen77.png b/config/images/zooz/zen77.png
new file mode 100644
index 00000000..8fa3ec51
Binary files /dev/null and b/config/images/zooz/zen77.png differ
diff --git a/config/images/zwave.me/razberry.png b/config/images/zwave.me/razberry.png
new file mode 100644
index 00000000..9ff878b6
Binary files /dev/null and b/config/images/zwave.me/razberry.png differ
diff --git a/config/images/zwave.me/zme_wallc_s.png b/config/images/zwave.me/zme_wallc_s.png
new file mode 100644
index 00000000..91eedc2a
Binary files /dev/null and b/config/images/zwave.me/zme_wallc_s.png differ
diff --git a/config/images/zwp/PA-100.png b/config/images/zwp/PA-100.png
new file mode 100644
index 00000000..450dd596
Binary files /dev/null and b/config/images/zwp/PA-100.png differ
diff --git a/config/inovelli/lzw30-sn.xml b/config/inovelli/lzw30-sn.xml
index 4b5d9695..0102acb6 100644
--- a/config/inovelli/lzw30-sn.xml
+++ b/config/inovelli/lzw30-sn.xml
@@ -1,4 +1,4 @@
-<Product Revision="7" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="10" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/031E:0001:0002</MetaDataItem>
     <MetaDataItem name="ProductPic">images/inovelli/lzw30-sn.png</MetaDataItem>
@@ -23,6 +23,9 @@ Please Note: If this doesn't work, you can check to see if your switch is within
     <ChangeLog>
       <Entry author="Eric Maycock - ericm@inovelli.com" date="10 Sep 2019" revision="6">Adding Metadata</Entry>
       <Entry author="Justin Hammond" date="13 Mar 2020" revision="7">Remove Static Central Scene Entries - Issue #2155</Entry>
+      <Entry author="Brett Daugherty and SirDeadlyStrike" date="23 Jul 2020" revision="8">Add Instant On/Off Parameter</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="24 Jul 2020" revision="9">Clarifying which scenes are disabled with parameter 51</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="30 Oct 2020" revision="10">Adding parameter 13 to manually specify the load if auto detection doesn't work</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -109,6 +112,20 @@ Please Note: If this doesn't work, you can check to see if your switch is within
       Default: 10
       </Help>
     </Value>
+    <Value genre="config" type="list" size="1" index="13" label="Load Type" min="0" max="1" value="0">
+       <Help>
+       The default of the switch is to auto detect the load. In some situations you may want to try the option for a special load type. (firmware 1.17+)
+       </Help>
+       <Item value="0" label="Default"/>
+       <Item value="1" label="Special Load"/>
+    </Value>
+    <Value genre="config" type="list" size="1" index="51" label="Instant On" min="0" max="1" value="1">
+       <Help>
+       Enables instant on (ie: disables the 700ms button delay). Note, if you disable the delay, it will also disable scene control except for the following: Up pressed, held, released, Down pressed, held, released &amp; config button pressed.
+       </Help>
+       <Item value="0" label="Enabled (no delay)"/>
+       <Item value="1" label="Disabled (700ms delay)"/>
+    </Value>
   </CommandClass>
 
   <!-- Association Groups -->
diff --git a/config/inovelli/lzw30.xml b/config/inovelli/lzw30.xml
index 357e6641..79870df3 100644
--- a/config/inovelli/lzw30.xml
+++ b/config/inovelli/lzw30.xml
@@ -1,4 +1,4 @@
-<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/031E:0001:0004</MetaDataItem>
     <MetaDataItem name="ProductPic">images/inovelli/lzw30.png</MetaDataItem>
@@ -23,6 +23,9 @@ Please Note: If this doesn't work, you can check to see if your switch is within
     </MetaDataItem>
     <ChangeLog>
       <Entry author="Eric Maycock - ericm@inovelli.com" date="10 Sep 2019" revision="5">Adding Metadata</Entry>
+      <Entry author="Brett Daugherty and SirDeadlyStrike" date="23 Jul 2020" revision="6">Add Instant On/Off Parameter</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="24 Jul 2020" revision="7">Clarifying which scenes are disabled with parameter 51</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="30 Oct 2020" revision="8">Adding parameter 13 to manually specify the load if auto detection doesn't work</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -81,6 +84,21 @@ Please Note: If this doesn't work, you can check to see if your switch is within
       Default: 0
       </Help>
     </Value>
+    <Value genre="config" type="list" size="1" index="13" label="Load Type" min="0" max="1" value="0">
+       <Help>
+       The default of the switch is to auto detect the load. In some situations you may want to try the option for a special load type. (firmware 1.17+)
+       </Help>
+       <Item value="0" label="Default"/>
+       <Item value="1" label="Special Load"/>
+    </Value>
+    <Value genre="config" type="list" size="1" index="51" label="Instant On" min="0" max="1" value="1">
+       <Help>
+       Enables instant on (ie: disables the 700ms button delay). Note, if you disable the delay, it will also disable scene control except for the following: Up pres
+sed, held, released, Down pressed, held, released &amp; config button pressed.
+       </Help>
+       <Item value="0" label="Enabled (no delay)"/>
+       <Item value="1" label="Disabled (700ms delay)"/>
+    </Value>
   </CommandClass>
 
   <!-- Association Groups -->
diff --git a/config/inovelli/lzw31-sn.xml b/config/inovelli/lzw31-sn.xml
index 55e8152f..959d7f0c 100644
--- a/config/inovelli/lzw31-sn.xml
+++ b/config/inovelli/lzw31-sn.xml
@@ -1,4 +1,4 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/031E:0001:0001</MetaDataItem>
     <MetaDataItem name="ProductPic">images/inovelli/lzw31-sn.png</MetaDataItem>
@@ -22,6 +22,10 @@ Only use either of these procedures in the event that the network primary contro
 Please Note: If this doesn't work, you can check to see if your switch is within Z-Wave Range by holding down the Configuration Button for 5-10 seconds (if it's not within range, the LED Bar will indicate Red and if it is within Range, the LED Bar will indicate Green). If your switch indicates Red, please move the switch closer to the HUB. If your switch indicates Green, please try running an Exclusion to reset your switch.</MetaDataItem>
     <ChangeLog>
       <Entry author="Eric Maycock - ericm@inovelli.com" date="7 Nov 2019" revision="1">Initial Release</Entry>
+      <Entry author="Brett Daugherty and SirDeadlyStrike" date="23 Jul 2020" revision="2">Update config for Firmware 1.47+</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="24 Jul 2020" revision="3">Clarifying which scenes are disabled with parameter 51</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="31 Jul 2020" revision="4">Fix maximum value for parameter 16</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="30 Oct 2020" revision="5">Fixing value range for parameter 9 and 10</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -84,17 +88,17 @@ Please Note: If this doesn't work, you can check to see if your switch is within
       Default: 0
       </Help>
     </Value>
-    <Value genre="config" type="byte" size="1" index="9" label="Default Level (Local)" min="1" max="100" value="0">
+    <Value genre="config" type="byte" size="1" index="9" label="Default Level (Local)" min="0" max="99" value="0">
       <Help>
       Default level for the dimmer when it is powered on from the local switch. A setting of 0 means that the switch will return to the level that it was on before it was turned off.
-      Range:1-100
+      Range:0-99
       Default: 0
       </Help>
     </Value>
-    <Value genre="config" type="byte" size="1" index="10" label="Default Level (Z-Wave)" min="1" max="100" value="0">
+    <Value genre="config" type="byte" size="1" index="10" label="Default Level (Z-Wave)" min="0" max="99" value="0">
       <Help>
       Default level for the dimmer when it is powered on from a Z-Wave command. A setting of 0 means that the switch will return to the level that it was on before it was turned off.
-      Range:1-100
+      Range:0-99
       Default: 0
       </Help>
     </Value>
@@ -155,10 +159,10 @@ Please Note: If this doesn't work, you can check to see if your switch is within
     <Item value="9" label="90%"/>
     <Item value="10" label="100%"/>
     </Value>
-	<Value genre="config" type="int" size="4" index="16" label="LED Strip Effect" min="0" max="83823359" value="0">
+	<Value genre="config" type="int" size="4" index="16" label="LED Strip Effect" min="0" max="100600575" value="0">
       <Help>
       Please see website for documentation.
-      Range: 0-83823359
+      Range: 0-100600575
       Default: 0
       </Help>
     </Value>
@@ -220,6 +224,22 @@ Please Note: If this doesn't work, you can check to see if your switch is within
     <Item value="1" label="3-way Toggle"/>
     <Item value="2" label="3-way Momentary"/>
     </Value>
+    <Value genre="config" type="list" size="1" index="51" label="Instant On" min="0" max="1" value="1">
+       <Help>
+       Enables instant on (ie: disables the 700ms button delay). Note, if you disable the delay, it will also disable scene control except for the following: Up pres
+sed, held, released, Down pressed, held, released &amp; config button pressed.
+
+       </Help>
+       <Item value="0" label="Enabled (no delay)"/>
+       <Item value="1" label="Disabled (700ms delay)"/>
+    </Value>
+    <Value genre="config" type="list" size="1" index="52" label="Smart Bulb Mode" min="0" max="1" value="0">
+      <Help>
+      Optimize power output to be more compatible with smart bulbs. This prevents the dimmer from being able to dim and makes it act like an ON / OFF switch. (firmware 1.47+)
+    </Help>
+    <Item value="0" label="Smart Bulb Mode Disabled (Default)"/>
+    <Item value="1" label="Smart Bulb Mode Enabled"/>
+    </Value>
   </CommandClass>
 
   <!-- Association Groups -->
diff --git a/config/inovelli/lzw31.xml b/config/inovelli/lzw31.xml
index 84d7a24b..9051a1e2 100644
--- a/config/inovelli/lzw31.xml
+++ b/config/inovelli/lzw31.xml
@@ -1,4 +1,4 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/031E:0001:0003</MetaDataItem>
     <MetaDataItem name="ProductPic">images/inovelli/lzw31.png</MetaDataItem>
@@ -22,6 +22,9 @@ Only use either of these procedures in the event that the network primary contro
 Please Note: If this doesn't work, you can check to see if your switch is within Z-Wave Range by holding down the Configuration Button for 5-10 seconds (if it's not within range, the LED Bar will indicate Red and if it is within Range, the LED Bar will indicate Green). If your switch indicates Red, please move the switch closer to the HUB. If your switch indicates Green, please try running an Exclusion to reset your switch.</MetaDataItem>
     <ChangeLog>
       <Entry author="Eric Maycock - ericm@inovelli.com" date="7 Nov 2019" revision="1">Initial Release</Entry>
+      <Entry author="Brett Daugherty and SirDeadlyStrike" date="23 Jul 2020" revision="2">Update config for Firmware 1.47+</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="24 Jul 2020" revision="3">Clarifying which scenes are disabled with parameter 51</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="30 Oct 2020" revision="4">Fixing value range for parameter 9 and 10</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -84,17 +87,17 @@ Please Note: If this doesn't work, you can check to see if your switch is within
       Default: 0
       </Help>
     </Value>
-    <Value genre="config" type="byte" size="1" index="9" label="Default Level (Local)" min="1" max="100" value="0">
+    <Value genre="config" type="byte" size="1" index="9" label="Default Level (Local)" min="0" max="99" value="0">
       <Help>
       Default level for the dimmer when it is powered on from the local switch. A setting of 0 means that the switch will return to the level that it was on before it was turned off.
-      Range:1-100
+      Range:0-99
       Default: 0
       </Help>
     </Value>
-    <Value genre="config" type="byte" size="1" index="10" label="Default Level (Z-Wave)" min="1" max="100" value="0">
+    <Value genre="config" type="byte" size="1" index="10" label="Default Level (Z-Wave)" min="0" max="99" value="0">
       <Help>
       Default level for the dimmer when it is powered on from a Z-Wave command. A setting of 0 means that the switch will return to the level that it was on before it was turned off.
-      Range:1-100
+      Range:0-99
       Default: 0
       </Help>
     </Value>
@@ -192,6 +195,21 @@ Please Note: If this doesn't work, you can check to see if your switch is within
     <Item value="1" label="3-way Toggle"/>
     <Item value="2" label="3-way Momentary"/>
     </Value>
+    <Value genre="config" type="list" size="1" index="51" label="Instant On" min="0" max="1" value="1">
+       <Help>
+       Enables instant on (ie: disables the 700ms button delay). Note, if you disable the delay, it will also disable scene control except for the following: Up pres
+sed, held, released, Down pressed, held, released &amp; config button pressed.
+       </Help>
+       <Item value="0" label="Enabled (no delay)"/>
+       <Item value="1" label="Disabled (700ms delay)"/>
+    </Value>
+    <Value genre="config" type="list" size="1" index="52" label="Smart Bulb Mode" min="0" max="1" value="0">
+      <Help>
+      Optimize power output to be more compatible with smart bulbs. This prevents the dimmer from being able to dim and makes it act like an ON / OFF switch. (firmware 1.47+)
+    </Help>
+    <Item value="0" label="Smart Bulb Mode Disabled (Default)"/>
+    <Item value="1" label="Smart Bulb Mode Enabled"/>
+    </Value>
   </CommandClass>
 
   <!-- Association Groups -->
diff --git a/config/inovelli/lzw36.xml b/config/inovelli/lzw36.xml
new file mode 100644
index 00000000..148321b4
--- /dev/null
+++ b/config/inovelli/lzw36.xml
@@ -0,0 +1,334 @@
+<Product Revision="9" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/031E:0001:000e</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/inovelli/lzw36.png</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://inovelli.com/red-series-fan-light-switch-z-wave/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://support.inovelli.com/portal/en/kb/inovelli/products/switches-fan-light-red-series-lzw36</MetaDataItem>
+    <MetaDataItem id="0001" name="ZWProductPage" type="0001">https://products.z-wavealliance.org/products/3902</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">To Exclude your switch, put your HUB in exclusion mode, hold the light up or down button and press the Light on/off button three (3) times.</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="000e">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://support.inovelli.com/portal/api/kbArticles/407409000002102001/attachments/kw8eq50c812f5d3344bc08295860b8b394c7c/content?portalId=edbsn8bb12d5f5a97d693e61ce4ce8a23f8b0e323eac44a6c2794f893e912acf005df&amp;inline=true</MetaDataItem>
+    <MetaDataItem name="ResetDescription">You may factory reset the switch by holding down the light up or down button and the light on/off button for twenty (20) or more seconds. The LED Bar will turn Red and blink three (3) times to confirm.
+    </MetaDataItem>
+    <MetaDataItem name="Description">The Inovelli Red Series Fan/Light Switch is a 700 Series Z-Wave in-wall fan + light switch that controls both your fan motor and its attached LED, CFL, &amp; Incandescent bulbs which can be highly customized to your liking at the switch itself with our unique config buttons and advanced firmware. In addition, the Red Series comes with advanced features such as scene support, power monitoring, notifications, local protection, etc. This is the first of its kind that allows homes that only have one wire coming from the fan to the light switch and uses both a light switch and canopy module. Inspired and worked on by our wonderful community.</MetaDataItem>
+    <MetaDataItem name="Name">LZW36 Fan/Light Dimmer</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="000e">LZW36</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">put your HUB in exclusion mode, hold the light up or down button and press the Light on/off button three (3) times.
+
+Please Note: If this doesn't work, you can check to see if your switch is within Z-Wave Range by holding down the Light Button for 5-10 seconds (if it's not within range, the LED Bar will indicate Red and if it is within Range, the LED Bar will indicate Green). If your switch indicates Red, please move the switch closer to the HUB. If your switch indicates Green, please try running an Exclusion to reset your switch.
+    </MetaDataItem>
+    <ChangeLog>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="05 Jun 2020" revision="6">Adding Metadata</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="23 Jul 2020" revision="7">Fix Config Parameters</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="24 Jul 2020" revision="8">Adding additional metadata</Entry>
+      <Entry author="Eric Maycock - ericm@inovelli.com" date="27 Aug 2020" revision="9">Adding parameter 51 for firmware 1.36+</Entry>
+    </ChangeLog>
+  </MetaData>
+ 
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+
+    <Value genre="config" type="byte" size="1" index="1" label="Light Dimming Speed" min="0" max="98" value="4">
+      <Help>
+      This changes the speed in which the attached light dims up or down. A setting of 0 should turn the light immediately on or off (almost like an on/off switch). Increasing the value should slow down the transition speed.
+      Range:0-98
+      Default: 4
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="2" label="Light Dimming Speed (From Switch)" min="0" max="99" value="99">
+      <Help>
+      This changes the speed in which the attached light dims up or down when controlled from the physical switch. A setting of 0 should turn the light immediately on or off (almost like an on/off switch). Increasing the value should slow down the transition speed. A setting of 99 should keep this in sync with parameter 1.
+      Range:0-99
+      Default: 99
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="3" label="Light Ramp Rate" min="0" max="99" value="99">
+      <Help>
+      This changes the speed in which the attached light turns on or off. For example, when a user sends the switch a basicSet(value: 0xFF) or basicSet(value: 0x00), this is the speed in which those actions take place. A setting of 0 should turn the light immediately on or off (almost like an on/off switch). Increasing the value should slow down the transition speed. A setting of 99 should keep this in sync with parameter 1.
+      Range:0-99
+      Default: 99
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="4" label="Light Ramp Rate (From Switch)" min="0" max="99" value="99">
+      <Help>
+      This changes the speed in which the attached light turns on or off from the physical switch. For example, when a user presses the up or down button, this is the speed in which those actions take place. A setting of 0 should turn the light immediately on or off (almost like an on/off switch). Increasing the value should slow down the transition speed. A setting of 99 should keep this in sync with parameter 1.
+      Range:0-99
+      Default: 99
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="5" label="Minimum Light Level" min="1" max="45" value="1">
+      <Help>
+      The minimum level that the dimmer allows the bulb to be dimmed to. Useful when the user has an LED bulb that does not turn on or flickers at a lower level.
+      Range:1-45
+      Default: 1
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="6" label="Maximum Light Level" min="55" max="99" value="99">
+      <Help>
+      The maximum level that the dimmer allows the bulb to be dimmed to. Useful when the user has an LED bulb that reaches its maximum level before the dimmer value of 99.
+      Range:55-99
+      Default: 99
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="7" label="Minimum Fan Level" min="1" max="45" value="1">
+      <Help>
+      The minimum level that the dimmer allows the fan to be dimmed to. Useful when the user has a fan that does not turn at a lower level.
+      Range:1-45
+      Default: 1
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="8" label="Maximum Fan Level" min="55" max="99" value="99">
+      <Help>
+      The maximum level that the dimmer allows the fan to be dimmed to.
+      Range:55-99
+      Default: 99
+      </Help>
+    </Value>
+
+    <Value genre="config" type="short" size="2" index="10" label="Auto Off Light Timer" min="0" max="32767" value="0">
+      <Help>
+      Automatically turns the light switch off after this many seconds. When the switch is turned on a timer is started that is the duration of this setting. When the timer expires, the switch is turned off.
+      Range:0-32767
+      Default: 0
+      </Help>
+    </Value>
+
+    <Value genre="config" type="short" size="2" index="11" label="Auto Off Fan Timer" min="0" max="32767" value="0">
+      <Help>
+      Automatically turns the fan switch off after this many seconds. When the switch is turned on a timer is started that is the duration of this setting. When the timer expires, the switch is turned off.
+      Range:0-32767
+      Default: 0
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="12" label="Default Light Level (Local)" min="1" max="99" value="0">
+      <Help>
+      Default level for the dimmer when it is powered on from the local switch. A setting of 0 means that the switch will return to the level that it was on before it was turned off.
+      Range:1-99
+      Default: 0
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="13" label="Default Light Level (Z-Wave)" min="1" max="99" value="0">
+      <Help>
+      Default level for the dimmer when it is powered on from a Z-Wave command. A setting of 0 means that the switch will return to the level that it was on before it was turned off.
+      Range:1-99
+      Default: 0
+      </Help>
+    </Value>
+
+    <Value genre="config" type="list" size="1" index="14" label="Default Fan Level (Local)" min="0" max="99" value="0">
+      <Help>
+      Default level for the fan dimmer when it is powered on from the local switch.
+      Default: Last State
+      </Help>
+        <Item value="0" label="Last State"/>
+    <Item value="33" label="Low"/>
+        <Item value="66" label="Medium"/>
+        <Item value="99" label="High"/>
+    </Value>
+
+    <Value genre="config" type="list" size="1" index="15" label="Default Fan Level (Z-Wave)" min="1" max="99" value="0">
+      <Help>
+      Default level for the fan dimmer when it is powered on from the local switch.
+      Default: Last State
+      </Help>
+        <Item value="0" label="Last State"/>
+    <Item value="33" label="Low"/>
+        <Item value="66" label="Medium"/>
+        <Item value="99" label="High"/>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="16" label="Light State After Power Restored" min="0" max="100" value="0">
+      <Help>
+      The state the switch should return to once power is restored after power failure. 0 = off, 1-99 = level, 100=previous.
+      Range:0-100
+      Default: 100
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="17" label="Fan State After Power Restored" min="0" max="100" value="0">
+      <Help>
+      The state the switch should return to once power is restored after power failure.
+      Default: Off
+      </Help>
+        <Item value="0" label="Off"/>
+    <Item value="33" label="Low"/>
+        <Item value="66" label="Medium"/>
+        <Item value="99" label="High"/>
+        <Item value="100" label="Previous State"/>
+    </Value>
+
+    <Value genre="config" type="short" size="2" index="18" label="Light LED Indicator Color" min="0" max="255" value="170">
+      <Help>
+      This is the color of the Light LED strip represented as part of the HUE color wheel. Since the wheel has 360 values and this parameter only has 255, the following equation can be used to determine the color: value/255 * 360 = Hue color wheel value
+      Range: 0 to 255
+      Default: 170
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="19" label="Light LED Strip Intensity" min="0" max="10" value="5">
+      <Help>
+      This is the intensity of the Light LED strip.
+      Range: 0-10
+      Default: 5
+      </Help>
+    </Value>
+
+    <Value genre="config" type="short" size="2" index="20" label="Fan LED Indicator Color" min="0" max="255" value="170">
+      <Help>
+      This is the color of the Fan LED strip represented as part of the HUE color wheel. Since the wheel has 360 values and this parameter only has 255, the following equation can be used to determine the color: value/255 * 360 = Hue color wheel value
+      Range: 0 to 255
+      Default: 170
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="21" label="Fan LED Strip Intensity" min="0" max="10" value="5">
+      <Help>
+      This is the intensity of the Fan LED strip.
+      Range: 0-10
+      Default: 5
+    </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="22" label="Light LED Strip Intensity (When OFF)" min="0" max="10" value="1">
+      <Help>
+      This is the intensity of the Light LED strip when the switch is off. This is useful for users to see the light switch location when the lights are off.
+      Range: 0-10
+      Default: 1
+    </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="23" label="Fan LED Strip Intensity (When OFF)" min="0" max="10" value="1">
+      <Help>
+      This is the intensity of the Fan LED strip when the switch is off. This is useful for users to see the light switch location when the lights are off.
+      Range: 0-10
+      Default: 1
+    </Help>
+    </Value>
+
+    <Value genre="config" type="int" size="4" index="24" label="Light LED Strip Effect" min="0" max="100600319" value="0">
+      <Help>
+      Please see website for documentation.
+          Byte 4: Effect - 0 = Off, 1 = Solid, 2 = Slow Blink, 3 = Fast Blink, 4 = Chase, 5 = Pulse
+          Byte 3: Duration - 1 to 60 = seconds, 61 to 120  minutes, 121 -  254 = hours, 255 = Indefinitely
+          Byte 2: Intensity - 0 to 9.  0 = dim, 9 = bright
+          Byte 1: Color - 0 - 255. Hue color wheel. value/255 * 360 = Hue color wheel value
+      Range: 0-100600319
+      Default: 0
+      </Help>
+    </Value>
+
+    <Value genre="config" type="int" size="4" index="25" label="Fan LED Strip Effect" min="0" max="100600319" value="0">
+      <Help>
+      Please see website for documentation.
+          Byte 4: Effect - 0 = Off, 1 = Solid, 2 = Slow Blink, 3 = Fast Blink, 4 = Chase, 5 = Pulse
+          Byte 3: Duration - 1 to 60 = seconds, 61 to 120  minutes, 121 -  254 = hours, 255 = Indefinitely
+          Byte 2: Intensity - 0 to 9.  0 = dim, 9 = bright
+          Byte 1: Color - 0 - 255. Hue color wheel. value/255 * 360 = Hue color wheel value
+      Range: 0-100600319
+      Default: 0
+      </Help>
+    </Value>
+
+    <Value genre="config" type="list" size="1" index="26" label="Light LED Strip Timeout" min="0" max="10" value="3">
+      <Help>
+      When the LED strip is disabled (Light LED Strip Intensity is set to 0), this setting allows the LED strip to turn on temporarily while being adjusted.
+      Range: 0-10
+      Default: 3
+      </Help>
+      <Item value="0" label="Stay Off"/>
+      <Item value="1" label="1 Second"/>
+      <Item value="2" label="2 Seconds"/>
+      <Item value="3" label="3 Seconds"/>
+      <Item value="4" label="4 Seconds"/>
+      <Item value="5" label="5 Seconds"/>
+      <Item value="6" label="6 Seconds"/>
+      <Item value="7" label="7 Seconds"/>
+      <Item value="8" label="8 Seconds"/>
+      <Item value="9" label="9 Seconds"/>
+      <Item value="10" label="10 Seconds"/>
+    </Value>
+
+    <Value genre="config" type="list" size="1" index="27" label="Fan LED Strip Timeout" min="0" max="10" value="3">
+      <Help>
+      When the LED strip is disabled (Fan LED Strip Intensity is set to 0), this setting allows the LED strip to turn on temporarily while being adjusted.
+      Range: 0-10
+      Default: 3
+      </Help>
+      <Item value="0" label="Stay Off"/>
+      <Item value="1" label="1 Second"/>
+      <Item value="2" label="2 Seconds"/>
+      <Item value="3" label="3 Seconds"/>
+      <Item value="4" label="4 Seconds"/>
+      <Item value="5" label="5 Seconds"/>
+      <Item value="6" label="6 Seconds"/>
+      <Item value="7" label="7 Seconds"/>
+      <Item value="8" label="8 Seconds"/>
+      <Item value="9" label="9 Seconds"/>
+      <Item value="10" label="10 Seconds"/>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="28" label="Active Power Reports" min="0" max="100" value="10">
+      <Help>
+      The power level change that will result in a new power report being sent. The value is a percentage of the previous report. 0 = disabled.
+      Range:0-100
+      Default: 10
+      </Help>
+    </Value>
+
+    <Value genre="config" type="short" size="2" index="29" label="Periodic Power &amp; Energy Reports" min="0" max="32767" value="3600">
+      <Help>
+      Time period between consecutive power &amp; energy reports being sent (in seconds). The timer is reset after each report is sent.
+      Range:0-32767
+      Default: 3600
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="30" label="Energy Reports" min="0" max="100" value="10">
+      <Help>
+      The energy level change that will result in a new energy report being sent. The value is a percentage of the previous report.
+      Range:0-100
+      Default: 10
+      </Help>
+    </Value>
+
+    <Value genre="config" type="byte" size="1" index="31" label="Local Protection" min="0" max="3" value="0">
+      <Help>
+      Enable local protection on these buttons. 0 = none, 1 = light, 2 = fan, 3 = both.
+      </Help>
+      <Item value="0" label="None"/>
+      <Item value="1" label="Light Button"/>
+      <Item value="2" label="Fan Button"/>
+      <Item value="3" label="Both Buttons"/>
+    </Value>
+
+    <Value genre="config" type="list" size="1" index="51" label="Instant On" min="0" max="1" value="1">
+       <Help>
+       Enables instant on (ie: disables the 700ms button delay). Note, if you disable the delay, it will also disable scene control except for the following: Light on/off pressed, held, released, Fan on/off  pressed, held, released &amp; light up/down fan up/down  pressed (firmware 1.36+).
+       </Help>
+       <Item value="0" label="Enabled (no delay)"/>
+       <Item value="1" label="Disabled (700ms delay)"/>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="7">
+      <Group index="1" label="Lifeline" max_associations="5" />
+      <Group index="2" label="Basic_Set_Light" max_associations="5" />
+      <Group index="3" label="Switch_MultiLevel_Set_Light" max_associations="5" />
+      <Group index="4" label="Switch_MultiLevel_Start/Stop_Light" max_associations="5" />
+      <Group index="5" label="Basic_Set_Fan" max_associations="5" />
+      <Group index="6" label="Switch_MultiLevel_Set_Fan" max_associations="5" />
+      <Group index="7" label="Switch_MultiLevel_Start/Stop_Fan" max_associations="5" />
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/inovelli/lzw45.xml b/config/inovelli/lzw45.xml
new file mode 100644
index 00000000..b49d7bee
--- /dev/null
+++ b/config/inovelli/lzw45.xml
@@ -0,0 +1,194 @@
+<Product Revision="7" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/031E:0001:000a</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/inovelli/lzw31-sn.png</MetaDataItem>
+    <MetaDataItem id="0001" name="ZWProductPage" type="000a">https://products.z-wavealliance.org/products/3438</MetaDataItem>
+    <MetaDataItem name="ProductPage">TBD</MetaDataItem>
+    <MetaDataItem name="ProductSupport">TBD</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">TBD</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="000a">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ProductManual">TBD</MetaDataItem>
+    <MetaDataItem name="ResetDescription">TBD</MetaDataItem>
+    <MetaDataItem name="Description">TBD</MetaDataItem>
+    <MetaDataItem name="Name">LZW45 LED Light Strip</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="000a">LZW45</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">TBD</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jtronicus" date="29 Sep 2020" revision="1">Initial Release</Entry>
+      <Entry author="Jtronicus" date="2 Oct 2020" revision="2">Fix device type, fix some issues with parameter sizes</Entry>
+      <Entry author="Jtronicus" date="16 Oct 2020" revision="3">Updates to work with firmware 1.16</Entry>
+      <Entry author="Jtronicus" date="24 Oct 2020" revision="4">Updates to work with firmware 1.17</Entry>
+      <Entry author="Jtronicus" date="27 Oct 2020" revision="5">Updates to work with firmware 1.18</Entry>
+      <Entry author="Jtronicus" date="27 Oct 2020" revision="6">Updates parameter 30 to 4 bytes</Entry>
+      <Entry author="nathanfiscus" date="20 Jan 2021" revision="7">Updates parameter 30 value max</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" type="byte" size="1" index="1" label="Number of Pixels" min="0" max="130" value="0">
+      <Help>
+      When individually addressable LEDs are used, this parameter tells the controller the number of pixels that are attached. 
+      0: Automatic recognition of pixels
+      Range 1 - 130: Set the fixed value of the pixel bit
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="byte" size="1" index="2" label="Dimming Speed" min="0" max="98" value="3">
+      <Help>
+      This changes the speed in which the light strip dims up or down. A setting of 0 should turn the light immediately on or off (almost like an on/off switch). Increasing the value should slow down the transition speed.
+      Range 0 - 98: Set the dimming speed
+      Default: 4
+      </Help>
+    </Value>
+    <Value genre="config" type="byte" size="1" index="3" label="Ramp Rate" min="0" max="99" value="99">
+      <Help>
+      This changes the speed in which the light strip turns on or off. For example, when a user sends the switch a basicSet(value: 0xFF) or basicSet(value: 0x00), this is the speed in which those actions take place. A setting of 0 should turn the light immediately on or off (almost like an on/off switch). Increasing the value should slow down the transition speed. A setting of 99 should keep this in sync with parameter 2.
+      Range 0 - 98: Set the Ramp Rate
+      99: Keep in sync with parameter 2
+      Default: 99
+      </Help>
+    </Value>
+    <Value genre="config" type="byte" size="1" index="4" label="Minimum Level" min="1" max="45" value="1">
+      <Help>
+      The minimum level that the strip can be dimmed to. Useful when the user has an LED strip that does not turn on or flickers at a lower level.
+      Range: 1 - 45
+      Default: 1
+      </Help>
+    </Value>
+    <Value genre="config" type="byte" size="1" index="5" label="Maximum Level" min="55" max="99" value="99">
+      <Help>
+      The maximum level that the strip can be dimmed to. Useful when the user has an LED strip that reaches its maximum level before the dimmer value of 99.
+      Range: 55 - 99
+      Default: 99
+      </Help>
+    </Value>
+    <Value genre="config" type="short" size="2" index="6" label="Auto Off Timer" min="0" max="32767" value="0">
+      <Help>
+      Automatically turns the strip off after this many seconds. When the strip is turned on a timer is started that is the duration of this setting. When the timer expires, the strip is turned off.
+      0 - Auto off is disabled
+      Range: 0 - 32767
+      </Help>
+    </Value>
+    <Value genre="config" type="byte" size="1" index="7" label="Default Level (Local)" min="0" max="99" value="0">
+      <Help>
+      Default level for the strip when it is powered on from the local switch. A setting of 0 means that the switch will return to the level that it was on before it was turned off.
+      Range 0 - 99
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="byte" size="1" index="8" label="Default Level (Z-Wave)" min="0" max="99" value="0">
+      <Help>
+      Default level for the dimmer when it is powered on from a Z-Wave command (i.e. BasicSet(0xFF)). A setting of 0 means that the switch will return to the level that it was on before it was turned off.
+      Range: 0-99
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="int" size="4" index="9" label="Default Color" min="0" max="425984362" value="262144000">
+      <Help>
+      Byte(3-2): Values between 2700-6500 represent a color temperature. 
+      Byte(1-0): Values between 0-361, represent the color on the Hue color wheel. The value of 361 represents a random color.
+      Range: 0 - 425984362
+      Default: 262144000
+      </Help>
+    </Value>
+    <Value genre="config" type="list" size="1" index="10" label="State after power Restored" min="1" max="2" value="2">
+      <Help>
+      The state the switch should return to once power is restored after power failure.
+      0 - Off
+      1 - Default Color / Level (Parameter 9)
+      2 - Previous
+      Default: Previous
+      </Help>
+      <Item value="0" label="Off"/>
+      <Item value="1" label="Default Color/Level"/>
+      <Item value="2" label="Previous"/>
+    </Value>
+   <Value genre="config" type="byte" size="1" index="17" label="Active Power Reports" min="0" max="100" value="10">
+      <Help>
+      The power level change that will result in a new power report being sent. The value is a percentage of the previous report. 0 = disabled.
+      Range: 0 - 100
+      Default: 10
+      </Help>
+    </Value>
+    <Value genre="config" type="short" size="2" index="18" label="Periodic Power &amp; Energy Reports" min="0" max="32767" value="3600">
+      <Help>
+      Time period between consecutive power &amp; energy reports being sent (in seconds). The timer is reset after each report is sent.
+      Range: 0, 30 - 32767
+      Default: 3600
+      </Help>
+    </Value>
+    <Value genre="config" type="byte" size="1" index="19" label="Energy Reports" min="0" max="127" value="10">
+      <Help>
+      The energy level change that will result in a new energy report being sent (in kWh)
+	  0 = 0.01kWh, 10=0.1kWh, 100=1kWh
+      Range:0-127
+      Default: 10
+      </Help>
+    </Value>
+    <Value genre="config" type="int" size="4" index="21" label="Quick Strip Effect" min="0" max="2147483647" value="0">
+      <Help>
+      See website for details
+      *  Sending Basic, Binary Switch, Multilevel, and Color SET will automatically disable the strip effect.
+      *  Toggling OFF -> ON will cancel effect mode set on LED Strip and change the LED Strip back to the Previous color.
+      Range: 0 - 2147483647
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="int" size="4" index="22" label="Custom Strip Effect Parameter 1" min="0" max="2147483647" value="0">
+      <Help>
+      See website for details.
+      Range: 0 - 2147483647
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="int" size="4" index="23" label="Custom Strip Effect Parameter 2" min="0" max="2147483647" value="0">
+      <Help>
+      See website for details.
+      Range: 0 - 2147483647
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="int" size="4" index="24" label="Custom Strip Effect Parameter 3" min="0" max="2147483647" value="0">
+      <Help>
+      See website for details.
+      Range: 0 - 2147483647
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="int" size="4" index="30" label="Custom Strip Effect Parameter 4" min="0" max="197375" value="0">
+      <Help>
+      See website for details.
+      Range: 0 - 197375
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="short" size="2" index="31" label="Pixel Effect" min="0" max="32767" value="0">
+      <Help>
+      Byte 1 - Level
+      Byte 0 - Effect
+      See website for details.
+      Default: 0
+      </Help>
+    </Value>
+    <Value genre="config" type="list" size="1" index="51" label="Disable Physical On/Off Delay" min="0" max="1" value="1">
+      <Help>
+      The 700ms delay that occurs after pressing the physical button to turn the switch on/off is removed. Consequently this also removes the following scenes: 2x, 3x, 4x, 5x tap. Still working are the 1x tap, held, released, and the level up/down scenes. (firmware 1.36+)
+      0 - 700ms delay disabled (some scenes will not work)
+      1 - 700ms delay enabled (All scenes work)
+      Default: 700ms delay enabled
+      </Help>
+      <Item value="0" label="700ms delay disabled"/>
+      <Item value="1" label="700ms delay enabled"/>
+    </Value>    
+   </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" label="Lifeline" max_associations="5" />
+      <Group index="2" label="Basic_Set" max_associations="5" />
+	  <Group index="3" label="Switch_MultiLevel_Set" max_associations="5" />
+      <Group index="4" label="Switch_MultiLevel_Start/Stop" max_associations="5" />
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/inovelli/nzw30.xml b/config/inovelli/nzw30.xml
index 048addaf..2fe2fbff 100644
--- a/config/inovelli/nzw30.xml
+++ b/config/inovelli/nzw30.xml
@@ -1,4 +1,10 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/inovelli/nzw30.png</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Daniel Brunt - daniel@brunt.ca" date="30 July 2020" revision="4">Added pic</Entry>
+    </ChangeLog>
+  </MetaData>
   <!-- Configuration Parameters -->
   <CommandClass id="112">
     <Value genre="config" index="3" label="LED Indicator Control" max="255" min="0" size="1" type="list" units="" value="0">
diff --git a/config/kwikset/888.xml b/config/kwikset/888.xml
new file mode 100644
index 00000000..12b27b8a
--- /dev/null
+++ b/config/kwikset/888.xml
@@ -0,0 +1,124 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0090:0541:0003</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/kwikset/888.png</MetaDataItem>
+    <MetaDataItem id="0446" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2176</MetaDataItem>
+    <MetaDataItem id="0446" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0446" name="Identifier" type="0003">888</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.kwikset.com/products/detail/888-smartcode-electronic-deadbolt-with-z-wave-technology</MetaDataItem>
+    <MetaDataItem name="Description">Extend your smart home system to your current deadbolt, enabling your existing deadbolt to wirelessly communicate with your smart home or security system
+Dramatically reduced, all-metal interior
+Works with existing select single cylinder deadbolts</MetaDataItem>
+    <MetaDataItem name="ProductSupport">http://www.kwikset.com/Customer-Support/Overview.aspx</MetaDataItem>
+    <MetaDataItem name="Name">SmartCode 888</MetaDataItem>
+    <ChangeLog>
+      <Entry author="mike240se" date="20 Jun 2020" revision="1">Initial Version</Entry>
+      <Entry author="mike240se" date="24 Jul 2020" revision="2">Add Config Params</Entry>
+    </ChangeLog>
+    <MetaDataItem name="WakeupDescription">The electronic conversion kit remains asleep until an action occurs on the latch or a request is received from the RF side.
+For the RF side, it will wake up every 1 second to check if there are any requests from your smart home controller.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2268/Install_Guide_914C_03_09_2017.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Initiate the process to add the lock to your system at your smart home controller.
+When prompted by your smart home system to add the lock, press button “A” on the lock interior one time. The red LED will illuminate when the lock enters Add Mode.
+Please allow time for the controller to add the lock to your system.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Follow your smart home system’s instructions to remove the lock from the network. When prompted by the system, press button A” on the lock interior once.  The red LED will illuminate when the lock enters Remove mode. </MetaDataItem>
+    <MetaDataItem name="ResetDescription">A factory reset will delete all user codes associated with the lock and will remove itself from your smart home system.
+Please only perform a factory reset when the primary controller is missing or inoperable.
+
+To perform a factory reset, please perform the following:
+1. Remove the battery pack
+2. Press and HOLD the Program button while reinserting the battery pack.
+3. Keep holding the button for 30 seconds until the lock beeps and the status LED flashes red.
+4. Press the Program button once more.  The status LED will flash green and red several times.
+5. After a few seconds, the lock will initiate the door handing process.</MetaDataItem>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+	<Value genre="config" index="33" instance="1" label="MSB SKU part numbers" max="255" min="0" type="byte">
+      <Help>The configuration parameters 33 and 34 are used to set and get the SKU part numbers.
+The SKU is made up of 8 bytes. Each parameter consists of four bytes of data.
+Parameter 33 contains the first four most significant bytes of the SKU, while parameter
+34 contains the four least significant bytes of the SKU.
+When setting the SKU, it must be done in two set commands, one for each parameter.
+The order of programming the SKU does not matter. 
+Setting parameter 33 will program the first four bytes of the SKU. Setting parameter 34
+will program the last 4 bytes of the SKU. Most printable values are accepted for the set
+command.
+When getting the SKU, it must be done in two get commands, one for each parameter.
+The order of getting the SKU does not matter.
+Getting parameter 33 will retrieve the first four bytes of the SKU. Getting parameter 34
+will retrieve the last 4 bytes of the SKU.
+			</Help>
+    </Value>
+    <Value genre="config" index="34" instance="1" label="LSB SKU part numbers" max="255" min="0" type="byte">
+      <Help>The Configuration Parameter 33 and 34 are used to set the SKU part numbers to the Kwikset locks. 
+			Is the least four significant bytes (LSB). 			
+			</Help>
+    </Value>
+	<Value genre="config" index="35" instance="1" label="Interior Status LED Control" max="1" min="0" type="bool">
+	  <Help>The configuration parameter 35 is a one byte field that will allow the user to get / set the
+value for the Interior Status LED control. The value of 0 means that the setting is
+disabled; whereas the value of 1 means that the setting is enabled.
+Sending a set command with the default field set to 1 will cause the control to revert back
+to its factory default setting. </Help>
+	</Value>
+	<Value genre="config" index="36" label="AutoLock" size="2" type="list" value="1">
+      <Help>The configuration parameter 36 uses 2 bytes that will allow the user to get / set the value
+for the Auto Lock feature and timing for that feature. The first byte will be the
+enable/disable byte. The value of 0 means that the setting is disabled; whereas the value
+of 1 means that the setting is enabled. The next two bytes will be the timing for the Auto
+Lock feature and should contain the number of seconds before the Auto Lock will occur.
+The valid values are: 0 (default – 30 seconds), 30, 60, 90, 120, 180. For example, setting
+the auto lock feature for 60 seconds, the two timing bytes should be: 0x003C.
+Sending a set command with the default field set to 1 will cause the control to revert back
+to its factory default settings. </Help>
+      <Item label="Disabled" value="30"/>
+      <Item label="Enabled - 30s" value="286"/>
+      <Item label="Enabled - 60s" value="316"/>
+      <Item label="Enabled - 90s" value="346"/>
+	  <Item label="Enabled - 120s" value="376"/>
+	  <Item label="Enabled - 180s" value="436"/>
+    </Value>
+	<Value genre="config" index="37" instance="1" label="Audio Feature Control" max="1" min="0" type="bool">
+	  <Help>The configuration parameter 37 is a one byte field that will allow the user to get / set the
+value for the Audio feature. The value of 0 means that the setting is disabled; whereas
+the value of 1 means that the setting is enabled.
+Sending a set command with the default field set to 1 will cause the control to revert back
+to its factory default setting. 
+	   </Help>
+	</Value>
+	<Value genre="config" index="40" label="Reset To Factory Defaults" size="1" type="list" value="0" write_only="true">
+      <Help>Reset to factory defaults</Help>
+      <Item label="Perform Factory Reset" value="1"/>
+      <Item label="Normal" value="0"/>
+    </Value>
+	
+	<Value genre="config" index="47" label="Motor Load Control" size="1" max="1" min="0" type="bool">
+	  <Help>The configuration parameter 47 uses 1 byte that will allow the user to get / set the value
+to enable or disable the motor load alarm. Setting this byte to 0 will disable the alarm,
+whereas setting this byte to 1 will enable the alarm. If a motor load alarm has been
+activated and the alarm has been enabled, the alarm will be sent via the Power
+Management group in the Notification Command Class as a Load Error (0x09). 
+	   </Help>
+	</Value>
+	
+	
+  </CommandClass>
+  <CommandClass id="113">
+    <!-- These Door Locks don't send a DoorLockReport when the
+                Lock Status is Changed, but instead send a Alarm Message -
+                So we trigger a Refresh of the DoorLock Command Class when
+                we recieve a Alarm Message Instead -->
+    <TriggerRefreshValue Genre="user" Index="6" Instance="1">
+      <RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
+    </TriggerRefreshValue>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="Doorlock notify report" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
+
diff --git a/config/kwikset/910.xml b/config/kwikset/910.xml
new file mode 100644
index 00000000..dd606d08
--- /dev/null
+++ b/config/kwikset/910.xml
@@ -0,0 +1,369 @@
+<!-- 
+Kwikset smartcode 
+http://s7d5.scene7.com/is/content/BDHHI/z-wave-configuration
+--><Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0090:0001:0001</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/kwikset/smartcode.png</MetaDataItem>
+    <MetaDataItem id="0001" name="ZWProductPage" type="0001">https://products.z-wavealliance.org/products/945/</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="0001">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="0001">910</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://www.kwikset.com/Products/Details/Electronic-Locks/910TRL-ZW-15-SMT.aspx</MetaDataItem>
+    <MetaDataItem name="Description">Weiser introduces the SmartCode™ 10 Touchpad Electronic Deadbolt with Z-Wave.
+
+10 digit backlit keypad with one touch locking
+Dramatically reduced, all-metal interior
+30 user codes plus master code
+BHMA grade 2 certified
+20 minute fire rating - UL certified
+Full 128-bit encryption security
+SmartKey: Re-key the lock in seconds</MetaDataItem>
+    <MetaDataItem name="ProductSupport">http://www.kwikset.com/Customer-Support/Overview.aspx</MetaDataItem>
+    <MetaDataItem name="Name">SmartCode 10 Touchpad Electronic Deadbolt</MetaDataItem>
+    <ChangeLog>
+      <Entry author="firstof9 - firstof9@gmail.com" date="24 Jul 2020" revision="1">Fixed TriggerRefresh Index to properly update lock status via Alarm Type.</Entry>
+    </ChangeLog>
+    <MetaDataItem name="WakeupDescription">Even though the lock is sleeping, all buttons are active and can be used to initiate any lock activity.
+For the RF side, it will wake up every 1 second to check if there are any requests from your smart home controller.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2369/Install Guide GED1800 04112017.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Initiate the process to add the lock to your system at your smart home controller.
+When prompted by your smart home system to add the lock, press button “A” on the lock interior one time. The red LED will illuminate when the lock enters Add Mode.
+Please allow time for the controller to add the lock to your system.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Follow your smart home system’s instructions to remove the lock from the network. When prompted by the system, press button A” on the lock interior once.  The red LED will illuminate when the lock enters Remove mode. </MetaDataItem>
+    <MetaDataItem name="ResetDescription">A factory reset will delete all user codes associated with the lock and will remove itself from your smart home system.
+Please only perform a factory reset when the primary controller is missing or inoperable.
+
+To perform a factory reset, please perform the following:  
+1. Remove the battery pack
+2. Press and HOLD the Program button while reinserting the battery pack.
+3. Keep holding the button for 30 seconds until the lock beeps and the status LED flashes red.
+4. Press the Program button once more.  The status LED will flash green and red several times.
+5. After a few seconds, the lock will initiate the door handing process.</MetaDataItem>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="1 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="2 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="3 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="4 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="5 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="6 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="7 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="8 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="9 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="10 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="11 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="12 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="13 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="14 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="15" instance="1" label="15 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="16" instance="1" label="16 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="17" instance="1" label="17 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="18" instance="1" label="18 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="19" instance="1" label="19 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="20" instance="1" label="20 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="21" instance="1" label="21 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="22" instance="1" label="22 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="23" instance="1" label="23 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="24" instance="1" label="24 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="25" instance="1" label="25 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="26" instance="1" label="26 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="27" instance="1" label="27 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="28" instance="1" label="28 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="29" instance="1" label="29 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="30" instance="1" label="30 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="31" instance="1" label="Dipswitches state" max="255" min="0" read_only="true" type="byte">
+      <Help>Bit mask field that returns the state of the user accessible Dipswitches on the door look.
+			Bit 0 Lock LED Status (1: enable)
+			Bit 1 Auto lock (1: enable)
+			Bit 2 Auto Buzzer (1: enable)
+			Bit 3 Secure Screen (1: enable) *Only for MB 916
+			</Help>
+    </Value>
+    <Value genre="config" index="33" instance="1" label="MSB SKU part numbers" max="255" min="0" type="byte">
+      <Help>The Configuration Parameter 33 and 34 are used to set the SKU part numbers to the Kwikset locks. 
+			Is the first four most significant bytes (MSB). 
+			Below describes how Configuration Parameter 33 and 34 are being used.
+			* For a ZW Configuration Set, the DLM will first do a GET_SKU_ID to retrieve the full SKU from the lock, and the lock will respond with all 8 bytes. (If it not yet set, the DLM will consider that as all 0x30s.) 
+			  The DLM changes only the appropriate 4 bytes in its local copy of the SKU, and it then sends the full 8 bytes down to the lock in a SET_SKU_ID.
+			* For a ZW Configuration Get, the DLM will do a GET_SKU_ID down to the lock, to which the lock will respond with all 8 bytes. 
+			  The DLM will return the requested 4 bytes via ZW. If the SKU is not set, it will return all 0x30s (ASCII 0s).
+			</Help>
+    </Value>
+    <Value genre="config" index="34" instance="1" label="LSB SKU part numbers" max="255" min="0" type="byte">
+      <Help>The Configuration Parameter 33 and 34 are used to set the SKU part numbers to the Kwikset locks. 
+			Is the least four significant bytes (LSB). 			
+			</Help>
+    </Value>
+    <Value genre="config" index="35" instance="1" label="lock type" read_only="true" size="2" type="short">
+      <Help>Unique ID of the lock type
+			910 Z-Wave (Legacy, FW 3.4) 0x00 0x00
+			912 Z-Wave (Legacy, FW 3.2) 0x00 0x00
+			910 Z-Wave 0x02 0x36
+			912 Z-Wave 0x03 0x36
+			914 Z-Wave 0x04 0x36
+			916 Z-Wave 0x06 0x42
+			</Help>
+    </Value>
+    <Value genre="config" index="40" label="Reset To Factory Defaults" size="1" type="list" value="0" write_only="true">
+      <Help>Reset to factory defaults</Help>
+      <Item label="Do reset" value="1"/>
+      <Item label="Normal" value="0"/>
+    </Value>
+  </CommandClass>
+  <CommandClass id="113">
+    <!-- These Door Locks don't send a DoorLockReport when the
+		Lock Status is Changed, but instead send a Alarm Message -
+		So we trigger a Refresh of the DoorLock Command Class when
+		we recieve a Alarm Message Instead -->
+    <TriggerRefreshValue Genre="user" Index="512" Instance="1">
+      <RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
+    </TriggerRefreshValue>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/kwikset/916.xml b/config/kwikset/916.xml
new file mode 100644
index 00000000..33dbbec8
--- /dev/null
+++ b/config/kwikset/916.xml
@@ -0,0 +1,372 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0090:0001:0001</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/kwikset/916.jpg</MetaDataItem>
+    <MetaDataItem id="0642" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2188/</MetaDataItem>
+    <MetaDataItem id="0642" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0642" name="Identifier" type="0003">916</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.kwikset.com/support/productdetail/916-smartcode-traditional-electronic-deadbolt-with-z-wave-technology</MetaDataItem>
+    <MetaDataItem name="Description">Kwikset®, the leader in residential security, introduces the SmartCode™ 916 Touchscreen Electronic Deadbolt with Z-Wave.
+
+Capacitive touchscreen
+SecureScreen: Additional security by preventing fingerprint code detection
+One touch locking
+Dramatically reduced, all-metal interior
+30 user codes plus master code
+BHMA grade 2 certified
+20 minute fire rating - UL certified
+Full 128-bit encryption security
+SmartKey: Re-key the lock in seconds</MetaDataItem>
+    <MetaDataItem name="ProductSupport">http://www.kwikset.com/Customer-Support/Overview.aspx</MetaDataItem>
+    <MetaDataItem name="Name">SmartCode 916 Touchscreen Electronic Deadbolt</MetaDataItem>
+    <ChangeLog>
+        <Entry author="firstof9" date="20 Jul 2020" revision="1">Initial Version</Entry>
+    </ChangeLog>
+
+    <MetaDataItem name="WakeupDescription">Even though the lock is sleeping, all buttons are active and can be used to initiate any lock activity.
+For the RF side, it will wake up every 1 second to check if there are any requests from your smart home controller.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2188/Install_Guide_916_01_23_2017.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Initiate the process to add the lock to your system at your smart home controller.
+When prompted by your smart home system to add the lock, press button “A” on the lock interior one time. The red LED will illuminate when the lock enters Add Mode.
+Please allow time for the controller to add the lock to your system.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Follow your smart home system’s instructions to remove the lock from the network. When prompted by the system, press button A” on the lock interior once.  The red LED will illuminate when the lock enters Remove mode. </MetaDataItem>
+    <MetaDataItem name="ResetDescription">A factory reset will delete all user codes associated with the lock and will remove itself from your smart home system.
+Please only perform a factory reset when the primary controller is missing or inoperable.
+
+To perform a factory reset, please perform the following:  
+1. Remove the battery pack
+2. Press and HOLD the Program button while reinserting the battery pack.
+3. Keep holding the button for 30 seconds until the lock beeps and the status LED flashes red.
+4. Press the Program button once more.  The status LED will flash green and red several times.
+5. After a few seconds, the lock will initiate the door handing process.</MetaDataItem>
+    <MetaDataItem id="0642" name="ZWProductPage" type="0001">https://products.z-wavealliance.org/products/2188/</MetaDataItem>
+    <MetaDataItem id="0642" name="FrequencyName" type="0001">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0642" name="Identifier" type="0001">916</MetaDataItem>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="1 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="2 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="3 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="4 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="5 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="6 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="7 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="8 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="9 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="10 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="11 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="12 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="13 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="14 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="15" instance="1" label="15 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="16" instance="1" label="16 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="17" instance="1" label="17 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="18" instance="1" label="18 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="19" instance="1" label="19 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="20" instance="1" label="20 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="21" instance="1" label="21 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="22" instance="1" label="22 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="23" instance="1" label="23 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="24" instance="1" label="24 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="25" instance="1" label="25 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="26" instance="1" label="26 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="27" instance="1" label="27 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="28" instance="1" label="28 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="29" instance="1" label="29 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="30" instance="1" label="30 User Code Type" max="255" min="0" size="1" type="list" value="1">
+      <Help>
+			 set the User Code Type for their corresponding user codes.
+			</Help>
+      <Item label="Owner" value="1"/>
+      <Item label="Guest (Required for Year Day Schedules)" value="3"/>
+      <Item label="Worker (Required for Week Day Schedules)" value="4"/>
+      <Item label="No corresponding user code" value="255"/>
+    </Value>
+    <Value genre="config" index="31" instance="1" label="Dipswitches state" max="255" min="0" read_only="true" type="byte">
+      <Help>Bit mask field that returns the state of the user accessible Dipswitches on the door look.
+			Bit 0 Lock LED Status (1: enable)
+			Bit 1 Auto lock (1: enable)
+			Bit 2 Auto Buzzer (1: enable)
+			Bit 3 Secure Screen (1: enable) *Only for MB 916
+			</Help>
+    </Value>
+    <Value genre="config" index="33" instance="1" label="MSB SKU part numbers" max="255" min="0" type="byte">
+      <Help>The Configuration Parameter 33 and 34 are used to set the SKU part numbers to the Kwikset locks. 
+			Is the first four most significant bytes (MSB). 
+			Below describes how Configuration Parameter 33 and 34 are being used.
+			* For a ZW Configuration Set, the DLM will first do a GET_SKU_ID to retrieve the full SKU from the lock, and the lock will respond with all 8 bytes. (If it not yet set, the DLM will consider that as all 0x30s.) 
+			  The DLM changes only the appropriate 4 bytes in its local copy of the SKU, and it then sends the full 8 bytes down to the lock in a SET_SKU_ID.
+			* For a ZW Configuration Get, the DLM will do a GET_SKU_ID down to the lock, to which the lock will respond with all 8 bytes. 
+			  The DLM will return the requested 4 bytes via ZW. If the SKU is not set, it will return all 0x30s (ASCII 0s).
+			</Help>
+    </Value>
+    <Value genre="config" index="34" instance="1" label="LSB SKU part numbers" max="255" min="0" type="byte">
+      <Help>The Configuration Parameter 33 and 34 are used to set the SKU part numbers to the Kwikset locks. 
+			Is the least four significant bytes (LSB). 			
+			</Help>
+    </Value>
+    <Value genre="config" index="35" instance="1" label="lock type" read_only="true" size="2" type="short">
+      <Help>Unique ID of the lock type
+			910 Z-Wave (Legacy, FW 3.4) 0x00 0x00
+			912 Z-Wave (Legacy, FW 3.2) 0x00 0x00
+			910 Z-Wave 0x02 0x36
+			912 Z-Wave 0x03 0x36
+			914 Z-Wave 0x04 0x36
+			916 Z-Wave 0x06 0x42
+			</Help>
+    </Value>
+    <Value genre="config" index="40" label="Reset To Factory Defaults" size="1" type="list" value="0" write_only="true">
+      <Help>Reset to factory defaults</Help>
+      <Item label="Do reset" value="1"/>
+      <Item label="Normal" value="0"/>
+    </Value>
+  </CommandClass>
+  <CommandClass id="113">
+    <!-- These Door Locks don't send a DoorLockReport when the
+		Lock Status is Changed, but instead send a Alarm Message -
+		So we trigger a Refresh of the DoorLock Command Class when
+		we recieve a Alarm Message Instead -->
+    <TriggerRefreshValue Genre="user" Index="6" Instance="1">
+      <RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
+    </TriggerRefreshValue>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/kwikset/smartcode.xml b/config/kwikset/smartcode.xml
index f511295c..3426b3af 100644
--- a/config/kwikset/smartcode.xml
+++ b/config/kwikset/smartcode.xml
@@ -1,7 +1,7 @@
 <!-- 
 Kwikset smartcode 
 http://s7d5.scene7.com/is/content/BDHHI/z-wave-configuration
---><Product Revision="14" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="15" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0090:0001:0001</MetaDataItem>
     <MetaDataItem name="ProductPic">images/kwikset/smartcode.png</MetaDataItem>
@@ -33,6 +33,7 @@ SmartKey: Re-key the lock in seconds</MetaDataItem>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="12">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2188/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="13">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2237/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="14">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2369/xml</Entry>
+      <Entry author="Russell Troxel - russelltroxel@gmail.com" date="08 Jun 2020" revision="15">Fixed TriggerRefresh Index to properly update lock status via Access Control.</Entry>
     </ChangeLog>
     <MetaDataItem id="0642" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2188/</MetaDataItem>
     <MetaDataItem name="WakeupDescription">Even though the lock is sleeping, all buttons are active and can be used to initiate any lock activity.
@@ -376,7 +377,7 @@ To perform a factory reset, please perform the following:
 		Lock Status is Changed, but instead send a Alarm Message -
 		So we trigger a Refresh of the DoorLock Command Class when
 		we recieve a Alarm Message Instead -->
-    <TriggerRefreshValue Genre="user" Index="0" Instance="1">
+    <TriggerRefreshValue Genre="user" Index="6" Instance="1">
       <RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
     </TriggerRefreshValue>
   </CommandClass>
diff --git a/config/leviton/dz15s.xml b/config/leviton/dz15s.xml
index 8e03723b..9a151fbd 100644
--- a/config/leviton/dz15s.xml
+++ b/config/leviton/dz15s.xml
@@ -1,54 +1,50 @@
 <!--
 Leviton Switch DZ15S 
 http://products.z-wavealliance.org/products/1957
---><Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0001:3401</MetaDataItem>
     <MetaDataItem name="ProductPic">images/leviton/dz15s.png</MetaDataItem>
     <MetaDataItem id="0001" name="ZWProductPage" type="3401">https://products.z-wavealliance.org/products/1957/</MetaDataItem>
     <MetaDataItem name="ExclusionDescription">When removing a device from a Z-Wave® network best practice is to use the exclusion command found in the Z-Wave® controller.
-• Enter Programming Mode by holding the control button for 7 seconds, the Locator LED will turn amber.
-• Follow directions in the Z-Wave® controller to enter exclusion mode.
-• Tap the control button one time. The Locator LED will quickly flash green.
-The Z-Wave® controller will exclude the Decora Smart device.
+• Enter Programming Mode by holding the top of the paddle for 7 seconds, the Locator LED will blink amber.
+• Follow directions in the Z-Wave® controller to enter exclusion mode
+• Tap the top of the paddle one time. The Locator LED will quickly flash green.
+The Z-Wave® controller will exclude the Decora Smart™ device
 • The Z-Wave® controller will confirm successful exclusion from the network.</MetaDataItem>
     <MetaDataItem id="0001" name="Identifier" type="3401">DZ15S</MetaDataItem>
-    <MetaDataItem name="Description">The wireless Leviton DZPA1 is a Z-Wave enabled plug-in outlet designed for use for most residential applications to control plug-in lamps, holiday lighting, or small appliances. The DZPA1 Plug-In Outlet is fully compatible with Z-Wave Plus certified controllers.  Offers manual control to turn loads on/off.  Manufacturer Parameters allow custom configuration via Z-Wave commands.  Rated for 5A LED and CFL bulbs, 1800W incandescent bulbs, 1800W Fluorescent, 15A Resistive, and 1/2 HP Motor.   These Z-Wave Plus devices support beaming, network wide inclusion, and over the air updates.  </MetaDataItem>
-    <MetaDataItem name="InclusionDescription">Leviton Decora SmartTM Z-Wave® devices support two methods of inclusion.
-When using a Z-Wave PlusTM certified controller choose Network Wide Inclusion.
+    <MetaDataItem name="Description">The wireless Leviton DZ15S is a Z-Wave enabled switch designed for use for most residential lighting applications to control LED, CFL, and incandescent bulbs. The DZ15S Switch is fully compatible with Z-Wave Plus certified controllers.  Manufacturer Parameters allow custom configuration via Z-Wave commands. Offers manual control to turn lights on/off.  Facilitates single pole or three-way multi-location applications.  Rated for 600W LED and CFL bulbs, 1800W incandescent bulbs, 15A Fluorescent (at 120 VAC) and 8A (at 277 VAC), 15A Resistive, and 1/2 HP Motor.  Requires neutral connection.  These Z-Wave Plus devices support beaming, network wide inclusion, and over the air updates.  White and Light Almond color faces included, Decora wallplate sold separately.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Leviton Decora Smart™ Z-Wave® devices support two methods of inclusion. When using a Z-Wave Plus® certified controller choose Network Wide Inclusion.
 Network Wide Inclusion:
-Network Wide Inclusion allows your device to be added to the network using devices already in the network to assist with communication. Work your way from the closest devices to the controller outward.
-• Enter Programming Mode by holding the control button for 7 seconds, the Locator LED will blink amber.
-• Tap the control button one time.
+Network Wide Inclusion allows your device to be included into the network using devices already in the network to assist with communication. Work your way from the closest devices to the controller outward.
+• Enter Programming Mode by holding the top of the paddle for 7 seconds, the Locator LED will blink amber.
+• Tap the top of the paddle one time.
 The Locator LED will quickly flash green.
-• The Decora SmartTM Z-Wave® device is ready to learn into the Z-Wave® network.
-• Follow directions in the Z-Wave® controller to complete the adding process.
+• The Decora Smart™ Z-Wave® device is ready to learn into the Z-Wave® network.
+• Follow directions in the Z-Wave controller to complete the adding process.
 • Upon successful addition to network the LED will turn off and then blink green 3 times.
 • If the adding process is not successful the LED will flash red 3 times.
 Traditional Inclusion:
 For older controllers Traditional Inclusion is supported. Depending on the age of the controller the controller will need to be 3 to 35 feet from the device when including.
-• Enter Programming Mode by holding the control button for 7 seconds, the Locator LED will blink amber.
+• Enter Programming Mode by holding the top of the paddle for 7 seconds, the Locator LED will blink amber.
 • The Decora SmartTM Z-Wave® device is ready to add to the Z-Wave® network.
 • Follow directions in the Z-Wave® controller to enter learn mode.
-• Tap the control button one time. The Locator LED will quickly flash green.
-The Z-Wave® controller will begin to pair with the Decora Smart device.
+• Tap the top of the paddle one time. The Locator LED will quickly flash green. The Z-Wave® controller will begin to pair with the Decora Smart™ device.
 • Upon successful addition to the network the LED will turn off and then blink green 3 times.
-• If the adding process is not successful the LED will flash red 3 times.</MetaDataItem>
-    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/1959/DI-000-DZPA1-02B-X4.pdf</MetaDataItem>
-    <MetaDataItem name="ResetDescription">When removing a device from a network it is best practice to use the Exclusion process. In situations where a device needs to be returned to factory default follow the following steps. A reset should only be used when a controller is inoperable or missing:
-• Holding the control button for a total of 14 seconds.
-- After the first 7 seconds the LED turns amber.
-- The Locator LED will quickly flash red/amber after 14 seconds.
-• Release the control button and the device will reset.</MetaDataItem>
-    <MetaDataItem name="Name">Plug-In Outlet</MetaDataItem>
+• If the adding process is not successful the LED will flash red 3 times.
+</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/1957/DI-000-DZ15S-02A-X4.pdf</MetaDataItem>
+    <MetaDataItem name="ResetDescription">When removing a device from a network it is best practice to use the Exclusion process. In situations where a device needs to be returned to factory default follow the following steps. A reset should only be used when a controller is inoperable or missing.
+• Hold the top of the paddle for a total of 14 seconds.
+• After the first 7 seconds the LED turns amber.
+• The Locator LED will quickly flash red/amber after 14 seconds.
+• Release the top of the paddle and the device will reset.</MetaDataItem>
+    <MetaDataItem name="Name">Switch</MetaDataItem>
     <MetaDataItem id="0001" name="FrequencyName" type="3401">U.S. / Canada / Mexico</MetaDataItem>
     <ChangeLog>
-      <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1957/xml</Entry>
-      <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1959/xml</Entry>
+      <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="4">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1957/xml</Entry>
+      <Entry author="Jim Kaiser - j_j_k_4@yahoo.com" date="24 June 2020" revision="5">Reverts to Revision 3 (before the changes making this almost the DZPA1) - https://products.z-wavealliance.org/products/1957/xml</Entry>
     </ChangeLog>
-    <MetaDataItem id="0001" name="ZWProductPage" type="3601">https://products.z-wavealliance.org/products/1959/</MetaDataItem>
-    <MetaDataItem id="0001" name="Identifier" type="3601">DZPA1</MetaDataItem>
-    <MetaDataItem id="0001" name="FrequencyName" type="3601">U.S. / Canada / Mexico</MetaDataItem>
   </MetaData>
   <!-- Configuration Parameters -->
   <CommandClass id="112">
@@ -65,9 +61,4 @@ The Z-Wave® controller will begin to pair with the Decora Smart device.
       <Group index="1" label="Lifeline" max_associations="5"/>
     </Associations>
   </CommandClass>
-  <CommandClass id="134">
-    <Compatibility>
-      <ClassGetVersionSupported>false</ClassGetVersionSupported>
-    </Compatibility>
-  </CommandClass>
 </Product>
diff --git a/config/leviton/dzpa1.xml b/config/leviton/dzpa1.xml
new file mode 100644
index 00000000..99298dd8
--- /dev/null
+++ b/config/leviton/dzpa1.xml
@@ -0,0 +1,67 @@
+<!--
+Leviton Plug-In Outlet DZPA1 
+http://products.z-wavealliance.org/products/1959
+--><Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001d:0001:3601</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/leviton/dzpa1.png</MetaDataItem>
+    <MetaDataItem id="0001" name="ZWProductPage" type="3601">https://products.z-wavealliance.org/products/1959/</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">When removing a device from a Z-Wave® network best practice is to use the exclusion command found in the Z-Wave® controller.
+• Enter Programming Mode by holding the control button for 7 seconds, the Locator LED will turn amber.
+• Follow directions in the Z-Wave® controller to enter exclusion mode.
+• Tap the control button one time. The Locator LED will quickly flash green.
+The Z-Wave® controller will exclude the Decora Smart device.
+• The Z-Wave® controller will confirm successful exclusion from the network.</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="3601">DZPA1</MetaDataItem>
+    <MetaDataItem name="Description">The wireless Leviton DZPA1 is a Z-Wave enabled plug-in outlet designed for use for most residential applications to control plug-in lamps, holiday lighting, or small appliances. The DZPA1 Plug-In Outlet is fully compatible with Z-Wave Plus certified controllers.  Offers manual control to turn loads on/off.  Manufacturer Parameters allow custom configuration via Z-Wave commands.  Rated for 5A LED and CFL bulbs, 1800W incandescent bulbs, 1800W Fluorescent, 15A Resistive, and 1/2 HP Motor.   These Z-Wave Plus devices support beaming, network wide inclusion, and over the air updates.  </MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Leviton Decora SmartTM Z-Wave® devices support two methods of inclusion.
+When using a Z-Wave PlusTM certified controller choose Network Wide Inclusion.
+Network Wide Inclusion:
+Network Wide Inclusion allows your device to be added to the network using devices already in the network to assist with communication. Work your way from the closest devices to the controller outward.
+• Enter Programming Mode by holding the control button for 7 seconds, the Locator LED will blink amber.
+• Tap the control button one time.
+The Locator LED will quickly flash green.
+• The Decora SmartTM Z-Wave® device is ready to learn into the Z-Wave® network.
+• Follow directions in the Z-Wave® controller to complete the adding process.
+• Upon successful addition to network the LED will turn off and then blink green 3 times.
+• If the adding process is not successful the LED will flash red 3 times.
+Traditional Inclusion:
+For older controllers Traditional Inclusion is supported. Depending on the age of the controller the controller will need to be 3 to 35 feet from the device when including.
+• Enter Programming Mode by holding the control button for 7 seconds, the Locator LED will blink amber.
+• The Decora SmartTM Z-Wave® device is ready to add to the Z-Wave® network.
+• Follow directions in the Z-Wave® controller to enter learn mode.
+• Tap the control button one time. The Locator LED will quickly flash green.
+The Z-Wave® controller will begin to pair with the Decora Smart device.
+• Upon successful addition to the network the LED will turn off and then blink green 3 times.
+• If the adding process is not successful the LED will flash red 3 times.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/1959/DI-000-DZPA1-02B-X4.pdf</MetaDataItem>
+    <MetaDataItem name="ResetDescription">When removing a device from a network it is best practice to use the Exclusion process. In situations where a device needs to be returned to factory default follow the following steps. A reset should only be used when a controller is inoperable or missing:
+• Holding the control button for a total of 14 seconds.
+- After the first 7 seconds the LED turns amber.
+- The Locator LED will quickly flash red/amber after 14 seconds.
+• Release the control button and the device will reset.</MetaDataItem>
+    <MetaDataItem name="Name">Plug-In Outlet</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="3401">U.S. / Canada / Mexico</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jim Kaiser j_j_k_4@yahoo.com" date="22 June 2020" revision="1">Fixed incomplete clone of DZ15S to DZPA1 - https://products.z-wavealliance.org/products/1959/xml</Entry>
+    </ChangeLog>
+    <MetaDataItem id="0001" name="ZWProductPage" type="3601">https://products.z-wavealliance.org/products/1959/</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="3601">DZPA1</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="3601">U.S. / Canada / Mexico</MetaDataItem>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="7" label="Locator LED Status" max="255" min="0" size="1" type="list" units="" value="255">
+      <Help>Change the mode of the LED to Status Mode where the LED is illuminated when the load is On, Locator Mode where the LED is illuminated when the Load is Off, or turns off the LED completely for any other setting values.</Help>
+      <Item label="Off" value="0"/>
+      <Item label="Status Mode" value="254"/>
+      <Item label="Locator Mode" value="255"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/leviton/vrpa1.xml b/config/leviton/vrpa1.xml
new file mode 100644
index 00000000..eb49a642
--- /dev/null
+++ b/config/leviton/vrpa1.xml
@@ -0,0 +1,41 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0334:1805</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/leviton/vrpa1.png</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">When removing a device from a Z-Wave® network best practice is to use the exclusion command found in the Z-Wave® controller.
+• Enter Programming Mode by holding the control button for 7 seconds, the Locator LED will turn amber.
+• Follow directions in the Z-Wave® controller to enter exclusion mode.
+• Tap the control button one time. The Locator LED will quickly flash green.
+The Z-Wave® controller will exclude the Decora Smart device.
+• The Z-Wave® controller will confirm successful exclusion from the network.</MetaDataItem>
+    <MetaDataItem id="0334" name="Identifier" type="1805">VRPA1-15A</MetaDataItem>
+    <MetaDataItem name="Description"> The Vizia RF + Scene Capable Plug-in Appliance Module is ideal for any residential setting where remote ON/OFF switching of appliances, motor loads up to 1/2 HP, or freestanding lights, including Incandescent, Magnetic Low Voltage, Fluorescent and Compact Fluorescent loads is needed. Typical applications include switching of fluorescent lamps, portable fans, kitchen appliances, indoor fountains and more. The Vizia RF + Scene Capable Plug-in Appliance Module also allows users to incorporate small appliances into scene and zone home control applications</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Plug in the unit
+    2. Put your controller in inclusion mode
+    3. Press the button on the front of the plug-in module
+    </MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">1. Plug in the unit
+    1. Put your controller in exclusion mode
+    2. Press the button on the front of the plug-in module
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription"></MetaDataItem>
+    <MetaDataItem name="Name">Plug-In Outlet</MetaDataItem>
+    <MetaDataItem id="0334" name="FrequencyName" type="1805">U.S. / Canada / Mexico</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jeremy M. Johnson" date="21 June 2020" revision="1">Initial update based on dz15s, Leviton documentation, and CD-Jackson's Z-Wave Database</Entry>
+    </ChangeLog>
+    <MetaDataItem id="0334" name="ZWProductPage" type="1805">https://products.z-wavealliance.org/products/1959/</MetaDataItem>
+    <MetaDataItem id="0334" name="Identifier" type="1805">DZPA1</MetaDataItem>
+    <MetaDataItem id="0334" name="FrequencyName" type="1805">U.S. / Canada / Mexico</MetaDataItem>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <!-- None -->
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/leviton/vrpd3.xml b/config/leviton/vrpd3.xml
new file mode 100644
index 00000000..102c4743
--- /dev/null
+++ b/config/leviton/vrpd3.xml
@@ -0,0 +1,37 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+ <MetaData>
+  <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0334:1706</MetaDataItem>
+  <MetaDataItem name="ProductPic">images/leviton/vrpd3.png</MetaDataItem>
+  <MetaDataItem id="0334" name="Identifier" type="1706">VRPD3-1LW</MetaDataItem>
+  <MetaDataItem name="Description">The Vizia RF + Scene Capable Plug-in Lamp Dimming Module (VRPD3-1LW) is ideal for any residential setting where remote dimming of Incandescent loads up to 300 Watts CFL/LED loads up to 100W is needed. Typical applications include dimming of table and floor lamps. The Vizia RF + Scene Capable Plug-in Lamp Module also allows users to remotely control free-standing lamps individually or as part of a scene or zone grouping of lights through scene commands.</MetaDataItem>
+  <MetaDataItem name="InclusionDescription">1. Plug in Leviton VRPD3
+2. Place controller in inclusion mode
+3. Press button on front of VRPD3
+
+If successful, the VRPD3 LED will turn orange during inclusion and then green. The LED will flash red if it fails.
+    </MetaDataItem>
+  <MetaDataItem name="ExclusionDescription">1. Place controller in exclusion mode
+2. Press button on front of VRPD3
+
+If successful, the VRPD3 LED will turn orange during exclusion and then green. The LED will flash red if it fails.</MetaDataItem>
+  <MetaDataItem name="ResetDescription">1. Hold the control button for 5 seconds until the LED begins to flash amber
+2. Continue holding the control button until the LED turns red
+3. The plug-in dimmer module is reset</MetaDataItem>
+  <MetaDataItem name="Name">Scene Capable Plug-in Dimmer</MetaDataItem>
+  <MetaDataItem id="0334" name="FrequencyName" type="1706">U.S. / Canada / Mexico</MetaDataItem>
+  <ChangeLog>
+   <Entry author="Josh Palmer" date="27 July 2020" revision="1">Initial update based on vrpa1, Leviton documentation, and CD-Jackson's Z-Wave Database</Entry>
+  </ChangeLog>
+  <MetaDataItem id="0334" name="ZWProductPage" type="1706">https://products.z-wavealliance.org/products/1958</MetaDataItem>
+ </MetaData>
+ <!-- Configuration Parameters -->
+ <CommandClass id="112">
+  <!-- None -->
+ </CommandClass>
+ <!-- Association Groups -->
+ <CommandClass id="133">
+  <Associations num_groups="1">
+   <Group index="1" label="Lifeline" max_associations="5"/>
+  </Associations>
+ </CommandClass>
+</Product>
diff --git a/config/leviton/zw15r.xml b/config/leviton/zw15r.xml
new file mode 100644
index 00000000..9eec9af5
--- /dev/null
+++ b/config/leviton/zw15r.xml
@@ -0,0 +1,41 @@
+<!--
+ZW15R Decora Smart Tamper-Resistant Outlet with Z-Wave Technology, https://products.z-wavealliance.org/products/3829?selectedFrequencyId=2
+-->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+    <MetaData>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0002:0037</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/leviton/zw15r.png</MetaDataItem>
+        <MetaDataItem name="ZWProductPage" id="0002" type="0037">https://products.z-wavealliance.org/products/3829/</MetaDataItem>
+        <MetaDataItem name="ResetDescription">When removing an outlet from a network it is best practice to use the exclusion process. In situations where a device needs to be returned to factory default follow the following steps. A reset should only be used when a controller is inoperable or missing. 1. Hold the button for 7 seconds, the status light will turn amber. Continue holding the button for another 7 seconds (total of 14 seconds). The status light will quickly flash red/amber. 2. Release the button and the device will reset.</MetaDataItem>
+        <MetaDataItem name="InclusionDescription">For older controllers Classic Inclusion is supported. Depending on the age of the controller the controller will need to be 3 to 35 feet from the device when including. 1. To enter programming mode, hold the button for 7 seconds. The status light will turn amber, release and the status light will blink. 2. Follow the Z-Wave controller instructions to enter exclusion mode. 3. Tap the top of the button one time. The status light will quickly flash green. 4. The Z-Wave controller will confirm successful exclusion from the network.</MetaDataItem>
+        <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3829/Draft%20ZW4SF%203-25-20.pdf</MetaDataItem>
+        <MetaDataItem name="Identifier" id="0002" type="0037">ZW15R</MetaDataItem>
+        <MetaDataItem name="Name">Fan Speed Controller</MetaDataItem>
+        <MetaDataItem name="Description">4 Speed Fan controller 120VAC. Compatible with pull chain ceiling fans without electronic control. White paddle and vanishing LEDs. Color change kits are available to change to Light Almond, Ivory, Black, Brown, Gray. </MetaDataItem>
+        <MetaDataItem name="FrequencyName" id="0002" type="0037">U.S. / Canada / Mexico</MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">When removing an outlet from a Z-Wave network, best practice is to use the exclusion command found in the Z-Wave controller. 1. To enter programming mode, hold the button for 7 seconds. The status light will turn amber, release and the status light will blink. 2. Follow Z-Wave controller directions to enter exclusion mode 3. Tap the button 1 time. The status light will quickly flash green. 4. The Z-Wave controller will remove the device from the network</MetaDataItem>
+        <ChangeLog>
+            <Entry author="Bill Li" date="28 Nov 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3829/xml</Entry>
+        </ChangeLog>
+    </MetaData>
+    <!-- Configuration Parameters -->
+    <CommandClass id="112">
+        <Value genre="config" index="7" label="Locator LED Status" max="255" min="0" size="1" type="list" units="" value="255">
+            <Help>Change the mode of the LED to Status Mode where the LED is illuminated when the load is On, Locator Mode where the LED is illuminated when the Load is Off, or turns off the LED completely for any other setting values.</Help>
+            <Item label="LED Off" value="0"/>
+            <Item label="Status Mode" value="254"/>
+            <Item label="Locator Mode" value="255"/>
+        </Value>
+    </CommandClass>
+    <!-- Association Groups -->
+    <CommandClass id="133">
+        <Associations num_groups="1">
+            <Group index="1" label="Lifeline" max_associations="5"/>
+        </Associations>
+    </CommandClass>
+    <CommandClass id="134">
+        <Compatibility>
+            <ClassGetVersionSupported>false</ClassGetVersionSupported>
+        </Compatibility>
+    </CommandClass>
+</Product>
diff --git a/config/leviton/zw4sf.xml b/config/leviton/zw4sf.xml
new file mode 100644
index 00000000..ea3c21cc
--- /dev/null
+++ b/config/leviton/zw4sf.xml
@@ -0,0 +1,62 @@
+<!--
+Leviton Decora Smart 4 Speed Fan Controller, https://products.z-wavealliance.org/products/3832/
+-->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/001D:0002:0038</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/leviton/zw4sf.png</MetaDataItem>
+    <MetaDataItem id="0002" name="ZWProductPage" type="0038">https://products.z-wavealliance.org/products/3832/</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Factory Default When removing a fan speed controller from a network it is best practice to use the exclusion process. In situations where a device needs to be returned to factory default follow the following steps. A reset should only be used when a controller is inoperable or missing. 1. Hold the top of the paddle for 7 seconds, the status light will turn amber. Continue holding the top paddle for another 7 seconds (total of 14 seconds). The status light will quickly flash red/ amber. 2. Release the top of the paddle and the device will reset.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Classic Inclusion To A Z-Wave Network For older controllers Classic Inclusion is supported. Depending on the age of the controller the controller will need to be 3 to 35 feet from the device when including. 1. To enter programming mode, hold the button for 7 seconds. The status light will turn amber, release and the status light will blink. 2. Follow the Z-Wave controller instructions to enter inclusion mode. 3. Tap the top or the paddle of the paddle one time. The status light will quickly flash green. 4. The Z-Wave controller will confirm successful inclusion to the network.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3832/Draft%20ZW4SF%203-25-20.pdf</MetaDataItem>
+    <MetaDataItem id="0002" name="Identifier" type="0038">ZW4SF</MetaDataItem>
+    <MetaDataItem name="Name">Fan Speed Controller</MetaDataItem>
+    <MetaDataItem name="Description">4 Speed Fan controller 120VAC. Compatible with pull chain ceiling fans without electronic control. White paddle and vanishing LEDs. Color change kits are available to change to Light Almond, Ivory, Black, Brown, Gray. </MetaDataItem>
+    <MetaDataItem id="0002" name="FrequencyName" type="0038">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Exclusion From A Z-Wave Network When removing an fan speed controller from a Z-Wave network, best practice is to use the exclusion command found in the Z-Wave controller. 1. To enter programming mode, hold the button for 7 seconds. The status light will turn amber, release and the status light will blink. 2. Follow Z-Wave controller directions to enter exclusion mode 3. Tap the the top of the paddle 1 time. The status light will quickly flash green. 4. The Z-Wave controller will remove the device from the network.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Brian Laferriere" date="03 Oct 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3832/xml</Entry>
+    </ChangeLog>
+    <MetaDataItem id="0002" name="ZWProductPage" type="0038">https://products.z-wavealliance.org/products/3382/</MetaDataItem>
+    <MetaDataItem id="0002" name="FrequencyName" type="0038">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0002" name="Identifier" type="0038">ZW4SF</MetaDataItem>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="Min Level" max="99" min="0" size="1" type="byte" units="" value="10">
+      <Help>
+				Minimum Fan Speed level allowed
+			</Help>
+    </Value>
+    <Value genre="config" index="4" label="Max Level" max="99" min="0" size="1" type="byte" units="" value="99">
+      <Help>
+				Maximum Fan Speed level allowed
+			</Help>
+    </Value>
+    <Value genre="config" index="5" label="Preset Level" max="99" min="0" size="1" type="byte" units="" value="0">
+      <Help>Preset Level for On</Help>
+    </Value>
+    <Value genre="config" index="6" label="LED Dim Level Indicator Timeout" max="255" min="0" size="1" type="list" units="" value="3">
+      <Help>The length of time in seconds that the level indicators should stay illuminated after the dimming level is changed.  A value of 0 means the indicator is always off, and a value of 255 means the indicators are always on.</Help>
+      <Item label="Level Indicators Always Off" value="0"/>
+      <Item label="Level Indicators Always On" value="255"/>
+    </Value>
+    <Value genre="config" index="7" label="Locator LED Status" max="255" min="0" size="1" type="list" units="" value="255">
+      <Help>Change the mode of the LED to Status Mode where the LED is illuminated when the load is On, Locator Mode where the LED is illuminated when the Load is Off, or turns off the LED completely for any other setting values.</Help>
+      <Item label="LED Off" value="0"/>
+      <Item label="Status Mode" value="254"/>
+      <Item label="Locator Mode" value="255"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+  <CommandClass id="134">
+    <Compatibility>
+      <ClassGetVersionSupported>false</ClassGetVersionSupported>
+    </Compatibility>
+  </CommandClass>
+</Product>
diff --git a/config/linear/LB60Z-1.xml b/config/linear/LB60Z-1.xml
index dce4ec6a..ead9c14a 100644
--- a/config/linear/LB60Z-1.xml
+++ b/config/linear/LB60Z-1.xml
@@ -1,4 +1,4 @@
-<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/014F:3038:4754</MetaDataItem>
     <MetaDataItem name="ProductPic">images/linear/LB60Z-1.png</MetaDataItem>
@@ -41,6 +41,7 @@ Note: If Inclusion still fails after the 2nd attempt, you need to first RESET th
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="3">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1290/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1291/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1414/xml</Entry>
+      <Entry author="Socalix" date="08 Sep 2020" revision="6">Updated Configuration Parameters from manufacturer's product data</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Parameters -->
@@ -50,6 +51,16 @@ Note: If Inclusion still fails after the 2nd attempt, you need to first RESET th
       <Item label="Full Brightness" value="0"/>
       <Item label="Last Dim Setting" value="1"/>
     </Value>
+    <Value genre="config" index="9" label="Dim / Bright Step Level" max="99" min="1" size="1" type="byte" units="steps" value="1">
+      <Help>How much the bulb brightness will change. A low value (1) provides gradual dimming and brightening, a high value (99) makes it change rapidly.</Help>
+      <Item label="Low" value="1"/>
+      <Item label="High" value="99"/>
+    </Value>
+    <Value genre="config" index="10" label="Dim / Bright Speed" max="10" min="1" size="1" type="byte" units="steps" value="3">
+      <Help>How fast the bulb brightness will change. When the value is low (1), the step timing is quick. When the value is high (10), the step timing is slow.</Help>
+      <Item label="Fast" value="1"/>
+      <Item label="Slow" value="10"/>
+    </Value>
   </CommandClass>
   <!-- COMMAND_CLASS_ASSOCIATION -->
   <CommandClass id="133">
diff --git a/config/linear/WT00Z5-1.xml b/config/linear/WT00Z5-1.xml
new file mode 100644
index 00000000..b4670aa2
--- /dev/null
+++ b/config/linear/WT00Z5-1.xml
@@ -0,0 +1,56 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Smart 3-Way Switch/Dimmer</MetaDataItem>
+    <MetaDataItem name="Description">The WT00Z5-1 Wall Mount Accessory Dimmer Switch allows remote ON/OFF control and dimming of lights controlled by associated Z-Wave modules, creating virtual 3-way switches. The WT00Z5-1 controls no load directly, so it can be wired anywhere power is available, without the need for a traveler wire.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/014f:3530:5754</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.gocontrol.com/detail.php?productId=1782</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.gocontrol.com/support.php</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/linear/WT00Z5-1.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/1888/10007350B%20.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Refer to your Controller operating instructions to add this switch under the command of the Wireless Controller.
+1. With your Controller in Discovery or Add Mode, tap the switch. The LED will blink slowly when in ADD Mode.
+2. You should see an indication on your Controller that the “device was added” to the network and the LED will stop blinking.
+3. The device will appear in the list of Switches. It should display as a switch.
+If the Controller/Gateway shows the addition failed, repeat Steps 1-3.
+NOTE: If you have trouble adding the WT00Z5-1 to a group it may be that the Home ID and Node ID were not cleared from it after testing. You must first “RESET UNIT” to remove it from the network. Although adding it to a group includes it in the network, removing it from a group does not remove it from the network. If removed from a group, it functions as a repeater (only). “RESET UNIT” removes it completely from the network.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">The WT00Z5-1 can be removed from the network by the Controller/Gateway. Refer to the Controller operating instructions for details.
+1. Set the Controller into Removal Mode and follow its instruction to delete the WT00Z5-1 from the Controller.
+2. Remove the switch by tapping the paddle 2 times. The LED will begin blinking slowly for 10 seconds indicating that it has been removed.
+3. You should see an indication on your Controller that the “device was removed” from the network.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">In the event that your primary Controller is lost or otherwise inoperable, to reset the WT00Z5-1 and clear all network information, follow these steps:
+1. Tap the top of the switch five (5) times.
+2. Press and hold the bottom of the switch for 15 seconds. The LED will increasingly blink faster to indicate that a Reset is taking place.</MetaDataItem>
+    <MetaDataItem id="3530" name="ZWProductPage" type="5754">https://products.z-wavealliance.org/products/1888</MetaDataItem>
+    <MetaDataItem id="3530" name="FrequencyName" type="5754">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="3530" name="Identifier" type="5754">WT00Z5-1</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Nathan Spencer - natekspencer@gmail.com" date="06 July 2020" revision="1">Initial entry with data obtained from https://products.z-wavealliance.org/products/1888</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value type="list" index="3" genre="config" label="Night Light" units="" min="0" max="4" value="0" size="1">
+      <Help>
+        By default, the LED on the WT00Z5-1 will turn OFF when the Associated device is turned ON.
+      </Help>
+      <Item label="LED OFF when the load is on" value="0" />
+      <Item label="LED ON when the load is on" value="1" />
+      <Item label="LED is always ON" value="2" />
+      <Item label="LED is always OFF" value="3" />
+      <Item label="LED blinks during RF transmissions" value="4" />
+    </Value>
+    <Value type="list" index="4" genre="config" label="Invert Switch" units="" min="0" max="1" value="0" size="1">
+      <Help>
+        Change the top of the switch to OFF and the bottom of the switch to ON.
+      </Help>
+      <Item label="False" value="0" />
+      <Item label="True" value="1" />
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" max_associations="1" label="Lifeline" />
+      <Group index="2" max_associations="5" label="BASIC On/Off" />
+      <Group index="3" max_associations="5" label="Multilevel Switch" />
+    </Associations>
+  </CommandClass>
+</Product>
\ No newline at end of file
diff --git a/config/logicsoft/ZDB5100.xml b/config/logicsoft/ZDB5100.xml
index 5e5eb9e1..53276735 100644
--- a/config/logicsoft/ZDB5100.xml
+++ b/config/logicsoft/ZDB5100.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="5"
+  xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="Name">Matrix</MetaDataItem>
     <MetaDataItem name="Description">MATRIX ZDB5100 is a dimmer wall switch module with four backlit pushbuttons. MATRIX is designed to fit into 1-module FUGA® wall boxes (Danish standard).</MetaDataItem>
@@ -15,18 +16,36 @@
     <MetaDataItem id="0121" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
     <MetaDataItem id="0121" name="Identifier" type="0003">ZDB5100</MetaDataItem>
     <ChangeLog>
-      <Entry author="Dennis Staal - staal.dennis@gmail.com" date="10 August 2019" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3399/xml</Entry>
+      <Entry author="Dennis Staal - staal.dennis@gmail.com" date="10 August 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3399/xml</Entry>
+      <Entry author="Jean-François Auger - nechry@gmail.com" date="15 January 2021" revision="3">Convert param 1 to a bitset</Entry>
+      <Entry author="Jean-François Auger - nechry@gmail.com" date="15 January 2021" revision="4">Remove duplicate entry</Entry>	 
+      <Entry author="Jean-François Auger - nechry@gmail.com" date="18 January 2021" revision="5">Add bitmask on param 1</Entry>	    
     </ChangeLog>
   </MetaData>
   <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
   <CommandClass id="112">
-    <Value genre="config" index="1" instance="1" label="Operating pushbutton(s) for dimmer" max="1" min="0" size="1" type="list" value="1">
+<Value genre="config" index="1" instance="1" label="Operating pushbutton(s) for dimmer" size="1" type="bitset" bitmask="15" value="1">
       <Help>This parameter specifies which pushbutton(s) that shall be used to control the built-in dimmer.</Help>
-      <Item label="No local operation of the dimmer" value="0"/>
-      <Item label="Pushbutton 1 controls the dimmer" value="1"/>
-      <Item label="Pushbutton 2 controls the dimmer" value="2"/>
-      <Item label="Pushbutton 3 controls the dimmer" value="3"/>
-      <Item label="Pushbutton 4 controls the dimmer" value="4"/>
+      <BitSet id="0">
+        <Label>No local operation of the dimmer</Label>
+        <Help>No local operation of the dimmer</Help>
+      </BitSet>
+      <BitSet id="1">
+        <Label>Pushbutton 1</Label>
+        <Help>Pushbutton 1 controls the dimmer</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Pushbutton 2</Label>
+        <Help>Pushbutton 2 controls the dimmer</Help>
+      </BitSet>
+      <BitSet id="4">
+        <Label>Pushbutton 3</Label>
+        <Help>Pushbutton 3 controls the dimmer</Help>
+      </BitSet>
+      <BitSet id="8">
+        <Label>Pushbutton 4</Label>
+        <Help>Pushbutton 4 controls the dimmer</Help>
+      </BitSet>
     </Value>
     <Value genre="config" index="2" instance="1" label="Duration of dimming" max="255" min="0" type="byte" value="5">
       <Help>
diff --git a/config/manufacturer_specific.xml b/config/manufacturer_specific.xml
index a2423592..a437a633 100644
--- a/config/manufacturer_specific.xml
+++ b/config/manufacturer_specific.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<ManufacturerSpecificData Revision="98" xmlns="https://github.com/OpenZWave/open-zwave">
+<ManufacturerSpecificData Revision="172" xmlns="https://github.com/OpenZWave/open-zwave">
   <Manufacturer id="0028" name="2B Electronics"></Manufacturer>
   <Manufacturer id="0098" name="2GIG Technologies">
     <Product config="2gig/ct50e.xml" id="015e" name="CT50e Thermostat" type="3200"/>
@@ -19,13 +18,17 @@
     <Product config="2gig/ct101.xml" id="000b" name="CT101 Thermostat (Iris)" type="6501"/>
     <Product config="2gig/ct101.xml" id="000c" name="CT101 Thermostat (Iris)" type="6501"/>
     <Product config="2gig/ct101.xml" id="000d" name="CT101 Thermostat" type="6501"/>
+    <Product config="2gig/ct200.xml" id="0022" name="Vivint Element Thermostat" type="c801"/>
+    <Product config="2gig/ct200.xml" id="001d" name="Vivint Element Thermostat" type="c801"/>
   </Manufacturer>
   <Manufacturer id="002a" name="3e Technologies"></Manufacturer>
   <Manufacturer id="0022" name="A-1 Components"></Manufacturer>
   <Manufacturer id="0117" name="Abilia"></Manufacturer>
   <Manufacturer id="0400" name="Abode"></Manufacturer>
   <Manufacturer id="0409" name="ABUS August Bremicker Sohne KG"></Manufacturer>
-  <Manufacturer id="0403" name="ABUS Security-Center GmbH Co. KG"></Manufacturer>
+  <Manufacturer id="0403" name="ABUS Security-Center GmbH Co. KG">
+    <Product config="abus/SHRM10000.xml" id="0003" name="Smart Smoke Sensor SHRM10000" type="0002"/>
+  </Manufacturer>
   <Manufacturer id="034A" name="AcroComm Corp"></Manufacturer>
   <Manufacturer id="0001" name="ACT">
     <Product id="3130" name="ZCS101 Serial Interface" type="4349"/>
@@ -85,11 +88,11 @@
     <Product config="aeotec/dsc35103.xml" id="0011" name="DSC35103 Micro Double Switch" type="0003"/>
     <Product config="aeotec/dsd37.xml" id="0025" name="DSD37 Range Extender" type="0004"/>
     <!-- EU-market products start with type prefix "00" -->
-        <!-- US-market products start with type prefix "01" -->
-        <!-- AU-market products start with type prefix "02" -->
-        <!-- JP-market products start with type prefix "0A" -->
-        <!-- CN-market products start with type prefix "1D" -->
-        <!-- RU-market products start with type prefix "1A" -->
+    <!-- US-market products start with type prefix "01" -->
+    <!-- AU-market products start with type prefix "02" -->
+    <!-- JP-market products start with type prefix "0A" -->
+    <!-- CN-market products start with type prefix "1D" -->
+    <!-- RU-market products start with type prefix "1A" -->
     <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0004"/>
     <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0104"/>
     <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0204"/>
@@ -207,7 +210,7 @@
     <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0002"/>
     <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0102"/>
     <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0202"/>
-    <Product config="aeotec/zwa021.xml" id="0015" name="ZWA021 Thermostatic Valve" type="0002"/>      
+    <Product config="aeotec/zwa021.xml" id="0015" name="ZWA021 Thermostatic Valve" type="0002"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="0003"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="0103"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="0203"/>
@@ -217,9 +220,20 @@
     <Product config="aeotec/zwa008.xml" id="0007" name="ZWA008 Door Window Sensor 7" type="0002"/>
     <Product config="aeotec/zwa008.xml" id="0007" name="ZWA008 Door Window Sensor 7" type="0102"/>
     <Product config="aeotec/zwa008.xml" id="0007" name="ZWA008 Door Window Sensor 7" type="0202"/>
+    <Product config="aeotec/zwa009.xml" id="0009" name="ZWA009 AërQ Temperature &amp; Humidity Sensor" type="0002"/>
+    <Product config="aeotec/zwa009.xml" id="0009" name="ZWA009 AërQ Temperature &amp; Humidity Sensor" type="0102"/>
+    <Product config="aeotec/zwa009.xml" id="0009" name="ZWA009 AërQ Temperature &amp; Humidity Sensor" type="0202"/>
+    <Product config="aeotec/zwa011.xml" id="000B" name="ZWA011 Door Window Sensor 7" type="0002"/>
+    <Product config="aeotec/zwa012.xml" id="000C" name="ZWA012 Door Window Sensor 7 Pro" type="0002"/>
+    <Product config="aeotec/zwa012.xml" id="000C" name="ZWA012 Door Window Sensor 7 Pro" type="0102"/>
+    <Product config="aeotec/zwa012.xml" id="000C" name="ZWA012 Door Window Sensor 7 Pro" type="0202"/>
+    <Product config="aeotec/zwa019.xml" id="0013" name="ZWA019 Water Sensor 7 Pro" type="0002"/>
+    <Product config="aeotec/zwa019.xml" id="0013" name="ZWA019 Water Sensor 7 Pro" type="0102"/>
+    <Product config="aeotec/zwa019.xml" id="0013" name="ZWA019 Water Sensor 7 Pro" type="0202"/>
+    <Product config="aeotec/zwa023.xml" id="0017" name="ZWA023 Smart Switch 7" type="0103"/>
     <Product config="aeotec/zw141.xml" id="008d" name="ZW141 Nano Shutter" type="0003"/>
-    <Product config="aeotec/zw141.xml" id="008d" name="ZW141 Nano Shutter" type="0103"/>  
-    <Product config="aeotec/zw141.xml" id="008d" name="ZW141 Nano Shutter" type="0203"/>      
+    <Product config="aeotec/zw141.xml" id="008d" name="ZW141 Nano Shutter" type="0103"/>
+    <Product config="aeotec/zw141.xml" id="008d" name="ZW141 Nano Shutter" type="0203"/>
     <Product config="aeotec/zw164.xml" id="00a4" name="ZW164 Indoor Siren 6" type="0003"/>
     <Product config="aeotec/zw164.xml" id="00a4" name="ZW164 Indoor Siren 6" type="0103"/>
     <Product config="aeotec/zw175.xml" id="00af" name="ZW175 Smart Switch 7" type="0003"/>
@@ -261,14 +275,14 @@
     <Product config="assa_abloy/TouchDeadbolt.xml" id="0209" name="Yale Key Free Touchscreen Deadbolt (YRD240)" type="0002"/>
     <Product config="assa_abloy/TouchDeadbolt.xml" id="0600" name="Yale Key Free Touchscreen Deadbolt (YRD446)" type="8002"/>
     <Product config="assa_abloy/TouchDeadbolt.xml" id="1000" name="Yale Key Free Touchscreen Deadbolt (YRD446)" type="8002"/>
-    <Product config="assa_abloy/TouchDeadbolt.xml" id="0800" name="Yale Touchscreen Deadbolt (YRD120)" type="0002"/>
     <Product config="assa_abloy/PushButtonLever.xml" id="0409" name="Yale Push Button Lever Lock (YRL210)" type="0003"/>
     <Product config="assa_abloy/PushButtonLever.xml" id="0800" name="Yale Push Button Lever Lock (YRL210)" type="0003"/>
+    <Product config="assa_abloy/PushButtonLever.xml" id="0f00" name="Yale Push Button Lever Lock (YRL226)" type="800c"/>
     <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0000" name="Yale Push Button Deadbolt (YRD210)" type="0004"/>
     <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0209" name="Yale Push Button Deadbolt (YRD210)" type="0004"/>
     <Product config="assa_abloy/PushButtonDeadbolt.xml" id="aa00" name="Yale Push Button Deadbolt (YRD210)" type="0004"/>
     <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0600" name="Yale Push Button Deadbolt (YRD216)" type="8004"/>
-    <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0800" name="Yale Push Button Deadbolt (YRD110)" type="0004"/>
+    <Product config="assa_abloy/ProSLKey-FreeDeadbolt.xml" id="0508" name="Yale ProSL Push Button Deadbolt (YRD136)" type="803b"/>
     <Product config="assa_abloy/TouchDeadbolt.xml" id="0000" name="Yale Key Free Touchscreen Deadbolt (YRD240)" type="0006"/>
     <Product config="assa_abloy/KeyfreeConnected.xml" id="0000" name="Yale Keyless Connected Smart Lock (YSL)" type="0007"/>
     <Product config="assa_abloy/KeyfreeConnected.xml" id="9230" name="Yale Keyless Connected Smart Lock (YSL)" type="1bef"/>
@@ -278,6 +292,9 @@
     <Product config="assa_abloy/KeyfreeConnected-plus.xml" id="0000" name="Yale Keyfree Connected Smart Lock (YKFCON)" type="0600"/>
     <Product config="assa_abloy/nexTouch.xml" id="0b00" name="Yale nexTouch Wireless Push Button (NTB610)" type="8001"/>
     <Product config="assa_abloy/nexTouch.xml" id="0b00" name="Yale nexTouch Wireless Push Button (NTB620)" type="8003"/>
+    <Product config="assa_abloy/yrd1x0.xml" id="0800" name="YRD110 Push Button Deadbolt" type="0004"/>
+    <Product config="assa_abloy/yrd1x0.xml" id="0800" name="YRD120 Touchscreen Deadbolt" type="0002"/>
+    <Product config="assa_abloy/yrm276.xml" id="1604" name="Yale Assure Lock for Andersen Patio Doors (YRM276)" type="8014"/>
   </Manufacturer>
   <Manufacturer id="013B" name="AstraLink"></Manufacturer>
   <Manufacturer id="0134" name="AT&amp;T"></Manufacturer>
@@ -338,7 +355,9 @@
   <Manufacturer id="0145" name="Buffalo">
     <Product config="buffalo/hw-100v15a-zw.xml" id="0004" name="HW-100V15A-ZW Measure Power Monitor" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0190" name="Building 36 Technologies"></Manufacturer>
+  <Manufacturer id="0190" name="Building 36 Technologies">
+    <Product config="building36/b36-t10.xml" id="0001" name="B36-T10" type="0001"/>
+  </Manufacturer>
   <Manufacturer id="0396" name="Bulcraft Control"></Manufacturer>
   <Manufacturer id="0026" name="BuLogics"></Manufacturer>
   <Manufacturer id="0398" name="Calix"></Manufacturer>
@@ -369,7 +388,7 @@
   <Manufacturer id="0140" name="Computime"></Manufacturer>
   <Manufacturer id="011B" name="Connected Object"></Manufacturer>
   <Manufacturer id="0179" name="ConnectHome">
-    <Product id="0001" name="CH-201 Thermostat" type="0001"/>
+    <Product config="connecthome/ch-201.xml" id="0021" name="CH-201 Thermostat" type="0013"/>
   </Manufacturer>
   <Manufacturer id="0285" name="CONNECTION TECHNOLOGY SYSTEMS"></Manufacturer>
   <Manufacturer id="025D" name="Contec intelligent housing"></Manufacturer>
@@ -386,6 +405,7 @@
     <Product config="cooper/RF9501.xml" id="0000" name="RF9501 Light Switch" type="534c"/>
     <Product config="cooper/RF9517.xml" id="0000" name="RF9517 Accessory Light Switch" type="5352"/>
     <Product config="cooper/RFWC5.xml" id="0000" name="RFWC5/RFWDC Scene Controller" type="574d"/>
+    <Product config="cooper/RF9601.xml" id="0503" name="RF9601 Light Switch" type="534c"/>
   </Manufacturer>
   <Manufacturer id="009d" name="Coventive Technologies Inc."></Manufacturer>
   <Manufacturer id="0379" name="CPRO"></Manufacturer>
@@ -479,6 +499,9 @@
   <Manufacturer id="017C" name="EbV"></Manufacturer>
   <Manufacturer id="016B" name="Echostar"></Manufacturer>
   <Manufacturer id="028F" name="Eco Automation"></Manufacturer>
+  <Manufacturer id="0431" name="EcoDim">
+    <Product config="ecodim/0.7.xml" id="0002" name="ECO-DIM.07 Z-Wave LED dimmer" type="0202"/>
+  </Manufacturer>
   <Manufacturer id="037C" name="Eco Life Engineering Co. Ltd."></Manufacturer>
   <Manufacturer id="014a" name="Ecolink">
     <Product config="ecolink/sensor.xml" id="0001" name="Motion Sensor" type="0001"/>
@@ -490,7 +513,9 @@
     <Product config="ecolink/floodfreeze.xml" id="0010" name="Flood/Freeze Sensor" type="0005"/>
     <Product config="ecolink/firefighter.xml" id="000f" name="FireFighter" type="0005"/>
   </Manufacturer>
-  <Manufacturer id="0157" name="EcoNet Controls"></Manufacturer>
+  <Manufacturer id="015d" name="EcoNet Controls">
+    <Product config="econet/ezw1204.xml" id="c41c" name="EZW1204 Water Leak Sensor" type="2003"/>
+  </Manufacturer>
   <Manufacturer id="039D" name="ECS"></Manufacturer>
   <Manufacturer id="031F" name="Eelectron SpA"></Manufacturer>
   <Manufacturer id="026B" name="Ei Electronics"></Manufacturer>
@@ -509,6 +534,8 @@
     <Product config="dome/0087.xml" id="0087" name="On/Off Plug-In Switch" type="0003"/>
     <Product config="dome/0088.xml" id="0088" name="Siren" type="0003"/>
     <Product config="dome/0101.xml" id="0101" name="Door/Window Sensor" type="0003"/>
+    <Product config="dome/0104.xml" id="0104" name="Mouser" type="0003"/>
+    <Product config="dome/dmex1.xml" id="0108" name="DMEX1 Range Extender" type="0003"/>
     <Product config="dome/0201.xml" id="0201" name="Door/Window Sensor Pro" type="0003"/>
   </Manufacturer>
   <Manufacturer id="001b" name="ELK Products"></Manufacturer>
@@ -542,7 +569,7 @@
     <Product config="enerwave/zw15s.xml" id="0102" name="ZW15S 15A On/Off Switch" type="0101"/>
     <Product config="enerwave/zw20r.xml" id="0603" name="ZW20R 20A TR Duplex Receptacle" type="0101"/>
     <Product config="enerwave/zwnrsm1plus.xml" id="0605" name="ZWN-RSM1 PLUS—Smart Single Relay Switch Module" type="0111"/>
-    <!--<Product type="0111" id="0605" name="ZWN-RSM2-PLUS Smart Single Relay Switch Module" config="enerwave/zwnrsm2plus.xml"/>-->
+    <Product config="enerwave/zwnrsm2plus.xml" id="0606" name="ZWN-RSM2-PLUS Smart Single Relay Switch Module" type="0111"/>
     <Product config="enerwave/zw20rm.xml" id="0101" name="ZW20RM 20A TR Smart Meter Duplex Receptacle" type="0111"/>
     <Product config="enerwave/zw500d.xml" id="0201" name="ZW500D 500W In-Wall Preset Dimmer Switch" type="0102"/>
     <Product config="enerwave/zw15rmplus.xml" id="0105" name="ZW15RM Plus 15A TR Smart Meter Duplex Receptacle" type="0111"/>
@@ -580,6 +607,7 @@
     <Product config="evolve/lfm-20.xml" id="3133" name="LFM-20 Fixture Module" type="5246"/>
     <Product config="evolve/lsm-15.xml" id="3533" name="LSM-15 Wall Switch" type="5257"/>
     <Product config="evolve/ltm-5.xml" id="3033" name="LTM-5 Wall Switch Transmitter" type="5457"/>
+    <Product config="evolve/t-100.xml" id="5434" name="T-100 Thermostat" type="4556" />
   </Manufacturer>
   <Manufacturer id="036F" name="Evolvere SpA"></Manufacturer>
   <Manufacturer id="0036" name="Exceptional Innovations"></Manufacturer>
@@ -593,12 +621,14 @@
     <Product config="fakro/zws12.xml" id="0001" name="ZWS12 Chain actuator 12VDC" type="0003"/>
     <Product config="fakro/zws230.xml" id="0002" name="ZWS230 Chain actuator 230VAC" type="0003"/>
     <Product config="fakro/zwrs.xml" id="0001" name="ZWRS Roller Shutter FLiRS module" type="0016"/>
+    <Product config="fakro/arzsolar.xml" id="0012" name="ARZ SOLAR Roof Window Roller Shutter" type="0003"/>
+    <Product config="fakro/zrh12.xml" id="0004" name="ZRH12 Portable Remote Controller" type="0001"/>
   </Manufacturer>
   <Manufacturer id="016a" name="Fantem (Oomi)">
     <!-- EU-market products seems to start with type prefix "00" -->
-        <!-- US-market products start with type prefix "01" -->
-        <!-- AU-market products start with type prefix "02" -->
-        <!-- CN-market products start with type prefix "1D" -->
+    <!-- US-market products start with type prefix "01" -->
+    <!-- AU-market products start with type prefix "02" -->
+    <!-- CN-market products start with type prefix "1D" -->
     <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="0002"/>
     <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="0102"/>
     <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="0202"/>
@@ -607,7 +637,7 @@
     <Product config="oomi/ft111.xml" id="006F" name="FT111 In Wall Dimmer" type="0203"/>
     <Product config="oomi/ft111.xml" id="006F" name="FT111 In Wall Dimmer" type="1D03"/>
     <Product config="oomi/ft112.xml" id="0070" name="FT112 Door-window sensor" type="0002"/>
-    <Product config="oomi/ft118.xml" id="0076" name="FT118 Range extender 6" type="0004"/>  
+    <Product config="oomi/ft118.xml" id="0076" name="FT118 Range extender 6" type="0004"/>
   </Manufacturer>
   <Manufacturer id="010f" name="FIBARO System">
     <Product config="fibaro/fgbs001.xml" id="0101" name="FGBS001 Universal Binary Sensor" type="0501"/>
@@ -617,6 +647,8 @@
     <Product config="fibaro/fgbs001.xml" id="3002" name="FGBS001 Universal Binary Sensor" type="0501"/>
     <Product config="fibaro/fgbs001.xml" id="4002" name="FGBS001 Universal Binary Sensor" type="0501"/>
     <Product config="fibaro/fgbs222.xml" id="1000" name="FGBS222 Smart Implant" type="0502"/>
+    <Product config="fibaro/fgbs222.xml" id="2000" name="FGBS222 Smart Implant" type="0502"/>
+    <Product config="fibaro/fgbs222.xml" id="3000" name="FGBS222 Smart Implant" type="0502"/>
     <Product config="fibaro/fgd211.xml" id="0104" name="FGD211 Universal Dimmer 500W" type="0100"/>
     <Product config="fibaro/fgd211.xml" id="0106" name="FGD211 Universal Dimmer 500W" type="0100"/>
     <Product config="fibaro/fgd211.xml" id="0107" name="FGD211 Universal Dimmer 500W" type="0100"/>
@@ -635,6 +667,8 @@
     <Product config="fibaro/fgk10x.xml" id="2001" name="FGK10x Door Opening Sensor" type="0701"/>
     <Product config="fibaro/fgk10x.xml" id="3001" name="FGK10x Door Opening Sensor" type="0701"/>
     <Product config="fibaro/fgdw2.xml" id="1000" name="FGDW002 Door Opening Sensor 2" type="0702"/>
+    <Product config="fibaro/fgdw2.xml" id="2000" name="FGDW002 Door Opening Sensor 2" type="0702"/>
+    <Product config="fibaro/fgdw2.xml" id="3000" name="FGDW002 Door Opening Sensor 2" type="0702"/>
     <Product config="fibaro/fgr221.xml" id="0104" name="FGR221 Roller Shutter Controller" type="0300"/>
     <Product config="fibaro/fgr221.xml" id="100a" name="FGR221 Roller Shutter Controller" type="0300"/>
     <Product config="fibaro/fgr221.xml" id="0106" name="FGR221 Roller Shutter Controller" type="0300"/>
@@ -659,6 +693,8 @@
     <Product config="fibaro/fgs213.xml" id="2000" name="FGS213 Switch" type="0403"/>
     <Product config="fibaro/fgs213.xml" id="3000" name="FGS213 Switch" type="0403"/>
     <Product config="fibaro/fgs213.xml" id="4000" name="FGS213 Switch" type="0403"/>
+    <Product config="fibaro/fgs214.xml" id="1000" name="FGS214 Single Relay Switch" type="0404"/>
+    <Product config="fibaro/fgs214.xml" id="4000" name="FGS214 Single Relay Switch" type="0404"/>
     <Product config="fibaro/fgs221.xml" id="0104" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
     <Product config="fibaro/fgs221.xml" id="0105" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
     <Product config="fibaro/fgs221.xml" id="0106" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
@@ -673,10 +709,12 @@
     <Product config="fibaro/fgs223.xml" id="2000" name="FGS223 Double Relay" type="0203"/>
     <Product config="fibaro/fgs223.xml" id="3000" name="FGS223 Double Relay" type="0203"/>
     <Product config="fibaro/fgs223.xml" id="4000" name="FGS223 Double Relay" type="0203"/>
+    <Product config="fibaro/fgs224.xml" id="1000" name="FGS224 Double Smart Module" type="0204"/>
     <Product config="fibaro/fgr223.xml" id="1000" name="FGR223 Roller Shutter Controller 3" type="0303"/>
     <Product config="fibaro/fgwpe.xml" id="1000" name="FGWPE/F Wall Plug" type="0600"/>
     <Product config="fibaro/fgwpe.xml" id="1000" name="FGWPE/F Wall Plug" type="0200"/>
     <Product config="fibaro/fgwoe.xml" id="1000" name="FGWOE/F Walli Outlet" type="1f01"/>
+    <Product config="fibaro/fgwpb121.xml" id="2000" name="FGWPB-121 Wall Plug" type="1401"/>
     <Product config="fibaro/fgwpfzw5.xml" id="1001" name="FGWPE/F Wall Plug Gen5" type="0602"/>
     <Product config="fibaro/fgwpfzw5.xml" id="1003" name="FGWPE/F Wall Plug Gen5" type="0602"/>
     <Product config="fibaro/fgms.xml" id="1001" name="FGMS001 Motion Sensor" type="0800"/>
@@ -689,6 +727,7 @@
     <Product config="fibaro/fgmszw5.xml" id="2001" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
     <Product config="fibaro/fgmszw5.xml" id="2002" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
     <Product config="fibaro/fgmszw5.xml" id="3001" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
+    <Product config="fibaro/fgmszw5.xml" id="3002" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
     <Product config="fibaro/fgfs101.xml" id="3001" name="FGFS101 Flood Sensor" type="0b00"/>
     <Product config="fibaro/fgfs101.xml" id="4001" name="FGFS101 Flood Sensor" type="0b00"/>
     <Product config="fibaro/fgfs101.xml" id="1001" name="FGFS101 Flood Sensor" type="0b00"/>
@@ -697,11 +736,16 @@
     <Product config="fibaro/fgfs101zw5.xml" id="1002" name="FGFS101 Zwave+ Flood Sensor" type="0b01"/>
     <Product config="fibaro/fgfs101zw5.xml" id="1003" name="FGFS101 Zwave+ Flood Sensor" type="0b01"/>
     <Product config="fibaro/fgfs101zw5.xml" id="2002" name="FGFS101 Zwave+ Flood Sensor" type="0b01"/>
+    <Product config="fibaro/fgfs101zw5.xml" id="2003" name="FGFS101 Zwave+ Flood Sensor" type="0b01"/>
     <Product config="fibaro/fgfs101zw5.xml" id="3002" name="FGFS101 Zwave+ Flood Sensor" type="0b01"/>
     <Product config="fibaro/fgrgbwm441.xml" id="1000" name="FGRGBWM441 RGBW Controller" type="0900"/>
     <Product config="fibaro/fgrgbwm441.xml" id="2000" name="FGRGBWM441 RGBW Controller" type="0900"/>
     <Product config="fibaro/fgrgbwm441.xml" id="3000" name="FGRGBWM441 RGBW Controller" type="0900"/>
     <Product config="fibaro/fgrgbwm441.xml" id="4000" name="FGRGBWM441 RGBW Controller" type="0900"/>
+    <Product config="fibaro/fgrgbw442.xml" id="1000" name="FGRGBW442 RGBW Controller 2" type="0902"/>
+    <Product config="fibaro/fgrgbw442.xml" id="2000" name="FGRGBW442 RGBW Controller 2" type="0902"/>
+    <Product config="fibaro/fgrgbw442.xml" id="3000" name="FGRGBW442 RGBW Controller 2" type="0902"/>
+    <Product config="fibaro/fgrgbw442.xml" id="4000" name="FGRGBW442 RGBW Controller 2" type="0902"/>
     <Product config="fibaro/fgss101.xml" id="1000" name="FGSS101 Smoke Sensor" type="0c00"/>
     <Product config="fibaro/fgsd002.xml" id="1002" name="FGSD002 Smoke Sensor" type="0c02"/>
     <Product config="fibaro/fgsd002.xml" id="1003" name="FGSD002 Smoke Sensor" type="0c02"/>
@@ -718,13 +762,17 @@
     <Product config="fibaro/fgt001.xml" id="1001" name="FGT001 Heat Controller" type="1301"/>
     <Product config="fibaro/fgwpg111.xml" id="2000" name="FGWPG111 US Wall Plug" type="1701"/>
     <Product config="fibaro/fgwpg111.xml" id="1000" name="FGWPG111 UK Wall Plug" type="1801"/>
+    <Product config="fibaro/fgwds221ss.xml" id="1000" name="FGWDS221 Walli Double Switch (Single switch mode)" type="1A01"/>
     <Product config="fibaro/fgwds221.xml" id="1000" name="FGWDS221 Walli Double Switch" type="1B01"/>
     <Product config="fibaro/fgwd111.xml" id="1000" name="FGWD111 Walli Dimmer" type="1C01"/>
     <Product config="fibaro/fgwr111.xml" id="1000" name="FGWR111 Walli Roller Shutter" type="1d01"/>
+    <Product config="fibaro/fgwceu201.xml" id="1000" name="FGWCEU201 Walli Controller" type="2301"/>
   </Manufacturer>
   <Manufacturer id="0295" name="fifthplay nv"></Manufacturer>
   <Manufacturer id="0138" name="First Alert (BRK Brands Inc)">
+    <Product config="firstalert/zsmoke.xml" id="0001" name="ZSmoke Smoke Detector" type="0001"/>
     <Product config="firstalert/zcombo.xml" id="0002" name="ZCombo Smoke and Carbon Monoxide Detector" type="0001"/>
+    <Product config="firstalert/zcombo-g.xml" id="0003" name="ZCombo-G Smoke/CO Alarm" type="0001"/>
   </Manufacturer>
   <Manufacturer id="002c" name="Flex Automation"></Manufacturer>
   <Manufacturer id="004F" name="Flex Automation"></Manufacturer>
@@ -744,6 +792,7 @@
     <Product config="fortrezz/wwa02.xml" id="0109" name="WWA-02 Water and Temperature Alarm" type="0023"/>
     <Product id="0216" name="WWA-01AA Wireless Water and Freeze Alarm" type="0053"/>
     <Product config="fortrezz/wv01.xml" id="020c" name="WV-01 Automated Water Shut-Off Valve" type="0213"/>
+    <Product config="fortrezz/wv01.xml" id="aa06" name="WV-01 Automated Water Shut-Off Valve" type="0233"/>
     <Product config="fortrezz/wv01.xml" id="0300" name="WV-01 Automated Water Shut-Off Valve" type="0241"/>
     <Product config="fortrezz/wv01.xml" id="0216" name="WV-01 Automated Water Shut-Off Valve" type="0243"/>
     <Product config="fortrezz/ssa2.xml" id="0109" name="SSA1 / SSA2 - Siren/Strobe Light Alarm" type="0311"/>
@@ -770,7 +819,9 @@
     <Product config="frostdale/fdn2311.xml" id="0001" name="Nanogrid: FDN2nxx light switch - where n is 1, 2, 3 or 4 buttons" type="2411"/>
     <Product config="frostdale/fdn2nxx.xml" id="0031" name="Nanogrid: FDN2nxx light switch - where n is 1, 2, 3 or 4 buttons" type="7333"/>
   </Manufacturer>
-  <Manufacturer id="0305" name="Future Home AS"></Manufacturer>
+  <Manufacturer id="0305" name="Future Home AS">
+    <Product config="thermofloor/heatitz8.xml" id="a305" name="Future Home AS (Heatit) Z-Push Button 8" type="0300"/>
+  </Manufacturer>
   <Manufacturer id="033E" name="GE"></Manufacturer>
   <Manufacturer id="0063" name="GE (Jasco Products)">
     <Product config="ge/dimmer_module.xml" id="3030" name="45602 Lamp Dimmer Module" type="4450"/>
@@ -780,21 +831,29 @@
     <Product config="ge/12724-dimmer.xml" id="3034" name="12730 Fan Control Switch" type="4944"/>
     <Product config="ge/12724-dimmer.xml" id="3131" name="14287 Fan Control Switch" type="4944"/>
     <Product config="ge/12724-dimmer.xml" id="3032" name="12725 In-Wall 1000W Dimmer" type="4944"/>
+    <Product config="ge/14280-plugin-dimmer.xml" id="3033" name="14280 Plug-In Two-Outlet Smart Dimmer with Simultaneous Control" type="5044"/>
     <Product config="ge/14288-outlet.xml" id="3134" name="14288 In-Wall Tamper Resistant Smart Outlet" type="4952"/>
     <Product config="ge/14294-dimmer.xml" id="3038" name="14294 In-Wall Smart Dimmer" type="4944"/>
     <Product config="ge/14294-dimmer.xml" id="3039" name="14299 In-Wall 1000W Smart Dimmer" type="4944"/>
     <Product config="ge/14295-dimmer-toggle.xml" id="3130" name="14295 In-Wall Smart Toggle Dimmer" type="4944"/>
+    <Product config="ge/14298.xml" id="3034" name="14298 Plug-in Outdoor Smart Switch" type="4F50"/>
+    <Product config="ge/14322-dimmer-toggle.xml" id="3137" name="14322 In-Wall Smart Toggle Dimmer" type="4944"/>
     <Product config="ge/26931-motion-switch.xml" id="3032" name="26931 Smart Motion Switch" type="494d"/>
+    <Product config="ge/26932-motion-dimmer.xml" id="3033" name="26932 Smart Motion Dimmer" type="494d"/>
     <Product config="ge/26933-motion-dimmer.xml" id="3034" name="26933 Smart Motion Dimmer" type="494d"/>
     <Product config="ge/14291-switch.xml" id="3036" name="14291 In-Wall Smart Switch" type="4952"/>
     <Product config="ge/46201-switch.xml" id="3135" name="46201 In-Wall Smart Switch" type="4952"/>
+    <Product config="ge/46202-switch.xml" id="3137" name="46202 In-Wall Smart Switch" type="4952"/>
     <Product config="ge/46203-dimmer.xml" id="3235" name="46203 In-Wall Smart Dimmer" type="4944"/>
+    <Product config="ge/46204-dimmer-toggle.xml" id="3237" name="In-Wall Smart Toggle Dimmer" type="4944"/>
     <Product config="ge/14292-toggle-switch.xml" id="3037" name="14292 In-Wall Smart Toggle Switch" type="4952"/>
     <Product config="ge/14292-toggle-switch.xml" id="3038" name="14293 In-Wall Smart Toggle Switch" type="4952"/>
     <Product config="ge/45604.xml" id="3030" name="45603 Plugin Appliance Module" type="5250"/>
     <Product id="3130" name="45604 Outdoor Module" type="5250"/>
     <Product id="3031" name="12720 Outdoor Smart Switch" type="4f50"/>
+    <Product config="ge/12720.xml" id="3130" name="12720 Outdoor Smart Switch" type="6363"/>
     <Product config="ge/14284.xml" id="3032" name="14284 Outdoor Smart Switch" type="4f50"/>
+    <Product config="ge/14285.xml" id="3032" name="14285 Outdoor Smart Switch" type="4f44"/>
     <Product config="ge/receptacle.xml" id="3530" name="45605 Duplex Receptacle" type="5252"/>
     <Product config="ge/28167-plugin-dimmer.xml" id="3038" name="28167/ZW3104 Plug-In Smart Dimmer (Single Plug)" type="5044"/>
     <Product config="ge/receptacle.xml" id="3133" name="14288 Duplex Receptacle" type="4952"/>
@@ -818,7 +877,9 @@
   <Manufacturer id="022B" name="GKB Security Corporation"></Manufacturer>
   <Manufacturer id="018A" name="Globalchina-Tech"></Manufacturer>
   <Manufacturer id="0076" name="Goggin Research"></Manufacturer>
-  <Manufacturer id="0068" name="Good Way Technology Co. Ltd"></Manufacturer>
+  <Manufacturer id="0068" name="Good Way Technology Co. Ltd">
+    <Product config="goodway/td14010.xml" id="000b" name="RGBW Color LED Dimmer" type="0003"/>
+  </Manufacturer>
   <Manufacturer id="0099" name="GreenWave Reality Inc">
     <Product config="greenwave/gs1110-1-gr-1.xml" id="0002" name="One Gateway" type="0001"/>
     <Product config="greenwave/powernode1.xml" id="0002" name="PowerNode 1 port" type="0002"/>
@@ -833,7 +894,10 @@
   <Manufacturer id="037B" name="Guardtec Inc">
     <Product type="0002" id="0001" name="GKW-2000D Door Lock" config="guardtec/gkw2000d.xml"/>
   </Manufacturer>
-  <Manufacturer id="0287" name="HAB Home Intelligence LLC"></Manufacturer>
+  <Manufacturer id="0287" name="HAB Home Intelligence LLC">
+    <Product type="0003" id="000D" name="iblinds V2" config="hab/iblindsV2.xml"/>
+    <Product type="0004" id="0071" name="iblinds V3" config="hab/iblindsV3.xml"/>
+  </Manufacturer>
   <Manufacturer id="030D" name="Hampoo"></Manufacturer>
   <Manufacturer id="040A" name="Hangzhou Hikvision Digital Technology Co. Ltd"></Manufacturer>
   <Manufacturer id="0387" name="HangZhou iMagic Technology Co. Ltd"></Manufacturer>
@@ -852,6 +916,7 @@
     <Product config="hank/hkzw-rgb01.xml" id="0004" name="HKZW-RGB01 RGB bulb" type="0101"/>
     <Product config="hank/hkzw-so03.xml" id="000a" name="HKZW-SO03 Smart Plug" type="0101"/>
     <Product config="hank/hkzw-fld01.xml" id="000f" name="HKZW-FLD01 Flood Sensor" type="0200"/>
+    <Product config="hank/hkzw-so08-smartplug.xml" id="0019" name="HKZW-SO08 Smart Plug" type="0100"/>
   </Manufacturer>
   <Manufacturer id="024C" name="Hankook Gas Kiki CO.LTD"></Manufacturer>
   <Manufacturer id="025C" name="Hauppauge"></Manufacturer>
@@ -901,6 +966,7 @@
     <Product config="homeseer/hsm200.xml" id="0001" name="HSM200 Wireless Multi-Sensor" type="0004"/>
   </Manufacturer>
   <Manufacturer id="000c" name="HomeSeer Technologies">
+    <Product config="homeseer/hsm200.xml" id="0001" name="HSM200 Wireless Multi-Sensor" type="0004"/>
     <Product config="homeseer/hs-ws100plus.xml" id="3033" name="HS-WS100+ Wall Switch" type="4447"/>
     <Product config="homeseer/hs-wd100plus.xml" id="3034" name="HS-WD100+ Wall Dimmer" type="4447"/>
     <Product config="homeseer/hs-ws200plus.xml" id="3035" name="HS-WS200+ Wall Switch" type="4447"/>
@@ -910,6 +976,7 @@
     <Product config="homeseer/hs-ls100plus.xml" id="000a" name="HS-LS100+ Leak Sensor" type="0201"/>
     <Product config="homeseer/hs-fls100plus.xml" id="000b" name="HS-FLS100+ Floodlight Sensor" type="0201"/>
     <Product config="homeseer/hs-fc200plus.xml" id="0001" name="HS-FC200+ Z-Wave Plus Fan Controller" type="0203"/>
+    <Product config="homeseer/hs-fs100plus.xml" id="0001" name="HS-FS100+ Flex Sensor" type="0202"/>
   </Manufacturer>
   <Manufacturer id="0275" name="Honest Technology"></Manufacturer>
   <Manufacturer id="023D" name="Honest Technology Co. Ltd"></Manufacturer>
@@ -920,10 +987,13 @@
     <Product config="honeywell/39351-ZW3005.xml" id="3038" name="39351 / ZW3005 In-Wall Smart Dimmer" type="4944"/>
     <Product config="honeywell/39348-ZW4005.xml" id="3036" name="39348 / ZW4005 In-Wall Smart Switch" type="4952"/>
     <Product config="honeywell/39348-zw4008.xml" id="3135" name="39348 / ZW4008 In-Wall Smart Switch" type="4952"/>
+    <Product config="honeywell/39349-ZW1002.xml" id="3133" name="39349 / ZW1002 In-Wall Tamper Resistant Outlet" type="4952"/>
     <Product config="honeywell/39357-ZW3004.xml" id="3130" name="39357 / ZW3004 In-Wall Smart Toggle Dimmer" type="4944"/>
     <Product config="honeywell/39351-ZW3010.xml" id="3235" name="39351 / ZW3010 In-Wall Smart Dimmer" type="4944"/>
     <Product config="honeywell/39358-ZW4002.xml" id="3131" name="39358 / ZW4002 In-Wall Fan Control" type="4944"/>
     <Product config="honeywell/39449-ZW4106.xml" id="3033" name="39449 / ZW4106 Plug-in Smart Switch" type="5052"/>
+    <Product config="honeywell/2681-plugin-dimmer.xml" id="3038" name="39336 / ZW3104 Plug-in Dimmer" type="5044"/>
+    <Product config="honeywell/3830-zw3107.xml" id="3033" name="39446 / ZW3107 Plug-in Dimmer" type="5044"/>
   </Manufacturer>
   <Manufacturer id="0313" name="Hoppe"></Manufacturer>
   <Manufacturer id="0377" name="HORNBACH Baumarkt AG"></Manufacturer>
@@ -978,6 +1048,7 @@
     <Product id="0001" name="RAone SmartDimmer Wall Dimmer Module" type="0001"/>
   </Manufacturer>
   <Manufacturer id="0312" name="Inovelli">
+    <Product config="inovelli/lzw30.xml" id="ff04" name="LZW30 Switch" type="ff00"/>
     <Product config="inovelli/nzw30.xml" id="1e01" name="NZW30 Smart Switch" type="1e01"/>
     <Product config="inovelli/nzw30.xml" id="1e00" name="NZW30 Smart Switch (w/Scene)" type="1e00"/>
     <Product config="inovelli/nzw30.xml" id="1e02" name="NZW30 Smart Toggle Switch (w/Scene)" type="1e02"/>
@@ -1002,6 +1073,8 @@
     <Product type="0006" id="0001" name="LZW41 Multi-White Bulb" config="inovelli/lzw41.xml"/>
     <Product type="0007" id="0001" name="LZW40 Dimmable  Bulb" config="inovelli/lzw40.xml"/>
     <Product type="000d" id="0001" name="LZW60 4-in-1 Sensor" config="inovelli/lzw60.xml"/>
+    <Product type="000e" id="0001" name="LZW36 Fan/Light Dimmer" config="inovelli/lzw36.xml"/>
+    <Product type="000a" id="0001" name="LZW45 Light Strip" config="inovelli/lzw45.xml"/>
   </Manufacturer>
   <Manufacturer id="0100" name="Insignia"></Manufacturer>
   <Manufacturer id="0006" name="Intel"></Manufacturer>
@@ -1049,11 +1122,20 @@
   <Manufacturer id="0174" name="Kopera Development Inc"></Manufacturer>
   <Manufacturer id="023A" name="KUMHO ELECTRIC INC"></Manufacturer>
   <Manufacturer id="0090" name="Kwikset (Spectrum Brands)">
-    <Product config="kwikset/smartcode.xml" id="0001" name="Touchpad Electronic Deadbolt" type="0001"/>
-    <Product config="kwikset/smartcode.xml" id="0642" name="SmartCode 916" type="0003"/>
+    <Product config="kwikset/910.xml" id="0001" name="Touchpad Electronic Deadbolt" type="0001"/>
+    <Product config="kwikset/916.xml" id="0642" name="SmartCode 916" type="0001"/>
+    <Product config="kwikset/916.xml" id="0642" name="SmartCode 916" type="0003"/>
+    <Product config="kwikset/smartcode.xml" id="4006" name="SmartCode 914" type="0003"/>
     <Product config="kwikset/smartcode.xml" id="0440" name="SmartCode 914" type="0003"/>
+    <Product config="kwikset/smartcode.xml" id="0236" name="SmartCode 912" type="0003"/>
+    <Product config="kwikset/smartcode.xml" id="0339" name="SmartCode 912" type="0003"/>
+    <Product config="kwikset/smartcode.xml" id="0236" name="SmartCode 910" type="0001"/>
+    <Product config="kwikset/smartcode.xml" id="0238" name="SmartCode 910" type="0003"/>
+    <Product config="kwikset/910.xml" id="0001" name="SmartCode 910" type="0001"/>
     <Product config="kwikset/smartcode.xml" id="0440" name="SmartCode 10" type="0006"/>
+    <Product config="kwikset/smartcode.xml" id="0742" name="Obsidian" type="0003"/>
     <Product config="kwikset/914c.xml" id="0446" name="Convert 914" type="0003"/>
+    <Product config="kwikset/888.xml" id="0541" name="Smartcode 888" type="0003"/>
   </Manufacturer>
   <Manufacturer id="0051" name="Lagotek Corp"></Manufacturer>
   <Manufacturer id="0173" name="Leak Intelligence LLC"></Manufacturer>
@@ -1081,7 +1163,7 @@
     <Product config="leviton/vrf01.xml" id="0334" name="VRF01-1LZ Quiet Fan Speed Control" type="1001"/>
     <Product id="0243" name="VRCS2-MRZ 2-Button Scene Controller with Switches" type="1102"/>
     <Product config="leviton/vrcz4.xml" id="0243" name="VRCZ4-MRZ 4-Button Zone Controller with Switch" type="1202"/>
-    <Product id="0334" name="DZPD3-1LW Plug-In Dimming Lamp Module" type="1902"/>
+    <Product config="leviton/dzpd3.xml" id="0334" name="DZPD3-1LW Plug-In Dimming Lamp Module" type="1902"/>
     <Product id="0334" name="DZPA1-1LW Plug-In Appliance Module" type="1a02"/>
     <Product id="0334" name="DZMX1-1LZ Dimmer" type="1b03"/>
     <Product id="0334" name="DZS15-1LZ Switch" type="1c02"/>
@@ -1090,7 +1172,11 @@
     <Product config="leviton/dz6hd.xml" id="0001" name="DZ1KD-1BZ Decora 1000W Smart Dimmer" type="3301"/>
     <Product config="leviton/dz15s.xml" id="0001" name="DZ15S-1BZ Decora Smart Switch" type="3401"/>
     <Product config="leviton/dzpd3.xml" id="0001" name="DZPD3-2BW Decora 300W Plug-In Smart Dimmer" type="3501"/>
-    <Product config="leviton/dz15s.xml" id="0001" name="Leviton DZPA1 Plug-In Outlet" type="3601"/>
+    <Product config="leviton/vrpa1.xml" id="0334" name="Leviton VRPA1 Plug-In Outlet" type="1805" />
+    <Product config="leviton/dzpa1.xml" id="0001" name="Leviton DZPA1 Plug-In Outlet" type="3601"/>
+    <Product config="leviton/vrpd3.xml" id="0334" name="Leviton VRPD3-1LW 300W Plug-In Lamp Dimming Module" type="1706"/>
+    <Product config="leviton/zw4sf.xml" id="0002" name="ZW4SF-1BW Decora Smart 4 Speed Fan Controller" type="0038"/>
+    <Product config="leviton/zw15r.xml" id="0002" name="ZW15R Decora Smart Tamper-Resistant Outlet with Z-Wave Technology" type="0037"/>
   </Manufacturer>
   <Manufacturer id="0015" name="Lexel"></Manufacturer>
   <Manufacturer id="015B" name="LG Electronics"></Manufacturer>
@@ -1121,6 +1207,7 @@
     <Product config="linear/GC-TBZ48.xml" id="5436" name="GC-TBZ48 Battery Powered Z-Wave Thermostat" type="5442"/>
     <Product config="linear/GC-TBZ48.xml" id="5437" name="GC-TBZ48 Battery Powered Z-Wave Thermostat" type="5442"/>
     <Product config="linear/WD500Z5-1.xml" id="3530" name="WD500Z5-1 Wall Mounted Dimmer" type="5744"/>
+    <Product config="linear/WT00Z5-1.xml" id="3530" name="WT00Z5-1 Smart 3-Way Switch/Dimmer" type="5754"/>
   </Manufacturer>
   <Manufacturer id="035C" name="LINK ELECTRONICS Co. Ltd"></Manufacturer>
   <Manufacturer id="0316" name="Lite Automation"></Manufacturer>
@@ -1158,30 +1245,37 @@
     <Product config="mcohome/mhp220.xml" id="1352" name="MH-P220 Micro Dimmer" type="220a"/>
     <Product config="mcohome/mhp220.xml" id="5101" name="MH-P220 Micro Dimmer" type="220a"/>
     <Product config="mcohome/mhp220.xml" id="5102" name="MH-P220 Micro Dimmer" type="220a"/>
+    <Product config="mcohome/mhs220.xml" id="1252" name="MH-S220 One-Load" type="2201"/>
     <Product config="mcohome/mhs311.xml" id="0201" name="MH-S311 One-load" type="3102"/>
     <Product config="mcohome/mhs312.xml" id="0202" name="MH-S312 Two-load" type="3102"/>
     <Product config="mcohome/mhs314.xml" id="0204" name="MH-S314 Four-load" type="3102"/>
     <Product config="mcohome/mhs314.xml" id="1302" name="MH-S314 Four-load" type="3141"/>
-    <Product config="mcohome/mhs314.xml" id="3141" name="MH-S314 Four-load" type="5102"/>
+    <Product config="mcohome/mhs314.xml" id="5102" name="MH-S314 Four-load" type="3141"/>
     <Product config="mcohome/mhs411.xml" id="0201" name="MH-S411 One-load" type="4102"/>
     <Product config="mcohome/mhs412.xml" id="0202" name="MH-S412 Two-load" type="4102"/>
     <Product config="mcohome/mhs412.xml" id="1302" name="MH-S412 Two-load" type="4121"/>
     <Product config="mcohome/mhs412.xml" id="5102" name="MH-S412 Two-load" type="4121"/>
     <Product config="mcohome/mh8fceu.xml" id="3102" name="MH8-FC-EU Thermostat" type="0801"/>
     <Product config="mcohome/mh8fceu.xml" id="3102" name="MH8-FC4-EU Thermostat" type="0802"/>
+    <Product config="mcohome/mh8fceu0803.xml" id="3102" name="MH8-FC-EU Thermostat" type="0803"/>
+    <Product config="mcohome/mh8fceu0803.xml" id="5102" name="MH8-FC-EU Thermostat" type="0803"/>
     <Product config="mcohome/mh9co2.xml" id="0201" name="MH9-CO2-WD CO2 Monitor" type="0905"/>
     <Product config="mcohome/mh9co2.xml" id="3102" name="MH9-CO2-WD CO2 Monitor" type="0901"/>
+    <Product config="mcohome/mh9co2.xml" id="5102" name="MH9-CO2-WD CO2 Monitor" type="0901"/>
     <Product config="mcohome/mh9co2.xml" id="5102" name="MH9-CO2-WD CO2 Monitor" type="0902"/>
+    <Product config="mcohome/mh10pm25wd.xml" id="5102" name="MH10-PM2.5-WD PM 2.5 Monitor" type="0a02"/>
     <Product config="mcohome/a8-9.xml" id="1352" name="A8-9 Multi-sensor" type="a800"/>
     <Product config="mcohome/a8-9.xml" id="1352" name="A8-9 Multi-sensor" type="a803"/>
     <Product config="mcohome/mh7h.xml" id="5102" name="MH7H Water/Electrical Heating Thermostat" type="0701"/>
     <Product config="mcohome/mh7h.xml" id="5102" name="MH7H Water/Electrical Heating Thermostat" type="0702"/>
     <Product config="mcohome/mh7h.xml" id="5102" name="MH7H Water/Electrical Heating Thermostat" type="0712"/>
     <Product config="mcohome/mh7h.xml" id="5102" name="MH7H Water/Electrical Heating Thermostat" type="0732"/>
+	<Product config="mcohome/mhdt411.xml" id="5102" name="MH-DT411 Dimmer Switch" type="d411"/>
     <!--US-->
-    <Product config="mcohome/mhs513.xml" id="0103" name="Touch Panel Switch MH-S513" type="5102"/>
+    <Product config="mcohome/mhs513.xml" id="5102" name="MH-S513 Touch Panel Switch" type="0103"/>
     <!--AU-->
-    <Product config="mcohome/mhp511.xml" id="1453" name="Dimmer Touch Panel Switch MH-P511" type="511a"/>
+    <Product config="mcohome/mhp511.xml" id="1453" name="MH-P511 Dimmer Touch Panel Switch" type="511a"/>
+    <Product config="mcohome/mhs513.xml" id="5103" name="MH-S513 Touch Panel Switch" type="5131"/>
   </Manufacturer>
   <Manufacturer id="0222" name="MCT CO. LTD"></Manufacturer>
   <Manufacturer id="0027" name="Meedio LLC"></Manufacturer>
@@ -1217,7 +1311,13 @@
   <Manufacturer id="0083" name="MTC Maintronic"></Manufacturer>
   <Manufacturer id="0143" name="myStrom"></Manufacturer>
   <Manufacturer id="0438" name="Namron">
-    <Product config="namron/1402756.xml" id="0202" type="0002" name="LED Dimmer Z-Wave 200W"/>
+    <Product config="namron/1402756.xml" id="0002" type="0202" name="LED Dimmer Z-Wave 200W"/>
+    <Product config="namron/4512710.xml" id="d005" type="0200" name="Z-Wave Dimmer 400W"/>
+    <Product config="namron/4512712.xml" id="a30f" type="0300" name="Z-wave 1 Kanal Bryter" />
+    <Product config="namron/4512715.xml" id="d006" type="0200" name="Z-Wave Switch 400W"/>
+    <Product config="namron/4512724.xml" id="d00c" type="0200" name="Z-Wave Dimmer 2 400W"/>
+    <Product config="namron/4512720.xml" id="a306" type="0300" name="Z-wave 2 Kanaler Bryter" />
+    <Product config="namron/4512714.xml" id="a305" type="0300" name="Z-wave 4 Channel Remote" />
   </Manufacturer>
   <Manufacturer id="016E" name="Nanjing Easthouse Electrical Co"></Manufacturer>
   <Manufacturer id="0121" name="Napco Security Technologies, Inc.">
@@ -1227,6 +1327,9 @@
   <Manufacturer id="036B" name="NEC Platforms Ltd"></Manufacturer>
   <Manufacturer id="0241" name="NEEO AG"></Manufacturer>
   <Manufacturer id="006D" name="Nefit"></Manufacturer>
+  <Manufacturer id="0312" name="NEI Technology">
+    <Product config="nei/ms11z.xml" id="ff04" name="MS11Z" type="ff00"/>
+  </Manufacturer>
   <Manufacturer id="0351" name="NEOCONTROL US LLC"></Manufacturer>
   <Manufacturer id="0189" name="Ness Corporation Pty Ltd"></Manufacturer>
   <Manufacturer id="0133" name="Netgear"></Manufacturer>
@@ -1236,6 +1339,7 @@
   <Manufacturer id="0178" name="Nexia">
     <!-- full name in Z-wave database: Ingersoll Rand - Nexia Home Intelligence -->
     <Product config="nexia/db100z.xml" id="3130" name="DB100Z Doorbell Sensor" type="4442"/>
+    <Product config="nexia/th100nx.xml" id="3130" name="TH100NX Temperature &amp; Humidity Sensor" type="5448"/>
   </Manufacturer>
   <Manufacturer id="0075" name="NextEnergy"></Manufacturer>
   <Manufacturer id="0361" name="NHN Entertainment"></Manufacturer>
@@ -1317,7 +1421,7 @@
     <Product config="popp/004407.xml" id="0003" name="004407 CO Detector" type="0004"/>
     <Product config="popp/009402.xml" id="0004" name="009402 10-Year Smoke Detector with Siren" type="0004"/>
     <Product config="popp/700342.xml" id="000d" name="700342 10-Year Smoke Detector" type="0004"/>
-    <Product config="popp/700342.xml" id="0010" name="700342 10-Year Smoke Detector" type="0004"/>    
+    <Product config="popp/700342.xml" id="0010" name="700342 10-Year Smoke Detector" type="0004"/>
     <Product config="popp/009501.xml" id="0003" name="009501 Flow Stop" type="0005"/>
     <Product config="popp/700168.xml" id="0011" name="Popp Z-Rain Rain Sensor" type="0004"/>
     <Product config="popp/012501.xml" id="0001" name="012501 Strike Lock Control" type="0005"/>
@@ -1363,7 +1467,14 @@
     <Product config="qees/reto-plugin-switch.xml" id="0001" name="RETO Plug-in Switch Plus" type="3103"/>
   </Manufacturer>
   <Manufacturer id="0355" name="Qingdao hongyu cles air conditioning co.ltd"></Manufacturer>
-  <Manufacturer id="012A" name="Qolsys"></Manufacturer>
+  <Manufacturer id="0433" name="Q-light">
+    <Product config="q-light/q-light_zerodim.xml" id="000d" name="Q-Light Zerodim" type="0003"/>
+    <Product config="q-light/q-light_zerodim_2pol.xml" id="000E" name="Q-Light Zerodim 2pol" type="0003"/>
+    <Product config="q-light/q-light_puck.xml" id="0005" name="Q-Light puck" type="0003"/>
+  </Manufacturer>
+  <Manufacturer id="012A" name="Qolsys">
+    <Product config="qolsys/qz2140-840.xml" id="3032" name="QZ2140-840 Plug-In Dimmer" type="4744"/>
+  </Manufacturer>
   <Manufacturer id="0159" name="Qubino (Goap)">
     <Product config="qubino/ZMNHDA2.xml" id="0001" name="ZMNHDA2 Flush Dimmer" type="0001"/>
     <Product config="qubino/ZMNHDDx.xml" id="0051" name="ZMNHDD1 Flush Dimmer" type="0001"/>
@@ -1396,6 +1507,7 @@
     <Product config="qubino/ZMNKIDx.xml" id="0054" name="ZMNKIDx OnOff Thermostat 2" type="0005"/>
     <Product config="qubino/ZMNHQDx.xml" id="0051" name="ZMNHQDx LUXY Smart Light" type="0008"/>
     <Product config="qubino/ZMNKADx.xml" id="0052" name="ZMNKADx LUXY Smart Switch" type="0008"/>
+	<Product config="qubino/ZMNHMDx.xml" id="0051" name="ZMNHMDx Smart leak protector" type="0006"/>
   </Manufacturer>
   <Manufacturer id="0130" name="Quby">
     <Product config="quby/qb2.xml" id="0001" name="Energy Management System" type="0001"/>
@@ -1440,6 +1552,7 @@
     <Product config="remotec/zts-110.xml" id="8031" name="ZTS-110" type="0200"/>
     <Product config="remotec/zts-110.xml" id="8031" name="ZTS-110" type="0202"/>
     <Product config="remotec/zts-500.xml" id="8170" name="ZTS-500US" type="0200"/>
+    <Product config="remotec/zts-500.xml" id="8170" name="ZTS-500 AU/NZ" type="0202"/>
   </Manufacturer>
   <Manufacturer id="039B" name="Reply S.p.A."></Manufacturer>
   <Manufacturer id="0010" name="Residential Control Systems">
@@ -1450,11 +1563,14 @@
     <Product id="000a" name="TZ4Z-IHD RCS Thermostat" type="0001"/>
     <Product config="rcs/em52-zw.xml" id="3532" name="EM52-ZW Z-Wave Home Energy Meter" type="454d"/>
     <Product config="rcs/pm12-zw.xml" id="3132" name="PM12-ZW Z-Wave Power Monitoring Module" type="504d"/>
+    <Product type="5442" id="5432" name="TBZ48 Thermostat" config="linear/GC-TBZ48.xml" />
   </Manufacturer>
   <Manufacturer id="0216" name="RET Nanjing Intelligence System"></Manufacturer>
   <Manufacturer id="0153" name="Revolv"></Manufacturer>
   <Manufacturer id="0346" name="Ring">
     <Product config="ring/PIR-SS.xml" id="0201" name="PIR-SS Motion Detector" type="0301"/>
+    <Product config="ring/contact-sensor-v2.xml" id="0301" name="Contact Sensor" type="0201"/>
+    <Product config="ring/motion-detector-v2.xml" id="0301" name="Motion Detector" type="0301"/>
     <Product id="0201" name="DW-SS Contact Sensor" type="0201"/>
   </Manufacturer>
   <Manufacturer id="035E" name="RISCO Group"></Manufacturer>
@@ -1526,7 +1642,9 @@
     <Product config="shenzen_neo/nas-ds01z.xml" id="2082" name="Door/Window Detector" type="0003"/>
     <Product config="shenzen_neo/nas-wr01z.xml" id="0087" name="NAS-WR01Z Power plug 12A" type="0003"/>
     <Product config="shenzen_neo/nas-wr01z.xml" id="1087" name="NAS-WR01Z Power plug 12A" type="0003"/>
+    <Product config="shenzen_neo/nas-sc03ze.xml" id="102c" name="NAS-SC03ZE Roller Shutter" type="0200"/>
     <!-- NAS-WR01ZE and NAS-WR01Z hardware looks identical but are based on different SDK-->
+    <Product config="shenzen_neo/nas-wr01ze.xml" id="1027" name="NAS-WR01ZE Power plug 12A" type="0100"/>
     <Product config="shenzen_neo/nas-wr01ze.xml" id="1027" name="NAS-WR01ZE Power plug 12A" type="0200"/>
     <Product config="shenzen_neo/nas-wr01z.xml" id="2087" name="NAS-WR01Z Power plug 12A" type="0003"/>
     <Product config="shenzen_neo/nas-pd01z.xml" id="0083" name="NAS-PD01Z Battery Powered PIR Sensor" type="0003"/>
@@ -1534,29 +1652,44 @@
     <!-- NAS-PD02Z exist with and without temp sensor and different params but same IDs https://github.com/OpenZWave/open-zwave/issues/1866 -->
     <Product config="shenzen_neo/nas-pd02z.xml" id="108d" name="NAS-PD02Z Battery Powered PIR Sensor V2" type="0003"/>
     <Product config="shenzen_neo/nas-pd02z.xml" id="008d" name="NAS-PD02Z Battery Powered PIR Sensor V2" type="0003"/>
+    <Product config="shenzen_neo/nas-pd03z.xml" id="1031" name="NAS-PD03Z Battery Powered PIR Sensor V2" type="0200"/>
     <Product config="shenzen_neo/nas-ws02z.xml" id="0085" name="Water Leakage Detector" type="0003"/>
+    <Product config="shenzen_neo/nas-ws02z.xml" id="1025" name="Water Leakage Detector" type="0100"/>
     <Product config="shenzen_neo/nas-ws02z.xml" id="1085" name="Water Leakage Detector" type="0003"/>
     <Product config="shenzen_neo/nas-ws02z.xml" id="6085" name="Water Leakage Detector" type="0003"/>
     <Product config="shenzen_neo/nas-ws02z.xml" id="2085" name="Water Leakage Detector" type="0003"/>
     <Product config="shenzen_neo/nas-ab01z.xml" id="0088" name="Siren Alarm" type="0003"/>
     <Product config="shenzen_neo/nas-ab01z.xml" id="1088" name="Siren Alarm" type="0003"/>
+    <Product config="shenzen_neo/nas-ab01z.xml" id="6088" name="Siren Alarm" type="0003"/>
     <Product config="shenzen_neo/nas-rc01z.xml" id="008a" name="SOS/Remote Control" type="0003"/>
     <Product config="shenzen_neo/nas-rc01z.xml" id="108a" name="SOS/Remote Control" type="0003"/>
+    <Product config="shenzen_neo/ls03ch.xml" id="002b" name="Wall Switch (3 channels)" type="0200"/>
+    <Product config="shenzen_neo/ls03ch.xml" id="102b" name="Wall Switch (3 channels)" type="0200"/>
     <Product config="shenzen_neo/ls02ch.xml" id="008b" name="Wall Switch (2 channels)" type="0003"/>
     <Product config="shenzen_neo/ls02ch.xml" id="108b" name="Wall Switch (2 channels)" type="0003"/>
     <Product config="shenzen_neo/ls01ch.xml" id="008c" name="Wall Switch (1 channel)" type="0003"/>
     <Product config="shenzen_neo/ls01ch.xml" id="108c" name="Wall Switch (1 channel)" type="0003"/>
+	<!-- NAS-CS01Z Curtain Switch -->
+	<Product config="shenzen_neo/nas-cs01z.xml" id="102c" name="NAS-CS01Z Curtain Switch" type="0200"/>
+  </Manufacturer>
+  <Manufacturer id="041a" name="Shenzhen Neo Electronics Co Ltd"> <!-- new manufacturer id for Neo Coolcam -->
+    <Product config="shenzen_neo/nas-wr01ze.xml" id="0008" name="NAS-WR01ZE Power plug 12A" type="0200"/>
+  </Manufacturer>
+  <Manufacturer id="032C" name="Shenzhen Saykey Technology">
+    <Product config="shenzen_saykey/sk-3007-05.xml" id="0005" name="Curtain Motor Control with external module" type="3007"/>
   </Manufacturer>
-  <Manufacturer id="032C" name="Shenzhen Saykey Technology"></Manufacturer>
   <Manufacturer id="036C" name="Shenzhen Sen5 Technology"></Manufacturer>
   <Manufacturer id="0381" name="Shenzhen Thingsview Tech"></Manufacturer>
   <Manufacturer id="0250" name="Shenzhen Tripath Digital Audio Equipment"></Manufacturer>
   <Manufacturer id="0356" name="Shenzhen ZHIQU Technology Limited"></Manufacturer>
   <Manufacturer id="0081" name="SIEGENIA-AUBI KG"></Manufacturer>
   <Manufacturer id="0267" name="Simon">
+    <Product config="simon/10002020-13X.xml" id="023a" name="S100 Rocker iO for Dimmer" type="0007"/>
+    <Product config="simon/10002020-13X.xml" id="0000" name="S100 Rocker iO for Dimmer" type="0007"/>
     <Product config="simon/10002034-13X.xml" id="0000" name="S100 Socket iO" type="0001"/>
     <Product config="simon/10002034-13X.xml" id="00da" name="S100 Socket iO" type="0001"/>
     <Product config="simon/10002041-13X.xml" id="0022" name="S100 Socket iO" type="0009"/>
+    <Product config="simon/10002080-13X.xml" id="0000" name="S100 Rocker iO for Roller Blind" type="0004"/>
   </Manufacturer>
   <Manufacturer id="0045" name="Sine Wireless"></Manufacturer>
   <Manufacturer id="0266" name="Siterwell Technology HK"></Manufacturer>
@@ -1578,6 +1711,7 @@
     <Product config="graber/rsz1.xml" id="5a31" name="RSZ1 Roller Shade" type="5253"/>
     <Product config="graber/vcz1.xml" id="5a31" name="VCZ1 Virtual Cord Remote Control" type="5643"/>
     <Product config="graber/csz1.xml" id="5a31" name="CSZ1 Cellular Shade" type="4353"/>
+    <Product config="graber/mcz1.xml" id="5a31" name="MCZ1 Multi-Channel Remote" type="4d43"/>
   </Manufacturer>
   <Manufacturer id="026F" name="Sprue Safety Products"></Manufacturer>
   <Manufacturer id="0124" name="Square Connect"></Manufacturer>
@@ -1619,6 +1753,7 @@
   <Manufacturer id="0299" name="TechniSat">
     <Product type="0002" id="1a90" name="Single-Switch" config="technisat/03009499.xml"/>
     <Product type="0005" id="1a93" name="Shutter" config="technisat/03009496.xml"/>
+    <Product type="0004" id="1a92" name="Dimmer" config="technisat/03009497.xml"/>
   </Manufacturer>
   <Manufacturer id="012F" name="Tecom"></Manufacturer>
   <Manufacturer id="0012" name="Tell It Online">
@@ -1637,10 +1772,16 @@
     <Product config="there/800z.xml" id="0001" name="ThereGate" type="0001"/>
   </Manufacturer>
   <Manufacturer id="019b" name="ThermoFloor AS">
+    <Product config="thermofloor/heatitzm.xml" id="3500" name="Heatit ZM Single Relay 16A" type="0004"/>
     <Product config="thermofloor/heatit021.xml" id="0001" name="Heatit Thermostat TF 021" type="0001"/>
+    <Product config="thermofloor/heatit021-v1.92.xml" id="0201" name="Heatit Thermostat TF 016 (TF 021 FW > 1.92)" type="0003"/>
     <Product config="thermofloor/heatit056.xml" id="0202" name="Heatit Thermostat TF 056" type="0003"/>
+    <Product config="thermofloor/heatit058.xml" id="0203" name="Heatit Thermostat TF 058" type="0003"/>
+    <Product config="thermofloor/heatit204.xml" id="0204" name="Heatit Thermostat Z-Temp2" type="0004"/>
     <Product config="thermofloor/heatit-zdim.xml" id="2200" name="Heatit ZDim" type="0003"/>
-    <Product config="thermofloor/heatitz8.xml" id="0xa305" name="Heatit Z-Push Button 8" type="0x0300"/>
+    <Product config="thermofloor/heatitz8.xml" id="a305" name="Heatit Z-Push Button 8" type="0300"/>
+    <Product config="thermofloor/heatit20a.xml" id="020a" name="Heatit Z-Water TF 20a" type="0003"/>
+    <Product config="thermofloor/heatitz4.xml" id="a306" name="Heatit Z-Push Button 4" type="0300"/>
   </Manufacturer>
   <Manufacturer id="0317" name="Think Simple srl"></Manufacturer>
   <Manufacturer id="022A" name="TIMEVALVE"></Manufacturer>
@@ -1660,12 +1801,15 @@
     <Product config="wenzhou/tz68.xml" id="0103" name="TZ68 On/Off Switch Socket" type="0101"/>
     <Product config="wenzhou/tz66d.xml" id="1020" name="TZ66D Dual Wall Switch" type="0102"/>
     <Product config="wenzhou/tz67.xml" id="0611" name="TZ67 Wall Plug Dimmer" type="0202"/>
+    <Product config="wenzhou/tz67.xml" id="0008" name="TZ67G Wall Plug Dimmer" type="0003"/>
     <Product config="wenzhou/tz69.xml" id="0103" name="TZ69E Smart energy plug in switch" type="0311"/>
     <Product config="wenzhou/tz56s.xml" id="0202" name="TZ56S On/Off wall switch" type="0311"/>
     <Product config="wenzhou/tz57.xml" id="0203" name="TZ57 Two channel switch" type="0311"/>
     <Product config="wenzhou/tz79.xml" id="0305" name="TZ79 Power meter Relay Switch" type="0311"/>
     <Product config="wenzhou/tz74.xml" id="0304" name="TZ74 Dual Switch" type="0311"/>
-      <Product config="wenzhou/tz78.xml" id="0005" name="TZ78 In-Wall Single Relay Switch" type="0003"/>
+    <Product config="wenzhou/tz78.xml" id="0005" name="TZ78 In-Wall Single Relay Switch" type="0003"/>
+    <Product config="wenzhou/tz77.xml" id="0302" name="TZ77 RGBW Dimmer Switch" type="0311"/>
+    <Product config="wenzhou/tze96.xml" id="0506" name="TZE96 Color Touch Weekly Programming Heating Thermostat" type="0311"/>
   </Manufacturer>
   <Manufacturer id="011C" name="TKH Group / Eminent"></Manufacturer>
   <Manufacturer id="0327" name="TMC Technology"></Manufacturer>
@@ -1689,10 +1833,24 @@
   </Manufacturer>
   <Manufacturer id="0330" name="Sunricher">
     <Product config="sunricher/srzv9001t4dimeu.xml" id="a10d" name="Touch Panel Wall Controller - ZSC-01D" type="0003"/>
-    <Product config="sunricher/srzv9001k8.xml" id="a305" name="Wall Controller - SR-ZV9001" type="0300"/>
+    <Product config="sunricher/srzv9001k12dimz4.xml" id="b302" name="SR-ZV9001 4 Channel Dimmer Remote Control" type="0300"/>
+    <Product config="sunricher/srzv9001k12dimz4.xml" id="b302" name="SR-ZV9001 4 Channel Dimmer Remote Control" type="0301"/>
+    <Product config="sunricher/srzv9001k12dimz4.xml" id="b302" name="SR-ZV9001 4 Channel Dimmer Remote Control" type="0302"/>
+    <Product config="sunricher/srzv9001k12dimz5.xml" id="b301" name="SR-ZV9001 5 Channel Dimmer Remote Control" type="0300"/>
+    <Product config="sunricher/srzv9001k12dimz5.xml" id="b301" name="SR-ZV9001 5 Channel Dimmer Remote Control" type="0301"/>
+    <Product config="sunricher/srzv9001k12dimz5.xml" id="b301" name="SR-ZV9001 5 Channel Dimmer Remote Control" type="0302"/>
+    <Product config="sunricher/srzv9001k2dim.xml" id="a30f" name="Wall Controller - SR-ZV9001K2-DIM" type="0300"/>
+    <Product config="sunricher/srzv9001k4dim.xml" id="a310" name="Wall Controller - SR-ZV9001K4-DIM" type="0300"/>
+    <Product config="sunricher/srzv9001k4dimg2.xml" id="a306" name="Wall Controller - SR-ZV9001K4-DIM-G2" type="0300"/>
+    <Product config="sunricher/srzv9001k8.xml" id="a305" name="Wall Controller - SR-ZV9001K8" type="0300"/>
     <Product config="sunricher/zv9101.xml" id="d005" name="Dimmer ZV-9101" type="0200"/>
     <Product config="sunricher/srzv9101sachpeu.xml" id="d00c" name="Dimmer ZV9040" type="0200"/>
     <Product config="sunricher/srzv9003t4rgbweu.xml" id="a107" name="Z-Wave Wall Controller - SR-ZV9003T4-RGBW-EU" type="0300"/>
+    <Product config="sunricher/zv2835rac.xml" id="d017" name="ZV2835RAC Smart Knob Dimmer" type="0200"/>
+    <Product config="sunricher/srzv9001tccteu.xml" id="a104" name="Z-Wave Wall Controller - SR-ZV9001T-CCT-EU" type="0300"/>
+    <Product config="sunricher/zv9101fa.xml" id="d002" name="Dimmer ZV-9101FA" type="0200"/>
+    <Product config="sunricher/srzv9101sachpswitch.xml" id="d006" name="AC Switch ZV-9101SAC-HP-Switch" type="0200"/>
+    <Product config="sunricher/srzv9100aa.xml" id="d00f" name="SR-ZV9100A-A In-Wall Smart Switch" type="0200"/>
   </Manufacturer>
   <Manufacturer id="0049" name="Twisthink"></Manufacturer>
   <Manufacturer id="0270" name="Ubitech"></Manufacturer>
@@ -1715,7 +1873,10 @@
   <Manufacturer id="008c" name="Vera Control">
     <Product config="vera/vera2.xml" id="0001" name="Vera Lite" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0080" name="Vero Duco"></Manufacturer>
+  <Manufacturer id="0080" name="Vero Duco">
+    <Product config="duco/DucoBox.xml" id="0001" name="DucoBox Motor" type="0003"/>
+    <Product config="duco/Ducotronic_CO-RH_sensor.xml" id="0001" name="DucoBox CO/RH Sensor" type="0004"/>
+  </Manufacturer>
   <Manufacturer id="0237" name="Vestel Elektronik Ticaret ve Sanayi"></Manufacturer>
   <Manufacturer id="0053" name="Viewsonic"></Manufacturer>
   <Manufacturer id="005e" name="ViewSonic Corporation"></Manufacturer>
@@ -1810,7 +1971,10 @@
     <Product config="widom/UMS2.xml" id="0800" name="UMS2 Smart Roller Shutter" type="1214"/>
   </Manufacturer>
   <Manufacturer id="012D" name="Wilshine Holding"></Manufacturer>
-  <Manufacturer id="017F" name="Wink"></Manufacturer>
+  <Manufacturer id="017F" name="Wink">
+    <Product config="wink/wnk-mot1.xml" id="0001" name="WNK-MOT1 Motion Sensor" type="0101" />
+    <Product config="wink/wnk-sir1p.xml" id="0001" name="WNK-SIR1P Siren" type="0200" />
+  </Manufacturer>
   <Manufacturer id="004c" name="Woodward Labs"></Manufacturer>
   <Manufacturer id="0242" name="Winytechnology"></Manufacturer>
   <Manufacturer id="0199" name="Wireless Maingate AB"></Manufacturer>
@@ -1857,7 +2021,7 @@
   <Manufacturer id="0147" name="Z-Wave.Me">
     <Product id="0003" name="RaZberry Controller" type="0002"/>
     <Product id="0001" name="RaZberry Controller ZWave+" type="0400"/>
-    <Product id="0002" name="RaZberry Controller 2016 ZWave+" type="0400"/>
+    <Product id="0002" name="RaZberry Controller 2016 ZWave+" config="zwave.me/razberry.xml" type="0400"/>
   </Manufacturer>
   <Manufacturer id="024D" name="Z-works"></Manufacturer>
   <Manufacturer id="024E" name="zConnect"></Manufacturer>
@@ -1892,12 +2056,13 @@
     <Product config="zooz/zse09.xml" id="0083" name="ZSE09 Mini Sensor" type="0003"/>
     <Product config="zooz/zen15.xml" id="000D" name="ZEN15 Power Switch" type="0101"/>
     <Product config="zooz/zen16.xml" id="a00a" name="ZEN16 Multirelay" type="a000"/>
+    <Product config="zooz/zen17.xml" id="a00a" name="ZEN17 Universal Relay" type="7000"/>
     <Product config="zooz/zse18.xml" id="0012" name="ZSE18 Motion Sensor" type="0301"/>
     <Product config="zooz/zse19.xml" id="0003" name="ZSE19 S2 Multisiren" type="000c"/>
     <Product config="zooz/zen20v2.xml" id="a004" name="ZEN20 V2.0 Power Strip" type="a000"/>
     <Product config="zooz/zen21v3.xml" id="1e1c" name="ZEN21 Switch V3" type="b111"/>
     <Product config="zooz/zen22v2.xml" id="1f1c" name="ZEN22 Dimmer V2" type="b112"/>
-    <Product config="zooz/zen23.xml" id="251c" name="ZEN23 Toggle Switch V2" type="b111"/>
+    <Product config="zooz/zen23v3.xml" id="251c" name="ZEN23 Toggle Switch" type="b111"/>
     <Product config="zooz/zen24v2.xml" id="261c" name="ZEN24 Dimmer Switch V2" type="b112"/>
     <Product config="zooz/zen25.xml" id="a003" name="ZEN25 S2 Double Plug with USB Port" type="a000"/>
     <Product config="zooz/zen26.xml" id="a001" name="ZEN26 S2 On Off Wall Switch" type="a000"/>
@@ -1907,7 +2072,14 @@
     <Product config="zooz/zse30.xml" id="0085" name="ZSE30 Water Sensor" type="0003"/>
     <Product config="zooz/zen31.xml" id="2000" name="ZEN31 RGBW Dimmer" type="0902"/>
     <Product config="zooz/zse33.xml" id="0088" name="ZSE33 Smart Chime" type="0003"/>
-    <Product config="zooz/zse40.xml" id="2101" name="ZSE40 4-in-1 sensor" type="2021"/>    
+    <Product config="zooz/zen32.xml" id="a008" name="ZEN32 Scene Controller" type="7000"/>
+    <Product config="zooz/zen34.xml" id="f001" name="ZEN34 Remote Switch" type="0004"/>
+    <Product config="zooz/zen34.xml" id="f001" name="ZEN34 Remote Switch" type="7000"/>
+    <Product config="zooz/zse40.xml" id="2101" name="ZSE40 4-in-1 sensor" type="2021"/>
+    <Product config="zooz/zen71.xml" id="a001" name="ZEN71 On Off Switch" type="7000"/>
+    <Product config="zooz/zen72.xml" id="a002" name="ZEN72 Dimmer Switch" type="7000"/>
+    <Product config="zooz/zen76.xml" id="a006" name="ZEN76 S2 On Off Switch" type="7000"/>
+    <Product config="zooz/zen77.xml" id="a007" name="ZEN77 S2 Dimmer Switch" type="7000"/>
   </Manufacturer>
   <Manufacturer id="015d" name="Zooz (Willis Electric)">
     <Product config="zooz/zen20.xml" id="f51c" name="ZEN20 Power Strip" type="0651"/>
@@ -1916,6 +2088,7 @@
     <Product config="zooz/zen23.xml" id="1e1c" name="ZEN23 Toggle Switch" type="1111"/>
     <Product config="zooz/zen24.xml" id="1f1c" name="ZEN24 Dimmer Switch" type="0111"/>
     <Product config="inovelli/nzw97.xml" id="6100" name="NZW97 Inovelli Dual Outdoor Z-Wave Plug" type="6100"/>
+    <Product config="inovelli/nzw31.xml" id="1f01" name="NZW31 Inovelli Dimmer" type="1f01"/>
   </Manufacturer>
   <Manufacturer id="0315" name="zwaveproducts.com">
     <Product type="4447" id="3031" name="PA-100" config="zwp/PA-100.xml"/>
diff --git a/config/mcohome/mh10pm25wd.xml b/config/mcohome/mh10pm25wd.xml
new file mode 100644
index 00000000..5774e423
--- /dev/null
+++ b/config/mcohome/mh10pm25wd.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="0">
+    <!--MCOHome Particle Matter 2.5 Monitor MH10-PM2.5-WD -->
+    <!-- Configuration -->
+    <CommandClass id="112">
+        <Value genre="config" index="2" instance="1" label="PM2.5 reporting threshold" max="127" min="0" size="1" type="byte" units="" value="10">
+            <Help>0 report disabled, base on 0.1ug/m3 unit, 10 by default, 10*0.1ug/m3=1ug/m3</Help>
+        </Value>
+        <Value genre="config" index="3" instance="1" label="Temperature reporting threshold" max="127" min="0" size="1" type="byte" units="" value="1">
+            <Help>0 report disabled, base on 0.5C unit, 1 by default, 1*0.5C=0.5C</Help>
+        </Value>
+        <Value genre="config" index="4" instance="1" label="Humidity reporting threshold" max="50" min="0" size="1" type="byte" units="" value="2">
+            <Help>0 report disabled, base on 1% unit, 2 by default, 2*1C=2C</Help>
+        </Value>
+        <Value genre="config" index="255" instance="1" label="Factory setting" max="255" min="0" size="1" type="byte" units="" value="0">
+            <Help>Restore the factory setting - write only, set to 85 to reset</Help>
+        </Value>        
+    </CommandClass>
+    <!-- Association Groups -->
+    <CommandClass id="133">
+        <Associations num_groups="2">
+            <Group index="1" max_associations="5" label="Notification" auto="false"/>
+            <Group index="2" max_associations="1" label="Lifeline" auto="true"/>
+        </Associations>
+    </CommandClass>
+</Product>
diff --git a/config/mcohome/mh8fceu0803.xml b/config/mcohome/mh8fceu0803.xml
new file mode 100755
index 00000000..b637d8b8
--- /dev/null
+++ b/config/mcohome/mh8fceu0803.xml
@@ -0,0 +1,56 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!--MCOHome Thermostat fan coil MH8-FC-EU -->
+  <MetaData>
+	<MetaDataItem name="Name">MH8-FC</MetaDataItem>
+	<MetaDataItem name="Description">Fan Coil Thermostat MH8 is a Z-Wave Plus enabled device for indoor temperature control. 
+
+It is mainly applied to a 2-pipe Fan coil system. 
+
+It can read room temperature and local time, 
+
+and automatically control fan speed based on the temperature difference. 
+
+The device is of high reliability and practicability. 
+
+This product can be included and operated 
+
+in any Z-Wave network with other Z-Wave certified devices 
+
+from any other manufacturers. </MetaDataItem>
+	<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/015f:5102:0803</MetaDataItem>
+	<MetaDataItem name="ProductPage">http://www.mcohome.com/ProductDetail/3894174.html</MetaDataItem>
+	<MetaDataItem name="ProductSupport">http://www.mcohome.com/ProductDetail/3894174.html</MetaDataItem>
+	<MetaDataItem name="ProductPic">images/mcohome/mh8fceu0803.png</MetaDataItem>
+	<MetaDataItem name="ProductManual">http://www.mcohome.com/index.php?c=Front/DownDetail&amp;a=downloadFujian&amp;name=MH8-FC%20/%20MH8-FC4&amp;path=L2NvbWRhdGEvOTUzMDEvcHJvZHVjdGZ1amlhbi8yMDIwMDYwMzE1MDQwNjVlZDc0YjY2MjRmODkucGRm</MetaDataItem>
+	<MetaDataItem id="5102" name="Identifier" type="0803">mh8fceu</MetaDataItem>
+	<ChangeLog>
+		<Entry author="Kostas Injeyan - kostas2911@yahoo.gr" date="24 June 2020" revision="1">Initial Metadata Import</Entry>
+	</ChangeLog>
+  </MetaData>
+  <CommandClass id="67">
+  	<Compatibility>
+      <Base>0</Base>
+	    <AltTypeInterpretation>false</AltTypeInterpretation>
+    </Compatibility>
+  </CommandClass>
+  <!-- The thermostat does not properly report its operating modes -->
+  <CommandClass id="68">
+    <Instance index="1"/>
+    <Value genre="user" index="0" instance="1" label="Fan Mode" size="1" type="list" units="">
+      <Item label="On Low" value="1"/>
+      <Item label="On High" value="3"/>
+      <Item label="On Medium" value="5"/>
+    </Value>
+    <SupportedModes>
+      <Mode index="1" label="On Low"/>
+      <Mode index="3" label="On High"/>
+      <Mode index="5" label="On Medium"/>
+    </SupportedModes>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/mcohome/mhdt411.xml b/config/mcohome/mhdt411.xml
new file mode 100644
index 00000000..9289165b
--- /dev/null
+++ b/config/mcohome/mhdt411.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="3">
+  <!--MCOHome Touch Panel Dimmer Switch MH-DT411 
+	type=d411, id=5102	Unknown: id=015f	0x5102	0xd411
+  -->
+  <MetaData>
+    <MetaDataItem name="Name">Dimmer Switch MH-DT411</MetaDataItem>
+    <MetaDataItem name="Description">Dimmer switch is a wall panel built-in with Z-Wave Plus module. With it's stylish design and stable performance, the panel can be used to control the light level. It supports basic command class, multi channel command class and multi channel association command class, also works as a repeater in a Z-Wave network. This product can be included and operated in any Z-Wave network with other Z-Wave certified devices from any other manufacturers.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/015f:5102:d411</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://www.mcohome.com/ProductDetail/3894312.html</MetaDataItem>
+    <MetaDataItem name="ProductSupport">http://www.mcohome.com/ProductDetail/3894312.html</MetaDataItem>
+	<MetaDataItem name="ProductPic">images/mcohome/015f_5102_d411.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Set controller into inclusion mode and press 3 clicks on '+' button to include. If succeeded, green led flashes 4 times.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Set controller into exclusion mode and press 3 clicks on '-' button to exclude. If succeeded, green led flashes 4 times.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press 10 times of any button or exclude the device from Z-Wave network, then cut off the main power. The factory setting will be restored.</MetaDataItem>
+	<MetaDataItem id="015f" name="FrequencyName" type="015f">CEPT (Europe)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="rrozema - richard@uitdelft.nl" date="16 November 2020" revision="1">Information retrieved from manual pages delivered with the product. No revision or date on the manual.</Entry>
+      <Entry author="rrozema - richard@uitdelft.nl" date="18 November 2020" revision="2">Fixed option 17. Enabled and Disabled where interchanged.</Entry>
+      <Entry author="rrozema - richard@uitdelft.nl" date="18 November 2020" revision="3">Fixed association group indexes. Was 1, 2, 5, 8. Now 1, 2, 3, 4.</Entry>
+    </ChangeLog>
+  </MetaData>
+  
+  <!-- Configuration -->
+  <CommandClass id="112">    
+    <Value type="list" genre="config" instance="1" index="1" label="Saving state before power failure" size="1" value="1">
+      <Help>Switch state saved or not when power down</Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Dimming mode" type="list" size="1" value="1">
+      <Help>0x00 leading edge, 0x01 trailing edge, 0x02 On/off only. Default 0x01.</Help>
+      <Item label="Leading edge" value="0"/>
+      <Item label="Trailing edge" value="1"/>
+      <Item label="On/off only" value="2"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Auto detection of dimming mode when powered on" type="list" size="1" value="1">
+      <Help>0 = Auto detection disabled, 1 = Auto detection enabled.</Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="LED Backlit brightness level" type="byte" min="0" max="10" value="10">
+      <Help>0 = LED disabled, 1 - 10 = min level - max level.</Help>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="Minimum brightness level" type="byte" min="1" max="98" units="%" value="1">
+      <Help>1 - 98 percentage minimum brightness level. Must always be less than Maximum (option 6).</Help>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Maximum brightness level" type="byte" min="2" max="99" units="%" value="99">
+      <Help>1 - 98 percentage minimum brightness level. Must always be higher than Minimum (option 5).</Help>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Single dimming step time (manual)" type="short" min="0" max="255" units="10 ms" value="3">
+      <Help>Max 2.55s, in 10ms steps. Default = 3 for 30ms.</Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="Single dimming step size (manual)" type="byte" min="0" max="99" units="%" value="1">
+      <Help>1 - 99% per step. Recommended not to change. Default value = 1.</Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Single dimming step time (auto)" type="short" min="0" max="255" units="10 ms" value="3">
+      <Help>Max 2.55s, in 10ms steps. Default = 3 for 30ms.</Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Single dimming step size (auto)" type="byte" min="0" max="99" units="%" value="1">
+      <Help>1 - 99% per step. Recommended not to change. Default value = 1.</Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Dimming percentage set when single touching button '+' or '-'" type="byte" min="0" max="99" units="%" value="0">
+      <Help>0 = percentage from the last button-holding touch. 1 - 99 = percentage to set. Default value = 0.</Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Reporting interval for dimming level" type="byte" min="0" max="255" units="10 ms" value="10">
+      <Help>0 = No report during dimming, 1 - 255 = send report in 1 - 255 * 10ms intervals. Default value = 10ms.</Help>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="External switch type" type="list" size="1" value="0">
+      <Help>0 = Buttons, 1 = Toggle. Default value = Buttons.</Help>
+      <Item label="Buttons (momentary buttons)" value="0"/>
+      <Item label="Toggle (2-state switches)" value="1"/>
+    </Value>
+	<Value genre="config" index="14" instance="1" label="External switch input" type="list" size="1" value="0">
+      <Help>Default value = function disabled.</Help>
+      <Item label="function disabled" value="0"/>
+      <Item label="wire 1 external switch key to S1 only" value="1"/>
+      <Item label="wire 1 external switch key to S2 only" value="2"/>
+      <Item label="2 external switch keys wired to S1 and S2, each key can control both dimming directions" value="3"/>
+      <Item label="2 external switch keys wired to S1 and S2, each key controls one dimming direction" value="4"/>
+    </Value>
+	<Value genre="config" index="15" instance="1" label="Energy meter reporting" type="list" size="1" value="0">
+      <Help>Defines which metering values to send to the gateway. Default value = Disabled.</Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Watt" value="1"/>
+      <Item label="KWH" value="2"/>
+      <Item label="Watt + KWH" value="3"/>
+      <Item label="Ampere" value="4"/>
+      <Item label="Watt + Ampere" value="5"/>
+      <Item label="KWH + Ampere" value="6"/>
+      <Item label="Watt + KWH + Ampere" value="7"/>
+      <Item label="Voltage" value="8"/>
+      <Item label="Watt + Voltage" value="9"/>
+      <Item label="KWH + Voltage" value="10"/>
+      <Item label="Watt + KWH + Voltage" value="11"/>
+      <Item label="Ampere + Voltage" value="12"/>
+      <Item label="Watt + Ampere + Voltage" value="13"/>
+      <Item label="KWH + Ampere + Voltage" value="14"/>
+      <Item label="Watt + KWH + Ampere + Voltage" value="15"/>
+    </Value>
+    <Value genre="config" index="16" instance="1" label="Energy meter reporting interval" type="byte" min="0" max="255" units="seconds" value="10">
+      <Help>Interval to send unsollicited energy reports to the gateway. Requires option 15 (Energy meter reporting) to be set to anything other than Disabled. Default value is every 10 seconds.</Help>
+    </Value>
+    <Value genre="config" index="17" instance="1" label="Beep" type="list" size="1" value="1">
+      <Help>Enable or disable beep upon touching '+' and '-'. Default value = Enabled.</Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="32" instance="1" label="Ampere alarm threshold" type="short" units="0.01 Ampere" min="0" max="5000" value="0">
+      <Help>0 = alarm disabled, 1 - 5000 * 0.01 Ampere alarm enabled (notification to gateway). Default = 0 - alarm disabled.</Help>
+    </Value>
+    <Value genre="config" index="33" instance="1" label="Voltage alarm threshold" type="short" units="0.1 Volt" min="0" max="10000" value="0">
+      <Help>0 = alarm disabled, 1 - 10000 * 0.1 Volt alarm enabled (notification to gateway). Default = 0 - alarm disabled.</Help>
+    </Value>
+    <Value genre="config" index="255" instance="1" label="Factory reset" type="list" size="1" value="0">
+      <Help>Restore factory settings (write only). Default value = Disabled.</Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Factory reset" value="85"/>
+    </Value>
+  </CommandClass>
+        
+  <!-- Association Groups -->  
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" max_associations="1" label="Lifeline"/>
+      <Group index="2" max_associations="5" label="Send Switch Multilevel to associated devices"/>
+      <Group index="3" max_associations="5" label="Send Basic Set to associated devices on key '+'"/>
+      <Group index="4" max_associations="5" label="Send Basic Set to associated devices on key '-'"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/mcohome/mhs220.xml b/config/mcohome/mhs220.xml
new file mode 100644
index 00000000..8885a18f
--- /dev/null
+++ b/config/mcohome/mhs220.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!--MCOHome MH-S220 One-Load -->
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="1" label="Switch state saved or not when power down" units="" size="1" min="0" max="1" type="byte">
+      <Help>Switch state saved or not when power down. 0 = not saved, 1 = saved</Help>
+    </Value>
+    <Value genre="config" instance="1" index="2" value="1" label="External switch type " units="" size="1" min="0" max="1" type="byte">
+      <Help>External switch type. 0 = button, 1 = toggle (2 state switches)</Help>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="0" label="2-state switches" units="" size="1" min="0" max="1" type="byte">
+      <Help>2-state switches: 0 = toggle switch without specific position, 1 = toggle with specific on/off positions</Help>
+    </Value>
+    <Value genre="config" instance="1" index="4" value="0" label="Report from Switch 1 to Association Group 1" units="" size="1" min="0" max="2" type="byte">
+      <Help>Report from Switch 1 to Association Group 1</Help>
+    </Value>
+    <Value genre="config" instance="1" index="5" value="1" label="OFF timer" units="" size="1" min="0" max="1" type="byte">
+      <Help>OFF timer</Help>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="0" label="Timing function" units="" size="2" min="0" max="0" type="short">
+      <Help>Timing function</Help>
+    </Value>
+    <Value genre="config" instance="1" index="7" value="0" label="Operation mode of Switch 1" units="" size="1" min="0" max="1" type="byte">
+      <Help>Operation mode of Switch 1</Help>
+    </Value>
+    <Value genre="config" instance="1" index="8" value="0" label="Operation report from Sw 2 to Assoc Group 2" units="" size="1" min="0" max="2" type="byte">
+      <Help>Operation report from Switch 2 to Association Group 2</Help>
+    </Value>
+    <Value genre="config" instance="1" index="255" value="0" label="Factory setting" units="" size="1" min="0" max="55" type="byte">
+      <Help>Factory setting</Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="SW 1" max_associations="5" />
+      <Group index="2" label="SW 2" max_associations="5" />
+      <Group index="3" label="Controller" max_associations="5" auto="true" />
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/mcohome/mhs513.xml b/config/mcohome/mhs513.xml
index cad9d940..f78d9206 100644
--- a/config/mcohome/mhs513.xml
+++ b/config/mcohome/mhs513.xml
@@ -1,11 +1,294 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <!--MCOHome Touch Panel Switch MH-S513 -->
+  <MetaData>
+    <MetaDataItem name="Name">MH-S513 Touch Panel Switch</MetaDataItem>
+    <MetaDataItem name="Description">MCOHome Touch Panel Switch is a wall panel built-in with Z-Wave Plus module. It supports basic command class, association command class, which can control all associated devices synchronously. This product can be included and operated in any Z-Wave network with other Z-Wave certified devices from any other manufacturers.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/015f:5102:0103</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/015f:5103:5131</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://www.mcohome.com/ProductDetail/3894278.html</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/mcohome/mhs513.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Press and hold any key on the panel for 8 seconds or 3 clicks in quick succession. Note: If inclusion is successful, all INDICATION LEDs on the panel will flash 4 times.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Press and hold any key on the panel for 8 seconds or 3 clicks in quick succession. Note: If the exclusion is successful, all INDICATION LEDs on the panel will flash 4 times. The exclusion will delete all association data.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Write 0x55 to Configuration Parameter Index 255, or Press 20 times of any button or exclude the device from Z-Wave network, the factory setting will be restored.</MetaDataItem>
+    <MetaDataItem id="5102" name="FrequencyName" type="0103">US / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="5103" name="FrequencyName" type="5131">Australia / New Zealand</MetaDataItem>
+    <MetaDataItem id="5102" name="Identifier" type="0103">MH-S513-US</MetaDataItem>
+    <MetaDataItem id="5103" name="Identifier" type="5131">MH-S513-AU</MetaDataItem>
+    <ChangeLog>
+      <Entry author="StuartW - swish@email4me.com" date="27 December 2020" revision="4">Add AU frequency and update Configuration</Entry>
+    </ChangeLog>
+  </MetaData>
   <!-- Configuration -->
   <CommandClass id="112">
-    <Value genre="config" index="1" instance="1" label="Saving state before power failure" size="1" type="list" value="1">
+    <Value genre="config" index="2" label="Switch state saved or not when power down" max="1" min="0" size="1" type="list" value="1">
       <Help>Switch state saved or not when power down</Help>
-      <Item label="Disabled" value="0"/>
-      <Item label="Enabled" value="1"/>
+      <Item label="Not Saved. Switch will be off when powered again" value="0"/>
+      <Item label="Saved. Switch will keep the same state when powered again" value="1"/>
+    </Value>
+    <Value genre="config" index="3" label="All On / All Off" max="255" min="0" size="1" type="list" value="255">
+      <Help>All On / All Off</Help>
+      <Item label="forbid ALL ON, forbid ALL OFF" value="0"/>
+      <Item label="forbid ALL ON, allow ALL OFF" value="1"/>
+      <Item label="allow ALL ON, forbid ALL OFF" value="2"/>
+      <Item label="allow ALL ON, allow ALL OFF" value="255"/>
+    </Value>
+    <Value genre="config" index="4" label="LED Backlit brightness level" max="10" min="0" type="byte" units="" value="10">
+      <Help>0 = Off; 1 - 10 = Minimum - Maximum brightness level</Help>
+    </Value>
+    <Value genre="config" index="5" label="Key Mode" max="4" min="0" size="1" type="list" value="0">
+      <Help>
+      Key Mode
+      This function works for corridor or stairwell situation.
+      </Help>
+      <Item label="Single click to switch on/off status" value="0"/>
+      <Item label="Key default as off state. When it is turned on, then it will be turned off automatically after a time period, which can be set in item Key On duration" value="1"/>
+      <Item label="Key default as on state. When it is turned off, then it will be turned on automatically after a time period , which can be set in item Key On duration" value="2"/>
+      <Item label="Hold >3s then key is on, and off once released" value="3"/>
+      <Item label="Single click to switch on/off status and hold >3s then key is on, and off once released" value="4"/>
+      <Item label="Momentary Switch Mode 2, hold the key is on, off once released" value="5"/>
+      <Item label="If key is off, hold >3s then key is on, and it remains on after relese. If is is on, hold >3s then key is off, and it remains off after release." value="6"/>
+    </Value>
+    <Value genre="config" index="6" label="Key On duration" max="65535" min="0" type="short" units="s" value="0">
+      <Help>
+      Key On duration
+      0 = infinite
+      1 - 65535 = on duration in seconds
+      </Help>
+    </Value>
+    <Value genre="config" index="8" label="Basic CC integration setting" max="3" min="0" size="1" type="list" value="0">
+      <Help>
+      Basic CC integration setting
+      This parameter works for integration with different gateways/systems. If you do not know how to use, please keep as default.
+      </Help>
+      <Item label="Basic Set received, key 1 responds; Basic Get received， key 1 sends Basic Report; key 1 will not send unsolicited Basic Report （No Endpoint） to LifeLine Association" value="0"/>
+      <Item label="Basic Set received, key 1 responds; Basic Get received， key 1 sends Basic Report; key 1 will send unsolicited Basic Report （No Endpoint） to LifeLine Association" value="1"/>
+      <Item label="Basic Set received, all keys respond; Basic Get received， not reply Basic Report; All keys will not send unsolicited Basic Report （No Endpoint） to LifeLine Association" value="2"/>
+      <Item label="Basic Set received, all keys respond; Basic Get received， key 1 sends Basic Report; All keys will not send unsolicited Basic Report （No Endpoint） to LifeLine Association" value="3"/>
+    </Value>
+    <Value genre="config" index="10" label="Key 1 Mode" max="6" min="0" size="1" type="list" value="0">
+      <Help>
+      Key Mode
+      This function works for corridor or stairwell situation.
+      </Help>
+      <Item label="Single click to switch on/off status" value="0"/>
+      <Item label="Key default as off state. When it is turned on, then it will be turned off automatically after a time period, which can be set in item Key On duration" value="1"/>
+      <Item label="Key default as on state. When it is turned off, then it will be turned on automatically after a time period , which can be set in item Key On duration" value="2"/>
+      <Item label="Hold >3s then key is on, and off once released" value="3"/>
+      <Item label="Single click to switch on/off status and hold >3s then key is on, and off once released" value="4"/>
+      <Item label="Momentary Switch Mode 2, hold the key is on, off once released" value="5"/>
+      <Item label="If key is off, hold >3s then key is on, and it remains on after relese. If is is on, hold >3s then key is off, and it remains off after release." value="6"/>
+    </Value>
+    <Value genre="config" index="11" label="Key 2 Mode" max="6" min="0" size="1" type="list" value="0">
+      <Help>
+      Key Mode
+      This function works for corridor or stairwell situation.
+      </Help>
+      <Item label="Single click to switch on/off status" value="0"/>
+      <Item label="Key default as off state. When it is turned on, then it will be turned off automatically after a time period, which can be set in item Key On duration" value="1"/>
+      <Item label="Key default as on state. When it is turned off, then it will be turned on automatically after a time period , which can be set in item Key On duration" value="2"/>
+      <Item label="Hold >3s then key is on, and off once released" value="3"/>
+      <Item label="Single click to switch on/off status and hold >3s then key is on, and off once released" value="4"/>
+      <Item label="Momentary Switch Mode 2, hold the key is on, off once released" value="5"/>
+      <Item label="If key is off, hold >3s then key is on, and it remains on after relese. If is is on, hold >3s then key is off, and it remains off after release." value="6"/>
+    </Value>
+    <Value genre="config" index="12" label="Key 3 Mode" max="6" min="0" size="1" type="list" value="0">
+      <Help>
+      Key Mode
+      This function works for corridor or stairwell situation.
+      </Help>
+      <Item label="Single click to switch on/off status" value="0"/>
+      <Item label="Key default as off state. When it is turned on, then it will be turned off automatically after a time period, which can be set in item Key On duration" value="1"/>
+      <Item label="Key default as on state. When it is turned off, then it will be turned on automatically after a time period , which can be set in item Key On duration" value="2"/>
+      <Item label="Hold >3s then key is on, and off once released" value="3"/>
+      <Item label="Single click to switch on/off status and hold >3s then key is on, and off once released" value="4"/>
+      <Item label="Momentary Switch Mode 2, hold the key is on, off once released" value="5"/>
+      <Item label="If key is off, hold >3s then key is on, and it remains on after relese. If is is on, hold >3s then key is off, and it remains off after release." value="6"/>
+    </Value>
+    <Value genre="config" index="14" label="Disable Local Control" max="15" min="0" size="1" type="list" value="0">
+      <Help>All On / All Off</Help>
+      <Item label="all keys are valid for local control" value="0"/>
+      <Item label="all keys are invalid for local control" value="15"/>
+    </Value>
+    <Value genre="config" index="15" label="Disable Remote Control" max="15" min="0" size="1" type="list" value="0">
+      <Help>All On / All Off</Help>
+      <Item label="all keys are valid for remote (gateway) control" value="0"/>
+      <Item label="all keys are invalid for remote (gateway) control" value="15"/>
+    </Value>
+    <Value genre="config" index="16" label="Scene response" size="1" type="bitset" bitmask="7" value="0">
+      <Help>Scene response</Help>
+      <BitSet id="1">
+        <Label>Key 1</Label>
+        <Help>Key 1 scene response</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Key 2</Label>
+        <Help>Key 2 scene response</Help>
+      </BitSet>
+      <BitSet id="3">
+        <Label>Key 3</Label>
+        <Help>Key 3 scene response</Help>
+      </BitSet>
+    </Value>
+    <Value genre="config" index="17" label="Key1 Scene Activate Mode Setting" max="3" min="0" size="1" type="list" value="0">
+      <Help>Key 1 Scene response</Help>
+      <Item label="Scence active function disabled" value="0"/>
+      <Item label="One click Key1 always activate scene ID no matter what the status of Key1 is" value="1"/>
+      <Item label="One click Key1 always activate scene ID when Key1's relay output is open" value="2"/>
+      <Item label="One click Key1 always activate scene ID when Key1's relay output is closed" value="3"/>
+    </Value>
+    <Value genre="config" index="18" label="Key1 Activate Scene ID" max="255" min="0" type="byte" units="" value="0">
+      <Help>
+      Key1 Activate Scene ID
+      0 = Scene ID is invalid and will not send scene activate command.
+      1 - 255 = Scene ID
+      </Help>
+    </Value>
+    <Value genre="config" index="19" label="Key1 Activate Scene Duration" max="254" min="0" type="byte" units="" value="0">
+      <Help>
+      Key1 Activate Scene Duration
+      0 = Instantly
+      1 - 127 = Dimming durations from 1 second (1 | 0x01) to 127 seconds (127 | 0x7F) in 1-second resolution
+      128 - 254 = Dimming durations from 1 minute (128 | 0x80) to 127 minutes (254 | 0xFE) in 1-minute resolution
+      </Help>
+    </Value>
+    <Value genre="config" index="20" label="Key2 Scene Activate Mode Setting" max="3" min="0" size="1" type="list" value="0">
+      <Help>Key 2 Scene response</Help>
+      <Item label="Scence active function disabled" value="0"/>
+      <Item label="One click Key2 always activate scene ID no matter what the status of Key2 is" value="1"/>
+      <Item label="One click Key2 always activate scene ID when Key2's relay output is open" value="2"/>
+      <Item label="One click Key2 always activate scene ID when Key2's relay output is closed" value="3"/>
+    </Value>
+    <Value genre="config" index="21" label="Key2 Activate Scene ID" max="255" min="0" type="byte" units="" value="0">
+      <Help>
+      Key2 Activate Scene ID
+      0 = Scene ID is invalid and will not send scene activate command.
+      1 - 255 = Scene ID
+      </Help>
+    </Value>
+    <Value genre="config" index="22" label="Key2 Activate Scene Duration" max="254" min="0" type="byte" units="" value="0">
+      <Help>
+      Key2 Activate Scene Duration
+      0 = Instantly
+      1 - 127 = Dimming durations from 1 second (1 | 0x01) to 127 seconds (127 | 0x7F) in 1-second resolution
+      128 - 254 = Dimming durations from 1 minute (128 | 0x80) to 127 minutes (254 | 0xFE) in 1-minute resolution
+      </Help>
+    </Value>
+    <Value genre="config" index="23" label="Key3 Scene Activate Mode Setting" max="3" min="0" size="1" type="list" value="0">
+      <Help>Key 3 Scene response</Help>
+      <Item label="Scence active function disabled" value="0"/>
+      <Item label="One click Key3 always activate scene ID no matter what the status of Key3 is" value="1"/>
+      <Item label="One click Key3 always activate scene ID when Key3's relay output is open" value="2"/>
+      <Item label="One click Key3 always activate scene ID when Key3's relay output is closed" value="3"/>
+    </Value>
+    <Value genre="config" index="24" label="Key3 Activate Scene ID" max="255" min="0" type="byte" units="" value="0">
+      <Help>
+      Key3 Activate Scene ID
+      0 = Scene ID is invalid and will not send scene activate command.
+      1 - 255 = Scene ID
+      </Help>
+    </Value>
+    <Value genre="config" index="25" label="Key3 Activate Scene Duration" max="254" min="0" type="byte" units="" value="0">
+      <Help>
+      Key3 Activate Scene Duration
+      0 = Instantly
+      1 - 127 = Dimming durations from 1 second (1 | 0x01) to 127 seconds (127 | 0x7F) in 1-second resolution
+      128 - 254 = Dimming durations from 1 minute (128 | 0x80) to 127 minutes (254 | 0xFE) in 1-minute resolution
+      </Help>
+    </Value>
+    <Value genre="config" index="32" label="Scene response ID 1 - 50" size="1" type="bitset" bitmask="7" value="0">
+      <Help>
+      Scene response  ID 1 - 50
+      Valid only when the default is 0 (0x00) for Scene response (parameter 16 | 0x10)
+      </Help>
+      <BitSet id="1">
+        <Label>Key 1</Label>
+        <Help>Key 1 scene response</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Key 2</Label>
+        <Help>Key 2 scene response</Help>
+      </BitSet>
+      <BitSet id="3">
+        <Label>Key 3</Label>
+        <Help>Key 3 scene response</Help>
+      </BitSet>
+    </Value>
+    <Value genre="config" index="33" label="Scene response ID 51 - 100" size="1" type="bitset" bitmask="7" value="0">
+      <Help>
+      Scene response  ID 51 - 100
+      Valid only when the default is 0 (0x00) for Scene response (parameter 16 | 0x10)
+      </Help>
+      <BitSet id="1">
+        <Label>Key 1</Label>
+        <Help>Key 1 scene response</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Key 2</Label>
+        <Help>Key 2 scene response</Help>
+      </BitSet>
+      <BitSet id="3">
+        <Label>Key 3</Label>
+        <Help>Key 3 scene response</Help>
+      </BitSet>
+    </Value>   
+    <Value genre="config" index="34" label="Scene response ID 101 - 150" size="1" type="bitset" bitmask="7" value="0">
+      <Help>
+      Scene response  ID 101 - 150
+      Valid only when the default is 0 (0x00) for Scene response (parameter 16 | 0x10)
+      </Help>
+      <BitSet id="1">
+        <Label>Key 1</Label>
+        <Help>Key 1 scene response</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Key 2</Label>
+        <Help>Key 2 scene response</Help>
+      </BitSet>
+      <BitSet id="3">
+        <Label>Key 3</Label>
+        <Help>Key 3 scene response</Help>
+      </BitSet>
+    </Value>
+    <Value genre="config" index="35" label="Scene response ID 151 - 200" size="1" type="bitset" bitmask="7" value="0">
+      <Help>
+      Scene response  ID 151 - 200
+      Valid only when the default is 0 (0x00) for Scene response (parameter 16 | 0x10)
+      </Help>
+      <BitSet id="1">
+        <Label>Key 1</Label>
+        <Help>Key 1 scene response</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Key 2</Label>
+        <Help>Key 2 scene response</Help>
+      </BitSet>
+      <BitSet id="3">
+        <Label>Key 3</Label>
+        <Help>Key 3 scene response</Help>
+      </BitSet>
+    </Value>
+    <Value genre="config" index="36" label="Scene response ID 201 - 250" size="1" type="bitset" bitmask="7" value="0">
+      <Help>
+      Scene response  ID 201 - 250
+      Valid only when the default is 0 (0x00) for Scene response (parameter 16 | 0x10)
+      </Help>
+      <BitSet id="1">
+        <Label>Key 1</Label>
+        <Help>Key 1 scene response</Help>
+      </BitSet>
+      <BitSet id="2">
+        <Label>Key 2</Label>
+        <Help>Key 2 scene response</Help>
+      </BitSet>
+      <BitSet id="3">
+        <Label>Key 3</Label>
+        <Help>Key 3 scene response</Help>
+      </BitSet>
+    </Value>
+    <Value genre="config" index="255" label="Restore factory setting" max="85" min="0" size="1" type="list" value="0">
+      <Help>Restore factory setting</Help>
+      <Item label="Normal" value="0"/>
+      <Item label="Reset to factory defaults" value="85"/>
     </Value>
   </CommandClass>
   <!-- Map endpoints to instances -->
@@ -17,10 +300,10 @@
   <!-- Association Groups -->
   <CommandClass id="133">
     <Associations num_groups="4">
-      <Group auto="false" index="1" label="Button1" max_associations="5"/>
-      <Group index="2" label="Button2" max_associations="5"/>
-      <Group index="3" label="Button3" max_associations="5"/>
-      <Group auto="true" index="4" label="Lifeline" max_associations="1"/>
+      <Group index="1" label="Gateway" max_associations="1"/>
+      <Group index="2" label="Key1" max_associations="5"/>
+      <Group index="5" label="Key2" max_associations="5"/>
+      <Group index="8" label="Key3" max_associations="5"/>
     </Associations>
   </CommandClass>
 </Product>
diff --git a/config/namron/1402756.xml b/config/namron/1402756.xml
index f924a46f..551d38e1 100644
--- a/config/namron/1402756.xml
+++ b/config/namron/1402756.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
     <!--
     LED Dimmer Z-Wave 200W
     Manual: 
@@ -10,17 +10,14 @@
 Technical description
 
 A trailing edge dimmer, for use with 230V Halogen, 230V LED and electronic transformers. Has built-in short cut protection in case of lamp failure. Only need L-conductor connected.</MetaDataItem>
-    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/XXXX:XXXX:XXXX</MetaDataItem>
-    <MetaDataItem name="ProductPage"><!-- URL to the Product Page on the Vendors Website --></MetaDataItem>
-    <MetaDataItem name="ProductSupport"><!-- URL to the Product Support Page on the Vendors Website --></MetaDataItem>
-    <MetaDataItem name="ProductPic"><!-- path to images/vendor/product.png --></MetaDataItem>
-    <MetaDataItem name="ProductManual"><!-- URL to the product manual. - Prefer to use something hosted on the products.z-wavealliance.org pages --></MetaDataItem>
+    <MetaDataItem name="ProductPic">images/namron/1402756.png</MetaDataItem>
     <MetaDataItem name="InclusionDescription">Double click on the reset button </MetaDataItem>
     <MetaDataItem name="ExclusionDescription">Double click on the reset button</MetaDataItem>
     <MetaDataItem name="ResetDescription">Hold reset button for >5 secs</MetaDataItem>
     <MetaDataItem id="0002" name="Identifier" type="0202">1402756</MetaDataItem>
      <ChangeLog>
       <Entry author="Per Weisteen - per@weisteen.net" date="01 May 2020" revision="1">Handcrafted based on domoticz/Config/config-template.xml and Vendors product manual</Entry>
+      <Entry author="Justin Hammond" date="24 June 2020" revision="2">Add Product Pic</Entry>
     </ChangeLog>
   </MetaData>
 
diff --git a/config/namron/4512710.xml b/config/namron/4512710.xml
new file mode 100644
index 00000000..41718246
--- /dev/null
+++ b/config/namron/4512710.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+  <MetaData>
+    <MetaDataItem name="Name">Namron Z-Wave Dimmer 400W</MetaDataItem>
+    <MetaDataItem name="Description">
+      The in-wall dimmer is a Z-Wave device that is used to switch ON/OFF and adjust light intensity of the connected light.
+    </MetaDataItem>
+    <MetaDataItem name="ProductPic">images/namron/4512710.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Triple click on the reset button or repower the device</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Triple click on the reset button</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold reset button for 10 seconds</MetaDataItem>
+    <MetaDataItem id="d005" name="Identifier" type="0200">4512710</MetaDataItem>
+     <ChangeLog>
+      <Entry author="Nikhil André Luthra - nikhil.a.luthra@gmail.com" date="01 Nov 2020" revision="1">Handcrafted based on namron/1402756.xml and Vendors product manual</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Configuration -->
+  <CommandClass id="112"> 	
+    <Value type="list" genre="config" instance="1" index="2" label="Saving load state before power failure" size="1" value="0">
+        <Help>
+          Saving state before power failure.
+        </Help>
+      <Item label="Shutoff load" value="0"/>
+      <Item label="Turn on load" value="1"/>
+      <Item label="Save load state before power failure" value="2"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="3" label="Send Basic report" size="1" value="1">
+        <Help> 
+          Enable/disable to send the basic report to the Lifeline when the load state changed（When value set as 1, repower on the dimmer, it will send Basic report automatically）
+        </Help>
+      <Item label="Disable to send Basic report" value="0"/>
+      <Item label="Enable to send Basic report" value="1"/>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="4" label="Fade time" min="0" max="127" value="1">
+        <Help>
+          Default fade time (unit is second, this value has the same function as Duration of Multilevel).
+          Valid value: 0~127
+        </Help>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="5" label="Minimum brightness" size="1" value="5">
+        <Help>
+          Setting minimum brightness value. 
+          Valid value: 0~50, the bigger the value is, the higher the load’s minimum brightness is.
+        </Help>
+   </Value>
+  <Value type="list" genre="config" instance="1" index="6" label="MOSFET driving type" size="1" value="0">
+        <Help>
+          Choose MOSFET driving type.
+        </Help>
+        <Item label="Trailing edge" value="0"/>
+        <Item label="Leading edge" value="1"/>
+    </Value>
+     <Value type="list" genre="config" instance="1" index="7" label="Add/remove through external switch" size="1" value="1">
+        <Help>
+          Added to and removed from a network through external
+          switch (when enables this function, triple press the external
+          switch within 1.5 seconds to be added to or removed from a
+          network)
+        </Help>
+        <Item label="Disable" value="0"/>
+        <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="8" label="Dimming curve" size="1" value="0">
+        <Help>
+          Setting dimming curve
+        </Help>
+        <Item label="linear dimming" value="0"/>
+        <Item label="logarithmic dimming" value="1"/>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="9" label="Startup brightness of load" size="1" value="0">
+        <Help>
+          Setting startup brightness of the load
+          Valid value: 0~99
+          Note: every time when turn on the load from OFF status, if the
+          target brightness is lower than the startup brightness, the
+          brightness will first go to the startup brightness value then
+          fall down to the target brightness
+        </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" max_associations="5" label="Lifeline"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/namron/4512712.xml b/config/namron/4512712.xml
new file mode 100644
index 00000000..abf65f42
--- /dev/null
+++ b/config/namron/4512712.xml
@@ -0,0 +1,47 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+  <MetaData>
+    <MetaDataItem name="Name">Namron Z-Wave 1 kanal bryter K2</MetaDataItem>
+    <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave devices and activate scenes in Gateways. Although it is controlling other devices, the device cannot act as Z-Wave network controller (primary or secondary) and will always need a Z-Wave network controller to be added into a Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0438:a30f:0300</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.namron.com/products/namron-z-wave-1-kanal-bryter-k2/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.namron.com/contact/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/namron/4512712.jpg</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.elektroimportoren.no/docs/lib/4512712-Brukerveiledning-5.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">short press any button</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Set controller in inclusion mode press and hold down group 2 keys for 3 seconds</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Set controller in exclusion mode press and hold down group 2 keys for 3 seconds</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down group 2 keys for more than 10 seconds use only if controller is unavailable</MetaDataItem>
+    <MetaDataItem id="0xa30f" name="ZWProductPage" type="0x0300">https://products.z-wavealliance.org/products/3910</MetaDataItem>
+    <MetaDataItem id="0xa30f" name="FrequencyName" type="0x0300">CEPT</MetaDataItem>
+    <MetaDataItem id="0xa30f" name="Identifier" type="0x0300">4512712</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Joachim M. Giæver" date="28 November 2020" revision="2">Fix id. </Entry>
+      <Entry author="Joachim M. Giæver" date="28 November 2020" revision="1">Initial release. </Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+    <!-- Here is a Byte/Int/Short Value Sample -->
+    <Value genre="config" index="1" label="Factory reset" max="21930" min="21930" type="int" units="" value="0" write_only="true">
+      <Help>Set to 21930 to factory reset the device.</Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>true</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="LifeLine" max_associations="5"/>
+      <Group index="2" label="Launch 1" max_associations="5" auto="true"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/namron/4512714.xml b/config/namron/4512714.xml
new file mode 100644
index 00000000..ce946db5
--- /dev/null
+++ b/config/namron/4512714.xml
@@ -0,0 +1,84 @@
+<?xml version='1.0'?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+   <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+   <MetaData>
+      <MetaDataItem name="Name">Namron Z-Wave 4 Channel Wall Remote K8</MetaDataItem>
+      <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave devices and activate scenes in
+         Gateways. Although it is controlling other devices, the device cannot act as Z-Wave network controller (primary
+         or secondary) and will always need a Z-Wave network controller to be included into a Z-Wave network. It also
+         supports the Over The Air (OTA) feature for the product’s firmware upgrade.
+
+         The remote control has following functions:
+         1. Control of groups of other Z-Wave devices using 'ON', 'OFF' and Dim commands.
+         2. Activation of scenes in Gateway mode.
+
+         The encryption modes that the remote control supports are S0, S2 Authenticated, S2 Unauthenticated. When
+         the remote control is being included into a Z-Wave network, you can use your primary controller/gateway to
+         enable one encryption mode or disable encryption. (The primary controller/gateway shall support
+         encryption mode configuration).
+      </MetaDataItem>
+      <MetaDataItem name="OzwInfoPage">XX http://www.openzwave.com/device-database/0438:a305:0300</MetaDataItem>
+      <MetaDataItem name="ProductPage">https://www.namron.com/products/namron-z-wave-4-kanaler-bryter-k8-854/</MetaDataItem>
+      <MetaDataItem name="ProductSupport">https://www.namron.com/contact/</MetaDataItem>
+      <MetaDataItem name="ProductPic">images/namron/4512714.jpg</MetaDataItem>
+      <MetaDataItem name="ProductManual">https://www.elektroimportoren.no/docs/lib/4512714-Brukerveiledning-5.pdf</MetaDataItem>
+      <MetaDataItem name="WakeupDescription">The remote control is under sleepy mode for most of the time to save battery power. It can not receive wireless
+         command under sleepy mode. Before the gateway interacts data with the remote, the remote control shall be
+         activated manually first. Short press any button to activate the remote control for 3s, and press and hold down
+         I and O buttons of Group 2 over 1 second to activate the remote control</MetaDataItem>
+      <MetaDataItem name="InclusionDescription">Step 1. Make sure the remote control does not belong to any Z-Wave network, short press any button, if LED 
+         indicator does not turn on, the remote control does not belong to any network, then continue step 2,if LED indicator turns on, it means the remote
+         control has already been included to a network, please first set the remote control to exclusion mode (refer to the part Exclusion"" of this manual),
+         then continue step 2.
+         
+         Step 2. Set primary controller/gateway into inclusion mode (Please refer to your primary controllers manual on how to turn your controller into inclusion).
+         
+         Step 3. Press and hold down both buttons I and O of Group 2 over 3 seconds, LED indicator turns on, the remote control will be set to inclusion mode, 
+         and waiting to be included, after 10s LED indicator blinks 6 times quickly to indicate successful inclusion. The remote control is a sleepy device, 
+         after inclusion it will not enter into sleepy mode immediately, and will continue activation status for 30s and wait data interaction from the gateway, 
+         the LED indicator will stay solid on, please be patient to wait LED indicator to turn off.
+      </MetaDataItem>
+      <MetaDataItem name="ExclusionDescription">There are two exclusion methods:
+         Method 1: Exclusion from the primary controller/gateway as follows:
+            1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual on how to set your controller into exclusion).
+            2. Press and hold down both buttons I and O of Group 2 over 3 seconds, LED indicator turns on, the remote control will be set to exclusion mode, and
+            waiting to be excluded, after 7s LED indicator blinks 4 times quickly to indicate successful exclusion.
+         Method 2: Factory reset the remote control will force the remote control to be excluded from a network. (please refer to the part “Factory Reset” of this manual)
+      </MetaDataItem>
+      <MetaDataItem name="ResetDescription">Press and hold down both buttons I and O of Group 2 for over 10 seconds, LED indicator turns on and then
+         blinks 4 times quickly to indicate successful factory reset.Please use this procedure only when the network
+         primary controller is missing or otherwise inoperable.</MetaDataItem>
+      <MetaDataItem id="0xa305" name="ZWProductPage" type="0x0300">https://products.z-wavealliance.org/products/3639</MetaDataItem>
+      <MetaDataItem id="0xa305" name="FrequencyName" type="0x0300">CEPT</MetaDataItem>
+      <MetaDataItem id="0xa305" name="Identifier" type="0x0300">4512720</MetaDataItem>
+      <ChangeLog>
+         <Entry author="Petter L. H. Eide" date="28 November 2020" revision="1">Initial addition of product definition.</Entry>
+      </ChangeLog>
+   </MetaData>
+  <CommandClass id="112">
+    <!-- Here is a Byte/Int/Short Value Sample -->
+    <Value genre="config" index="1" label="Factory reset" max="21930" min="21930" type="int" units="" value="0" write_only="true">
+      <Help>Set to 21930 to factory reset the device.</Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>true</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+   <!-- Association Groups -->
+   <CommandClass id="133">
+      <Associations num_groups="5">
+         <Group index="1" label="Lifeline" max_associations="1" />
+         <Group index="2" label="Button 1" max_associations="5" />
+         <Group index="3" label="Button 2" max_associations="5" />
+         <Group index="4" label="Button 3" max_associations="5" />
+         <Group index="5" label="Button 4" max_associations="5" />
+      </Associations>
+   </CommandClass>
+</Product>
diff --git a/config/namron/4512715.xml b/config/namron/4512715.xml
new file mode 100644
index 00000000..28036bb5
--- /dev/null
+++ b/config/namron/4512715.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+  <MetaData>
+    <MetaDataItem name="Name">Namron Z-Wave Switch 400W</MetaDataItem>
+    <MetaDataItem name="Description">
+      The in-wall switch is a Z-wave device that is used to switch ON/OFF the connected light and can be controlled by other Z-Wave devices.
+      Supports S2 Unauthenticated.
+      Supports OTA.
+    </MetaDataItem>
+    <MetaDataItem name="ProductPic">images/namron/4512715.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Triple click on the reset button or repower the device</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Triple click on the reset button</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold reset button for 10 seconds</MetaDataItem>
+    <MetaDataItem id="d006" name="Identifier" type="0200">4512715</MetaDataItem>
+     <ChangeLog>
+      <Entry author="Nikhil André Luthra - nikhil.a.luthra@gmail.com" date="01 Nov 2020" revision="1">Handcrafted based on namron/1402756.xml and Vendors product manual</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Configuration -->
+  <CommandClass id="112"> 	
+    <Value type="list" genre="config" instance="1" index="2" label="Saving load state before power failure" size="1" value="2">
+        <Help>
+          Saving state before power failure.
+        </Help>
+      <Item label="Shutoff load" value="0"/>
+      <Item label="Turn on load" value="1"/>
+      <Item label="Save load state before power failure" value="2"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="3" label="Send Basic report" size="1" value="1">
+        <Help> 
+          Enable/disable to send the basic report to the Lifeline when the load state changed（When value set as 1, repower on the dimmer, it will send Basic report automatically）
+        </Help>
+      <Item label="Disable to send Basic report" value="0"/>
+      <Item label="Enable to send Basic report" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="7" label="Add/remove through external switch" size="1" value="1">
+        <Help>
+          Added to and removed from a network through external
+          switch (when enables this function, triple press the external
+          switch within 1.5 seconds to be added to or removed from a
+          network)
+        </Help>
+        <Item label="Disable" value="0"/>
+        <Item label="Enable" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" max_associations="5" label="Lifeline"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/namron/4512720.xml b/config/namron/4512720.xml
new file mode 100644
index 00000000..64db4f68
--- /dev/null
+++ b/config/namron/4512720.xml
@@ -0,0 +1,48 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+  <MetaData>
+    <MetaDataItem name="Name">Namron Z-Wave 2 kanaler bryter K4</MetaDataItem>
+    <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave devices and activate scenes in Gateways. Although it is controlling other devices, the device cannot act as Z-Wave network controller (primary or secondary) and will always need a Z-Wave network controller to be added into a Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0438:a306:0300</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.namron.com/products/namron-z-wave-2-kanaler-bryter-k4/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.namron.com/contact/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/namron/4512720.jpg</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.elektroimportoren.no/docs/lib/4512720-Brukerveiledning-5.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">short press any button</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Set controller in inclusion mode press and hold down group 2 keys for 3 seconds</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Set controller in exclusion mode press and hold down group 2 keys for 3 seconds</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down group 2 keys for more than 10 seconds use only if controller is unavailable</MetaDataItem>
+    <MetaDataItem id="0xa306" name="ZWProductPage" type="0x0300">https://products.z-wavealliance.org/products/3911</MetaDataItem>
+    <MetaDataItem id="0xa306" name="FrequencyName" type="0x0300">CEPT</MetaDataItem>
+    <MetaDataItem id="0xa306" name="Identifier" type="0x0300">4512720</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Joachim M. Giæver" date="28 November 2020" revision="2">Fix product page</Entry>
+      <Entry author="Joachim M. Giæver" date="28 November 2020" revision="1">Based on thermofloor/heatitz4.xml, fix groups and add multi channel assoc.</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+    <!-- Here is a Byte/Int/Short Value Sample -->
+    <Value genre="config" index="1" label="Factory reset" max="21930" min="21930" type="int" units="" value="0" write_only="true">
+      <Help>Set to 21930 to factory reset the device.</Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>true</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="LifeLine" max_associations="5"/>
+      <Group index="2" label="Launch 1" max_associations="5" auto="true"/>
+      <Group index="3" label="Launch 2" max_associations="5" auto="true"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/namron/4512724.xml b/config/namron/4512724.xml
new file mode 100644
index 00000000..3997f648
--- /dev/null
+++ b/config/namron/4512724.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+  <MetaData>
+    <MetaDataItem name="Name">Namron Z-Wave Dimmer 2 400W</MetaDataItem>
+    <MetaDataItem id="1000" name="ZWProductPage" type="0102">https://products.z-wavealliance.org/products/3912</MetaDataItem>
+    <MetaDataItem name="Description">
+      The micro smart dimmer is a Z-Wave device designed to work with various types of light sources. It may be
+      connected to two-wire or three-wire configuration so it can operate with or without neutral lead. The dimmer can
+      switch or dim connected light source either through Z-Wave devices or through the wall switch connected
+      directly to it. The smart dimmer is equipped with an algorithm of smart light source detection which makes
+      configuration easier and ensures high compatibility of the device. It may be used as a switch with nondimmable
+      light sources (in 3-wire connection).
+
+      The dimmer can be included and operated in any Z-Wave network with other Z-Wave certified devices from
+      other manufacturers and/or other applications. All non- battery operated nodes within the network will act as
+      repeaters regardless of vendor to increase reliability of the network.
+
+      The encryption mode that the dimmer supports is S2 Unauthenticated. When the dimmer is being included into
+      a Z-Wave network, you can use your primary controller/gateway to enable encryption mode or disable
+      encryption. (The primary controller/gateway shall support encryption mode configuration). The dimmer
+      supports OTA and can update firmware wirelessly.
+    </MetaDataItem>
+    <MetaDataItem name="ProductPic">images/namron/4512724.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Triple click on the reset button or repower the device</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Triple click on the reset button</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold reset button for 10 seconds</MetaDataItem>
+    <MetaDataItem id="d00c" name="Identifier" type="0200">4512724</MetaDataItem>
+     <ChangeLog>
+      <Entry author="Nikhil André Luthra - nikhil.a.luthra@gmail.com" date="01 Nov 2020" revision="1">Handcrafted based on namron/1402756.xml and Vendors product manual</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Configuration -->
+  <CommandClass id="112"> 	
+    <Value type="list" genre="config" instance="1" index="2" label="Saving load state before power failure" size="1" value="2">
+        <Help>
+          Saving state before power failure.
+        </Help>
+      <Item label="Shutoff load" value="0"/>
+      <Item label="Turn on load" value="1"/>
+      <Item label="Save load state before power failure" value="2"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="3" label="Send Basic report" size="1" value="1">
+        <Help> 
+          Enable/disable to send the basic report to the Lifeline when the load state changed（When value set as 1, repower on the dimmer, it will send Basic report automatically）
+        </Help>
+      <Item label="Disable to send Basic report" value="0"/>
+      <Item label="Enable to send Basic report" value="1"/>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="4" label="Fade time" min="0" max="127" value="1">
+        <Help>
+          Default fade time (unit is second, this value has the same function as Duration of Multilevel).
+          Valid value: 0~127
+        </Help>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="5" label="Minimum brightness" size="1" value="15">
+        <Help>
+          Setting minimum brightness value. 
+          Valid value: 0~50, the bigger the value is, the higher the load’s minimum brightness is.
+        </Help>
+   </Value>
+   <Value type="byte" genre="config" instance="1" index="6" label="Maximum brightness" size="1" value="100">
+        <Help>
+          Setting maximum brightness value.
+          Valid value: 0~100
+        </Help>
+  </Value>
+    <Value type="list" genre="config" instance="1" index="7" label="MOSFET driving type" size="1" value="0">
+        <Help>
+          Choose MOSFET driving type.
+        </Help>
+        <Item label="Trailing edge" value="0"/>
+        <Item label="Leading edge" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="8" label="External switch type" value="0" size="1">
+        <Help>
+           External switch type
+        </Help>
+        <Item label="Push button switch" value="0"/>
+        <Item label="Normal on/off switch" value="1"/>
+        <Item label="3-way switch" value="2"/>
+     </Value>
+     <Value type="list" genre="config" instance="1" index="9" label="Add/remove through external switch" size="1" value="1">
+        <Help>
+          Added to and removed from a network through external
+          switch (when enables this function, triple press the external
+          switch within 1.5 seconds to be added to or removed from a
+          network)
+        </Help>
+        <Item label="Disable" value="0"/>
+        <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="11" label="Wiring type (read only)" read_only="true" size="1" value="0">
+        <Help>
+          Wiring type (Read only)
+        </Help>
+        <Item label="Unknown" value="0"/>
+        <Item label="2 wire with no neutral" value="1"/>
+        <Item label="3 wire with neutral" value="2"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="12" label="Load type (read only)" read_only="true" size="1" value="0">
+        <Help>
+          Wiring type (Read only)
+        </Help>
+        <Item label="Unknown" value="0"/>
+        <Item label="resistive" value="1"/>
+        <Item label="inductive" value="2"/>
+        <Item label="capacitive" value="3"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="13" label="Over current protection" size="1" value="1">
+        <Help>
+          Enable/disable over current protection (over 2.1A for 20 seconds continuously)
+        </Help>
+        <Item label="Disable" value="0"/>
+        <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="14" label="Power automatic report absolute threshold" value="10">
+        <Help>
+          Power automatic report absolute threshold, unit is W.
+          When power changes above the absolute threshold, immediately report current power value
+        </Help>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="15" label="Power automatic report percentage threshold" size="1" value="20">
+        <Help>
+          Power automatic report percentage threshold, unit is %.
+          When power changes above the percentage threshold, immediately report current power value
+        </Help>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="21" label="Power metering automatic report time cycle" value="600">
+        <Help>
+          Power metering automatic report time cycle, unit is second.
+          Valid time cycle value: 5~2678400, when set as 0, report function disabled
+        </Help>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="22" label="Energy metering automatic report time cycle" value="1800">
+        <Help>
+          Energy metering automatic report time cycle, unit is second
+          Valid time cycle value: 5~2678400, when set as 0, report function disabled
+        </Help>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="23" label="Voltage metering automatic report time cycle" value="3600">
+        <Help>
+          Voltage metering automatic report time cycle, unit is second
+          Valid time cycle value: 5~2678400, when set as 0, report function disabled
+        </Help>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="24" label="Current metering automatic report time cycle, unit is second" value="3600">
+        <Help>
+          Current metering automatic report time cycle, unit is second
+          Valid time cycle value: 5~2678400, when set as 0, report function disabled
+        </Help>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="31" label="Dimming curve" size="1" value="0">
+        <Help>
+          Setting dimming curve
+        </Help>
+        <Item label="linear dimming" value="0"/>
+        <Item label="logarithmic dimming" value="1"/>
+    </Value>
+    <Value type="byte" genre="config" instance="1" index="32" label="Startup brightness of load" size="1" value="0">
+        <Help>
+          Setting startup brightness of the load
+          Valid value: 0~99
+          Note: every time when turn on the load from OFF status, if the
+          target brightness is lower than the startup brightness, the
+          brightness will first go to the startup brightness value then
+          fall down to the target brightness
+        </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" max_associations="5" label="Lifeline"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/nei/ms11z.xml b/config/nei/ms11z.xml
new file mode 100644
index 00000000..0d2f95d5
--- /dev/null
+++ b/config/nei/ms11z.xml
@@ -0,0 +1,66 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">MS11Z</MetaDataItem> 
+    <MetaDataItem name="Description">Minoston Smart Dimmer Switch</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">https://products.z-wavealliance.org/products/3610?selectedFrequencyId=2</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://minoston.com/product/z-wave-plus-smart-dimmer-switch-%EF%BC%88ms11z%EF%BC%89/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/inovelli/lzw30.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Add  the MS13Z from the existing Z-Wave home control network with your primary controller.
+
+ Refer to your primary controller instructions to process the inclusion / exclusion setup procedure.
+ When prompted by your primary controller, click the Up or Down button three times in one second.
+Include MS13Z to/from a Z-Wave Gateway with supporting Security.The MS13Z can support the Primary Controller that implemented the security S2.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Remove the MS13Z from the existing Z-Wave home control network with your primary controller.
+
+ Refer to your primary controller instructions to process the inclusion / exclusion setup procedure.
+ When prompted by your primary controller, click the Up or Down button three times in one second.</MetaDataItem>
+    
+    <ChangeLog>
+      <Entry author="Ryan McFadden - rjmcfadd@gmail.com" date="11 Jan 2021" revision="1">Adding Device</Entry>
+    </ChangeLog> 
+  </MetaData> 
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="0" label="Locally button function" units="" size="1" min="0" max="2" type="list">
+      <Help>Locally button function</Help>
+      <Item value="0" label="Up Button:On Down Button: Off" />
+      <Item value="1" label="Up Button:Off Down Button: On" />
+      <Item value="2" label="Up Button:On/Off Down Button: On/Off" />
+    </Value>
+    <Value genre="config" instance="1" index="2" value="0" label="LED indicator" units="" size="1" min="0" max="3" type="list">
+      <Help>LED indicator</Help>
+      <Item value="0" label="On when Off and Off when On "/>
+      <Item value="1" label="On when On and Off when Off" />
+      <Item value="2" label="Always Off " />
+      <Item value="3" label="Always On" />
+    </Value>
+    <Value genre="config" instance="1" index="3" value="0" label="Enable Auto Turn-Off Timer" units="" size="1" min="0" max="1" type="list">
+      <Help>Enable Auto Turn-Off Timer</Help>
+      <Item value="0" label="Disabled" />
+      <Item value="1" label="Enabled" />
+    </Value>
+    <Value genre="config" instance="1" index="4" value="0" label="Auto turn off timer" units="" size="4" min="0" max="65535" type="int">
+      <Help>Auto turn off timer</Help>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="2" label="Restore state after power failure" units="" size="1" min="0" max="2" type="byte">
+      <Help>Restore state after power failure</Help>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="5" />
+      <Group index="2" label=" Send Basic Set ON/OFF" max_associations="1" />
+    </Associations>
+  </CommandClass>
+  <!-- Central Scene Reports -->
+  <CommandClass id="91">
+    <Instance index="1" />
+      <Value type="int" genre="system" instance="1" index="0" label="Scene Count" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="2" />
+      <Value type="int" genre="user" instance="1" index="2" label="Top Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0" />
+      <Value type="int" genre="user" instance="1" index="1" label="Bottom Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0" />
+      <Value type="int" genre="user" instance="1" index="3" label="Config Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0" />
+  </CommandClass>
+
+</Product>
diff --git a/config/nexia/th100nx.xml b/config/nexia/th100nx.xml
new file mode 100644
index 00000000..06df0367
--- /dev/null
+++ b/config/nexia/th100nx.xml
@@ -0,0 +1,98 @@
+<Product Revision="1" 
+    xmlns="https://github.com/OpenZWave/open-zwave">
+    <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+    <MetaData>
+        <MetaDataItem name="Name">Remote Temperature and Humidity Sensor</MetaDataItem>
+        <MetaDataItem name="Description">The Remote Temperature and Humidity sensor is a Z-Wave Plus multilevel, battery-powered, routing sensor that measures and reports indoor temperature and relative humidity.  The reporting intervals and thresholds for the indoor temperature, indoor humidity and battery are configurable.  The wakeup interval is also configurable.   This sensor cannot be used with Trane/American Standard thermostats for HVAC control.</MetaDataItem>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0178:3130:5448</MetaDataItem>
+        <MetaDataItem name="ProductPage">https://products.z-wavealliance.org/products/2223</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/nexia/th100nx.png</MetaDataItem>
+        <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/2223/18-HD84D1-1A.pdf</MetaDataItem>
+        <MetaDataItem name="WakeupDescription">Press the Install button three times rapidly to send a Battery Report and Wakeup Notification when installed on a network.</MetaDataItem>
+        <MetaDataItem name="InclusionDescription">Set primary controller to inclusion mode, then press and release install button. Status LED will blink three times to show success.</MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">Set primary controller to exclusion mode, then press and release install button. Status LED will blink three times to show success.</MetaDataItem>
+        <MetaDataItem name="ResetDescription">Press and hold install button for 10 seconds to restore to factory defaults.</MetaDataItem>
+        <MetaDataItem id="3130" name="ZWProductPage" type="5448">https://products.z-wavealliance.org/products/2223</MetaDataItem>
+        <MetaDataItem id="3130" name="FrequencyName" type="5448">U.S. / Canada / Mexico</MetaDataItem>
+        <MetaDataItem id="3130" name="Identifier" type="5448">TH100NX</MetaDataItem>
+        <ChangeLog>
+            <Entry author="Daniel Koronthaly - daniel@koronthaly.net" date="06 July 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2223/xml</Entry>
+        </ChangeLog>
+    </MetaData>
+    <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+    <CommandClass id="112">
+        <Value genre="config" index="1" label="Battery Report Interval" max="127" min="0" size="1" type="list" units="hours" value="0">
+            <Help>Time between Battery Reports in hours</Help>
+            <Item label="Do not send periodically" value="0"/>
+        </Value>
+        <Value genre="config" index="2" label="Basic Set ON Above Temp" max="121" min="15" size="1" type="list" units="Farenheit" value="121">
+            <Help>BASIC SET ON above this temperature.</Help>
+            <Item label="Disabled" value="121"/>
+        </Value>
+        <Value genre="config" index="3" label="Basic Set ON Below Temp" max="121" min="15" size="1" type="list" units="Farenheit" value="121">
+            <Help>BASIC SET ON below this temperature.</Help>
+            <Item label="Disabled" value="121"/>
+        </Value>
+        <Value genre="config" index="4" label="Basic Set OFF Above Temp" max="121" min="15" size="1" type="list" units="Farenheit" value="121">
+            <Help>BASIC SET OFF above this temperature.</Help>
+            <Item label="Disabled" value="121"/>
+        </Value>
+        <Value genre="config" index="5" label="Basic Set OFF Below Temp" max="121" min="15" size="1" type="list" units="Farenheit" value="121">
+            <Help>BASIC SET OFF below this temperature.</Help>
+            <Item label="Disabled" value="121"/>
+        </Value>
+        <Value genre="config" index="6" label="Basic Set Attempts" max="5" min="0" size="1" type="list" units="Attempts" value="0">
+            <Help>How many attempts</Help>
+            <Item label="Disabled" value="0"/>
+        </Value>
+        <Value genre="config" index="7" label="Temp Units" max="1" min="0" size="1" type="list" units="C/F" value="1">
+            <Help>Temperature Units used</Help>
+            <Item label="Farenheit" value="1"/>
+            <Item label="Celsius" value="0"/>
+        </Value>
+        <Value genre="config" index="12" label="Basic Set ON Above RH" max="100" min="0" size="1" type="list" units="%" value="0">
+            <Help>BASIC SET ON above this humidity</Help>
+            <Item label="Disabled" value="0"/>
+        </Value>
+        <Value genre="config" index="13" label="Basic Set ON Below RH" max="100" min="0" size="1" type="list" units="%" value="0">
+            <Help>BASIC SET ON below this humidity</Help>
+            <Item label="Disabled" value="0"/>
+        </Value>
+        <Value genre="config" index="14" label="Basic Set OFF Above RH" max="100" min="0" size="1" type="list" units="%" value="0">
+            <Help>BASIC SET OFF above this humidity</Help>
+            <Item label="Disabled" value="0"/>
+        </Value>
+        <Value genre="config" index="15" label="Basic Set OFF Below RH" max="100" min="0" size="1" type="list" units="%" value="0">
+            <Help>BASIC SET OFF below this humidity</Help>
+            <Item label="Disabled" value="0"/>
+        </Value>
+        <Value genre="config" index="20" label="Basic Set Option" max="4" min="1" size="1" type="list" units="int" value="1">
+            <Help>Basic Set Options for temperature and humidity.
+                1 = Enable Registers 2, 5, 12 15
+                2 = Enable Registers 2, 5, 13, 14
+                3 = Enable Registers 3, 4, 12, 15
+                4 = Enable Registers 3, 4, 13, 14
+            </Help>
+        </Value>
+        <Value genre="config" index="21" label="Temp Offset" max="7" min="-7" size="1" type="list" units="Farenheit" value="0">
+            <Help>Temperature offset</Help>
+        </Value>
+        <Value genre="config" index="22" label="Humidity Offset" max="7" min="-7" size="1" type="list" units="%" value="0">
+            <Help>Humidity offset</Help>
+        </Value>
+        <Value genre="config" index="23" label="Humidity Filter Time Constant" max="60" min="1" size="1" type="list" units="minutes" value="30">
+            <Help>BASIC SET ON above this humidity</Help>
+        </Value>
+    </CommandClass>
+    <CommandClass id="133">
+        <Associations num_groups="6">
+            <!-- Z-Wave Plus Lifeline Battery Report, Notification Report, Device Reset Locally Notification -->
+            <Group index="1" label="Lifeline" max_associations="1"/>
+            <Group index="2" label="Temperature Reports" max_associations="5"/>
+            <Group index="3" label="Humidity Reports" max_associations="5"/>
+            <Group index="4" label="Temperature Driven Basic Sets" max_associations="5"/>
+            <Group index="5" label="Humidity Driven Basic Sets" max_associations="5"/>
+            <Group index="6" label="Battery Reports" max_associations="5"/>
+        </Associations>
+    </CommandClass>
+</Product>
diff --git a/config/oomi/ft112.xml b/config/oomi/ft112.xml
index 64026a2c..fba3ea23 100644
--- a/config/oomi/ft112.xml
+++ b/config/oomi/ft112.xml
@@ -1,5 +1,6 @@
-<!-- Oomi Door/Window Sensor 6 --><Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<!-- Oomi Door/Window Sensor 6 --><Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
+    <MetaDataItem name="ProductPic">images/oomi/ft112.png</MetaDataItem>
     <MetaDataItem name="ExclusionDescription">Turn the primary controller into exclusion mode, short press the product’s Action Button that you can find in back of the product.</MetaDataItem>
     <MetaDataItem name="WakeupDescription">Press the Action Button once, which will trigger sending out the Wake up notification command, press and hold the Action Button for 3 seconds, which will toggle on/off the Sensor be waked up for 10 minutes.</MetaDataItem>
     <MetaDataItem name="InclusionDescription">Turn the primary controller into inclusion mode, short press the product’s Action Button that you can find in the back of the product.</MetaDataItem>
@@ -10,6 +11,7 @@ It can be included and operated in any Z-Wave network with other Z-Wave certifie
     <MetaDataItem name="ResetDescription">Press the Action Button once that you can find in the back of the product for 20 seconds and then release. This procedure should only be used when the primary controller is inoperable.</MetaDataItem>
     <ChangeLog>
       <Entry author="Jeff Thompson" date="27 April 2020" revision="1">Initial version - clone of aeotec/zw112</Entry>
+      <Entry author="Justin Hammond" date="24 June 2020" revision="2">Add Product Pic</Entry>
     </ChangeLog>
     <MetaDataItem id="0070" name="FrequencyName" type="0002">CEPT (Europe)</MetaDataItem>
     <MetaDataItem id="0070" name="Identifier" type="0002">FT112-C</MetaDataItem>
diff --git a/config/oomi/ft118.xml b/config/oomi/ft118.xml
index 5d68bac5..d980d82c 100644
--- a/config/oomi/ft118.xml
+++ b/config/oomi/ft118.xml
@@ -1,7 +1,8 @@
 <!--
 Oomi FT118-C15 Range Extender 6, based on Aeotec ZW117, of which it's a clone
---><Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+--><Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
+    <MetaDataItem name="ProductPic">images/oomi/ft118.png</MetaDataItem>
     <MetaDataItem name="ExclusionDescription">Turn the primary controller of Z-Wave network into exclusion mode, press  the Z-Wave Button on Range Extender 6.</MetaDataItem>
     <MetaDataItem name="Description">Oomi Range Extender is a Z-Wave mesh network repeater which can extend the range of communication between Z-Wave products and assist other devices to reach each other in your Z-Wave network. Clone of Aeotec ZW117 extender 6.
 The Range Extender can also communicate securely via AES 128 wireless Z-Wave commands and supports Over-The-Air (OTA) firmware upgrades.
@@ -13,6 +14,7 @@ Use this procedure only in the event that your primary network controller is mis
     <MetaDataItem name="InclusionDescription">Turn the primary controller of Z-Wave network into inclusion mode, press the Z-Wave Button on Range Extender 6.</MetaDataItem>
     <ChangeLog>
       <Entry author="Jeff Thompson" date="27 April 2020" revision="1">Initial version, cloned from Aeotec ZW117 xml</Entry>
+      <Entry author="Justin Hammond" date="24 June 2020" revision="2">Add Product Pic</Entry>
     </ChangeLog>
     <MetaDataItem id="0076" name="FrequencyName" type="0004">CEPT (Europe)</MetaDataItem>
     <MetaDataItem id="0076" name="Identifier" type="0004">FT118-C15</MetaDataItem>
diff --git a/config/q-light/q-light_puck.xml b/config/q-light/q-light_puck.xml
new file mode 100644
index 00000000..1a41a95a
--- /dev/null
+++ b/config/q-light/q-light_puck.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0433:0005:0003</MetaDataItem>  
+    <MetaDataItem name="ProductPic">images/q-light/q-light_puck.png</MetaDataItem>	
+    <MetaDataItem id="0005" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/3774</MetaDataItem>  
+    <MetaDataItem id="0005" name="Identifier" type="0003">Puck</MetaDataItem>	
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3774/Instructions_Z-Wave_Puck_Norsk_A4.pdf	</MetaDataItem>	
+    <MetaDataItem name="Description">Z-Wave Puck dimmer by Q-light is a micro size in wall dimmer.
+Features:
+- 0-100% dimming range
+- 2-180W LED load
+- Compatible with any Z-Wave or Z-Wave Plus Controller
+- There is memorized function at power off
+- OverLoad protection
+- Soft start function
+- SmartStart
+- Works with various types of switches – on/off, momentary, roller-blind, and etc
+- This device is a security enable Z-Wave Plus product that is able to use encrypted Z-Wave Plus
+messages to communicate to other security enable Z-Wave Plus products.
+</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">
+Removing (Exclusion):
+Allowing to remove the Z-Wave device from existing Z-Wave network.
+
+1. Place the Z-Wave Puck within the direct range of your Z-Wave controller.
+2. Identify switch S1/S2 (turns the light on) or the Internal button (located on the device’s housing).
+3. Set the main controller in (security/non-security) add mode (see the controller’s manual).
+4. Quickly, three times press switch S1 / S2 or Internal button.
+5. Wait for the removing process to end.
+	</MetaDataItem>
+    <MetaDataItem id="0005" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="Name">Q-light Zerodim Z-Wave</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Resetting the Z-Wave Puck:
+
+1. Quickly, nine times press switch S1 / S2 or Internal button. 
+2. Wait for the resetting process to end, which is signaled with the LED indicator blinks 20 times. 
+
+Device reset status: Turn on the light at maximum brightness.
+
+Please use this procedure only when the network primary controller is missing or otherwise inoperable
+	</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">
+Classic Learn Mode:
+
+1. Place the Z-Wave Puck within the direct range of your Z-Wave controller.
+2. Identify switch S1/S2 (turns the light on) or the Internal button (located on the device’s housing).
+3. Set the main controller in (security/non-security) add mode (see the controller’s manual).
+4. Quickly, three times press switch S1 / S2 or Internal button. 5. Wait for the adding process to end.
+6. Successful adding will be confirmed by the Z-Wave controller’s message.
+	</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Geir Råness - git@winning.no" date="03 July 2020" revision="1">Initial release</Entry>
+      <Entry author="Geir Råness - git@winning.no" date="06 July 2020" revision="2">fix associations</Entry>
+    </ChangeLog>
+  </MetaData>
+  
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="15" label="Minimum brightness level" units="%" size="1" min="1" max="98" type="byte">
+      <Help>
+Set the desired value from 1 to 98% for the minimum dim level that the dimmer is restricted to, the dimmer will not go lower than the value set here.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="2" value="99" label="Maximum brightness level" units="%" size="1" min="2" max="99" type="byte">
+      <Help>
+Set the desired value from 2 to 99% for the maximum dim level that the dimmer is restricted to, the dimmer will not go higher than the value set here.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="1" label="Automatic control - dimming step size" units="%" size="1" min="1" max="99" type="byte">
+      <Help>
+This parameter defines the percentage value of dimming step during the automatic control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="4" value="1" label="Automatic control - time of a dimming step" units="ms" size="1" min="1" max="255" type="byte">
+      <Help>
+This parameter defines the time of single dimming step set in parameter 3 during the automatic control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="5" value="1" label="Manual control - dimming step size" units="%" size="1" min="1" max="99" type="byte">
+      <Help>
+This parameter defines the percentage value of dimming step during the manual control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="5" label="Manual control - time of a dimming step" units="ms" size="1" min="1" max="255" type="byte">
+      <Help>
+This parameter defines the time of single dimming step setin parameter 5 during the manual control.	  
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="7" value="1" label="Memory function after power failure" size="1" min="0" max="1" type="list">
+      <Help>Set the desired value from 0 to 1 to turn on/off the memory function.Setting this value to 0 turns off the dimmer's Memory fucntion.Setting this value to 1 truns on the dimmer's Memory function.</Help>
+	    <Item value="0" label="Device does not save the state before a power failure, it returns to off position"/>
+      <Item value="1" label="Device restores it's state before power failure"/>
+    </Value>
+    <Value genre="config" instance="1" index="8" value="0" label="Switch type" size="1" min="0" max="2" type="list">
+      <Help>
+Choose between momentary, ON/OFF and roller blind switch.
+
+Available settings:
+0 – momentary (Push) switch.
+1 – ON/OFF switch. 
+2– roller blind switch-two switchs operate the device(S1 to brighter, S2 to dim
+	  </Help>
+	  <Item value="0" label="momentary (Push) switch"/>
+    <Item value="1" label="ON/OFF switch"/>
+	  <Item value="2" label="roller blind switch-two switchs operate the device(S1 to brighter, S2 to dim)"/>
+    </Value>
+    <Value genre="config" instance="1" index="9" value="0" label="Switch functionality of S1 and S2" size="1" min="0" max="1" type="list">
+      <Help>Set the desired value from 0 to 1 to turn on/off the memory function.Setting this value to 0 turns off the dimmer's Memory fucntion.Setting this value to 1 truns on the dimmer's Memory function.</Help>
+	    <Item value="0" label="Standard mode"/>
+      <Item value="1" label="S1 operates as S2, S2 operates as S1"/>
+    </Value>
+    <Value genre="config" instance="1" index="10" value="1" label="S1 Scene ID set" units="step" size="1" min="1" max="255" type="byte">
+      <Help>
+When you press S1 five times,the light is dimmed to the brightness set in Scene ID 3 .
+
+S1 Scene ID is set by this configuration.
+
+Note: The actual action of each SCENE ID are set by SCE-NE_ACTUATOR_CONF(0x26) command.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="11" value="2" label="S1 Scene ID set" units="step" size="1" min="1" max="255" type="byte">
+      <Help>
+When you press S1 five times,the light is dimmed to the brightness set in Scene ID 5.
+
+
+S2 Scene ID is set by this configuration.
+
+Note: The actual action of each SCENE ID are set by SCE-NE_ACTUATOR_CONF(0x26) command.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="12" value="0" label="Timer functionality (auto - off)" units="seconds" size="2" min="0" max="32767" type="short">
+    <Help>This parameter allows to automatically switch off the device after specified time from switching on the light source. It may be useful when the Zerodim Z-Wave is installed in the stairway.
+
+Available settings: 
+0 - Function disabled. 
+1-32767 - time to turn off measured in seconds (1s-9.1h)
+    </Help>
+    </Value>
+  </CommandClass>
+
+  <CommandClass id="133">
+    <Associations num_groups="5">
+      <Group index="1" label="Lifeline" max_associations="1" />
+      <Group index="2" label="On/Off(S1) / Mirror of endpoint 1, group 2" max_associations="5" />
+      <Group index="3" label="Dimmer(S1) / Mirror of endpoint 1, group 3" max_associations="5" />
+      <Group index="4" label="On/Off(S2) / Mirror of endpoint 2, group 2" max_associations="5" />
+      <Group index="5" label="Dimmer(S2) / Mirror of endpoint 2, group 3" max_associations="5" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/q-light/q-light_zerodim.xml b/config/q-light/q-light_zerodim.xml
new file mode 100644
index 00000000..747c175b
--- /dev/null
+++ b/config/q-light/q-light_zerodim.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0433:000D:0003</MetaDataItem>  
+    <MetaDataItem name="ProductPic">images/q-light/q-light_zerodim.png</MetaDataItem>	
+    <MetaDataItem id="000D" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/3775</MetaDataItem>  
+    <MetaDataItem id="000D" name="Identifier" type="0003">Zerodim</MetaDataItem>	
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3775/Instructions_ZerodimZwave_Norsk_A4.pdf</MetaDataItem>	
+    <MetaDataItem name="Description">Zerodim Z-Wave by Q-light is a wireless smart home device.
+Features:
+- 0-99% dimming range
+- 2-180W LED load
+- Compatible with any Z-Wave or Z-Wave Plus Controller
+- There is memorized function at power off
+- OverLoad protection
+- Soft start function
+- SmartStart
+- This device is a security enable Z-Wave Plus product that is able to use encrypted Z-Wave Plus messages to communicate to other security enable Z-Wave Plus products.
+</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">
+1. Place the Zerodim Z-Wave within the direct range of your Z-Wave controller.
+2. Identify switch rotary knob (turns the light on).
+3. Set the main controller in (security/non-security) add mode (see the controller’s manual).
+4. Quickly, three times press switch rotary knob.
+5. Wait for the removing process to end.
+6. Successful removing will be confirmed by the Z-Wave controller’s message.
+	</MetaDataItem>
+    <MetaDataItem id="000D" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="Name">Q-light Zerodim Z-Wave</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Resetting the Zerodim Z-Wave:
+1. Quickly, nine times press switch rotary knob.
+2. Wait for the resetting process to end, the lamp will be set to maximum brightness.
+
+Device reset statues: Turn on the light at maximum brightness.
+	</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">
+Classic Learn Mode:
+1. Place the Zerodim Z-Wave within the direct range of your Z-Wave controller.
+2. Identify switch rotary knob (turns the light on).
+3. Set the main controller in (security/non-security) add mode (see the controller’s manual).
+4. Quickly, three times press switch rotary knob.
+5. Wait for the adding process to end.
+6. Successful adding will be confirmed by the Z-Wave controller’s message.
+
+SmartStart Learn Mode:
+1. Scanning the Z-Wave QR Code present on the product with a controller providing SmartStart inclusion.
+2. No further action is required and the SmartStart product will be added automaticall within 10 minutes of being switched on in the network vicinity.
+3. The QR Code and DSK are attached to the back of the product case, as shown below:
+	</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Geir Råness - git@winning.no" date="03 July 2020" revision="1">Initial release</Entry>
+      <Entry author="Geir Råness - git@winning.no" date="06 July 2020" revision="2">fix associations</Entry>
+    </ChangeLog>
+  </MetaData>
+  
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="10" label="Minimum brightness level" units="%" size="1" min="1" max="98" type="byte">
+      <Help>
+Set the desired value from 1 to 98% for the minimum dim level that the dimmer is restricted to, the dimmer will not go lower than the value set here.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="2" value="99" label="Maximum brightness level" units="%" size="1" min="2" max="99" type="byte">
+      <Help>
+Set the desired value from 2 to 99% for the maximum dim level that the dimmer is restricted to; the dimmer will not go higher than the value set here.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="1" label="Automatic control - dimming step size" units="%" size="1" min="1" max="99" type="byte">
+      <Help>
+This parameter defines the percentage value of dimming step during the automatic control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="4" value="1" label="Automatic control - time of a dimming step" units="ms" size="1" min="1" max="255" type="byte">
+      <Help>
+This parameter defines the time of single dimming step set in parameter 3 during the automatic control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="5" value="1" label="Manual control - dimming step size" units="step" size="1" min="1" max="99" type="byte">
+      <Help>
+This parameter defines the percentage value of dimming step during the manual control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="5" label="Manual control - time of a dimming step" units="ms" size="1" min="1" max="255" type="byte">
+      <Help>
+This parameter defines the time of single dimming step setin parameter 5 during the manual control.	  
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="7" value="1" label="Memory function after power failure" size="1" min="0" max="1" type="list">
+      <Help>Set the desired value from 0 to 1 to turn on/off the memory function.Setting this value to 0 turns off the dimmer's Memory fucntion.Setting this value to 1 truns on the dimmer's Memory function.</Help>
+	    <Item value="0" label="Device does not save the state before a power failure, it returns to off position"/>
+      <Item value="1" label="Device restores it's state before power failure"/>
+    </Value>
+    <Value genre="config" instance="1" index="8" value="1" label="Scene ID set" units="step" size="1" min="1" max="255" type="byte">
+      <Help>
+Scene ID is set by this configuration.
+
+Note: The actual action of each SCENE ID are set by
+SCENE_ACTUATOR_CONF(0x26) command.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="9" value="0" label="Timer functionality (auto - off)" units="seconds" size="2" min="0" max="32767" type="short">
+    <Help>
+This parameter allows to automatically switch off the device after specified time from switching on the light source. It may be useful when the Zerodim Z-Wave is installed in the stairway.
+
+Available settings: 
+0 - Function disabled. 
+1-32767 - time to turn off measured in seconds (1s-9.1h)
+    </Help>
+    </Value>
+
+  </CommandClass>
+
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="1" />
+      <Group index="2" label="On/Off (rotary nob) / Mirror of endpoint 1, group 2" max_associations="5" />
+      <Group index="3" label="Dimmer (rotary nob) / Mirror of endpoint 1, group 3" max_associations="5" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/q-light/q-light_zerodim_2pol.xml b/config/q-light/q-light_zerodim_2pol.xml
new file mode 100644
index 00000000..63f19ec0
--- /dev/null
+++ b/config/q-light/q-light_zerodim_2pol.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0433:000E:0003</MetaDataItem>  
+    <MetaDataItem name="ProductPic">images/q-light/q-light_zerodim_2pol.png</MetaDataItem>	
+    <MetaDataItem id="000E" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/3881</MetaDataItem>  
+    <MetaDataItem id="000E" name="Identifier" type="0003">Zerodim</MetaDataItem>	
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3881/Instructions_ZerodimZwave_2pol_Norsk_A4.pdf</MetaDataItem>	
+    <MetaDataItem name="Description">Zerodim Z-Wave by Q-light is a wireless smart home device.
+Features:
+- 0-99% dimming range
+- 2-180W LED load
+- Compatible with any Z-Wave or Z-Wave Plus Controller
+- There is memorized function at power off
+- OverLoad protection
+- Soft start function
+- SmartStart
+- This device is a security enable Z-Wave Plus product that is able to use encrypted Z-Wave Plus messages to communicate to other security enable Z-Wave Plus products.
+</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">
+1. Place the Zerodim Z-Wave within the direct range of your Z-Wave controller.
+2. Identify switch rotary knob (turns the light on).
+3. Set the main controller in (security/non-security) add mode (see the controller’s manual).
+4. Quickly, three times press switch rotary knob.
+5. Wait for the removing process to end.
+6. Successful removing will be confirmed by the Z-Wave controller’s message.
+	</MetaDataItem>
+    <MetaDataItem id="000E" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="Name">Q-light Zerodim Z-Wave</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Resetting the Zerodim Z-Wave:
+1. Quickly, nine times press switch rotary knob.
+2. Wait for the resetting process to end, the lamp will be set to maximum brightness.
+
+Device reset statues: Turn on the light at maximum brightness.
+	</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">
+Classic Learn Mode:
+1. Place the Zerodim Z-Wave within the direct range of your Z-Wave controller.
+2. Identify switch rotary knob (turns the light on).
+3. Set the main controller in (security/non-security) add mode (see the controller’s manual).
+4. Quickly, three times press switch rotary knob.
+5. Wait for the adding process to end.
+6. Successful adding will be confirmed by the Z-Wave controller’s message.
+
+SmartStart Learn Mode:
+1. Scanning the Z-Wave QR Code present on the product with a controller providing SmartStart inclusion.
+2. No further action is required and the SmartStart product will be added automaticall within 10 minutes of being switched on in the network vicinity.
+3. The QR Code and DSK are attached to the back of the product case, as shown below:
+	</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Geir Råness - git@winning.no" date="03 July 2020" revision="1">Initial release</Entry>
+      <Entry author="Geir Råness - git@winning.no" date="06 July 2020" revision="2">fix associations</Entry>
+    </ChangeLog>
+  </MetaData>
+  
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="10" label="Minimum brightness level" units="%" size="1" min="1" max="98" type="byte">
+      <Help>
+Set the desired value from 1 to 98% for the minimum dim level that the dimmer is restricted to, the dimmer will not go lower than the value set here.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="2" value="99" label="Maximum brightness level" units="%" size="1" min="2" max="99" type="byte">
+      <Help>
+Set the desired value from 2 to 99% for the maximum dim level that the dimmer is restricted to; the dimmer will not go higher than the value set here.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="1" label="Automatic control - dimming step size" units="%" size="1" min="1" max="99" type="byte">
+      <Help>
+This parameter defines the percentage value of dimming step during the automatic control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="4" value="1" label="Automatic control - time of a dimming step" units="ms" size="1" min="1" max="255" type="byte">
+      <Help>
+This parameter defines the time of single dimming step set in parameter 3 during the automatic control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="5" value="1" label="Manual control - dimming step size" units="step" size="1" min="1" max="99" type="byte">
+      <Help>
+This parameter defines the percentage value of dimming step during the manual control.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="5" label="Manual control - time of a dimming step" units="ms" size="1" min="1" max="255" type="byte">
+      <Help>
+This parameter defines the time of single dimming step setin parameter 5 during the manual control.	  
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="7" value="1" label="Memory function after power failure" size="1" min="0" max="1" type="list">
+      <Help>Set the desired value from 0 to 1 to turn on/off the memory function.Setting this value to 0 turns off the dimmer's Memory fucntion.Setting this value to 1 truns on the dimmer's Memory function.</Help>
+	    <Item value="0" label="Device does not save the state before a power failure, it returns to off position"/>
+      <Item value="1" label="Device restores it's state before power failure"/>
+    </Value>
+    <Value genre="config" instance="1" index="8" value="1" label="Scene ID set" units="step" size="1" min="1" max="255" type="byte">
+      <Help>
+Scene ID is set by this configuration.
+
+Note: The actual action of each SCENE ID are set by
+SCENE_ACTUATOR_CONF(0x26) command.
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="9" value="0" label="Timer functionality (auto - off)" units="seconds" size="2" min="0" max="32767" type="short">
+    <Help>
+This parameter allows to automatically switch off the device after specified time from switching on the light source. It may be useful when the Zerodim Z-Wave is installed in the stairway.
+
+Available settings: 
+0 - Function disabled. 
+1-32767 - time to turn off measured in seconds (1s-9.1h)
+    </Help>
+    </Value>
+
+  </CommandClass>
+
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="1" />
+      <Group index="2" label="On/Off (rotary nob) / Mirror of endpoint 1, group 2" max_associations="5" />
+      <Group index="3" label="Dimmer (rotary nob) / Mirror of endpoint 1, group 3" max_associations="5" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/qolsys/qz2140-840.xml b/config/qolsys/qz2140-840.xml
new file mode 100644
index 00000000..81822ff8
--- /dev/null
+++ b/config/qolsys/qz2140-840.xml
@@ -0,0 +1,57 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">QZ2140-840 Plug-In Dimmer</MetaDataItem>
+    <MetaDataItem name="Description">The IQ Dimmer is a Z-Wave Plus certified device with S2 security and SmartStart features. You can now add this device securely and with ease using QR code on the product with compatible gateways supporting S2 and SmartStart. The IQ Dimmer communicates with other Z-Wave certified devices and updates your home into a smart home. The IQ Dimmer can be used to turn any plug in lamps into a smart lamp with dimmable light bulbs, turning it On, Off, or control dimming wirelessly. Each Z-Wave device also serves as a node to repeat the signal in the network, thus, extending the overall Z-Wave mesh wireless network range.
+Additional Features:
+* Power 120 VAC, 60Hz, up to 300 watts
+* Region US: 908.4, 916 MHz
+* Works w/ most incandescent, dimmable CFL &amp; LED lights
+* Plugs into Standard AC outlet
+* Remotely controls On, Off, or Dim levels
+* Control lights via schedule
+* LED backlit manual On/Off button
+* Second wall AC outlet remains free
+* Works with any certified gateway supporting Z-Wave</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/012A:3032:4744</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/qolsys/qz2140-840.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2912/IQ Dimmer UG Online.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Place your network controller into inclusion mode by following the controller manufacturer's instructions.
+2. When the controller is ready, single click the button on the front of the IQ Dimmer. The controller should indicate that the new device was added successfully.
+3. Once the IQ Dimmer has been successfully added to your home network, you can move it to the preferred location in the home</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Place your network controller into exclusion mode by following the controller manufacturer's instructions.
+2. When the controller is ready, single click the button on the front of the IQ Dimmer. The controller should indicate that the new device was removed successfully.
+3. Once the IQ Dimmer has been successfully added to your home network, you can move it to the preferred location in the home</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1. Unplug the IQ Dimmer from the AC outlet and also unplug the power plugs of the lighting from the module (if plugged in)
+2. Press and hold the button on the IQ Dimmer
+3. Plug the IQ Dimmer back into the AC outlet with the button pressed. After 3 seconds, release the button. If you see the button blink, that means that IQ Dimmer has been reset successfully.
+
+Please use this procedure only when the network primary controller is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem id="3032" name="ZWProductPage" type="4744">https://products.z-wavealliance.org/products/2912</MetaDataItem>
+    <MetaDataItem id="3032" name="FrequencyName" type="4744">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="3032" name="Identifier" type="4744">QZ2140-840</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Tao Gong - gongtao0607@gmail.com" date="03 Nov 2020" revision="1">Import from https://products.z-wavealliance.org/products/2912/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+    <Value genre="config" index="3" label="Night Light" max="2" min="0" size="1" type="list" value="0">
+      <Help>When value =0 the LED indicator will be OFF when the the connected light is ON, and the LED will be ON when the connected light is OFF. If value =1 the LED indicator will be ON when the connected light is ON, and the LED indicator will be OFF when the connected light is OFF. If value =2 the LED indicator will always be OFF regardless of the load status</Help>
+      <Item label="0: The LED indicator will be ON when the connected light is OFF." value="0"/>
+      <Item label="1: The LED indicator will be ON when the connected light is ON." value="1"/>
+      <Item label="2: The LED indicator will always be OFF regardless of the load status." value="2"/>
+    </Value>
+    <Value genre="config" index="9" label="Dimming Resolution Level" max="99" min="1" type="byte" units="" value="1">
+      <Help>Valid Values: 1-99, indicates the number of dimming levels.</Help>
+    </Value>
+    <Value genre="config" index="10" label="Dimming Resolution Speed" max="255" min="1" type="byte" units="" value="3">
+      <Help>Valid Values: 1-255, indicates the time duration of each level.</Help>
+    </Value>
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="LifeLine" max_associations="1"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/qubino/ZMNHCDx.xml b/config/qubino/ZMNHCDx.xml
index e3101023..2aa12456 100644
--- a/config/qubino/ZMNHCDx.xml
+++ b/config/qubino/ZMNHCDx.xml
@@ -1,38 +1,42 @@
-<Product Revision="7" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="9" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0159:0052:0003</MetaDataItem>
     <MetaDataItem name="ProductPic">images/qubino/ZMNHCDx.png</MetaDataItem>
     <MetaDataItem id="0052" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/2505/</MetaDataItem>
-    <MetaDataItem name="InclusionDescription">•	Connect module to power supply (with 
-temperature sensor connected - if purchased),
-•	auto-inclusion (works for about 5 seconds after connected to power supply) or
-•	press push button I1 three times within 3s (3 times change switch state within 3 seconds) or
-•	press service button S (only applicable for 24 V SELV supply voltage) for more than 2 second.
+    <MetaDataItem name="InclusionDescription">
+      • Connect module to power supply (with
+      temperature sensor connected - if purchased),
+      • auto-inclusion (works for about 5 seconds after connected to power supply) or
+      • press push button I1 three times within 3s (3 times change switch state within 3 seconds) or
+      • press service button S (only applicable for 24 V SELV supply voltage) for more than 2 second.
 
-NOTE1: For auto-inclusion procedure, first set main controller into inclusion mode and then connect module to power supply.
+      NOTE1: For auto-inclusion procedure, first set main controller into inclusion mode and then connect module to power supply.
 
-NOTE2: When connecting temperature sensor to module that has already been included, you have to exclude module first. Switch off power supply, connect the sensor and re-include the module.
-</MetaDataItem>
-    <MetaDataItem name="ExclusionDescription">•	Connect module to power supply 
-•	bring module within maximum 1 meter (3 feet) of the main controller,
-•	enable add/remove mode on main controller,
-•	press push button I1 five times within 3s (5 times change switch state within 3 seconds) in the first 60 seconds after the module is connected to the power supply or
-•	press service button S (only applicable for 24 V SELV supply voltage)  for more than 6 second.
-By this function all parameters of the module are set to default values and own ID is deleted.
+      NOTE2: When connecting temperature sensor to module that has already been included, you have to exclude module first. Switch off power supply, connect the sensor and re-include the module.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">
+      • Connect module to power supply
+      • bring module within maximum 1 meter (3 feet) of the main controller,
+      • enable add/remove mode on main controller,
+      • press push button I1 five times within 3s (5 times change switch state within 3 seconds) in the first 60 seconds after the module is connected to the power supply or
+      • press service button S (only applicable for 24 V SELV supply voltage) for more than 6 second.
+      By this function all parameters of the module are set to default values and own ID is deleted.
 
-If push button I1 is pressed three times within 3s (or service button S is pressed more than 2 and less than 6 seconds) module is excluded, but configuration parameters are not set to default values. 
+      If push button I1 is pressed three times within 3s (or service button S is pressed more than 2 and less than 6 seconds) module is excluded, but configuration parameters are not set to default values.
 
-NOTE: Please use this procedure only when the network primary controller is missing or otherwise inoperable.
+      NOTE: Please use this procedure only when the network primary controller is missing or otherwise inoperable.
 
-NOTE: If the module is included with parameters 71 with value different to default and module reset is done, wait at least 30s before next inclusion
-</MetaDataItem>
-    <MetaDataItem name="ResetDescription">•	press push button I1 five times within 3s (5 times change switch state within 3 seconds) in the first 60 seconds after the module is connected to the power supply or
-•	press service button S (only applicable for 24 V SELV supply voltage)  for more than 6 second.
+      NOTE: If the module is included with parameters 71 with
+      value different to default and
+      module reset is done, wait at least 30s before next inclusion
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">
+      • press push button I1 five times within 3s (5 times change switch state within 3 seconds) in the first 60 seconds after the module is connected to the power supply or
+      • press service button S (only applicable for 24 V SELV supply voltage) for more than 6 second.
 
-NOTE: Please use this procedure only when the network primary controller is missing or otherwise inoperable.
-</MetaDataItem>
-    <MetaDataItem name="Description">This Z-Wave module is used to control the motor of blinds, rollers, shades, venetian blinds, etc … The module can be controlled either through a Z-Wave network or through the wall switch. Precise positioning is supported for motors equipped with mechanical or electronic end switches. The module is designed to be mounted inside a “flush mounting box”, hidden behind a traditional wall switch. Module measures power consumption of motor and support connection of digital temperature sensor. It is designed to act as repeater in order to improve range and stability of Z-Wave network.                      
-</MetaDataItem>
+      NOTE: Please use this procedure only when the network primary controller is missing or otherwise inoperable.
+    </MetaDataItem>
+    <MetaDataItem name="Description">This Z-Wave module is used to control the motor of blinds, rollers, shades, venetian blinds, etc … The module can be controlled either through a Z-Wave network or through the wall switch. Precise positioning is supported for motors equipped with mechanical or electronic end switches. The module is designed to be mounted inside a “flush mounting box”, hidden behind a traditional wall switch. Module measures power consumption of motor and support connection of digital temperature sensor. It is designed to act as repeater in order to improve range and stability of Z-Wave network.</MetaDataItem>
     <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2505/Qubino_Flush Shutter PLUS extended manual_eng_2.2.pdf</MetaDataItem>
     <MetaDataItem id="0052" name="Identifier" type="0003">ZMNHCD3</MetaDataItem>
     <MetaDataItem name="Name">Flush Shutter</MetaDataItem>
@@ -41,26 +45,20 @@ NOTE: Please use this procedure only when the network primary controller is miss
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="5">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2376/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2504/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="7">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2505/xml</Entry>
+      <Entry author="Olifant1990 - olifant1990@jo-ro.nl" date="31 December 2019" revision="8">Fixed problem of lifeline group 1.1 receives no update (https://www.domoticz.com/forum/viewtopic.php?f=24&amp;t=29715#p225812) and fixed format of this XML</Entry>
+      <Entry author="Olifant1990 - olifant1990@jo-ro.nl" date="31 December 2019" revision="9">Second fix of lifeline group 1.1 receives no update (https://www.domoticz.com/forum/viewtopic.php?f=24&amp;t=29715#p225812)</Entry>
     </ChangeLog>
   </MetaData>
-  <!--
-	Qubino: ZMNHCDx Flush shutter zwave+
+  <!-- Qubino: ZMNHCDx Flush shutter zwave+ ZMNHCD1 868,4 MHz ZMNHCD2 921,4 MHz ZMNHCD3 908,4 MHz ZMNHCD4 869,0 MHz ZMNHCD5 916,0 MHz -->
 
-	ZMNHCD1 868,4 MHz
-	ZMNHCD2 921,4 MHz
-	ZMNHCD3 908,4 MHz
-	ZMNHCD4 869,0 MHz
-	ZMNHCD5 916,0 MHz
--->
-
-	<!-- Configuration -->
+  <!-- Configuration -->
   <CommandClass id="112">
     <Value genre="config" index="10" instance="1" label="Activate / deactivate functions ALL ON/ALL OFF" max="255" min="0" size="2" type="list" value="255">
       <Help>Flush 1 relay module responds to commands ALL ON / ALL OFF that may be sent by the main controller or by other controller belonging to the system.</Help>
-      <Item label="ALL ON active, ALL OFF active" value="255"/>
-      <Item label="ALL ON is not active ALL OFF is not active" value="0"/>
-      <Item label="ALL ON is not active ALL OFF active" value="1"/>
-      <Item label="ALL ON active ALL OFF is not active" value="2"/>
+      <Item label="ALL ON active, ALL OFF active" value="255" />
+      <Item label="ALL ON is not active ALL OFF is not active" value="0" />
+      <Item label="ALL ON is not active ALL OFF active" value="1" />
+      <Item label="ALL ON active ALL OFF is not active" value="2" />
     </Value>
     <Value genre="config" index="40" instance="1" label="Power reporting in Watts on power change for Q1 or Q2" max="100" min="0" size="1" type="byte" units="%" value="1">
       <Help>Set value from 0 - 100 (0% - 100%). 0 - Reporting Disabled. 1 - 100 = 1% - 100% Reporting enabled. Power report is send (push) only when actual power (in Watts) in real time changes for more than set percentage comparing to previous actual power in Watts, step is 1%. Default value 1</Help>
@@ -70,93 +68,105 @@ NOTE: Please use this procedure only when the network primary controller is miss
     </Value>
     <Value genre="config" index="71" instance="1" label="Operating modes" max="1" min="0" size="1" type="list" value="0">
       <Help>This parameter defines selection between two available operating modes</Help>
-      <Item label="Shutter mode" value="0"/>
-      <Item label="Venetian mode (up/down and slate rotation)" value="1"/>
+      <Item label="Shutter mode" value="0" />
+      <Item label="Venetian mode (up/down and slate rotation)" value="1" />
     </Value>
     <Value genre="config" index="72" instance="1" label="Slats tilting full turn time" max="65535" min="0" type="short" units="s" value="150">
       <Help>
-				This parameter defines the time necessary for slats to make full turn (180 degrees)
-				default value 150 = 1,5 seconds
-				0 - Tilting time disabled
-				1 - 32767 = 0,01seconds - 327,67 seconds
-				</Help>
+        This parameter defines the time necessary for slats to make full turn (180 degrees)
+        default value 150 = 1,5 seconds
+        0 - Tilting time disabled
+        1 - 32767 = 0,01seconds - 327,67 seconds
+      </Help>
     </Value>
     <Value genre="config" index="73" instance="1" label="Slats position" max="1" min="0" size="1" type="list" value="1">
-      <Help>This parameter defines slats position after up/down movement through Z-wave or push-buttons
-				Slats return to previously set position only in case of
-				</Help>
-      <Item label="Z-wave control" value="0"/>
-      <Item label="Z-wave control, push-button operation or when the lower limit switch is reached" value="1"/>
+      <Help>
+        This parameter defines slats position after up/down movement through Z-wave or push-buttons
+        Slats return to previously set position only in case of
+      </Help>
+      <Item label="Z-wave control" value="0" />
+      <Item label="Z-wave control, push-button operation or when the lower limit switch is reached" value="1" />
     </Value>
     <Value genre="config" index="74" instance="1" label="Motor moving up/down time" max="65535" min="0" type="short" value="0">
-      <Help>This parameter defines shutter motor moving time of complete opening or complete closing.
-				Default value 0
-				0 - moving time disabled (working with limit switches).
-				1 - 65535 = 0,1seconds - 6553,5seconds
-				After that time motor is stopped (relay goes to off state)</Help>
+      <Help>
+        This parameter defines shutter motor moving time of complete opening or complete closing.
+        Default value 0
+        0 - moving time disabled (working with limit switches).
+        1 - 65535 = 0,1seconds - 6553,5seconds
+        After that time motor is stopped (relay goes to off state)
+      </Help>
     </Value>
     <Value genre="config" index="76" instance="1" label="Motor operation detection" max="127" min="0" type="byte" units="w" value="10">
       <Help>
-				Power threshold to be interpreted when motor reach the limit switch.
-				default value 10 = 10W
-				0 - 127 = 1-127 W. The value 0 means reaching a limit switch will not be detected.
-			</Help>
+        Power threshold to be interpreted when motor reach the limit switch.
+        default value 10 = 10W
+        0 - 127 = 1-127 W. The value 0 means reaching a limit switch will not be detected.
+      </Help>
     </Value>
     <Value genre="config" index="78" instance="1" label="Forced Shutter calibration" max="1" min="0" size="1" type="list" value="0">
       <Help>By modifying the parameters setting from 0 to 1 a Shutter enters the calibration mode</Help>
-      <Item label="Default" value="0"/>
-      <Item label="Start calibration process" value="1"/>
+      <Item label="Default" value="0" />
+      <Item label="Start calibration process" value="1" />
     </Value>
     <Value genre="config" index="85" instance="1" label="Power consumption max delay time" max="50" min="0" type="byte" units="" value="0">
       <Help>
-				This parameter defines the max time before motor power consumption is read after one of the relays is switched ON.
-				If there is no power consumption during this max time (motor not connected, damaged or requires higher time to start, motor in end position) the relay will switch OFF.
-				Time is defined by entering it manually.
-				default value 0 = time is set automatically
-				3 - 50 = 0,3seconds - 5seconds (100ms resolution)
-				</Help>
+        This parameter defines the max time before motor power consumption is read after one of the relays is switched ON.
+        If there is no power consumption during this max time (motor not connected, damaged or requires higher time to start, motor in end position) the relay will switch OFF.
+        Time is defined by entering it manually.
+        default value 0 = time is set automatically
+        3 - 50 = 0,3seconds - 5seconds (100ms resolution)
+      </Help>
     </Value>
     <Value genre="config" index="90" instance="1" label="Time delay for next motor movement" max="30" min="1" type="byte" units="" value="5">
       <Help>
-				This parameter defines the minimum time delay between next motor movement (minimum time between switching motor off and on again).
-				default value 5 = 500ms
-				1 - 30 = 0,1seconds - 3seconds (100ms resolution)
-				</Help>
+        This parameter defines the minimum time delay between next motor movement (minimum time between switching motor off and on again).
+        default value 5 = 500ms
+        1 - 30 = 0,1seconds - 3seconds (100ms resolution)
+      </Help>
     </Value>
     <Value genre="config" index="110" instance="1" label="Temperature sensor offset settings" max="65535" min="1" type="short" value="32536">
       <Help>
-				Set value is added or subtracted to actual measured value by sensor.
-				default value 32536
-				32536 - offset is 0.0C
-				From 1 to 100 - value from 0.1 C to 10.0 C is added to actual measured temperature.
-				From 1001 to 1100 - value from -0.1 C to -10.0 C is subtracted to actual measured temperature.
-			</Help>
+        Set value is added or subtracted to actual measured value by sensor.
+        default value 32536
+        32536 - offset is 0.0C
+        From 1 to 100 - value from 0.1 C to 10.0 C is added to actual measured temperature.
+        From 1001 to 1100 - value from -0.1 C to -10.0 C is subtracted to actual measured temperature.
+      </Help>
     </Value>
     <Value genre="config" index="120" instance="1" label="Digital temperature sensor reporting" max="127" min="0" type="byte" units="" value="5">
       <Help>
-				If digital temperature sensor is connected, module reports measured temperature on temperature change defined by this parameter
-				default value 5 = 0,5C
-				0 - Reporting disabled
-				1-127 = 0,1C - 12,7C, step is 0,1C
-				</Help>
+        If digital temperature sensor is connected, module reports measured temperature on temperature change defined by this parameter
+        default value 5 = 0,5C
+        0 - Reporting disabled
+        1-127 = 0,1C - 12,7C, step is 0,1C
+      </Help>
     </Value>
   </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
+    <Compatibility>
+      <ForceInstances>false</ForceInstances>
+    </Compatibility>
     <Associations num_groups="9">
-      <Group index="1" label="Lifeline" max_associations="1"/>
-      <Group index="2" label="basic on/off (triggered at change of the input I1 state and reflecting its state)" max_associations="16"/>
-      <Group index="3" label="basic on/off (triggered at change of the input I2 state and reflecting its state)" max_associations="16"/>
-      <Group index="4" label="basic on/off (triggered at sensing moving direction of roller: up=FF, down=0)" max_associations="16"/>
-      <Group index="5" label="basic on/off (triggered at reaching roller position: bottom=FF, top=0)" max_associations="16"/>
-      <Group index="6" label="basic on/off (triggered at reaching roller position: bottom=FF, not bottom=0)" max_associations="16"/>
-      <Group index="7" label="multilevel set (triggered at changes of value of the Flush shutter DC position)" max_associations="16"/>
-      <Group index="8" label="multilevel set (triggered at changes of value of slats tilting position)" max_associations="16"/>
-      <Group index="9" label="multilevel sensor report (triggered at change of temperature sensor)" max_associations="16"/>
+      <Group index="1" label="Lifeline" max_associations="1" />
+      <Group index="2" label="basic on/off (triggered at change of the input I1 state and reflecting its state)" max_associations="16" />
+      <Group index="3" label="basic on/off (triggered at change of the input I2 state and reflecting its state)" max_associations="16" />
+      <Group index="4" label="basic on/off (triggered at sensing moving direction of roller: up=FF, down=0)" max_associations="16" />
+      <Group index="5" label="basic on/off (triggered at reaching roller position: bottom=FF, top=0)" max_associations="16" />
+      <Group index="6" label="basic on/off (triggered at reaching roller position: bottom=FF, not bottom=0)" max_associations="16" />
+      <Group index="7" label="multilevel set (triggered at changes of value of the Flush shutter DC position)" max_associations="16" />
+      <Group index="8" label="multilevel set (triggered at changes of value of slats tilting position)" max_associations="16" />
+      <Group index="9" label="multilevel sensor report (triggered at change of temperature sensor)" max_associations="16" />
     </Associations>
   </CommandClass>
+  <!-- Multi Channel Association Groups -->
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>false</ForceInstances>
+    </Compatibility>
+  </CommandClass>
   <!-- Remove COMMAND_CLASS_BASIC -->
-  <CommandClass action="remove" id="32"/>
+  <CommandClass action="remove" id="32" />
   <!-- Map endpoints to instances -->
   <CommandClass id="96">
     <Compatibility>
diff --git a/config/qubino/ZMNHHDx.xml b/config/qubino/ZMNHHDx.xml
index 9a136b32..315e3ea3 100644
--- a/config/qubino/ZMNHHDx.xml
+++ b/config/qubino/ZMNHHDx.xml
@@ -1,8 +1,52 @@
-<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
     <!--
   Qubino: ZMNHHDx Mini Dimmer Z-Wave+
   https://products.z-wavealliance.org/products/3381
   -->
+	<MetaData>
+        <MetaDataItem name="Name">Mini Dimmer</MetaDataItem>
+        <MetaDataItem name="Description">
+			The Qubino Mini Dimmer is smaller than any other zwave wireless dimmer in the world. Mini Dimmer is a
+			MOSFET-switching light device that also supports control of low-voltage halogen lamps with electronic
+			transformers, dimmable compact fluorescent lights, and dimmable LED bulbs. It can work with or
+			without the neutral line (3 or 2-wire installation). 
+		</MetaDataItem>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0159:0055:0001</MetaDataItem>
+        <MetaDataItem name="ProductPage">https://qubino.com</MetaDataItem>
+        <MetaDataItem name="ProductSupport">https://support.qubino.com/support/home</MetaDataItem>
+		<MetaDataItem name="ProductPic">images/qubino/ZMNHHDx.png</MetaDataItem>
+        <MetaDataItem name="InclusionDescription">
+            Manual inclusion is triggered by the following procedure:
+            1. Connect the device to the power supply
+			2. Enable add/remove mode on your Z-Wave gateway (hub)
+			3. Toggle the switch connected to the terminal I 3 times within 3 seconds (this procedure puts the
+			device in LEARN MODE). The device has to get On/Off signal 3 times, meaning 3 times push of the
+			momentary switch or with toggle switch 3 times On and 3 times Off. 
+        </MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">
+            Exclusion is triggered by the following procedure:
+            1. Connect the device to the power supply.
+			2. Make sure the device is within direct range of your Z-Wave gateway (hub) or use a hand-held Z-Wave
+			remote to perform exclusion.
+			3. Enable add/remove mode on your Z-Wave gateway (hub).
+			4. Toggle the switch connected to the terminal I 3 times within 3 seconds (this procedure put the device
+			in LEARN MODE). The device has to get On/Off signal 3 times, meaning 3 times push of the momentary
+			switch or with toggle switch 3 times On and 3 times Off.
+        </MetaDataItem>
+        <MetaDataItem name="ResetDescription">
+            Reset is triggered after the following procedure:
+            1. Connect the device to the power supply.
+			2. Within the first minute (60 seconds) the device is connected to the power supply, toggle the switch
+			connected to the terminal I 5 times within 3 seconds. The device has to get On/Off signal 5 times, meaning
+			5 times push of the momentary switch or with toggle switch 5 times On and 5 times Off.
+        </MetaDataItem>
+        <ChangeLog>
+            <Entry author="Jean-François Auger" date="4 July 2019" revision="1">Initial Import</Entry>
+            <Entry author="Gert van Dijk" date="19 February 2020" revision="2">Fixed value type of config parameter 65</Entry>
+			<Entry author="Klemen Petrovcic" date="23 April 2021" revision="3">Changed descriptions of parameters 5 and 6 and added some metadata</Entry>
+        </ChangeLog>
+    </MetaData>
+	
     <!-- Configuration -->
     <CommandClass id="112">
         <Value genre="config" index="1" instance="1" label="In-wall Switch Type for Load to control I1" max="1" min="0" size="1" type="list" value="0">
@@ -11,7 +55,27 @@
             <Item label="Toggle switch" value="1"/>
         </Value>
         <Value genre="config" index="5" instance="1" label="Working mode" max="1" min="0" size="1" type="list" value="0">
-            <Help>With this parameter, you can change the device presentation on the user interface.</Help>
+            <Help>With this parameter, you can change the device presentation on the user interface. This parameter was removed in ZMNHHDx H1S3P2 (recertification) and was replaced with parameter no.6.</Help>
+            <Item label="Dimmer mode" value="0"/>
+            <Item label="Switch mode" value="1"/>
+        </Value>
+		<Value genre="config" index="6" instance="1" label="Load type" max="1" min="0" size="1" type="list" value="0">
+            <Help>
+				With this parameter, you select the load type: dimmable or non dimmable. 
+				Device operating in dimmable mode or non-dimmable load can lead to device or load malfunction. 
+				For non dimmable loads no.6 must be set to 1.
+					
+				NOTE: When no.6 set to 1 (non dimmable load) values of the following parameters will be ingnored:
+				- par.60 min. dimming value, 
+				- par.61 max. dimming value, 
+				- par.65 Dimm. Time when key presed,
+				- par.66 dimm. Time when key hold, 
+				- par.21 Double click function
+				
+				NOTE: If the bulb is dimmable or non dimmable (generally valid for LED) is shown on the bulb itself or on packaging.
+				
+				This parameter was added in ZMNHHDx H1S3P2 (recertification) and replaces parameter no.5, that required a reinclusion of the device.
+			</Help>
             <Item label="Dimmer mode" value="0"/>
             <Item label="Switch mode" value="1"/>
         </Value>
diff --git a/config/qubino/ZMNHMDx.xml b/config/qubino/ZMNHMDx.xml
new file mode 100644
index 00000000..a4311a15
--- /dev/null
+++ b/config/qubino/ZMNHMDx.xml
@@ -0,0 +1,168 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+    <MetaData>
+        <MetaDataItem name="Name">Smart leak protector</MetaDataItem>
+        <MetaDataItem name="Description">Qubino Smart leak protector can get the information about consumed water on one side, or have the complete protection of your home water system with water metering, flood detection and actuator for opening and closing the valve accordingly.</MetaDataItem>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0159:0051:0006</MetaDataItem>
+        <MetaDataItem name="ProductPage">https://qubino.com</MetaDataItem>
+        <MetaDataItem name="ProductSupport">https://support.qubino.com/support/home</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/qubino/ZMNHADx.png</MetaDataItem>
+        <MetaDataItem name="InclusionDescription">
+            1. Enable add/remove mode on your Z-Wave gateway.
+			2. Connect the device to the power supply.
+			3. Make sure the device is within direct range of your Z-Wave gateway.
+			4. Push the switch connected to the I1 terminal 3 times within 5 seconds.
+			OR
+			Press and hold the S (Service) button between 2 and 6 seconds.
+			4. A new device will appear on your dashboard.
+			5. Inclusion with the switch connected to I1 terminal is not limited by time.
+		</MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">
+            1. Connect the device to the power supply.
+			2. Make sure the device is within direct range of your Z-Wave gateway or use a hand-held Z-Wave remote to perform exclusion.
+			3. Enable add/remove mode on your Z-Wave gateway.
+			4. Toggle the switch connected to the I1 terminal 3 times within 5 seconds. The device must get ON/OFF signal 3 times. 
+			OR
+			Press and hold the S (Service) button between 2 and 6 seconds.
+			5. Exclusion with the switch connected to I1 terminal is not limited by time.
+			6. The device will be removed from your network, but any custom configuration parameters will not be erased.
+		</MetaDataItem>
+        <MetaDataItem name="ResetDescription">
+            1. Connect the device to the power supply.
+			2. Within the first minute (60 seconds) of the device being connected to the power supply, push the momentary switch connected to the I1 terminal 5 times within 5 seconds.
+			OR
+			Press and hold the S (Service) button for more than 6 seconds.
+			The procedure is always available.
+		</MetaDataItem>
+        <ChangeLog>
+            <Entry author="K.Petrovcic@goap.si" date="26 March 2021" revision="1">Initial Import</Entry>
+        </ChangeLog>
+    </MetaData>
+
+    <!-- Configuration Command Class -->
+    <CommandClass id="112">
+
+        <Value genre="config" index="1" instance="1" label="Output 1 contact type" max="1" min="0" size="1" type="list" value="0">
+            <Help>Defines the output contact type for Q↑.</Help>
+            <Item label="NO (normally open) contact type" value="0"/>
+            <Item label="NC (normally closed) contact type" value="1"/>
+        </Value>
+		
+		<Value genre="config" index="2" instance="1" label="Input 2 contact type" max="1" min="0" size="1" type="list" value="0">
+            <Help>Defines how the device reacts if a signal from I2 input is registered.</Help>
+            <Item label="NO (normally open) contact type" value="0"/>
+            <Item label="NC (normally closed) contact type" value="1"/>
+        </Value>
+		
+		<Value genre="config" index="3" instance="1" label="Input 3 contact type" max="1" min="0" size="1" type="list" value="0">
+            <Help>Defines how the device reacts if a signal from I3 input is registered..</Help>
+            <Item label="NO (normally open) contact type" value="0"/>
+            <Item label="NC (normally closed) contact type" value="1"/>
+        </Value>
+		
+		 <Value genre="config" index="30" instance="1" label="Restore state on power failure" max="1" min="0" size="1" type="list" value="0">
+            <Help>With this parameter, the user can select if the state of the device should be restored, after a power failure.</Help>
+            <Item label="Enabled (the device will restore state on power failure)" value="0"/>
+            <Item label="Disabled (the device will not restore state on power failure and will remain off)" value="1"/>
+        </Value>
+		
+		<Value genre="config" index="48" instance="1" label="Water total consumption value in Liters" max="2147483647" min="-2147483648" size="4" type="int" value="0">
+            <Help>
+				With this parameter we can set the current water consumption value in liters. 
+				The value is represented with two's complement notation so that it can represent negative values also. 
+				Span of the input value is from (-2147483648) to (+2147483647). 
+				Its main usage is to set the same value on our device as on physical water meter. 
+				If we get the PARAMETER_48 value with PARAMETER_GET command we get the last value that was set with this parameter and not the current water consumption value! 
+				To get the current consumption value we must send the METER_GET command.
+			</Help>
+        </Value>
+		
+		<Value genre="config" index="50" instance="1" label="Number of liters per pulse" units="litres" max="1000" min="1" size="2" type="short" value="10">
+            <Help>
+				This number defines how many litres represent 1 received pulse from the water meter connected to I2.
+				Default value = 10 (1 pulse = 10 liters)
+				1 to 1000 => 1 litre – 1000 litres (step is 1 litre).
+            </Help>
+        </Value>
+		
+		<Value genre="config" index="51" instance="1" label="Number of liters for Slow Leak" units="litres" max="1000" min="1" size="2" type="short" value="10">
+            <Help>
+				This number defines how many minimum litres must be consumed each hour and constantly repeated for the defined time in parameter 52 to cause the leak alarm (depends on meter resolution).
+				Default value = 1 (1 litre)
+				1 to 1000 => 1 litre – 1000 litres (step is 1 litre).
+			</Help>
+        </Value>
+		
+		<Value genre="config" index="52" instance="1" label="Water consumption time interval for Slow Leak" units="hours" max="24" min="1" size="1" type="byte" value="24">
+            <Help>
+				Set value means time interval (0 – 24) in hours, during which the device checks, if water consumption defined in Parameter 51 was consumed to cause the leak alarm.
+				Default value = 24 (checking for a leak alarm in 24 hours)
+				1 – 24 => 1 hour – 24 hours
+			</Help>
+        </Value>
+		
+		<Value genre="config" index="53" instance="1" label="Number of liters for Medium Leak" units="litres" max="1000" min="1" size="2" type="short" value="150">
+            <Help>
+				This number defines how many minimum litres must be consumed each hour and constantly repeated for the defined time in parameter 54 to cause the leak alarm.
+				Default value = 150 (150 litres)
+				1 – 1000 => 1 litre – 1000 litres – step is 1 litre
+			</Help>
+        </Value>
+		
+		<Value genre="config" index="54" instance="1" label="Water consumption time interval for Medium Leak" units="hours" max="24" min="1" size="1" type="byte" value="6">
+            <Help>
+				Set value means time interval (0 – 24) in hours, during which the device checks, if water consumption defined in Parameter 53 was consumed to cause the leak alarm.
+				Default value = 6 (checking for a leak alarm in 6 hours)
+				1 – 24 => 1 hour – 24 hours
+			</Help>
+        </Value>
+		
+		<Value genre="config" index="55" instance="1" label="Number of liters for Fast Leak" units="litres" max="1000" min="1" size="2" type="short" value="300">
+            <Help>
+				This number defines how many minimum liters must be consumed each hour and constantly repeated for the defined time in parameter 56 to cause the leak alarm.
+				Default value 300 (300 liters)
+				1 – 1000 = 1 litre – 1000 litres – step is 1 litre
+			</Help>
+        </Value>
+		
+		<Value genre="config" index="56" instance="1" label="Water consumption time interval for Fast Leak" units="hours" max="24" min="1" size="1" type="byte" value="3">
+            <Help>
+				Set value means time interval (0 – 24) in hours, during which the device checks, if water consumption defined in Parameter 53 was consumed to cause the leak alarm.
+				Default value = 3 (checking for a leak alarm in 3 hours)
+				1 – 24 => 1 hour – 24 hours
+			</Help>
+        </Value>
+		
+		<Value genre="config" index="60" instance="1" label="Enable closing valve according to Slow Leak" max="1" min="0" size="1" type="list" value="1">
+            <Help>This parameter defines what happens with the valve if the leak alarm is triggered.</Help>
+            <Item label="Close the valve" value="0"/>
+            <Item label="Don’t close the valve" value="1"/>
+        </Value>
+		
+		<Value genre="config" index="61" instance="1" label="Enable closing valve according to Medium Leak" max="1" min="0" size="1" type="list" value="1">
+            <Help>This parameter defines what happens with the valve if the leak alarm is triggered.</Help>
+            <Item label="Close the valve" value="0"/>
+            <Item label="Don’t close the valve" value="1"/>
+        </Value>
+		
+		<Value genre="config" index="62" instance="1" label="Enable closing valve according to Fast Leak" max="1" min="0" size="1" type="list" value="1">
+            <Help>This parameter defines what happens with the valve if the leak alarm is triggered.</Help>
+            <Item label="Close the valve" value="0"/>
+            <Item label="Don’t close the valve" value="1"/>
+        </Value>
+		
+		<Value genre="config" index="63" instance="1" label="Enable closing valve according to Hardware Leak" max="1" min="0" size="1" type="list" value="1">
+            <Help>This parameter defines what happens with the valve if the leak alarm is triggered.</Help>
+            <Item label="Close the valve" value="0"/>
+            <Item label="Don’t close the valve" value="1"/>
+        </Value>
+       
+    </CommandClass>
+	
+    <!-- Association Groups -->
+    <CommandClass id="133">
+        <Associations num_groups="2">
+            <Group index="1" label="Lifeline" max_associations="1"/>
+            <Group index="2" label="Basic OnOff" max_associations="5"/>
+        </Associations>
+    </CommandClass>
+</Product>
\ No newline at end of file
diff --git a/config/qubino/ZMNHQDx.xml b/config/qubino/ZMNHQDx.xml
index 22594c07..2e2e95c1 100644
--- a/config/qubino/ZMNHQDx.xml
+++ b/config/qubino/ZMNHQDx.xml
@@ -1,10 +1,11 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
     <MetaData>
         <MetaDataItem name="Name">LUXY Smart Light</MetaDataItem>
         <MetaDataItem name="Description">The Qubino LUXY Smart Light is ideal for gentle illumination of any room and for visual and sound notifications.</MetaDataItem>
         <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0159:0051:0008</MetaDataItem>
         <MetaDataItem name="ProductPage">https://qubino.com</MetaDataItem>
         <MetaDataItem name="ProductSupport">https://support.qubino.com/support/home</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/qubino/ZMNHQDx.png</MetaDataItem>
         <MetaDataItem name="InclusionDescription">
             Manual inclusion is triggered by the following procedure:
             Full white needs to be active (c-button 2). The user can select it by quickly pressing the c-button2 once.
@@ -31,6 +32,7 @@
             <Entry author="K.Petrovcic@goap.si" date="18 October 2019" revision="1">Initial Import</Entry>
             <Entry author="Jean-Francois Auger - nechry@gmail.com" date="29 December 2019" revision="2">Reformat and remove small typo</Entry>
             <Entry author="Justin Hammond" date="23 March 2020" revision="3">Fix Empty ChangeLog Entry</Entry>
+            <Entry author="Justin Hammond" date="24 June 2020" revision="4">Add Product Pic</Entry>
         </ChangeLog>
     </MetaData>
 
diff --git a/config/qubino/ZMNKADx.xml b/config/qubino/ZMNKADx.xml
index f9534c8d..3f0839d8 100644
--- a/config/qubino/ZMNKADx.xml
+++ b/config/qubino/ZMNKADx.xml
@@ -1,10 +1,11 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
     <MetaData>
         <MetaDataItem name="Name">LUXY Smart Switch</MetaDataItem>
         <MetaDataItem name="Description">The Qubino LUXY Smart Switch is ideal for gentle illumination of any room, for visual and sound notifications, and for controling various loads, using the built-in relay.</MetaDataItem>
         <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0159:0052:0008</MetaDataItem>
         <MetaDataItem name="ProductPage">https://qubino.com</MetaDataItem>
         <MetaDataItem name="ProductSupport">https://support.qubino.com/support/home</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/qubino/ZMNKADx.png</MetaDataItem>
         <MetaDataItem name="InclusionDescription">
             Manual inclusion is triggered by the following procedure:
             Full white needs to be active (c-button 2). The user can select it by quickly pressing the c-button2 once.
@@ -29,6 +30,7 @@
         </MetaDataItem>
         <ChangeLog>
             <Entry author="K.Petrovcic@goap.si" date="22 January 2020" revision="1">Initial Import</Entry>
+            <Entry author="Justin Hammond" date="24 June 2020" revision="2">Add Product Pic</Entry>
         </ChangeLog>
     </MetaData>
 
diff --git a/config/remotec/zts-500.xml b/config/remotec/zts-500.xml
index cda03abb..0911d9c6 100644
--- a/config/remotec/zts-500.xml
+++ b/config/remotec/zts-500.xml
@@ -1,4 +1,4 @@
-<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/5254:8170:0200</MetaDataItem>
     <MetaDataItem name="ProductPic">images/remotec/zts-500.png</MetaDataItem>
@@ -11,27 +11,31 @@ Press &lt; to cancel and back to the previous screen.
 Use the RESET procedure ONLY when the primary Controller is missing or inoperable.
 </MetaDataItem>
     <MetaDataItem id="8170" name="FrequencyName" type="0200">U.S. / Canada / Mexico</MetaDataItem>
-    <MetaDataItem name="Description">ZTS-500 is a user-friendly Z-Wave programmable smart thermostat. The ZTS-500 is compatible with any Z-Wave certified controller or gateway and is designed to fit perfectly over most original thermostat installation marks without the need for a mounting board. The invisible 4-button back-illuminated interface combines a simple and intuitive interactive experience with a modern fashionable look. The flip-over terminal-board makes installation a breeze, The ZTS-500 allows utilization even in environments where a C wire is not available. With automatic power source detection (24Vac or Battery Power), it decide to maximizing battery life or acting as a range extender in the Z-Wave network, and all your connections will be safe and secure behind AES128 encryption. The ZTS-500’s available multi-color faceplates allow for seamless integration into a variety of interior designs.</MetaDataItem>
+    <MetaDataItem name="Description">ZTS-500 is a user-friendly Z-Wave programmable smart thermostat. The ZTS-500 is compatible with any Z-Wave certified controller or gateway and is designed to fit perfectly over most original thermostat installation marks without the need for a mounting board. The invisible 4-button back-illuminated interface combines a simple and intuitive interactive experience with a modern fashionable look. The flip-over terminal-board makes installation a breeze, The ZTS-500US allows utilization even in environments where a C wire is not available. With automatic power source detection (24Vac or Battery Power), it decide to maximizing battery life or acting as a range extender in the Z-Wave network, and all your connections will be safe and secure behind AES128 encryption. The ZTS-500’s available multi-color faceplates allow for seamless integration into a variety of interior designs.</MetaDataItem>
     <MetaDataItem name="InclusionDescription">From the Standby screen, press > or &lt; to navigate to the Z-Wave screen and the Z-Wave LED will continuously flash.
-Tap + to include the ZTS-500US into the network.
--	The “✔” symbol will be displayed on screen once the ZTS-500US is added into the network.
+Tap + to include the ZTS-500 into the network.
+-	The “✔” symbol will be displayed on screen once the ZTS-500 is added into the network.
 The Z-Wave disconnect icon will also be removed from the standby screen.
 
--	The “x” symbol will be displayed on screen if there is no action (time out) or unable to include the ZTS-500US into the network.
+-	The “x” symbol will be displayed on screen if there is no action (time out) or unable to include the ZTS-500 into the network.
 </MetaDataItem>
-    <MetaDataItem id="8170" name="Identifier" type="0200">ZTS-500US</MetaDataItem>
+    <MetaDataItem id="8170" name="Identifier" type="0200">ZTS-500</MetaDataItem>
     <MetaDataItem name="ExclusionDescription">Press and keep holding > or &lt; for 3 seconds to navigate to the System Main (SYS) screen. 
 On the Z-Wave (Z-w) screen.
-Tap + to exclude ZTS-500US from the network.
+Tap + to exclude ZTS-500 from the network.
 Press &lt; to cancel and back to the previous screen.
 </MetaDataItem>
     <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/1767/F-BW8170US (ZTS-500US) User_Manual_V1.01_Z-Wave validation_20160510.pdf</MetaDataItem>
     <MetaDataItem name="Name">Z-WAVE SMART THERMOSTAT</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="4">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1767/xml</Entry>
+      <Entry author="James Dodds" date="04 October 2020" revision="5">Update to include AU version, which is idential to the US version but with a different type</Entry>
     </ChangeLog>
+    <MetaDataItem id="8170" name="ZWProductPage" type="0202">https://products.z-wavealliance.org/products/1767/xml</MetaDataItem>
+    <MetaDataItem id="8170" name="Identifier" type="0202">ZTS-500</MetaDataItem>
+    <MetaDataItem id="8170" name="FrequencyName" type="0202">Australia / New Zealand</MetaDataItem>
   </MetaData>
-  <!-- Remotec ZTS-500 Thermostat
+  <!-- Remotec ZTS-500US Thermostat
      http://www.zwaveproducts.com/product-documentation/F-BW8170US%20(ZTS-500US)%20User_Manual_V1.01_Z-Wave%20validation_20160510.pdf
      http://products.z-wavealliance.org/products/1767/configs -->
 
diff --git a/config/ring/contact-sensor-v2.xml b/config/ring/contact-sensor-v2.xml
new file mode 100644
index 00000000..8f0dd68d
--- /dev/null
+++ b/config/ring/contact-sensor-v2.xml
@@ -0,0 +1,74 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Contact Sensor</MetaDataItem>
+    <MetaDataItem name="Description">Ring Alarm Contact Sensor is a wireless sensor for the Ring Alarm system which provides users the ability to know when a door or window is open or closed. After installing the sensor on a door or window and setting up the sensor in the Ring app, monitor and receive notifications when the door or window opens or closes. The Ring Alarm Base Station is required to enable Contact Sensor features and functions within the Ring app. </MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0346:0301:0201</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ring/contact-sensor-v2.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3862/Z-WaveUserManual_Contact_Sensor_700.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">The sensor will wake up every so often to send a Wake-Up Notification to allow the life line master node controller that the sensor is now available for any queued messages that the controller may have for the sensor. The time between Wake-Up Notifications can be configured with the Wake-Up Notification command class according to the following configurable values:
+•	Min Value 1 hr
+•	Max Value 24 hr
+•	Default Value 12 hours (12 * 60 * 60 seconds)
+•	Wake Up Interval Step Seconds 1 hour (3600 seconds)
+    </MetaDataItem>
+    <MetaDataItem name="InclusionDescription">After powering on the device, press and hold the button on the front of the device for ~3 seconds. Release the button and the device will enter Classic inclusion mode which implements both classic inclusion with a Node Information Frame, and Network Wide Inclusion. During Classic Inclusion mode, the green LED will blink three times followed by a brief pause, repeatedly. When Classic inclusion times-out, the device will blink alternating red and green a few times.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Exclusion Instructions:
+1.	Initiate remove “Ring Alarm Contact Sensor” flow in the Ring Alarm mobile application – Select the settings icon from device details page and choose “Remove Device” to remove the device. This will place the controller into Remove or “Z-Wave Exclusion” mode.
+2.	With the controller in Remove (Z-Wave Exclusion) mode, use a paper clip or similar object and tap the pinhole button. The device’s red LED turns on solid to indicate the device was removed from the network.
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Factory Default Instructions
+1.	To restore Ring Alarm Contact Sensor to factory default settings, locate the pinhole reset button on the device. This is found inside the battery compartment on the back of the device after removing the back bracket.
+2.	Using a paperclip or similar object, insert it into the pinhole, press and hold the button down for 10 seconds.
+3.	The device will rapidly blink green continuously for 10 seconds. After about 10 seconds, when the green blinking stops, release the button. The red LED will turn on solid to indicate the device was removed from the network.
+    </MetaDataItem>
+    <MetaDataItem id="0301" name="ZWProductPage" type="0201">https://products.z-wavealliance.org/products/3862/</MetaDataItem>
+    <MetaDataItem id="0301" name="Identifier" type="0201">Contact Sensor v2</MetaDataItem>
+    <MetaDataItem id="0301" name="FrequencyName" type="0201">U.S. / Canada / Mexico</MetaDataItem>
+    <ChangeLog>
+	<Entry author="gongtao0607@gmail.com" date="13 Jan 2021" revision="1">Initial Metadata Creation</Entry>
+	<Entry author="gongtao0607@gmail.com" date="17 Jan 2021" revision="2">Minor correction</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="Heartbeat Interval" max="70" min="1" size="1" type="byte" units="minutes" value="70">
+      <Help>
+        Heartbeats are automatic battery reports on a timer after the last event.
+      </Help>
+    </Value>
+    <Value genre="config" index="2" label="Application Retriess" max="5" min="0" size="1" type="byte" units="" value="1">
+      <Help>
+        Number of application level retries attempted for messages either not ACKed or messages encapsulated via supervision get that did not receive a report.
+      </Help>
+    </Value>
+    <Value genre="config" index="3" label="Application Level Retry Base Wait Time Period" max="96" min="1" size="1" type="byte" units="seconds" value="5">
+      <Help>
+        This parameter is the number base seconds used in the calculation for sleeping between retry messages.
+      </Help>
+    </Value>
+    <Value genre="config" index="4" label="LED Indicator Enable" max="2" min="0" size="1" type="list" value="1">
+      <Help>
+        This parameter allows a user, via software, to configure the various LED indications on the device.
+      </Help>
+      <Item label="Don't show green" value="0"/>
+      <Item label="Show green after Supervision Report Intrusion (Fault)" value="1"/>
+      <Item label="Show green after Supervision Report both Intrusion and Intrusion clear" value="2"/>
+    </Value>
+    <Value genre="config" index="5" label="One Shot Timer" max="65535" min="5" size="2" type="short" units="seconds" value="0">
+      <Help>
+        Writing to this parameter prompts the sensor to send a wakeup notification one time after this parameter's number of seconds. After which it is reset back to 0.
+      </Help>
+    </Value>
+    <Value genre="config" index="6" label="Supervisory Report Timeout" max="30000" min="500" size="2" type="short" units="milliseconds" value="10000">
+      <Help>
+        The number of milliseconds waiting for a Supervisory Report response to a Supervisory Get encapsulated command from the sensor before attempting a retry.
+      </Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="1">
+       <Group index="1" label="LifeLine" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
+
diff --git a/config/ring/motion-detector-v2.xml b/config/ring/motion-detector-v2.xml
new file mode 100644
index 00000000..b5ab5c9d
--- /dev/null
+++ b/config/ring/motion-detector-v2.xml
@@ -0,0 +1,97 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Motion Detector</MetaDataItem>
+    <MetaDataItem name="Description">Ring Alarm Motion Detector is a wireless sensor for the Ring Alarm system which provides users the ability to know when there is movement of a person or similar object within an area. After installing the sensor and setting up the sensor in the Ring app, monitor and receive notifications motion is detected. The Ring Alarm Base Station is required to enable Motion Detector features and functions within the Ring app.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0346:0301:0301</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/ring/motion-detector-v2.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3869/Z-WaveUserManual_Motion_Detector_700.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Not applicable. Ring Alarm Motion Detector is a Frequently Listening Receiver Slave (FLiRS) device and does not support Wake Up Command Class.
+    </MetaDataItem>
+    <MetaDataItem name="InclusionDescription">After powering on the device, press and hold the button on the front of the device for ~3 seconds. Release the button and the device will enter Classic inclusion mode which implements both classic inclusion with a Node Information Frame, and Network Wide Inclusion. During Classic Inclusion mode, the green LED will blink three times followed by a brief pause, repeatedly. When Classic inclusion times-out, the device will blink alternating red and green a few times.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Exclusion Instructions: 
+1.	Initiate remove “Ring Alarm Motion Detector” flow in the Ring Alarm mobile application – Select the settings icon from device details page and choose “Remove Device” to remove the device. This will place the controller into Remove or “Z-Wave Exclusion” mode. 
+2.	Locate the pinhole reset button on the back of the device in the battery compartment. 
+3.	With the controller in Remove (Z-Wave Exclusion) mode, use a paper clip or similar object and tap the pinhole button. The device’s red LED turns on solid to indicate the device was removed from the network. 
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Factory Default Instructions 
+1.	To restore Ring Alarm Motion Detector to factory default settings, locate the pinhole reset button on the device. This is found inside the battery compartment on the back of the device after removing the back bracket. 
+2.	Using a paperclip or similar object, insert it into the pinhole, press and hold the button down for 10 seconds. 
+3.	The device will rapidly blink green continuously for 10 seconds. After about 10 seconds, when the green blinking stops, release the button. The red LED will turn on solid to indicate the device was removed from the network. 
+
+Note: Use this procedure only in the event that the network primary controller is missing or otherwise inoperable.
+    </MetaDataItem>
+    <MetaDataItem id="0301" name="ZWProductPage" type="0301">https://products.z-wavealliance.org/products/3869/</MetaDataItem>
+    <MetaDataItem id="0301" name="Identifier" type="0301">Motion Detector v2</MetaDataItem>
+    <MetaDataItem id="0301" name="FrequencyName" type="0301">U.S. / Canada / Mexico</MetaDataItem>
+    <ChangeLog>
+	<Entry author="gongtao0607@gmail.com" date="17 Jan 2021" revision="1">Initial Metadata Creation</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="Heartbeat Interval" max="70" min="1" size="1" type="byte" units="minutes" value="70">
+      <Help>
+        This parameter is the number minutes between heartbeats. Heartbeats are automatic battery reports on a timer after the last event.
+      </Help>
+    </Value>
+    <Value genre="config" index="2" label="Application Retriess" max="5" min="0" size="1" type="byte" units="" value="1">
+      <Help>
+        Number of application level retries attempted for messages either not ACKed or messages encapsulated via supervision get that did not receive a report.
+      </Help>
+    </Value>
+    <Value genre="config" index="3" label="Application Level Retry Base Wait Time Period" max="96" min="1" size="1" type="byte" units="seconds" value="5">
+      <Help>
+        The number base seconds used in the calculation for sleeping between retry messages.
+      </Help>
+    </Value>
+    <Value genre="config" index="4" label="LED Indicator Enable" max="2" min="0" size="1" type="list" value="1">
+      <Help>
+        This parameter allows a user, via software, to configure the various LED indications on the device.
+      </Help>
+      <Item label="Don't show green" value="0"/>
+      <Item label="Show green after Supervision Report Intrusion (Fault)" value="1"/>
+      <Item label="Show green after Supervision Report both Intrusion and Intrusion clear" value="2"/>
+    </Value>
+    <Value genre="config" index="5" label="Runtime Occ Clear Delay" max="255" min="0" size="1" type="byte" units="seconds" value="0">
+      <Help>
+        Delay time in seconds for occupancy signal to clear
+      </Help>
+    </Value>
+    <Value genre="config" index="6" label="Runtime Intrusion Clear Delay" max="255" min="0" size="1" type="byte" units="seconds" value="15">
+      <Help>
+        Delay time in seconds for intrusion signal to clear
+      </Help>
+    </Value>
+    <Value genre="config" index="7" label="Runtime Std Clear Delay" max="255" min="0" size="1" type="byte" units="seconds" value="0">
+      <Help>
+        Standard delay time in seconds
+      </Help>
+    </Value>
+    <Value genre="config" index="8" label="Motion Detection Mode" max="4" min="0" size="1" type="byte" units="" value="3">
+      <Help>
+        Adjusts motion sensitivity
+      </Help>
+    </Value>
+    <Value genre="config" index="9" label="Lighting Enabled" max="1" min="0" size="1" type="byte" units="" value="0">
+      <Help>
+        Enable or Disable light sensor
+      </Help>
+    </Value>
+    <Value genre="config" index="10" label="Lighting Delay" max="60" min="0" size="1" type="byte" units="minutes" value="2">
+      <Help>
+        Delay used to turn off lights when motion is no longer detected
+      </Help>
+    </Value>
+    <Value genre="config" index="11" label="Supervisory Report Timeout" max="30000" min="500" size="2" type="short" units="milliseconds" value="10000">
+      <Help>
+        The number of milliseconds waiting for a Supervisory Report response to a Supervisory Get encapsulated command from the sensor before attempting a retry.
+      </Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="1">
+       <Group index="1" label="LifeLine" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
+
diff --git a/config/schlage/BE468.xml b/config/schlage/BE468.xml
index de43e570..cc9c364f 100644
--- a/config/schlage/BE468.xml
+++ b/config/schlage/BE468.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
 	<CommandClass id="112">
 		<Value type="list" genre="config" index="3" label="Beeper" min="0" max="255" size="1" value="255">
 			<Help>
@@ -65,7 +65,7 @@
 		Lock Status is Changed, but instead send a Alarm Message -
 		So we trigger a Refresh of the DoorLock Command Class when
 		we recieve a Alarm Message Instead -->
-		<TriggerRefreshValue Genre="user" Index="0" Instance="1">
+		<TriggerRefreshValue Genre="user" Index="6" Instance="1">
 			<RefreshClassValue CommandClass="98" RequestFlags="0" Index="1" Instance="1" />
 		</TriggerRefreshValue>
 	</CommandClass>
diff --git a/config/schlage/BE469ZP.xml b/config/schlage/BE469ZP.xml
index cf2c64a7..617988ba 100644
--- a/config/schlage/BE469ZP.xml
+++ b/config/schlage/BE469ZP.xml
@@ -1,4 +1,4 @@
-<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/003B:0469:0001</MetaDataItem>
     <MetaDataItem name="ProductPic">images/schlage/BE469ZP.png</MetaDataItem>
@@ -49,6 +49,7 @@ NOTE: Please use this procedure only when the network primary controller is miss
 </MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3130/xml</Entry>
+      <Entry author="Jaburges" date="03 Nov 2020" revision="3">Update TriggerRefreshValue index. </Entry>
     </ChangeLog>
   </MetaData>
   <CommandClass id="112">
@@ -195,7 +196,7 @@ NOTE: Please use this procedure only when the network primary controller is miss
 		Lock Status is Changed, but instead send a Alarm Message -
 		So we trigger a Refresh of the DoorLock Command Class when
 		we recieve a Alarm Message Instead -->
-    <TriggerRefreshValue Genre="user" Index="0" Instance="1">
+    <TriggerRefreshValue Genre="user" Index="6" Instance="1">
       <RefreshClassValue CommandClass="98" Index="1" Instance="1" RequestFlags="0"/>
     </TriggerRefreshValue>
   </CommandClass>
diff --git a/config/sensative/kaipule/im20.xml b/config/sensative/kaipule/im20.xml
new file mode 100644
index 00000000..78a9bd18
--- /dev/null
+++ b/config/sensative/kaipule/im20.xml
@@ -0,0 +1,50 @@
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0214:0001:0002</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/kaipule/im20.png</MetaDataItem>
+    <MetaDataItem id="0001" name="ZWProductPage" type="0002">https://products.z-wavealliance.org/products/2027/</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">enter the Exclusion Mode of gateway, and press the tamper switch 3 times within 1.5s, then the door sensor will be removed after a period of time.</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="0002">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem name="Description">IM20_Zwave is a door/window sensor adopting Zwave500 series chip. It uses special structure design, suitable for kinds of installation environments. Also, it supports door &amp; window open/close detection, anti-tamper, battery level detection and associated gateway and interaction device notifications.</MetaDataItem>
+    <MetaDataItem name="Name">Z-Wave DOOR SENSOR</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/2027/IM20-Z-Wave Product Manual.pdf</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="0002">IM20-Z-Wave</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press the tamper switch 6 times in 2s, it will recover to factory setting after a period of time（Please use the reset procedure only when the primary controller is missing or inoperable）</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">a) Manual Wake-up
+Quickly press tamper switch once, the door sensor will automatically send wake-up information, and there will be 10s after wake-up to receive gateway setting information.
+b) Automatic Wake-up
+Default time of automatic wake-up is 24 hours, and there will be 10s after wake-up to receive gateway setting information, the max automatic report time = 24 hours, minimum=30min</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">enter the Inclusion Mode of gateway, and press the tamper switch 3 times within 1.5s,then the door sensor will stay in enrollment state until successfully enrolled into network or enrollment time out after 30s.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2027/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!--
+Kaipule IM20 Door/Window Sensor
+https://products.z-wavealliance.org/products/2027
+-->
+	<!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Basic Set Level" max="255" min="1" size="1" type="byte" value="255">
+      <Help>Basic Set parameter setting, the receivers make relevant adjustment according to parameter value</Help>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Turn Off Light Time" max="120" min="1" size="1" type="byte" units="seconds" value="20">
+      <Help>
+				If there is any device under Association Group2, the door sensor will send Basic Set = value command to Group2, and send Basic Set = 0x00 command to turn-off light after t seconds,	Set value = t, means to send Basic Set command after t seconds.
+			</Help>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Auto report status time" max="24" min="0" size="1" type="byte" units="hours" value="6">
+      <Help>
+				Under normal working status (without trigger), the door sensor will automatically send report to the Gateway about its current tamper and open/close status.
+				Set value = t, means t hours, (t=0, means no status report).
+				0-24 hours (Default 6 hours)</Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="Control BASIC SET reports" max_associations="2"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sensative/kaipule/ix32.xml b/config/sensative/kaipule/ix32.xml
new file mode 100644
index 00000000..fe79a1bb
--- /dev/null
+++ b/config/sensative/kaipule/ix32.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Kaipule IX32 PIR Sensor -->
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+	<!-- Configuration -->
+	<CommandClass id="112">
+		<Value type="byte" genre="config" instance="1" index="1" label="Basic Set Level" size="1" min="1" max="255" value="255">
+			<Help>Basic Set parameter setting, the receivers make relevant adjustment according to parameter value</Help>
+		</Value>		
+		<Value type="byte" genre="config" instance="1" index="2" label="Turn Off Light Time" size="1" min="1" max="255" units="5seconds" value="1">
+			<Help>When the device triggered and sends out BASIC SET to the lightings, the light turns on and off as the set time. 
+			The minimum value is 1, means the light bright time is 1*5s (5 seconds), and turn off after 5 seconds, if the value is t, means the bright time is t*5s, turn off after t*5 seconds.</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="3" label="Alarm Elimination Time" size="1" min="1" max="24" units="5seconds" value="4">
+			<Help>Eliminate alarm after 5xt seconds.</Help>
+		</Value>
+	</CommandClass>
+	<!-- Association Groups -->
+	<CommandClass id="133">
+		<Associations num_groups="2">
+			<Group index="1" max_associations="1" label="Lifeline"/>
+			<Group index="2" max_associations="2" label="Control BASIC SET" />
+		</Associations>
+	</CommandClass>
+</Product>
diff --git a/config/shenzen_neo/ls01ch.xml b/config/shenzen_neo/ls01ch.xml
index 5726fe7a..1136f285 100644
--- a/config/shenzen_neo/ls01ch.xml
+++ b/config/shenzen_neo/ls01ch.xml
@@ -1,28 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
-<!-- Configuration Parameters -->
-<CommandClass id="112">
-  <Value type="list" genre="config" instance="1" index="1" label="Save On/Off status" value="0" size="1">
-    <Help>This parameter defines the on/off status of relay needs saving or not. The status will be saved when relay status is changed if this parameter is set to '1'. Otherwise the relay status is not saved. The Light Switch will restore the relay On/Off status when it's powered again.</Help>
-    <Item label="Disable" value="0"/>
-    <Item label="Enable" value="1"/>
-  </Value>
-  <Value type="list" genre="config" instance="1" index="2" label="Backlight" value="0" size="1">
-    <Help>This parameter defines the back light state of the touch button.</Help>
-    <Item label="Disable" value="0"/>
-    <Item label="Enable" value="1"/>
-  </Value>
-  <Value type="list" genre="config" instance="1" index="3" label="Relay On/Off Indicate" value="0" size="1">
-    <Help>This Parameter defines the relay state. The led will be turned on with pink color when the button is touched to turn on relay if this parameter is set to '1'. Otherwise the LED is off.</Help>
-    <Item label="Disable" value="0"/>
-    <Item label="Enable" value="1"/>
-  </Value>
-</CommandClass>
-<!-- Association Groups -->
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
+  <MetaData>
+    <MetaDataItem name="Name">Shenzhen NEO Electronics (Neo-CoolCam) Light Switch (1 channel)</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0258:108c:0003</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://szneo.com/en/products/show.php?id=201</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/shenzhen-neo/eu-1.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Set Z-Wave gateway into inclusion mode (refer to gateway user manual).
+Touch any button three times continuously within 1,5 seconds, then Light Switch will enter into inclusion mode.
+Meanwhile, LED light would flash red colour five time on and off alternately.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Set Z-Wave gateway into exclusion mode (refer to gateway user manual).
+Touch any button three times continuously within 1,5 seconds, then Light Switch will enter into exclusion mode.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Touch and hold any button for 10 seconds, then release the button.
+LEF lights would flash red (1CH:pink) color 5 times within 2s after resetting successfully.
+During the resetting process, please make sure the Light Switch is powered on all the time.</MetaDataItem>
+    <MetaDataItem id="108C" name="ZWProductPage" type="0003">https://szneo.com/en/products/show.php?id=201</MetaDataItem>
+    <MetaDataItem id="108C" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="108C" name="Identifier" type="0003">EU-1</MetaDataItem>
+    <MetaDataItem id="008C" name="ZWProductPage" type="0003">https://szneo.com/en/products/show.php?id=202</MetaDataItem>
+    <MetaDataItem id="008C" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="008C" name="Identifier" type="0003">US-1</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Attila Lukács" date="13 September 2017" revision="1">Initial version</Entry>
+      <Entry author="Dmitry Blokhin - santafox@gmail.com" date="17 January 2021" revision="2">Added pictures, descriptions and metadata</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value type="list" genre="config" instance="1" index="1" label="Relay On/Off Status Saved Enable" value="1" size="1">
+      <Help>This parameter defines the on/off status of relay needs to be saved or not.
+The status will be saved when relay status is changed if this parameter is set to '1'; otherwise the relay stataus is not saved.
+The Light Switch will restore the relay On/Off status when is powered on again.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="2" label="Back Light Enable" value="1" size="1">
+      <Help>This parameter defines the back light state of the touch button.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="3" label="Relay On/Off Indicate" value="1" size="1">
+      <Help>This Parameter defines the relay state. The led will be turned on with pink color when the button is touched to turn on relay if this parameter is set to '1'. Otherwise the LED is off.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
   <CommandClass id="133">
     <Associations num_groups="2">
        <Group index="1" max_associations="5" label="Lifeline"/>
        <Group index="2" max_associations="5" label="Sending Report Endpoint 1"/>
     </Associations>
   </CommandClass>
-</Product>
\ No newline at end of file
+</Product>
diff --git a/config/shenzen_neo/ls02ch.xml b/config/shenzen_neo/ls02ch.xml
index 03eb1ab1..1233a623 100644
--- a/config/shenzen_neo/ls02ch.xml
+++ b/config/shenzen_neo/ls02ch.xml
@@ -1,27 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
-  <!--
-  Shenzhen NEO Electronics (Neo-CoolCam) Light Switch (2 channel)
-  -->
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
+  <MetaData>
+    <MetaDataItem name="Name">Shenzhen NEO Electronics (Neo-CoolCam) Light Switch (2 channels)</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0258:108b:0003</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://szneo.com/en/products/show.php?id=196</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/shenzhen-neo/eu-2.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Set Z-Wave gateway into inclusion mode (refer to gateway user manual).
+Touch any button three times continuously within 1,5 seconds, then Light switch will enter into inclusion mode.
+Meanwhile, LED light would flash red colour five time on and off alternately.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Set Z-Wave gateway into exclusion mode (refer to gateway user manual).
+Touch any button three times continuously within 1,5 seconds, then Light switch will enter into exclusion mode.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Touch and hold any button for 10 seconds, then release the button.
+LEF lights would flash red (1CH:pink) color 5 times within 2s after resetting successfully.
+During the resetting process, please make sure the light switch is powered on all the time.</MetaDataItem>
+    <MetaDataItem id="108B" name="ZWProductPage" type="0003">https://szneo.com/en/products/show.php?id=196</MetaDataItem>
+    <MetaDataItem id="108B" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="108B" name="Identifier" type="0003">EU-2</MetaDataItem>
+    <MetaDataItem id="008B" name="ZWProductPage" type="0003">https://szneo.com/en/products/show.php?id=203</MetaDataItem>
+    <MetaDataItem id="008B" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="008B" name="Identifier" type="0003">US-2</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Attila Lukács" date="29 August 2017" revision="1">Initial version</Entry>
+      <Entry author="Dmitry Blokhin - santafox@gmail.com" date="17 January 2021" revision="2">Added pictures, descriptions and metadata</Entry>
+    </ChangeLog>
+  </MetaData>
   <!-- Configuration Parameters -->
   <CommandClass id="112">
-    <Value type="list" genre="config" instance="1" index="1" label="Back light Enable" value="1" size="1">
-      <Help>This parameter defines the back light state of the touch button. The back light led would be on when Light Switch is powered on if the parameter is set to '1'. Otherwise the back light led would be off.</Help>
+    <Value type="list" genre="config" instance="1" index="1" label="Back Light Enable" value="1" size="1">
+      <Help>This parameter defines the back light state of the touch button.
+The back light led would be on when Light Switch is powered on if the parameter is set to '1'.
+Otherwise the back light led would be off.</Help>
       <Item label="Disable" value="0"/>
       <Item label="Enable" value="1"/>
     </Value>
-    <Value type="list" genre="config" instance="1" index="2" label="Relay On/Off indicate" value="1" size="1">
-      <Help>This parameter defines the relays state. The led will be turned on with pink color when the button is touched to tur on relay if this paramtere is set to '1'. Otherwise the ledstate is not changed.</Help>
+    <Value type="list" genre="config" instance="1" index="2" label="Relay On/Off Indicate" value="1" size="1">
+      <Help>This parameter defines the relays state.
+The led will be turned on with pink color when the button is touched to turn on relay if this paramtere is set to '1'.
+Otherwise the led state is not changed.</Help>
       <Item label="Disable" value="0"/>
       <Item label="Enable" value="1"/>
     </Value>
-    <Value type="list" genre="config" instance="1" index="3" label="Relay On/Off States Saved Enable" value="1" size="1">
-      <Help>This parameter defines the on/off status of relay needs to be saved. The status will be saved when relay status is changed if this parameter is set to '1'. Otherwise the relay stataus is not saved. The Light Switch will restore the relay On/Off  status when powered again.</Help>
+    <Value type="list" genre="config" instance="1" index="3" label="Relay On/Off Status Saved Enable" value="1" size="1">
+      <Help>This parameter defines the on/off status of relay needs to be saved or not.
+The status will be saved when relay status is changed if this parameter is set to '1'; otherwise the relay stataus is not saved.
+The Light Switch will restore the relay On/Off status when is powered on again.</Help>
       <Item label="Disable" value="0"/>
       <Item label="Enable" value="1"/>
     </Value>
-    <Value type="list" genre="config" instance="1" index="4" label="Root Device Mapped Setting" min="0" max="3" value="0" size="1">
-      <Help>This parameter defines which endpoint is mapped to root device (Endpoint 0). 0 - No endpoint is mapped to root device. 1 - Endpoint 1 is mapped to root device. 2 - Endpoint 2 is mapped to root device. 3 - Both endpoint 1 and 2 are mapped to root device.</Help>
+    <Value type="list" genre="config" instance="1" index="4" label="Root Device Mapped Setting" min="0" max="3" value="1" size="1">
+      <Help>This parameter defines which endpoint is mapped to root device (Endpoint 0).
+The valid values are explaned as follows. Default value is 1.
+0 - No endpoint is mapped to root device; 1 - Endpoint 1 is mapped to root device; 2 - Endpoint 2 is mapped to root device; 3 - Both endpoint 1 and 2 are mapped to root device.
+For example, assume this parameter is set to 1 (default value). Gateway or other devices (such as door/window sensor, motion sensor, etc.) that is associated
+with Light Switch send a command BASIC_SET = 0xFF to Light Switch, the relay in endpoint 1 will be turned on, and other relay status will not be changed.</Help>
       <Item label="No endpoint is mapped to root device" value="0"/>
       <Item label="Endpoint 1 is mapped to root device" value="1"/>
       <Item label="Endpoint 2 is mapped to root device" value="2"/>
diff --git a/config/shenzen_neo/ls03ch.xml b/config/shenzen_neo/ls03ch.xml
new file mode 100644
index 00000000..86cccecc
--- /dev/null
+++ b/config/shenzen_neo/ls03ch.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
+  <MetaData>
+    <MetaDataItem name="Name">Shenzhen NEO Electronics (Neo-CoolCam) Light Switch (3 channels)</MetaDataItem>
+    <MetaDataItem name="Description">3 gang lightswitch EU 868.42 MHz</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0258:102b:0200</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://szneo.com/en/products/show.php?id=237</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/shenzhen-neo/eu-3.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Set Z-Wave gateway into inclusion mode (refer to gateway user manual).
+Touch any button three times continuously within 1,5 seconds, then Light Switch will enter into inclusion mode.
+Meanwhile, LED light would flash red colour five time on and off alternately.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Set Z-Wave gateway into exclusion mode (refer to gateway user manual).
+Touch any button three times continuously within 1,5 seconds, then Light Switch will enter into exclusion mode.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Touch and hold any button for 10 seconds, then release the button.
+LEF lights would flash red (1CH:pink) color 5 times within 2s after resetting successfully.
+During the resetting process, please make sure the Light Switch is powered on all the time.</MetaDataItem>
+    <MetaDataItem id="102B" name="ZWProductPage" type="0200">https://szneo.com/en/products/show.php?id=237</MetaDataItem>
+    <MetaDataItem id="102B" name="FrequencyName" type="0200">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="102B" name="Identifier" type="0200">EU-3</MetaDataItem>
+    <MetaDataItem id="002B" name="ZWProductPage" type="0003">https://szneo.com/en/products/show.php?id=236</MetaDataItem>
+    <MetaDataItem id="002B" name="FrequencyName" type="0003">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="002B" name="Identifier" type="0003">US-3</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Mark Evers - goldwing@outlook.com" date="04 August 2020" revision="1">Initial Release</Entry>
+      <Entry author="Dmitry Blokhin - santafox@gmail.com" date="17 January 2021" revision="2">Added pictures, descriptions and metadata</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value type="list" genre="config" instance="1" index="2" label="Back light Enable" value="1" size="1">
+      <Help>This parameter defines the back light state of the touch button. The back light led would be on when Light Switch is powered on if the parameter is set to '1'. Otherwise the back light led would be off.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="3" label="Relay On/Off indicate" value="1" size="1">
+      <Help>This parameter defines the relays state. The led will be turned on with pink color when the button is touched to tur on relay if this paramtere is set to '1'. Otherwise the ledstate is not changed.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="1" label="Relay On/Off States Saved Enable" value="1" size="1">
+      <Help>This parameter defines the on/off status of relay needs to be saved. The status will be saved when relay status is changed if this parameter is set to '1'. Otherwise the relay stataus is not saved. The Light Switch will restore the relay On/Off  status when powered again.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="4" label="Root Device Mapped Setting" min="0" max="3" value="0" size="1">              <Help>This parameter defines which endpoint is mapped to root device (Endpoint 0). 0 - No endpoint is mapped to root device. 1 - Endpoint 1 is mapped to root device. 2 - Endpoint 2 is mapped to root device. 3 - Both endpoint 1 and 2 are mapped to root device.</Help>            <Item label="No endpoint is mapped to root device" value="0"/>
+      <Item label="Endpoint 1 is mapped to root device" value="1"/>
+      <Item label="Endpoint 2 is mapped to root device" value="2"/>
+      <Item label="Endpoint 3 is mapped to root device" value="3"/>
+      <Item label="All three endpoints are mapped to root device" value="4"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" max_associations="5" label="Lifeline"/>
+      <Group index="2" max_associations="5" label="Sending Report Endpoint 1"/>
+      <Group index="3" max_associations="5" label="Sending Report Endpoint 2"/>
+      <Group index="4" max_associations="5" label="Sending Report Endpoint 3"/>
+        </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/shenzen_neo/nas-cs01z.xml b/config/shenzen_neo/nas-cs01z.xml
new file mode 100644
index 00000000..ce085e9f
--- /dev/null
+++ b/config/shenzen_neo/nas-cs01z.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+	<!--
+  Shenzhen NEO Electronics (Neo-CoolCam) Curtain Switch
+  -->
+	<MetaData>
+		<MetaDataItem name="ProductPage">https://www.szneo.com/en/products/show.php?id=234</MetaDataItem>
+		<MetaDataItem name="ProductPic">images/shenzen_neo/nas-cs01z.jpg</MetaDataItem>
+		<MetaDataItem name="InclusionDescription">Prepaire z-wave controller for inclusion and press any button 3 times within 1.5 seconds to start the pairing process</MetaDataItem>
+		<MetaDataItem name="ExclusionDescription">Prepaire z-wave controller for exclusion and press any button 3 times within 1.5 seconds to start the exclusion process</MetaDataItem>
+		<MetaDataItem name="Description">Curtain Switch EU 868.42 MHz</MetaDataItem>
+		<ChangeLog>
+			<Entry author="Kevin TEMIN" date="24 November 2020" revision="1">Initial Release</Entry>
+		</ChangeLog>
+	</MetaData>
+	<CommandClass id="112">
+		<Value type="list" genre="config" instance="1" index="1" label="Up/Down Button Swap" size="1" value="1">
+			<Help>This parameter defines if the action for UP/DOWN touch bouton need to be exchange. Default value 1-'Enable'</Help>
+			<Item label="Disable" value="0"/>
+			<Item label="Enable" value="1"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="2" label="Motor Rotation Direction Swap" size="1" value="0">
+			<Help>This parameter defines if the direction for left/right motor rotation need to be exchange. Default value 0-'Disable'</Help>
+			<Item label="Disable" value="0"/>
+			<Item label="Enable" value="1"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="3" label="Backlight" size="1" value="1">
+			<Help>This parameter defines the back light state of the touch button. The back light led would be on when Light Switch is powered on if the parameter is set to '1'. Otherwise the back light led would be off.</Help>
+			<Item label="Disable" value="0"/>
+			<Item label="Enable" value="1"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="4" label="Curtain Moving Indicate" size="1" value="1">
+			<Help>This parameter defines the led anabled status whe curtain is moving. Default 1-'Enable'</Help>
+			<Item label="Disable" value="0"/>
+			<Item label="Enable" value="1"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="5" label="Button Switch Function" size="1" value="1">
+			<Help>Settings this configuration as 'Disable' will be disabled to controle the curtain motor by pressed any buttons. Default 1-'Enable'</Help>
+			<Item label="Disable" value="0"/>
+			<Item label="Enable" value="1"/>
+		</Value>
+	</CommandClass>
+	<CommandClass id="133">
+		<Associations num_groups="1">
+			<Group index="1" max_associations="5" label="Lifeline"/>
+		</Associations>
+	</CommandClass>
+</Product>
diff --git a/config/shenzen_neo/nas-pd02z.xml b/config/shenzen_neo/nas-pd02z.xml
index 3a5aa9fc..a0d9c814 100644
--- a/config/shenzen_neo/nas-pd02z.xml
+++ b/config/shenzen_neo/nas-pd02z.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="3">
   <MetaData>
     <!--
   Neo (Coolcam) NAS-PD02Z Motion Sensor (PIR) Version 2 aka NAS-PD02ZT
@@ -8,8 +8,10 @@
   Parameters probably changed on firmware 3.80 of this device.
   Does not figure on https://products.z-wavealliance.org
   -->
+    <MetaDataItem name="ProductPic">images/shenzen_neo/nas-pd02z.png</MetaDataItem>
     <ChangeLog>
       <Entry author="Peter Gebruers - peter.gebruers@gmail.com" date="06 July 2019" revision="2">Fix parameters for temperature model, based on user feedback https://github.com/OpenZWave/open-zwave/issues/1866</Entry>
+      <Entry author="Justin Hammond" date="24 June 2020" revision="3">Add Product Pic Entry</Entry>
     </ChangeLog>
   </MetaData>
 
diff --git a/config/shenzen_neo/nas-pd03z.xml b/config/shenzen_neo/nas-pd03z.xml
new file mode 100644
index 00000000..dc7ade1b
--- /dev/null
+++ b/config/shenzen_neo/nas-pd03z.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
+  <MetaData>
+    <!--
+  Neo (Coolcam) NAS-PD03Z Motion Sensor (PIR) Version 2
+  No official manual available
+  Does not figure on https://products.z-wavealliance.org
+  -->
+    <MetaDataItem name="Name">Neo (Coolcam) NAS-PD03Z Motion Sensor (PIR) Version 2</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.szneo.com/en/products/show.php?id=197</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/shenzen_neo/nas-pd02z.png</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Press button in sensor once. If successfull, LED will blink one time.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Set gateway in inclusion mode. Press button in sensor three times. LED will flash red five times and then on and off alternately.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Set gateway in exclusion mode. Press button in sensor three times. LED will flash red five times and then on and off alternately.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold button the button in sensor for 10-15 seconds. LED will one time first and then five times on and off alternately. Release button.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Mick Venhorst" date="19 September 2020" revision="1">Initial version, based on PD02Z file</Entry>
+      <Entry author="Mick Venhorst" date="23 November 2020" revision="2">Changed value type list to byte for index 1, value of index 4 ws not present in list values </Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value type="byte" genre="config" instance="1" index="1" label="Motion detection sensitivity" value="12" min="8" max="255" size="1">
+      <Help>Adapt the sensitivity of the motion detection where 8 means highest sensibility and 255 lowest.</Help>
+    </Value>
+
+    <Value type="short" genre="config" instance="1" index="2" label="Motion detection ON time" units="second" value="30" min="5" max="600" size="2">
+      <Help>This parameter can be determined how long the associated devices should stay ON status.
+        For instance, this parameter is set to 30(second), the PIR detector will send a BASIC_SET Command to an associated device with value basic set level if PIR detector is triggered and the associated device will be turned on 30(second) before it is turned off.
+        This Parameter value must be large than Parameter 6# - Retrigger interval.
+        Available Settings:5 to 600(second).
+      </Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="3" label="Basic Set Level" value="255" min="0" max="255" size="1">
+      <Help>Basic Set Command will be sent, on the associated devices (group 2), where contains a value when PIR detector is triggered, the receiver will take it for consideration; for instance, if a lamp module is received the Basic Set Command of which value is decisive as to how bright of dim level of lamp module shall be.
+        This Parameter is used to some associated devices.
+        Available Settings: 0, 1 to 99 or 255.
+      </Help>
+    </Value>
+
+    <Value type="list" genre="config" instance="1" index="4" label="Motion detection function" min="0" max="255" value="255" size="1">
+      <Help>
+        Enable the motion detection (PIR) function.
+        This parameter does not effect the luminance reporting.
+      </Help>
+      <Item label="Disable" value="0" />
+      <Item label="Enable" value="255" />
+    </Value>
+
+    <Value type="short" genre="config" instance="1" index="5" label="Ambient Illumination Lux Level" units="lux" value="100" min="0" max="1000" size="2">
+      <Help>
+        Define the illumination level value which determines when the 'Illumination switch ON function' is activated.
+        If the illumination level falls below this value and a person moves across or within the detected area, the motion sensor will switch on the associated device (group 2).
+        0 to 1000(Lux).
+      </Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="6" label="Retrigger interval " units="second" value="8" min="1" max="8" size="1">
+      <Help>
+        Period after motion detection in which the sensor is insensitive for new motion detection.
+        This value must be less than the 'Motion detection ON time'.
+        Available Settings: 1 to 8(s).
+      </Help>
+    </Value>
+
+    <Value type="short" genre="config" instance="1" index="7" label="Illumination reporting interval" units="second" value="180" min="60" max="36000" size="2">
+      <Help>
+        Determine the time between illumination reports, even when value has not changed.
+        NOTE: This Value Must Be less than Wakeup Interval Time.
+        Available Settings: 60 ~ 36000(second).
+      </Help>
+    </Value>
+
+    <Value type="list" genre="config" instance="1" index="8" label="Illumination function" value="0" min="0" max="1" size="1">
+      <Help>
+        Enable the function to switch on a associated device (group 2) once motion has been detected and the illumination level will be less than the value specified in 'Illumination switch ON level'.
+      </Help>
+      <Item label="Disable" value="0" />
+      <Item label="Enable" value="1" />
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="9" label="Illumination report threshold" units="lux" value="100" min="0" max="100" size="1">
+      <Help>This parameter defines by how much Lux Level must change, in lux, to be reported to the main controller.</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="10" label="Ambient Temperature Differential Level Report" units="0.1 C" value="5" min="0" max="127" size="1">
+      <Help>This parameter is configured the value that differential between current measured and previous report value. If the differential value larger than the settings, device will report this measured temperature value to nodes associated in lifeline.</Help>
+    </Value>
+
+    <Value type="list" genre="config" instance="1" index="11" label="Led Blink Enable" value="1" min="0" max="1" size="1">
+      <Help>This parameter can enabled or disable the PIR led blinking function. </Help>
+      <Item label="Disable" value="0" />
+      <Item label="Enable" value="1" />
+    </Value>
+
+    <Value type="list" genre="config" instance="1" index="12" label="Motion Event Report One Time Enable (temperature reporting version)" value="1" min="0" max="1" size="1">
+      <Help>The motion detected event can be sent multiple times/only once until device report motion cleared event. </Help>
+      <Item label="multiple times" value="0" />
+      <Item label="only once" value="1" />
+    </Value>
+
+    <Value type="short" genre="config" instance="1" index="99" label="Ambient Light Intensity Calibration" value="1000" min="1" max="65535" size="2">
+      <Help>This parameter defines the calibrated scale for ambient light intensity.</Help>
+    </Value>
+
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" max_associations="4" label="Lifeline" />
+      <Group index="2" max_associations="4" label="Control Commands BASIC_SET" />
+      <Group index="3" max_associations="4" label="Send Notification Report" />
+      <Group index="4" max_associations="4" label="Send Sensor Binary Report" />
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/shenzen_neo/nas-sc03ze.xml b/config/shenzen_neo/nas-sc03ze.xml
new file mode 100644
index 00000000..7d8efd34
--- /dev/null
+++ b/config/shenzen_neo/nas-sc03ze.xml
@@ -0,0 +1,74 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<MetaData>
+	<MetaDataItem name="Name">NEO Coolcam Roller Shutter</MetaDataItem>
+	<MetaDataItem name="Description">NEO Coolcam Roller Shutter - Curtain Switch - NAS-SC03ZE-2-T-V3</MetaDataItem>
+	<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0258:102c:0200</MetaDataItem>
+	<MetaDataItem name="ProductPage">https://szneo.com/en/products/show.php?id=234</MetaDataItem>
+	<MetaDataItem name="ProductSupport">https://szneo.com/en/service/index.php</MetaDataItem>
+	<MetaDataItem name="ProductPic">images/shenzen_neo/nas-sc03ze.jpg</MetaDataItem>
+	<MetaDataItem name="ProductManual">https://doc.eedomus.com/files/Curtain%20Switch%20NeoCoolcam.pdf</MetaDataItem>
+	<MetaDataItem name="WakeupDescription">Power on the device</MetaDataItem>
+	<MetaDataItem name="InclusionDescription">1. Set Zwave controller intro inclusion mode
+2. power on the device
+3. touch the middle button 3 times within 1s
+4. the device will be entered into inclusion mode automatically
+(All Led lights will be bliked with 1s interval until inclusion successfull)</MetaDataItem>
+	<MetaDataItem name="ExclusionDescription">1. Set Z-WaveControll into exclusion mode
+2. Power on the device
+3. Touch the middle button 3 times within 1s
+4. the device will be entered into exclusion mode
+(All led lights will de blinked 3 times with 0.5s interval.)</MetaDataItem>
+	<MetaDataItem name="ResetDescription">Power on the device
+	Keep touching the middle button for 10s until the led turns to red, then release</MetaDataItem>
+	<MetaDataItem id="102c" name="ZWProductPage" type="0200">Unknown</MetaDataItem>
+	<MetaDataItem id="102c" name="FrequencyName" type="0200">CEPT (Europe)</MetaDataItem>
+	<MetaDataItem id="102c" name="Identifier" type="0200">NAS-SC03ZE</MetaDataItem>
+	<ChangeLog>
+		<Entry author="John Huppertz - jhuppertz@ziggo.nl" date="02 December 2020" revision="1">Initial setup of metadata file</Entry>
+	</ChangeLog>
+</MetaData>
+  <!-- Configuration Parameters -->
+<CommandClass id="112">
+		<Value genre="config" instance="1" index="1" value="1" label="Up/Down Button Swap Enable" units="" size="1" min="0" max="1" type="list">
+			<Help>
+					Up/Down Button Swap Enable
+				</Help>
+			<Item label="Disabled" value="0"/>
+			<Item value="1" label="Enabled"/>
+			</Value>
+		<Value genre="config" instance="1" index="2" value="0" label="Motor Rotation Direction Swap Enable" units="" size="1" min="0" max="1" type="list">
+			  <Help>
+						Motor Rotation Direction Swap Enable
+					</Help>
+			  <Item value="0" label="Disabled"/>
+			  <Item value="1" label="Enabled"/>
+			</Value>
+		<Value genre="config" instance="1" index="3" value="1" label="Backlight Enable" units="" size="1" min="0" max="1" type="list">
+			  <Help>
+						Backlight Enable
+					</Help>
+			  <Item value="0" label="LED Disabled"/>
+			  <Item value="1" label="LED ON when Switch is ON"/>
+			</Value>
+		<Value genre="config" instance="1" index="4" value="1" label="Curtain Moving Indicate Enable" units="" size="1" min="0" max="1" type="list">
+		  <Help>
+					Curtain Moving Indicate Enable
+				</Help>
+		  <Item value="0" label="LED Disabled"/>
+		  <Item value="1" label="LED Enabled"/>
+		</Value>
+		<Value genre="config" instance="1" index="5" value="1" label="Button Switch" units="" size="1" min="0" max="1" type="list">
+		  <Help>
+					Button Switch
+				</Help>
+		  <Item value="0" label="Button Switch Disabled"/>
+		  <Item value="1" label="Button Switch Enabled"/>
+		</Value>
+	</CommandClass>
+  <!-- Association Groups -->
+<CommandClass id="133">
+		<Associations num_groups="1">
+		  <Group index="1" label="Lifeline" max_associations="5"/>
+		</Associations>
+	</CommandClass>
+</Product>
diff --git a/config/shenzen_neo/nas-wr01z.xml b/config/shenzen_neo/nas-wr01z.xml
index 2733c020..ee1a1936 100644
--- a/config/shenzen_neo/nas-wr01z.xml
+++ b/config/shenzen_neo/nas-wr01z.xml
@@ -1,4 +1,4 @@
-<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0258:0087:0003</MetaDataItem>
     <MetaDataItem name="ProductPic">images/shenzen_neo/nas-wr01z.png</MetaDataItem>
@@ -35,6 +35,7 @@ Reset procedure will delete all information on the Z‐Wave network and Z‐Wave
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="4">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1670/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1783/xml</Entry>
+      <Entry author="Daniel Brunt - daniel@brunt.ca" date="15 Sep 2020" revision="6">Correction to Value genre="config" index="2" instance="1" label="Meter Report Interval" max="65536" should be "65535"</Entry>
     </ChangeLog>
     <MetaDataItem id="1087" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/1783/</MetaDataItem>
     <MetaDataItem id="1087" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
@@ -51,7 +52,7 @@ Reset procedure will delete all information on the Z‐Wave network and Z‐Wave
       <Item label="Disable" value="0"/>
       <Item label="Enable" value="1"/>
     </Value>
-    <Value genre="config" index="2" instance="1" label="Meter Report Interval" max="65536" min="1" size="2" type="short" units="second" value="300">
+    <Value genre="config" index="2" instance="1" label="Meter Report Interval" max="65535" min="1" size="2" type="short" units="second" value="300">
       <Help>This parameter defines interval time (in seconds) that Meter report data to main controller.</Help>
     </Value>
     <Value genre="config" index="3" instance="1" label="Configure maximum over-load current" max="16" min="1" size="1" type="byte" units="Ampere" value="13">
diff --git a/config/shenzen_neo/nas-wr01ze.xml b/config/shenzen_neo/nas-wr01ze.xml
index bf8afd0c..d9116330 100644
--- a/config/shenzen_neo/nas-wr01ze.xml
+++ b/config/shenzen_neo/nas-wr01ze.xml
@@ -1,8 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
   <!--
   Shenzhen NEO Electronics (Neo-CoolCam) Smart Power Plug EU
   -->
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0258:1027:0200</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/shenzen_neo/nas-wr01ze.png</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Add the Device (Smart Plug) to Z‐Wave Network
+1.Make sure the sensor is powered. 
+2.Set Z‐Wave controller or Z‐Wave gateway into inclusion mode (Refer to the controller or gateway operating manual) 
+3.Press the button three times within 1.5 second, the device will enter inclusion mode. And the LED will flash on and off with green alternately five times within 2 seconds. </MetaDataItem>
+    <MetaDataItem name="WakeupDescription">this power plug is connected to power, not battery powered</MetaDataItem>
+    <MetaDataItem name="Description">This product can be included and operated in any Z‐Wave network with other Z‐Wave certified devices from other manufacturers and/or other applications. All non‐battery operated nodes within the network will act as repeaters regardless of vendor to increase reliability of the network.
+
+In the front casing, there is button that is used to carry out include, exclude or reset factory default settings on PCB Board.
+
+When power is first supplied, the LED will flash on and off with yellow alternately every 1 second intervals within 5 seconds if the detector has not been added a Z‐Wave network, otherwise the LED will flash on and off 5 times with cyan alternately every 300 millisecond. Please get familiar with the terms below before starting the operations.
+
+This Plug has function that remembers the relay states, the plug will turn on after power up next time if the plug is turn on before the power cut‐off.</MetaDataItem>
+    <MetaDataItem name="Name">Smart Power Plug </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Delete the Device (Smart Plug) from Z‐Wave Network
+1.Make sure the sensor is powered. 
+2.Set Z‐Wave controller or Z‐Wave gateway into exclusion mode (Refer to the controller or gateway operating manual) 
+3.Press the button three times within 1.5 second, the device will enter exclusion mode. And the LED will flash on and off with yellow alternately five times within 2 seconds.  </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Note:  to use the reset procedure only when the primary controller is missing or inoperable.
+Restore the Device (Smart Plug) to Factory Default Settings
+
+Reset procedure will delete all information on the Z‐Wave network and Z‐Wave controller or Z‐Wave Gateway, and restore the sensor to factory default settings.
+1.Make sure the sensor is powered. 
+
+2.Press and hold the button more than 10 seconds until the LED blink with red color. 
+
+3.Release the button. </MetaDataItem>
+    <MetaDataItem id="1027" name="Identifier" type="0200">NAS-WR01ZE</MetaDataItem>
+    <MetaDataItem id="1027" name="Identifier" type="0100">NAS-WR01ZE</MetaDataItem>
+    <MetaDataItem id="1027" name="FrequencyName" type="0100">U.S. / Canada / Mexico</MetaDataItem>
+    <ChangeLog>
+      <Entry author="David Burrows - david@burrows.org" date="19 Aug 2020" revision="2">Added metadata, and added US version (type 0100) that is branded "Power Plug" with no model number displayed. There is no matching Z-Wave Alliance database entry.</Entry>
+    </ChangeLog>
+  </MetaData>
   <!-- Configuration Parameters -->
   <CommandClass id="112">
   <Value type="list" genre="config" instance="1" index="1" label="Remember Relay ON/OFF status" value="1" size="1">
diff --git a/config/shenzen_saykey/sk-3007-05.xml b/config/shenzen_saykey/sk-3007-05.xml
new file mode 100644
index 00000000..5b20caef
--- /dev/null
+++ b/config/shenzen_saykey/sk-3007-05.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">https://products.z-wavealliance.org/products/2662:0005:3007</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/shenzen_saykey/SK-3007-05.png</MetaDataItem>
+    <MetaDataItem id="0005" name="ZWProductPage" type="3007">https://products.z-wavealliance.org/products/2662/</MetaDataItem>
+    <MetaDataItem id="0005" name="Identifier" type="3007">SK-3007-05</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=Manuals/2662/SK-3007-05-Manual_en_20171112.pdf</MetaDataItem>
+    <MetaDataItem name="Name">Curtain Motor Control with external module</MetaDataItem>
+    <MetaDataItem name="Description">The SK-3007-05 curtain motor external module support connect specify motor to Z-Wave system reply. It support control motor open/close/stop and position, meanwhile it can feedback motor position as soon as it stopped.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Connect power line to motor, plug power socket in 220VAC power supply, and Make sure
+the device is located within direct range of the Z-Wave controller.
+2. Set the controller into the exclusion/remove mode (refer to controllers operating manual).
+3. Click the PB-button triple times in 1.5 second, located left side of the motor external box.
+4. Curtain motor will be detected and excluded from the Z-Wave network.</MetaDataItem>
+    <MetaDataItem id="0000" name="FrequencyName" type="0001">China</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1. Connect power line to motor, plug power socket in 220VAC power supply.
+2. Press and hold the PB-button excess 10 second.
+3. Curtain motor will be reset to factory default and clear Z-Wave included network state.
+Please use this procedure only when the network primary controller is missing or otherwise
+inoperable.</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Connect power line to motor, plug power socket in 220VAC power supply, and Make sure
+the device is located within direct range of the Z-Wave controller.
+2. Set the controller into the inclusion/add mode (refer to controllers operating manual).
+3. Click the PB-button triple times in 1.5 second, located left side of the motor external box.
+4. Curtain motor will be detected and included in the Z-Wave network.
+[Note] During inclusion, a LED will fast flash red light until inclusion done. If motor not
+included in any controller, a LED will slow flash red light constantly.
+[Note1] In order to working properly, user should operate curtain open and close once
+manually after power up. If lead tail was changed or re-assembling motor, motor tail
+reset should be done by configuration command parameter #7 manually.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Remi ARNAUD" date="29 Jul 2019" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2662</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="6" instance="1" label="Set motor direction reverse" max="127" min="-128" size="1" type="byte" value="0">
+      <Help>
+				Support Set only. Toggle motor direction between reverse and default as send out set command with any value(0x00-0xFF).
+			</Help>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Clear motor lead tail endpoint setting" max="127" min="-128" type="byte" value="0">
+      <Help>
+				Support Set only. Clear motor lead tail endpoint setting as send out set command with any value(0x00-0xFF).
+			</Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="Enable manual pull function" max="127" min="-128" type="byte" value="0">
+      <Help>
+				Support Set only. Enable manual pull function as send out set command with any value(0x00-0xFF).
+			</Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/simon/10002020-13X.xml b/config/simon/10002020-13X.xml
new file mode 100755
index 00000000..b239236f
--- /dev/null
+++ b/config/simon/10002020-13X.xml
@@ -0,0 +1,143 @@
+<!--
+Simon S100 Socket iO
+https://products.z-wavealliance.org/products/2669
+-->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/simon/10002020-13X.png</MetaDataItem>
+    <MetaDataItem id="0000" name="ZWProductPage" type="0007">https://products.z-wavealliance.org/products/2590/</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=%filename=MarketCertificationFiles/2590/DIMMER_991024_990912.pdf</MetaDataItem>
+    <MetaDataItem name="Name">S100 Rocker iO for Dimmer</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jordi Andújar - jordi.andujar@gmail.com" date="21 Dec 2020" revision="1">Added support for Simon S100 Rocker iO dimmer.</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value type="list" index="1" genre="config" label="Association LED" min="0" max="255" value="0" size="1">
+      <Help>
+        Used during Association process by Simon Shortcut Switch IO to turn ON the main LED of all devices already associated to this shortcut.
+      </Help>
+      <Item label="Turns the central LED OFF" value="0"/>
+      <Item label="Turns the central LED ON" value="255"/>
+    </Value>
+
+    <Value type="byte" index="4" genre="config" label="Set Time" units="seconds" min="0" max="127" value="0" size="1">
+      <Help>
+        This parameter allows to choose the dimmer set time in seconds.
+        Value 0 - Instantly (default).
+        Values from 1 to 127 - 1 second to 127 seconds in 1 second resolution.
+      </Help>
+    </Value>
+
+    <Value type="byte" index="5" genre="config" label="Fade Time" units="seconds" min="0" max="127" value="0" size="1">
+      <Help>
+        This parameter allows to choose the dimmer fade time in seconds.
+        Value 0 - Instantly (default).
+        Values from 1 to 127 - 1 second to 127 seconds in 1 second resolution.
+      </Help>
+    </Value>
+
+    <Value type="byte" index="10" genre="config" label="Delay ON" units="seconds" min="0" max="127" value="0" size="1">
+      <Help>
+        This parameter allows to choose the ON delay in seconds.
+        Value 0 - Instantly (default).
+        Values from 1 to 127 - 1 second to 127 seconds in 1 second resolution.
+      </Help>
+    </Value>
+
+    <Value type="byte" index="11" genre="config" label="Activation TIME" units="seconds" min="0" max="127" value="0" size="1">
+      <Help>
+        This parameter allows to choose the activation time in seconds.
+        Value 0 - Instantly (default).
+        Values from 1 to 127 - 1 second to 127 seconds in 1 second resolution.
+      </Help>
+    </Value>
+
+    <Value type="byte" index="16" genre="config" label="Delay OFF" units="seconds" min="0" max="127" value="0" size="1">
+      <Help>
+        This parameter allows to choose the OFF delay in seconds.
+        Value 0 - Instantly (default).
+        Values from 1 to 127 - 1 second to 127 seconds in 1 second resolution.
+      </Help>
+    </Value>
+
+    <Value genre="config" index="9" label="Calibration" max="3" min="1" size="1" type="list" value="0">
+      <Help>This parameter allows choosing between trailing or leading edge configuration.</Help>
+      <Item label="Device performs calibration using Trailing and Leading edge and decides which one is better." value="1"/>
+      <Item label="Device is calibrated using Trailing Edge" value="2"/>
+      <Item label="Device is calibrated using Leading Edge" value="3"/>
+    </Value>
+
+    <Value type="byte" index="6" genre="config" label="Min Dimming Value %" units="%" min="1" max="99" value="1" size="1">
+      <Help>Sets the Min percentage that can be reached. Once the device gets a value through Z-Wave, it scales the value read according to this Min margin.</Help>
+    </Value>
+
+    <Value type="byte" index="7" genre="config" label="Max Dimming Value %" units="%" min="1" max="99" value="1" size="1">
+      <Help>Sets the Max percentage that can be reached. Once the device gets a value through Z-Wave, it scales the value read according to this Max margin.</Help>
+    </Value>
+
+    <Value type="byte" index="8" genre="config" label="Last On Value" units="%" min="1" max="99" value="1" size="1">
+      <Help>Returns or sets the last non zero dimming value. In case of Set the device turns ON the load.</Help>
+    </Value>
+
+    <Value genre="config" index="12" label="Behavior of LED in Repose" max="255" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows to choose behaviour of LED in repose</Help>
+      <Item label="LED OFF" value="0"/>
+      <Item label="LED ON at 20% of maximum level" value="255"/>
+    </Value>
+
+    <Value genre="config" index="13" label="Lock Input" max="255" min="0" size="1" type="list" value="0">
+      <Help>This parameter locks the direct control of load.</Help>
+      <Item label="Unlock the direct control of load" value="0"/>
+      <Item label="Lock the direct control of load" value="255"/>
+    </Value>
+
+    <Value genre="config" index="15" label="Reset Default" max="39015" min="39015" size="2" type="list" value="0" write_only="true">
+      <Help>Parameters, Groups, and Z-Wave status are restored to default (Only writable).</Help>
+      <Item label="Device performs a factory default Reset" value="39015"/>
+    </Value>
+
+    <Value genre="config" index="19" label="Press Action" max="5" min="0" size="1" type="list" value="5">
+      <Help>This parameter allows choosing.</Help>
+      <Item label="When press less than 2sec, device toggles the load. The slider does not work." value="0"/>
+      <Item label="When press less than 2sec, device turns ON the load. The slider does not work." value="1"/>
+      <Item label="When press less than 2sec, device turns OFF the load. The slider does not work." value="2"/>
+      <Item label="When press less than 2sec, device turns ON the load. When press between 2sec and 10sec, device turns OFF the load. The slider does not work. With this configuration the device will not send the Node Info neither show the LEDs feedback with this press action. The slider does not work." value="4"/>
+      <Item label="(default) when press less than 2sec, device toggles the load. The slider dims the load when it is ON." value="5"/>
+    </Value>
+
+    <Value genre="config" index="20" label="Identify (Write Only)" max="255" min="255" size="1" type="list" value="0">
+      <Help>Write only value that performs a fast blink on Central LED during 5 seconds in order to identify the device when it is installed in a multiple frame.</Help>
+      <Item label="The central LED flashes for 5 seconds at a frequency of 0,1s." value="255"/>
+    </Value>
+
+    <Value genre="config" index="21" label="State of charge (Read Only)" max="65535" min="0" type="byte" size="1" value="0" read_only="true">
+      <Help>
+        Read only Configuration used to report the device state and last value. This value is represented in Hexadecimal.
+        Byte 0 informs about load state (0 load is OFF and 1 load is ON).
+        Byte 1 informs about last active dimming value (0x00 or 0x63)
+      </Help>
+    </Value>
+
+    <Value genre="config" index="23" label="Calibration required (Read Only)" max="255" min="0" size="1" type="byte" value="0" read_only="true">
+      <Help>
+        Reports whether the roller dimmer needs calibration.
+        0x00 Calibration is not required.
+        0xFF It is necessary to calibrate the dimmer to work properly.
+      </Help>
+    </Value>
+
+    <Value genre="config" index="27" label="Lock long press" max="255" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows to choose the long press behaviour.</Help>
+      <Item label="Long press works as described in the product manual." value="0"/>
+      <Item label="Long press between 2s to 10s: do not send the Node Info. Long press of more than 30s: parameters, except Lock long press are restored to default and device sends a Node Info " value="255"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="3"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/simon/10002080-13X.xml b/config/simon/10002080-13X.xml
new file mode 100755
index 00000000..80b11243
--- /dev/null
+++ b/config/simon/10002080-13X.xml
@@ -0,0 +1,96 @@
+<!--
+Simon S100 Socket iO
+https://products.z-wavealliance.org/products/2669
+-->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/simon/10002080-13X.png</MetaDataItem>
+    <MetaDataItem id="0000" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/2669/</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?filename=MarketCertificationFiles/2669/ROLLERBLIND_991025_990913.pdf</MetaDataItem>
+    <MetaDataItem name="Name">S100 Rocker iO for Roller Blind</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jordi Andújar - jordi.andujar@gmail.com" date="20 Ago 2020" revision="1">Added support for Simon S100 Rocker iO roller blind.</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value type="list" index="1" genre="config" label="Association LED" min="0" max="255" value="0" size="1">
+      <Help>
+        Used during Association process by Simon Shortcut Switch IO to turn ON the main LED of all devices already associated to this shortcut.
+      </Help>
+      <Item label="Turns the central LED OFF" value="0"/>
+      <Item label="Turns the central LED ON" value="255"/>
+    </Value>
+
+    <Value type="byte" index="4" genre="config" label="UP Time" units="seconds" min="0" max="127" value="0" size="1">
+      <Help>
+        This parameter allows to choose the roller blind UP time in seconds.
+        Value 0 - Instantly (default).
+        Values from 1 to 127 - 1 second to 127 seconds in 1 second resolution.
+      </Help>
+    </Value>
+
+    <Value type="byte" index="5" genre="config" label="DOWN Time" units="minutes" min="128" max="254" value="128" size="1">
+      <Help>
+        This parameter allows to choose the roller blind DOWN time in minutes.
+        Values from 1 to 127 - 1 minute to 127 minutes in 1 minute resolution.
+      </Help>
+    </Value>
+
+    <Value genre="config" index="12" label="Behavior of LED in Repose" max="255" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows to choose behaviour of LED in repose</Help>
+      <Item label="LED OFF" value="0"/>
+      <Item label="LED ON at 20% of maximum level" value="255"/>
+    </Value>
+
+    <Value genre="config" index="13" label="Lock Input" max="255" min="0" size="1" type="list" value="0">
+      <Help>This parameter locks the direct control of load.</Help>
+      <Item label="Unlock the direct control of load" value="0"/>
+      <Item label="Lock the direct control of load" value="255"/>
+    </Value>
+
+    <Value genre="config" index="15" label="Reset Default" max="39015" min="39015" size="2" type="list" value="0" write_only="true">
+      <Help>Parameters, Groups, and Z-Wave status are restored to default (Only writable).</Help>
+      <Item label="Device performs a factory default Reset" value="39015"/>
+    </Value>
+
+    <Value genre="config" index="20" label="Identify (Write Only)" max="255" min="255" size="1" type="list" value="0">
+      <Help>Write only value that performs a fast blink on Central LED during 5 seconds in order to identify the device when it is installed in a multiple frame.</Help>
+      <Item label="The central LED flashes for 5 seconds at a frequency of 0,1s." value="255"/>
+    </Value>
+
+    <Value genre="config" index="21" label="Load State (Read Only)" max="65535" min="0" type="byte" size="1" value="0" read_only="true">
+      <Help>
+        Read only Configuration used to report the device state and last value. This value is represented in Hexadecimal.
+        Byte 0 informs about Load State (0 load is OFF and 1 load is ON).
+        Byte 1 informs about Load value (0x00 or 0xFF)
+      </Help>
+    </Value>
+
+    <Value genre="config" index="23" label="Calibration required (Read Only)" max="255" min="0" size="1" type="byte" value="0" read_only="true">
+      <Help>
+        Reports whether the roller blind needs calibration.
+        0x00 Calibration is not required.
+        0xFF It is necessary to calibrate the dimmer to work properly.
+      </Help>
+    </Value>
+
+    <Value genre="config" index="24" label="Operating Mode" max="255" min="0" size="1" type="list" value="255">
+      <Help>This parameter allows to choose the roller blind operating mode (window shutter or sundblinds).</Help>
+      <Item label="Window shutter" value="0"/>
+      <Item label="Sunblinds (default)" value="255"/>
+    </Value>
+
+    <Value genre="config" index="25" label="Lock long press" max="255" min="0" size="1" type="list" value="0">
+      <Help>This parameter allows to choose the long press behaviour.</Help>
+      <Item label="Long press works as described in the product manual." value="0"/>
+      <Item label="Long press between 2s to 10s: do not send the Node Info. Long press of more than 30s: parameters, except Lock long press are restored to default and device sends a Node Info " value="255"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="3"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sunricher/srzv9001k12dimz4.xml b/config/sunricher/srzv9001k12dimz4.xml
new file mode 100644
index 00000000..9e5d8e90
--- /dev/null
+++ b/config/sunricher/srzv9001k12dimz4.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+    <MetaData>
+        <MetaDataItem name="Name">SR-ZV9001 4 Channel Dimmer Remote Control</MetaDataItem>
+        <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave
+            devices and activate scenes in Gateways.
+        </MetaDataItem>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:b302:0300</MetaDataItem>
+        <MetaDataItem name="ProductPage">
+            https://www.sunricher.com/single-color-z-wave-remote-secondary-controller-sr-zv9001k12-dim-z4.html
+        </MetaDataItem>
+        <MetaDataItem name="ProductPic">images/sunricher/srzv9001k12dimz4.png</MetaDataItem>
+        <MetaDataItem name="ProductManual">
+            https://www.sunricher.com/media/resources/manual/SR-ZV9001K12-DIM-Z4%20V2%20Instruction.pdf
+        </MetaDataItem>
+        <MetaDataItem name="WakeupDescription">Short press any button to activate the remote control for 3s, and press
+            and hold down both buttons All On and All Off for over 1 second to activate the remote control for 7s.
+        </MetaDataItem>
+        <MetaDataItem name="InclusionDescription">
+            Step 1. Make sure the remote control does not belong to any Z-Wave network, short press any button, if LED
+            indicator does not turn on, the remote control does not belong to any network, then continue step 2,if LED
+            indicator turns on, it means the remote control has already been included to a network, please first set the
+            remote control to exclusion mode (refer to the part "Exclusion" of this manual),then continue step 2.
+            Step 2. Set primary controller/gateway into inclusion mode (Please refer to your primary controllers manual
+            on how to turn your controller into inclusion).
+            Step 3. Press and hold down both buttons All On and All Off for over 3 seconds, LED indicator turns on, the
+            remote control will be set to inclusion mode, and waiting to be included, after 10s LED indicator blinks 6
+            times quickly to indicate successful inclusion. The remote control is a sleepy device, after inclusion it
+            will not enter into sleepy mode immediately, and will continue activation status for 30s and wait data
+            interaction from the gateway, the LED indicator will stay solid on, please be patient to wait LED indicator
+            to turn off.
+        </MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">
+            There are two exclusion methods:
+            Method 1: Exclusion from the primary controller/gateway as follows:
+            1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual
+            on how to set your controller into exclusion).
+            2. Press and hold down both buttons All On and All Off for over 3 seconds, LED indicator turns on, the
+            remote control will be set to exclusion mode, and waiting to be excluded, after 7s LED indicator blinks 4
+            times quickly to indicate successful exclusion.
+            Method 2: Factory reset the remote control will force the remote control to be excluded from a network.
+            (please refer to the part “Factory Reset” of this manual)
+        </MetaDataItem>
+        <MetaDataItem name="ResetDescription">
+            Press and hold down both buttons All On and All Off for over 10 seconds, LED indicator turns on and then
+            blinks 4 times quickly to indicate successful factory reset.
+        </MetaDataItem>
+        <MetaDataItem id="b302" name="FrequencyName" type="0300">CEPT (Europe)</MetaDataItem>
+        <MetaDataItem id="b302" name="FrequencyName" type="0301">U.S. / Canada / Mexico</MetaDataItem>
+        <MetaDataItem id="b302" name="FrequencyName" type="0302">Australia / New Zealand</MetaDataItem>
+        <MetaDataItem id="b302" name="Identifier" type="0300">SR-ZV9001K12-DIM-Z4</MetaDataItem>
+        <MetaDataItem id="b302" name="Identifier" type="0301">SR-ZV9001K12-DIM-Z4</MetaDataItem>
+        <MetaDataItem id="b302" name="Identifier" type="0302">SR-ZV9001K12-DIM-Z4</MetaDataItem>
+        <ChangeLog>
+            <Entry author="Thiago Bergman" date="28 Aug 2020" revision="1">Initial Configuration file</Entry>
+        </ChangeLog>
+    </MetaData>
+    <CommandClass id="133">
+        <Associations num_groups="5">
+            <Group index="1" max_associations="5" label="Lifeline"/>
+            <Group index="2" label="Launch 1" max_associations="5"/>
+            <Group index="3" label="Launch 2" max_associations="5"/>
+            <Group index="4" label="Launch 3" max_associations="5"/>
+            <Group index="5" label="Launch 4" max_associations="5"/>
+        </Associations>
+    </CommandClass>
+</Product>
\ No newline at end of file
diff --git a/config/sunricher/srzv9001k12dimz5.xml b/config/sunricher/srzv9001k12dimz5.xml
new file mode 100644
index 00000000..36722f90
--- /dev/null
+++ b/config/sunricher/srzv9001k12dimz5.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+    <MetaData>
+        <MetaDataItem name="Name">SR-ZV9001 5 Channel Dimmer Remote Control</MetaDataItem>
+        <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave
+            devices and activate scenes in Gateways.
+        </MetaDataItem>
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:b301:0300</MetaDataItem>
+        <MetaDataItem name="ProductPage">
+            https://www.sunricher.com/single-color-z-wave-remote-secondary-controller-sr-zv9001k12-dim-z5.html
+        </MetaDataItem>
+        <MetaDataItem name="ProductPic">images/sunricher/srzv9001k12dimz5.png</MetaDataItem>
+        <MetaDataItem name="ProductManual">
+            https://www.sunricher.com/media/resources/manual/SR-ZV9001K12-DIM-Z5%20V2%20Instruction.pdf
+        </MetaDataItem>
+        <MetaDataItem name="WakeupDescription">Short press any button to activate the remote control for 3s, and press
+            and hold down both buttons All On and All Off for over 1 second to activate the remote control for 7s.
+        </MetaDataItem>
+        <MetaDataItem name="InclusionDescription">
+            Step 1. Make sure the remote control does not belong to any Z-Wave network, short press any button, if LED
+            indicator does not turn on, the remote control does not belong to any network, then continue step 2,if LED
+            indicator turns on, it means the remote control has already been included to a network, please first set the
+            remote control to exclusion mode (refer to the part "Exclusion" of this manual),then continue step 2.
+            Step 2. Set primary controller/gateway into inclusion mode (Please refer to your primary controllers manual
+            on how to turn your controller into inclusion).
+            Step 3. Press and hold down both buttons All On and All Off for over 3 seconds, LED indicator turns on, the
+            remote control will be set to inclusion mode, and waiting to be included, after 10s LED indicator blinks 6
+            times quickly to indicate successful inclusion. The remote control is a sleepy device, after inclusion it
+            will not enter into sleepy mode immediately, and will continue activation status for 30s and wait data
+            interaction from the gateway, the LED indicator will stay solid on, please be patient to wait LED indicator
+            to turn off.
+        </MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">
+            There are two exclusion methods:
+            Method 1: Exclusion from the primary controller/gateway as follows:
+            1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual
+            on how to set your controller into exclusion).
+            2. Press and hold down both buttons All On and All Off for over 3 seconds, LED indicator turns on, the
+            remote control will be set to exclusion mode, and waiting to be excluded, after 7s LED indicator blinks 4
+            times quickly to indicate successful exclusion.
+            Method 2: Factory reset the remote control will force the remote control to be excluded from a network.
+            (please refer to the part “Factory Reset” of this manual)
+        </MetaDataItem>
+        <MetaDataItem name="ResetDescription">
+            Press and hold down both buttons All On and All Off for over 10 seconds, LED indicator turns on and then
+            blinks 4 times quickly to indicate successful factory reset.
+        </MetaDataItem>
+        <MetaDataItem id="b301" name="FrequencyName" type="0300">CEPT (Europe)</MetaDataItem>
+        <MetaDataItem id="b301" name="FrequencyName" type="0301">U.S. / Canada / Mexico</MetaDataItem>
+        <MetaDataItem id="b301" name="FrequencyName" type="0302">Australia / New Zealand</MetaDataItem>
+        <MetaDataItem id="b301" name="Identifier" type="0300">SR-ZV9001K12-DIM-Z5</MetaDataItem>
+        <MetaDataItem id="b301" name="Identifier" type="0301">SR-ZV9001K12-DIM-Z5</MetaDataItem>
+        <MetaDataItem id="b301" name="Identifier" type="0302">SR-ZV9001K12-DIM-Z5</MetaDataItem>
+        <ChangeLog>
+            <Entry author="Thiago Bergman" date="28 Aug 2020" revision="1">Initial Configuration file</Entry>
+        </ChangeLog>
+    </MetaData>
+    <CommandClass id="133">
+        <Associations num_groups="6">
+            <Group index="1" max_associations="5" label="Lifeline"/>
+            <Group index="2" label="Launch 1" max_associations="5"/>
+            <Group index="3" label="Launch 2" max_associations="5"/>
+            <Group index="4" label="Launch 3" max_associations="5"/>
+            <Group index="5" label="Launch 4" max_associations="5"/>
+            <Group index="6" label="Launch 5" max_associations="5"/>
+        </Associations>
+    </CommandClass>
+</Product>
\ No newline at end of file
diff --git a/config/sunricher/srzv9001k2dim.xml b/config/sunricher/srzv9001k2dim.xml
new file mode 100644
index 00000000..7be2f12a
--- /dev/null
+++ b/config/sunricher/srzv9001k2dim.xml
@@ -0,0 +1,46 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:a30f:0300</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.sunricher.com/single-color-wall-mounted-z-wave-push-button-secondary-controller-light-switch-sr-zv9001k2-dim.html</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/sunricher/srzv9001k2dim.png</MetaDataItem>
+    <MetaDataItem id="a30f" name="ZWProductPage" type="0300">https://products.z-wavealliance.org/products/3900</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.sunricher.com/media/resources/manual/SR-ZV9001K2-DIM%20Instruction%20V1.pdf</MetaDataItem>
+    <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave devices and activate scenes in Gateways.</MetaDataItem>
+    <MetaDataItem name="Name">Wall Controller</MetaDataItem>
+    <MetaDataItem id="a30f" name="FrequencyName" type="0300">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="a30f" name="Identifier" type="0300">SR-ZV9001K2-DIM</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Step 1. Make sure the remote control does not belong to any Z-Wave network, short press any button, if LED
+indicator does not turn on, the remote control does not belong to any network, then continue step 2,if LED
+indicator turns on, it means the remote control has already been included to a network, please first set the
+remote control to exclusion mode (refer to the part "Exclusion" of this manual),then continue step 2.
+Step 2. Set primary controller/gateway into inclusion mode (Please refer to your primary controllers manual on
+how to turn your controller into inclusion).
+Step 3. Press and hold down both buttons and of Group 2 over 3 seconds, LED indicator turns on, the
+remote control will be set to inclusion mode, and waiting to be included, after 10s LED indicator blinks 6 times
+quickly to indicate successful inclusion. The remote control is a sleepy device, after inclusion it will not enter
+into sleepy mode immediately, and will continue activation status for 30s and wait data interaction from the
+gateway, the LED indicator will stay solid on, please be patient to wait LED indicator to turn off.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">There are two exclusion methods:
+Method 1: Exclusion from the primary controller/gateway as follows:
+1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual on
+how to set your controller into exclusion).
+2. Press and hold down both buttons and of Group 2 over 3 seconds, LED indicator turns on, the remote
+control will be set to exclusion mode, and waiting to be excluded, after 7s LED indicator blinks 4 times quickly to
+indicate successful exclusion.
+Method 2: Factory reset the remote control will force the remote control to be excluded from a network. (please
+refer to the part “Factory Reset” of this manual)
+Note: Factory reset is not recommended for exclusion, please use this procedure only if the primary
+controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down both I and O buttons together for over 10 seconds, LED indicator turns on and then blinks 4 times quickly to indicate successful factory reset.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="stevew817" date="13 Dec 2020" revision="1">Initial Configuration file</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="Launch 1" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sunricher/srzv9001k4dim.xml b/config/sunricher/srzv9001k4dim.xml
new file mode 100644
index 00000000..6af709fe
--- /dev/null
+++ b/config/sunricher/srzv9001k4dim.xml
@@ -0,0 +1,45 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:a310:0300</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.sunricher.com/single-color-wall-mounted-push-button-z-wave-secondary-controller-dimmer-switch-sr-zv9001k4-dim.html</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/sunricher/srzv9001k4dim.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.sunricher.com/media/resources/manual/SR-ZV9001K4-DIM%20Instruction%20V1.pdf</MetaDataItem>
+    <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave devices and activate scenes in Gateways.</MetaDataItem>
+    <MetaDataItem name="Name">Wall Controller</MetaDataItem>
+    <MetaDataItem id="a310" name="FrequencyName" type="0300">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="a310" name="Identifier" type="0300">SR-ZV9001K4-DIM</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Step 1. Make sure the remote control does not belong to any Z-Wave network, short press any button, if LED
+indicator does not turn on, the remote control does not belong to any network, then continue step 2,if LED
+indicator turns on, it means the remote control has already been included to a network, please first set the
+remote control to exclusion mode (refer to the part "Exclusion" of this manual),then continue step 2.
+Step 2. Set primary controller/gateway into inclusion mode (Please refer to your primary controllers manual on
+how to turn your controller into inclusion).
+Step 3. Press and hold down both buttons and of Group 2 over 3 seconds, LED indicator turns on, the
+remote control will be set to inclusion mode, and waiting to be included, after 10s LED indicator blinks 6 times
+quickly to indicate successful inclusion. The remote control is a sleepy device, after inclusion it will not enter
+into sleepy mode immediately, and will continue activation status for 30s and wait data interaction from the
+gateway, the LED indicator will stay solid on, please be patient to wait LED indicator to turn off.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">There are two exclusion methods:
+Method 1: Exclusion from the primary controller/gateway as follows:
+1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual on
+how to set your controller into exclusion).
+2. Press and hold down both buttons and of Group 2 over 3 seconds, LED indicator turns on, the remote
+control will be set to exclusion mode, and waiting to be excluded, after 7s LED indicator blinks 4 times quickly to
+indicate successful exclusion.
+Method 2: Factory reset the remote control will force the remote control to be excluded from a network. (please
+refer to the part “Factory Reset” of this manual)
+Note: Factory reset is not recommended for exclusion, please use this procedure only if the primary
+controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down both buttons I and O of Group 2 for over 10 seconds, LED indicator turns on and then blinks 4 times quickly to indicate successful factory reset.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="stevew817" date="13 Dec 2020" revision="1">Initial Configuration file</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="Launch 1" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sunricher/srzv9001k4dimg2.xml b/config/sunricher/srzv9001k4dimg2.xml
new file mode 100644
index 00000000..c95bad77
--- /dev/null
+++ b/config/sunricher/srzv9001k4dimg2.xml
@@ -0,0 +1,46 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:a306:0300</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/sunricher/srzv9001k4dimg2.png</MetaDataItem>
+    <MetaDataItem id="a306" name="ZWProductPage" type="0300">https://products.z-wavealliance.org/products/3783</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3783/SR-ZV9001K4-DIM-G2%20Instruction.pdf</MetaDataItem>
+    <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave devices and activate scenes in Gateways.</MetaDataItem>
+    <MetaDataItem name="Name">Wall Controller</MetaDataItem>
+    <MetaDataItem id="a306" name="FrequencyName" type="0300">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="a306" name="Identifier" type="0300">SR-ZV9001K4-DIM-G2</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Step 1. Make sure the remote control does not belong to any Z-Wave network, short press any button, if LED
+indicator does not turn on, the remote control does not belong to any network, then continue step 2,if LED
+indicator turns on, it means the remote control has already been included to a network, please first set the
+remote control to exclusion mode (refer to the part "Exclusion" of this manual),then continue step 2.
+Step 2. Set primary controller/gateway into inclusion mode (Please refer to your primary controllers manual on
+how to turn your controller into inclusion).
+Step 3. Press and hold down both buttons and of Group 2 over 3 seconds, LED indicator turns on, the
+remote control will be set to inclusion mode, and waiting to be included, after 10s LED indicator blinks 6 times
+quickly to indicate successful inclusion. The remote control is a sleepy device, after inclusion it will not enter
+into sleepy mode immediately, and will continue activation status for 30s and wait data interaction from the
+gateway, the LED indicator will stay solid on, please be patient to wait LED indicator to turn off.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">There are two exclusion methods:
+Method 1: Exclusion from the primary controller/gateway as follows:
+1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual on
+how to set your controller into exclusion).
+2. Press and hold down both buttons and of Group 2 over 3 seconds, LED indicator turns on, the remote
+control will be set to exclusion mode, and waiting to be excluded, after 7s LED indicator blinks 4 times quickly to
+indicate successful exclusion.
+Method 2: Factory reset the remote control will force the remote control to be excluded from a network. (please
+refer to the part “Factory Reset” of this manual)
+Note: Factory reset is not recommended for exclusion, please use this procedure only if the primary
+controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down both buttons I and O of Group 2 for over 10 seconds, LED indicator turns on and then blinks 4 times quickly to indicate successful factory reset.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="stevew817" date="13 Dec 2020" revision="1">Initial Configuration file</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="Launch 1" max_associations="5"/>
+      <Group index="3" label="Launch 2" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sunricher/srzv9001tccteu.xml b/config/sunricher/srzv9001tccteu.xml
new file mode 100644
index 00000000..7b003a27
--- /dev/null
+++ b/config/sunricher/srzv9001tccteu.xml
@@ -0,0 +1,43 @@
+<Product Revision="1"
+  xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Z-Wave CCT Wall Controller</MetaDataItem>
+    <MetaDataItem name="Description">The Wall controller is a Security Enabled Z-Wave Plus device that can both control another Z-Wave device.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:0300:a104</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.sunricher.com/touch-panel-dual-color-z-wave-secondary-controller-sr-zv9001t-cct.html#product_tabs_description_tabbed</MetaDataItem>
+    <MetaDataItem name="ProductSupport">http://www.sunricher.com/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/sunricher/srzv9001tccteu.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.sunricher.com/media/resources/manual/SR-ZV9001T-CCT-EU%20Instruction.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Short press the “inclusion/exclusion” button, or press and hold down “ALL ON/OFF” button for over 3 seconds, the wall controller will be set to inclusion mode, and waiting to be included, then LED indicator turns on and blinks 6 times quickly to indicate successful inclusion.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Short press the “inclusion/exclusion” button, or press and hold down “ALL ON/OFF” button for over 3 seconds, the wall controller will be set to exclusion mode, and waiting to be excluded, then LED indicator turns on and shows 3 short blinks and 1 long blink to indicate successful exclusion.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down “inclusion/exclusion” button for over 8 seconds, LED indicator blinks slowly to indicate successful factory reset, release “inclusion/exclusion” button,the wall controller will restart automatically.</MetaDataItem>
+    <!-- <MetaDataItem id="a104" name="ZWProductPage" type="0300">https://products.z-wavealliance.org/products/2945</MetaDataItem> -->
+    <MetaDataItem id="a104" name="FrequencyName" type="0300">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="0104" name="Identifier" type="0300">SR-ZV9001T-CCT-EU</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Mark Broadbent" date="24 Aug 2020" revision="1">Initial entry based on manufacturer data and test device</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="3" instance="1" label="Choose working mode of the remote control" size="1" type="list" value="1">
+      <Help>
+              Choose working mode of the remote control.
+        </Help>
+      <Item label="Choose activation of scenes in gateway mode" value="0"/>
+      <Item label="Choose direct control of associated devices mode" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- This device has no real or virtual outputs so cannot be controlled or polled, basic class is 'controlling' only -->
+  <CommandClass id="32">
+    <Compatibility>
+      <GetSupported>false</GetSupported>
+    </Compatibility>
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="142">
+    <Associations num_groups="2">
+      <Group index="1" label="LifeLine" max_associations="1"/>
+      <Group index="2" label="Launch 1" max_associations="12"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sunricher/srzv9100aa.xml b/config/sunricher/srzv9100aa.xml
new file mode 100644
index 00000000..1b24b206
--- /dev/null
+++ b/config/sunricher/srzv9100aa.xml
@@ -0,0 +1,80 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:d00f:0200</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/sunricher/zv9100a.png</MetaDataItem>
+    <MetaDataItem id="d00f" name="ZWProductPage" type="0200">https://products.z-wavealliance.org/products/3333</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/3331/SR-ZV9100A-A%20In-Wall%20Smart%20Switch.pdf</MetaDataItem>
+    <MetaDataItem name="Description">The in-wall smart switch is a Z-Wave device designed to work with various types of light sources.</MetaDataItem>
+    <MetaDataItem name="Name">In-wall switch</MetaDataItem>
+    <MetaDataItem id="d00f" name="FrequencyName" type="0200">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="d00f" name="Identifier" type="0200">SR-ZV9100A-A</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Step 1. Set primary controller/gateway into inclusion mode (Please refer to your primary controllers manual on
+how to turn your controller into inclusion).
+Step 2. Power on the in-wall switch and set it into inclusion mode. There are two methods to set the in-wall switch into inclusion mode:
+1)Repower on the switch, it will be set into inclusion mode automatically, and waiting to be included.
+2)Triple press the action button on the switch, it will set the switch into inclusion mode.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">There are two exclusion methods:
+Method 1: Exclusion from the primary controller/gateway as follows:
+1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual on
+how to set your controller into exclusion).
+2. Press and hold down both buttons and of Group 2 over 3 seconds, LED indicator turns on, the remote
+control will be set to exclusion mode, and waiting to be excluded, after 7s LED indicator blinks 4 times quickly to
+indicate successful exclusion.
+Method 2: Factory reset the remote control will force the remote control to be excluded from a network. (please
+refer to the part “Factory Reset” of this manual)
+Note: Factory reset is not recommended for exclusion, please use this procedure only if the primary
+controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down the action button for over 10 seconds, the switch will be reset to factory defaults.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="AntoineVDH" date="7 Dec 2020" revision="1">Initial Configuration file</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!--
+    Z-Wave In-Wall Smart Switch SR-ZV9100A-A
+    Manual: https://www.sunricher.com/media/resources/manual/SR-ZV9100A-A%20Instruction%20V1.pdf
+    -->
+
+   <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="2" instance="1" label="Saving state before power failure" size="1" type="list" value="1">
+      <Help>
+              Saving state before power failure.
+            Default Not saved.
+        </Help>
+      <Item label="State NOT saved at power failure, all outputs are set to OFF upon power restore" value="0"/>
+      <Item label="State NOT saved at power failure, all outputs are set to ON upon power restore" value="1"/>
+      <Item label="State saved at power failure, all outputs are set to previous state upon power restore" value="2"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Send the basic report" size="1" type="list" value="1">
+      <Help>Enable/disable to send the basic report to the Lifeline when the load state changed.
+              When value set as 1, re-power on the switch, it will send Basic report automatically. 
+		Default Enabled.
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="External switch to be added to and removed from a network" size="1" type="list" value="1">
+      <Help>Enable/disable external switch to be added to and removed from a network.
+              When enables this function, triple press the external switch within 1.5 seconds to be added to or removed from a net-work.
+            Default Enabled.
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="External switch type" size="1" type="list" value="0">
+      <Help>
+	   Choose external switch type. 
+		Default push button switch. 
+        </Help>
+      <Item label="Push button switch" value="0"/>
+      <Item label="normal on/off switch" value="1"/>
+      <Item label="3-way switch" value="2"/>
+    </Value>
+  </CommandClass>
+    <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sunricher/srzv9101sachpswitch.xml b/config/sunricher/srzv9101sachpswitch.xml
new file mode 100644
index 00000000..ac7ac54f
--- /dev/null
+++ b/config/sunricher/srzv9101sachpswitch.xml
@@ -0,0 +1,65 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:D006:0200</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.sunricher.com/z-wave-ac-in-wall-switch-sr-zv9101sac-hp-switch.html</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/sunricher/srzv9101sachpswitch.png</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down the action button for over 10 seconds, the dimmer will be reset to factory defaults.
+
+Note: Factory reset is not recommended for exclusion, please use this procedure only if the primary controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="Description">The in-wall switch is a Z-Wave device that is used to switch ON/OFF the connected light and can be controlled
+by other Z-Wave devices. The In-wall switch can be included and operated in any Z-Wave network with other ZWave certified devices from other manufacturers and/or other applications. All non-battery operated nodes
+within the network will act as repeaters regardless of vendor to increase reliability of the network.</MetaDataItem>
+    <MetaDataItem name="Name">Z-Wave AC In Wall Switch</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Set primary controller/gateway into inclusion mode (Please refer to your primary controller’s manual on how to turn your controller into inclusion).
+2. Power on the in-wall switch and set it into inclusion mode. There are two methods to set the in-wall switch into inclusion mode:
+1)Repower on the switch, it will be set into inclusion mode automatically, and waiting to be included.
+2)Triple press the action button on the switch, it will set the switch into inclusion mode.
+The connected light will stay solid on for 3 seconds to indicate successful inclusion.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">There are two exclusion methods:
+Method 1: Exclusion from the primary controller/gateway as follows:
+1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual on how to set your controller into exclusion).
+2. Triple press the action button, the switch will be set to exclusion mode, and waiting to be excluded, then the switch will be excluded from the network.
+Method 2: Factory reset the switch will force it to be excluded from a network. (please refer to the part “Factory Reset” of this manual)
+Note: Factory reset is not recommended for exclusion, please use this procedure only if the primary controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.sunricher.com/media/resources/manual/SR-ZV9101SAC-HP-Switch%20Instruction.pdf</MetaDataItem>
+    <MetaDataItem id="D006" name="Identifier" type="0200">SR-ZV9101SAC-HP-Switch</MetaDataItem>
+    <MetaDataItem id="D006" name="FrequencyName" type="0200">CEPT (Europe)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="stevew817" date="13 Dec 2020" revision="1">Initial Configuration file</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="2" instance="1" label="Saving state before power failure" size="1" type="list" value="2">
+      <Help>
+              Saving state before power failure.
+            Default Not saved.
+        </Help>
+      <Item label="State NOT saved at power failure, all outputs are set to OFF upon power restore" value="0"/>
+      <Item label="State NOT saved at power failure, all outputs are set to ON upon power restore" value="1"/>
+      <Item label="State saved at power failure, all outputs are set to previous state upon power restore" value="2"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Send the basic report" size="1" type="list" value="1">
+      <Help>Enable/disable to send the basic report to the Lifeline when the load state changed.
+              When value set as 1, re-power on the switch, it will send Basic report automatically.
+		Default Enabled.
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="External switch to be added to and removed from a network" size="1" type="list" value="1">
+      <Help>Enable/disable external switch to be added to and removed from a network.
+              When enables this function, triple press the external switch within 1.5 seconds to be added to or removed from a net-work.
+            Default Enabled.
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sunricher/zv2835rac.xml b/config/sunricher/zv2835rac.xml
new file mode 100644
index 00000000..1fed0359
--- /dev/null
+++ b/config/sunricher/zv2835rac.xml
@@ -0,0 +1,161 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:D017:0200</MetaDataItem>
+    <MetaDataItem id="D017" name="FrequencyName" type="0200">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Set primary controller/gateway into inclusion mode (Please refer to your primary controller’s manual on how to turn your controller into inclusion)
+    
+2. Power on the knob dimmer and set it into inclusion mode. There are two methods to set the dimmer into inclusion mode:
+
+1) Repower on the dimmer, it will be set into inclusion mode automatically, and waiting to be included.
+2) Triple press reset button on the dimmer, it will set the dimmer into inclusion mode</MetaDataItem>
+    <MetaDataItem name="Name">Knob Smart Dimmer</MetaDataItem>
+    <MetaDataItem id="D017" name="Identifier" type="0200">ZV2835RAC</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down the action button for over 10 seconds, the dimmer will be reset to factory defaults.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">There are two exclusion methods:
+Method 1: Exclusion from the primary controller/gateway as follows:
+1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual on how to set your controller into exclusion).
+2. Triple press reset button, the dimmer will be set to exclusion mode, and waiting to be excluded, then the dimmer will be excluded from the network.
+
+Method 2: Factory reset the dimmer will force it to be excluded from a network. (please refer to the part “Factory Reset” of this manual)
+
+Note: Factory reset is not recommended for exclusion, please use this procedure only if the primary controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="Description">The knob smart dimmer is a Z-Wave device designed to work with various types of light sources. It may be connected to two-wire or three-wire configuration so it can operate with or without neutral lead. The dimmer can switch or dim connected light source either through  Z-Wave devices or through the rotary knob directly. The smart dimmer is equipped with an algorithm of smart light source detection which makes configuration easier and ensures high compatibility of the device. It may be used as a switch with non-dimmable light sources (in 3-wire connection).</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/sunricher/zv2835rac.png</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Fritiof Hedman - openzwave@fritiofhedman.se" date="11 Aug 2020" revision="1">Inital support based on the products manual.</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="2" instance="1" label="Saving state before power failure" size="1" type="list" value="2">
+      <Help>
+              Saving state before power failure. Default is saved.
+        </Help>
+      <Item label="State NOT saved at power failure, all outputs are set to OFF upon power restore" value="0"/>
+      <Item label="State NOT saved at power failure, all outputs are set to ON upon power restore" value="1"/>
+      <Item label="State saved at power failure, all outputs are set to previous state upon power restore" value="2"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Send the basic report" size="1" type="list" value="1">
+      <Help>Enable/disable to send the basic report to the Lifeline when the load state changed.
+              When value set as 1, re-power on the dimmer, it will send Basic report automatically.
+            Default Enabled.
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Default fade time" max="127" min="0" type="byte" value="1">
+      <Help>Fade time in seconds. 0 is instantly, default is 1.</Help>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="Setting minimum brightness value" max="50" min="0" type="byte" value="15">
+      <Help>Setting minimum brightness value.
+              Valid value: 0 - 50, the bigger the value is, the higher the loads minimum brightness is.
+        </Help>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Setting maximum brightness value" max="100" min="0" type="byte" value="100">
+      <Help>Setting maximum brightness value.
+              Valid value: 0 - 100.</Help>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Choose MOSFET driving type" size="1" type="list" value="1">
+      <Help>
+          Choose MOSFET driving type. Default trailing edge.
+        </Help>
+      <Item label="Trailing edge" value="0"/>
+      <Item label="Leading edge" value="1"/>
+    </Value>
+<Value genre="config" index="8" instance="1" label="Setting step of the knob" max="50" min="1" type="byte" value="5">
+      <Help>Corresponding dimming stepping level for each rotation of the knob (a full dimming stepping level is 99),Valid value: 1-50.</Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Added to and removed from a network through external switch" size="1" type="list" value="0">
+	    <Help>
+		    Added to and removed from a network through external switch (when enables this function, triple press the external switch within 1.5 seconds to be added to or removed from a network)
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Detect load after re-power on" size="1" type="list" value="0">
+	    <Help>
+		    Enable/disable to detect load after re-power on (detect load type, minimum brightness, maximum brightness)
+		    
+		    Note: When the device does not belong to any network, load detection will be enabled every time after re-power on. When the device has already been added to a network, load detection will be disabled
+        </Help>
+      <Item label="Enable" value="0"/>
+      <Item label="Disable" value="1"/>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Wiring type" size="1" type="list" value="0" read_only="true">
+	    <Help>
+		    Wiring type
+        </Help>
+      <Item label="Unknown" value="0"/>
+      <Item label="2 wire with no neutral" value="1"/>
+      <Item label="3 wire with neutral" value="2"/>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Load type" size="1" type="list" value="0" read_only="true">
+	    <Help>
+		    Load type
+        </Help>
+      <Item label="Unknown" value="0"/>
+      <Item label="Resistive" value="1"/>
+      <Item label="Inductive" value="2"/>
+      <Item label="Capacitive" value="3"/>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Enable over current protection" size="1" type="list" value="1">
+	    <Help>
+		    Enable/disable over current protection (over 3.2A for 20 seconds continuously).
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <!-- the allowed range is not given in the manual! -->
+    <Value genre="config" index="14" instance="1" label="Absolute automatic power report" max="65535" min="0" type="short" units="watts" value="10">
+	    <Help>
+	   Power automatic report absolute threshold, unit is WWhen power changes above the absolute threshold, immediately report current power value
+	    </Help>
+    </Value>
+    <!-- the allowed range is not given in the manual! -->
+    <Value genre="config" index="15" instance="1" label="Relative automatic power report" max="100" min="0" type="byte" units="%" value="20">
+	    <Help>
+Power automatic report percentage threshold, unit is %. When power changes above the percentage threshold, immediately report current power value.
+	    </Help>
+    </Value>
+    <Value genre="config" index="21" instance="1" label="Power metering automatic report time cycle" max="2678400" min="5" type="int" units="seconds" value="600">
+	    <Help>
+		    Power metering automatic report time cycle, unit is second. Valid time cycle value: 5~2678400. Default is 600 (10 minutes).
+	    </Help>
+    </Value>
+    <Value genre="config" index="22" instance="1" label="Energy metering automatic report time cycle" max="2678400" min="5" type="int" units="seconds" value="1800">
+	    <Help>
+		    Energy metering automatic report time cycle, unit is second. Valid time cycle value: 5~2678400. Default is 1800 (30 minutes).
+	    </Help>
+    </Value>
+    <Value genre="config" index="23" instance="1" label="Voltage metering automatic report time cycle" max="2678400" min="5" type="int" units="seconds" value="3600">
+	    <Help>
+		    Voltage metering automatic report time cycle, unit is second. Valid time cycle value: 5~2678400. Default is 3600 (60 minutes).
+	    </Help>
+    </Value>
+    <Value genre="config" index="24" instance="1" label="Current metering automatic report time cycle" max="2678400" min="5" type="int" units="seconds" value="3600">
+	    <Help>
+		    Current metering automatic report time cycle, unit is second. Valid time cycle value: 5~2678400. Default is 3600 (60 minutes).
+	    </Help>
+    </Value>
+    <Value genre="config" index="31" instance="1" label="Dimming curve" size="1" type="list" value="0">
+	    <Help>
+		    Setting dimming curve.
+        </Help>
+      <Item label="Linear dimming" value="0"/>
+      <Item label="Logarithmic dimming" value="1"/>
+    </Value>
+    <Value genre="config" index="32" instance="1" label="Startup brightness" max="99" min="0" type="byte" value="0">
+	    <Help>
+		    Setting startup brightness of the loadValid value: 0~99Note: every time when turn on the load from OFF status, if the target brightness is lower than the startup brightness, the brightness will first go to the startup brightness value then fall down to the target brightness.
+	    </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Launch 1" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/sunricher/zv9101fa.xml b/config/sunricher/zv9101fa.xml
new file mode 100644
index 00000000..3fba18c3
--- /dev/null
+++ b/config/sunricher/zv9101fa.xml
@@ -0,0 +1,96 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0330:D002:0200</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/sunricher/srzv9101facct.png</MetaDataItem>
+    <MetaDataItem id="D002" name="FrequencyName" type="0200">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="D002" name="FrequencyName" type="0201">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="D002" name="FrequencyName" type="0202">Australia / New Zealand</MetaDataItem>
+    <MetaDataItem id="D002" name="FrequencyName" type="021A">Russia</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Set primary controller/gateway into inclusion mode (Please refer to your primary controllers manual on how to turn your controller into inclusion).
+2. Power on the in-wall dimmer and set it into inclusion mode. There are two methods to set the in-wall dimmer into inclusion mode:
+1)Repower on the dimmer, it will be set into inclusion mode automatically, and waiting to be included.
+2)Triple press the action button on the dimmer, it will set the plug into inclusion mode.
+The connected light will stay solid on for 3 seconds to indicate successful inclusion.</MetaDataItem>
+    <MetaDataItem name="Name">Dimmable LED controller</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.sunricher.com/media/resources/manual/SR-ZV9101FA-CCT%20Instruction%20V1.pdf</MetaDataItem>
+    <MetaDataItem id="D002" name="Identifier" type="0200">SR-ZV9101FA</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold down the action button for over 10 seconds, the dimmer will be reset to factory defaults.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">There are two exclusion methods:
+Method 1: Exclusion from the primary controller/gateway as follows:
+1. Set the primary controller/gateway into exclusion mode (Please refer to your primary controllers manual on how to set your controller into exclusion).
+2. Triple press the action button, the dimmer will be set to exclusion mode, and waiting to be excluded, then the dimmer will be included to the network.
+Method 2: Factory reset the dimmer will force the it to be excluded from a network.
+(please refer to the part “Factory Reset” of this manual)
+Note: Factory reset is not recommended for exclusion, please use this procedure only if the primary controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="Description">The LED dimmer is a Z-Wave device that is used to switch ON/OFF, adjust light intensity and optionally the color temperature and rgbw of the connected tunable LED light and can be controlled by other Z-Wave devices.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Mark Broadbent" date="23 Aug 2020" revision="1">Initial import, adapted from ZV9101</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!--
+    Sunricher ZV-9101FA (same for CCT, DIM and RGBW)
+    https://www.sunricher.com/media/resources/manual/SR-ZV9101FA-CCT%20Instruction%20V1.pdf
+    -->
+
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value genre="config" index="2" instance="1" label="Saving state before power failure" size="1" type="list" value="1">
+      <Help>
+              Saving state before power failure. Default Not saved.
+        </Help>
+      <Item label="State NOT saved at power failure, all outputs are set to OFF upon power restore" value="0"/>
+      <Item label="State NOT saved at power failure, all outputs are set to ON upon power restore" value="1"/>
+      <Item label="State saved at power failure, all outputs are set to previous state upon power restore" value="2"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Send the basic report" size="1" type="list" value="1">
+      <Help>Enable/disable to send the basic report to the Lifeline when the load state changed.
+              When value set as 1, re-power on the dimmer, it will send Basic report automatically.
+            Default Enabled.
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="Choose a cool light stage mode" size="1" type="list" value="0">
+      <Help>Choose a cool light stage mode (when receiving Command Class Switch Color, it recovers to normal lighting mode.)
+        </Help>
+      <Item label="Inactive of light stage mode" value="0"/>
+      <Item label="Fade in and fade out mode, colors set by parameter 8" value="1"/>
+      <Item label="Flash mode, colors set by parameter 8" value="2"/>
+      <Item label="Rainbow mode, system fixed changing effect" value="3"/>
+      <Item label="Fade in and fade out mode, color changes randomly" value="4"/>
+      <Item label="Flash mode, color changes randomly" value="5"/>
+      <Item label="Rainbow mode, color changes randomly" value="6"/>
+      <Item label="Random mode, the colors switch randomly" value="7"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Speed of stage mode" size="1" max="255" min="0" type="byte" value="243">
+      <Help>
+          Speed of stage mode. 0 is the slowest, 255 is the fastest
+        </Help>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Execution times of stage mode" size="1" max="255" min="0" type="byte" value="0">
+      <Help>
+          Execution times of stage mode.
+          0: unlimited times.
+          1~255: execution times 1~255
+        </Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="The hue of stage mode" size="1" max="255" min="0" type="byte" value="0">
+      <Help>
+          The hue of stage mode. The hue is only valid for fade in and fade out mode, flash mode
+        </Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Enable/disable external switch to be added to and removed from a network" size="1" type="list" value="0">
+      <Help>
+          Enable/disable external switch to be added to and removed from a network (when enables this function, triple press the external switch within 1.5 seconds to be added to or removed from a network)
+        </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/technisat/03009496.xml b/config/technisat/03009496.xml
index f8f11727..0051b6a0 100644
--- a/config/technisat/03009496.xml
+++ b/config/technisat/03009496.xml
@@ -1,4 +1,4 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0299:1A93:0005</MetaDataItem>
     <MetaDataItem name="ProductPic">images/technisat/03009496.png</MetaDataItem>
@@ -28,6 +28,7 @@
 </MetaDataItem>
     <ChangeLog>
       <Entry author="Mathis Klooss - ozw@gunah.eu" date="13 Jun 2020" revision="1">Initial file based on z-wavealliance.org</Entry>
+      <Entry author="Andreas Krueger - ankrueg@gmx.de" date="15 Nov 2020" revision="2">Value type for "Parameter 2" and "Parameter 3" changed to "short" as parameter size is 2 bytes.</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration -->
@@ -39,13 +40,13 @@
       <Item label="disable central scene" value="0" />
       <Item label="enable central scene" value="1" />
     </Value>
-    <Value type="int" genre="config" instance="1" index="2" label="Parameter 2" value="3" min="0" max="8640">
+    <Value type="short" genre="config" instance="1" index="2" label="Parameter 2" value="3" min="0" max="8640">
       <Help>
         3 to 8640 - Interval of current wattage meter reports in 10 seconds increments.
         0 - Disable unsolicited meter reports of current wattage.
       </Help>
     </Value>
-    <Value type="int" genre="config" instance="1" index="3" label="Parameter 3" value="60" min="0" max="30240">
+    <Value type="short" genre="config" instance="1" index="3" label="Parameter 3" value="60" min="0" max="30240">
       <Help>
         Interval of active energy meter reports in minutes.
          - 10 to 30240 - Interval of active energy meter unsolicited reports in minutes (10 minutes - 3 weeks)
@@ -67,4 +68,4 @@
       <Group index="2" label="Basic on/off" max_associations="16"/>
     </Associations>
   </CommandClass>
-</Product>
\ No newline at end of file
+</Product>
diff --git a/config/technisat/03009497.xml b/config/technisat/03009497.xml
new file mode 100644
index 00000000..2d9c3ade
--- /dev/null
+++ b/config/technisat/03009497.xml
@@ -0,0 +1,105 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage"></MetaDataItem>
+    <MetaDataItem name="ProductPic">images/technisat/03009497.png</MetaDataItem>
+    <MetaDataItem id="1000" name="ZWProductPage" type="0303">https://products.z-wavealliance.org/products/3798/</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">TechniSat Dimmer-Switch is powered with mains voltage so it is always awake.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Use this procedure only when the network primary controller is missing or otherwise inoperable.
+      1. Press and hold position T2 for more than 20 seconds.
+      2. The LED will alternately flash red and green for 5 seconds after a successful reset.
+</MetaDataItem>
+    <MetaDataItem id="1000" name="Identifier" type="0303">0300/9497</MetaDataItem>
+    <MetaDataItem name="Name">Dimmer</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Install the TechniSat Dimmer.
+      2. After checking the correct installation, re-enable electrical power at the main fuse or circuit breaker.
+      3. Start the Z-Wave device add mode on your Z-Wave gateway, according to the gateway‘s manual.
+      4. Press T1 3x within 1 second.
+      5. The red status LED is on while the device is added to the Z-Wave network.
+      6. The green LED is on for 5 seconds after successfully adding the device.
+</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3798/Manual_SMD01_Dimmer.pdf</MetaDataItem>
+    <MetaDataItem id="1000" name="FrequencyName" type="0303">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Start the Z-Wave device remove mode on your Z-Wave gateway, according to the gateway‘s manual.
+      2. Press and hold position T1 for more than 10 seconds.
+      3. The red status LED is on while the device is removed from the Z-Wave network.
+      4. The green LED is on for 5 seconds after successfully removing the device.
+</MetaDataItem>
+    <MetaDataItem name="Description">Designed as a drop-in replacement for your single wall switch or dimmer from leading brand manufacturers, TechniSat's Dimmer integrates your wall switch into the Smart Home future.
+       Featuring Z-Wave SmartStart and S2 security for easy installation and secure operation, yourdimmer can now be controlled from your Smart Home as well.
+       ● Full manual operation
+       ● can trigger central scenes via multiple button clicks
+       ● Integrated 230 V auxiliary input for push button or toggle switch types, applicable in alternating switching and or intermediate switching circuits
+       ● Short circuit and overload protection monitoring
+</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Technikte - technikte@mail.de" date="16 Aug 2020" revision="1">Initial file based on the work of Mathis Klooss for the Single-Switch and z-wavealliance.org information+local handbook</Entry>
+      <Entry author="Andreas Krueger - ankrueg@gmx.de" date="03 Jan 2021" revision="2">Value type for "Parameter 2" and "Parameter 3" changed to "short" as parameter size is 2 bytes.</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration -->
+  <CommandClass id="112">
+    <Value type="list" genre="config" instance="1" index="1" label="Parameter 1" size="1" value="1">
+      <Help>
+        Enable/disable central scene notifications for 2x-5x button presses.
+      </Help>
+      <Item label="disable central scene" value="0" />
+      <Item label="enable central scene" value="1" />
+    </Value>
+    <Value type="short" genre="config" instance="1" index="2" label="Parameter 2" value="3" min="0" max="8640">
+      <Help>
+        3 to 8640 - Interval of unsolicited reports in 10s increments, a value of 3 means 30 seconds (30 seconds - 1 day)
+        0 - Disable unsolicited meter reports of current wattage.
+      </Help>
+    </Value>
+    <Value type="short" genre="config" instance="1" index="3" label="Parameter 3" value="60" min="0" max="30240">
+      <Help>
+        Interval of active energy meter reports in minutes.
+         - 10 to 30240 - Interval of active energy meter unsolicited reports in minutes (10 minutes - 3 weeks)
+         - 0 - Disable unsolicited meter reports of active energy.
+      </Help>
+    </Value>
+    <Value type="list" genre="config" instance="1" index="4" label="Parameter 4" size="1" value="0">
+      <Help>
+        Operations mode for push buttons controlling the output.
+         - Normal Switch: In this mode the top button will turn the output on, while the bottom button will turn the output off.
+         - Toogle Switch: In this mode any button press will toggle the output - when on it will be turned off, when off it will be turned on.
+      </Help>
+      <Item label="Normal Switch" value="0" />
+      <Item label="Toogle Switch" value="1" />
+    </Value>
+    <Value type="list" genre="config" instance="1" index="5" label="Parameter 5" size="1" value="0">
+      <Help>
+        Configuration of switch type connected to extension input S.
+         - External Normal Switch: Use this value if a toggle switch is connected to extension input S.
+         - External Push Button: Use this value if a push button switch is connected to extension input S.
+      </Help>
+      <Item label="External Normal Switch" value="0" />
+      <Item label="External Push Button" value="1" />
+    </Value>
+    <Value type="list" genre="config" instance="1" index="6" label="Parameter 6" size="1" value="1">
+      <Help>
+        Central Scene mapping of extension input S.
+         - Central Scene 1: Multiple button presses (2x-5x) on extension input S will trigger events of central scene 1.
+         - Central Scene 2: Multiple button presses (2x-5x) on extension input S will trigger events of central scene 2.
+         - Central Scene 3: Multiple button presses (2x-5x) on extension input S will trigger events of central scene 3 - an additional central scene exclusive to extension input S.
+      </Help>
+      <Item label="Central Scene 1" value="1" />
+      <Item label="Central Scene 2" value="2" />
+      <Item label="Central Scene 3" value="3" />
+    </Value>
+    <Value type="list" genre="config" instance="1" index="7" label="Parameter 7" size="1" value="0">
+      <Help>
+        Select the dimming curve that should be used.
+      </Help>
+      <Item label="Dimming Curve 1" value="0" />
+      <Item label="Dimming Curve 2" value="1" />
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="1"/>
+      <Group index="2" label="Basic on/off" max_associations="10"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/technisat/03009499.xml b/config/technisat/03009499.xml
index 581bcf20..47732de1 100644
--- a/config/technisat/03009499.xml
+++ b/config/technisat/03009499.xml
@@ -1,4 +1,4 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0299:1A90:0002</MetaDataItem>
     <MetaDataItem name="ProductPic">images/technisat/03009499.png</MetaDataItem>
@@ -32,6 +32,7 @@
 </MetaDataItem>
     <ChangeLog>
       <Entry author="Mathis Klooss - ozw@gunah.eu" date="13 Jun 2020" revision="1">Initial file based on z-wavealliance.org</Entry>
+      <Entry author="Andreas Krueger - ankrueg@gmx.de" date="03 Jan 2021" revision="2">Value type for "Parameter 2" and "Parameter 3" changed to "short" as parameter size is 2 bytes.</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration -->
@@ -43,13 +44,13 @@
       <Item label="disable central scene" value="0" />
       <Item label="enable central scene" value="1" />
     </Value>
-    <Value type="int" genre="config" instance="1" index="2" label="Parameter 2" value="3" min="0" max="8640">
+    <Value type="short" genre="config" instance="1" index="2" label="Parameter 2" value="3" min="0" max="8640">
       <Help>
         3 to 8640 - Interval of unsolicited reports in 10s increments (30 seconds - 1 day)
         0 - Disable unsolicited meter reports of current wattage.
       </Help>
     </Value>
-    <Value type="int" genre="config" instance="1" index="3" label="Parameter 3" value="60" min="0" max="30240">
+    <Value type="short" genre="config" instance="1" index="3" label="Parameter 3" value="60" min="0" max="30240">
       <Help>
         Interval of active energy meter reports in minutes.
          - 10 to 30240 - Interval of active energy meter unsolicited reports in minutes (10 minutes - 3 weeks)
@@ -93,4 +94,4 @@
       <Group index="2" label="Basic on/off" max_associations="16"/>
     </Associations>
   </CommandClass>
-</Product>
\ No newline at end of file
+</Product>
diff --git a/config/thermofloor/heatit-zdim.xml b/config/thermofloor/heatit-zdim.xml
index 0857c06a..f1b08e7a 100644
--- a/config/thermofloor/heatit-zdim.xml
+++ b/config/thermofloor/heatit-zdim.xml
@@ -1,173 +1,187 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
-  <MetaData>
-    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/019b:2200:0003</MetaDataItem>  
-    <MetaDataItem name="ProductPic">images/thermofloor/heatit_zdim.png</MetaDataItem>	
-    <MetaDataItem id="2200" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/3261</MetaDataItem>  
-    <MetaDataItem id="2200" name="Identifier" type="0003">Zdim</MetaDataItem>	
-    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3261/Manual_Heatit_Z-DIM_FW%201.0_Ver2019-A_ENG.pdf</MetaDataItem>	
-    <MetaDataItem name="Description">Z-Wave rotary dimmer for different light sources. The LED dimmer dims at low load without the light flickering. Dimmer LED from 1-200VA, 230V halogen and incandescent bulbs, dimmable LED drivers and electronic transformers. Not affected by additional starting currents. Need L + N conductor connected.
-The dimmer has end-turn function. This allows you to turn on the light and dimming with one dimmer, and then turn off the light with another dimmer. Convenient for example in stairs and corridors.
-The dimmer fits into standard Elko, Schneider Exxact and Gira System 55 frame systems.
-
-FUNCTIONS
-- Z-wave rotary dimmer
-- Scene controller
-- Dims:
-- LED
-- 230V halogen
-- Incandescent lightbulbs
-- Dimable LED-drivers
-- Electronic transformators
-- Starts at 1VA and dims up to 200VA LED
-- Trailing edge
-- Multiway switching option
-- Electronic thermal cutoff with automatic reset
-- Firmware updates (OTA)
-- Power metering
-- Supports encryption mode: S0, S2 Authenticated Class, S2 Unauthenticated Class
-
-CONNECTION
-1. Disconnect the power.
-2. Connect the live to the dimmer terminal marked "L".
-3. Connect the neutral to the dimmer terminal marked "N".
-4. Connect the neutral to the load terminal marked "N".
-5. Connect the load terminal marked "L" to the dimmer terminal marked (see wiring
- diagram).
-6. Install the dimmer (A) in the wall box. Make sure that no wires are pinched.
-7. Attach the cover (B) with the supplied nut (C).
-8. Attach the button (D) with a simple push.
-To use the multiway function (stairway function) a 230VAC rated momentary switch
-can be connected as follows:
-9. Connect the live to the toggle switch terminal marked "L".
-10. Connect the toggle switch terminal marked to the dimmer terminal marked "S"
- (see wiring diagram).
-
-TECHNICAL DATA
-Protocol Z-Wave, 868,4MHz
-Chip Z-Wave 500 chip
-SDK 6.71.03
-Rated voltage 230V AC 50Hz
-Power 1VA - 200VA
-Input current 0,9A
-Controls Push and rotary dimmer
-Operating temperature -20°C - 40 °C
-Connection Max. 2,5mm2
-Flush mounting depth 15mm
-IP Code IP 20
-Size (LxWxH) 84 x 84 x 43mm
-
-APPROVALS
-Z-Wave Plus
-CE
-EN 55015/A2: 2009, EN 61547:2009
-EN 61000-3-2/A2:2009
-EN 61000-3-3:2008
-EN 60669-2-1/A12:2010
-EN 60669-1:A2:2008
-EMC 2014/30/EU, RoHS 2011/65/EU
-LVD 2014/35/EU
-</MetaDataItem>
-    <MetaDataItem name="ExclusionDescription">INCLUSION/EXCLUSION
-Press the main button on dimmer 6 times in a rapid sequence. Heatit Z-DIM is now included in your Z-Wave network.</MetaDataItem>
-    <MetaDataItem id="2200" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
-    <MetaDataItem name="Name">Heatit Zdim</MetaDataItem>
-    <MetaDataItem name="ResetDescription">FACTORY RESET - RES
-By pressing and holding the main button for 20 seconds, the dimmer will perform
-a complete factory reset. The connected light source will blink once and go in the
-"OFF" state if successfully reset. NB! Please use this procedure only when the primary
-controller is missing or otherwise inoperable</MetaDataItem>
-    <MetaDataItem name="InclusionDescription">INCLUSION/EXCLUSION
-Press the main button on dimmer 6 times in a rapid sequence. Heatit Z-DIM is now included in your Z-Wave network.</MetaDataItem>
-    <ChangeLog>
-      <Entry author="Pål Kristensen - paalkr77@gmail.com" date="10 January 2020" revision="1">Initial release</Entry>
-    </ChangeLog>
-  </MetaData>
-  
-  <CommandClass id="112">
-    <Value genre="config" instance="1" index="1" value="0" label="Connected Load" size="1" min="0" max="200" type="byte">
-      <Help>
-The parameter defines the value of connected load. Refer to Paragraph 8 "Power Metering". 
-0 = Default
-1 - 200 = 1-200 Watts connected load
-
-POWER METERING
-The Heatit Z-Dim has functionality to calculate power consumption. To enable this
-function, Parameter 1 "Connected load" should have a value greater than 0. This is an
-estimated value, therefore power consumption accuracy depends on load estimation.
-1. Estimate the load value (Watt) connected to the Heatit Z-Dim.
-2. Use this value in Parameter 1.
-Heatit Z-Dim can report accumulated (kWh) and instant (Watt), or only instant (Watt)
-power consumption. The report time interval can be altered by Parameter 9. 
-	  </Help>
-    </Value>
-    <Value genre="config" instance="1" index="2" value="20" label="Minimum Dim level" units="%" size="1" min="1" max="98" type="byte">
-      <Help>
-The parameter defines the lowest dimming level of the dimmer. The value must be lower than parameter 3 "Maximum Dim Level"	  
-1% - 98% Default is 20 (20%)
-	  </Help>
-    </Value>
-    <Value genre="config" instance="1" index="3" value="85" label="Maximum Dim level" units="%" size="1" min="2" max="99" type="byte">
-      <Help>
-The parameter defines the highest dimming level of the dimmer.
-The value must be higher than parameter 2 "Minimum Dim Level"
-2% - 99% Default is 85 (85%)	  
-	  </Help>
-    </Value>
-    <Value genre="config" instance="1" index="4" value="15" label="Total steps" units="step" size="1" min="5" max="255" type="byte">
-      <Help>
-The parameter defines how many steps it should take to dim from minimum
-to maximum dim level (One round = 20 steps).
-5 - 255 = 5-255 steps. Default is 15 (3/4 round)
-	  </Help>
-    </Value>
-    <Value genre="config" instance="1" index="5" value="0" label="Double press function" size="1" type="list">
-      <Help>The parameter defines the double press functionality. </Help>
-      <Item value="0" label="Central Scene notification (Default)"/>
-      <Item value="1" label="Dim to highest level"/>
-    </Value>
-    <Value genre="config" instance="1" index="6" value="1" label="Scene controller" size="1" type="list">
-      <Help>Enables scene controller</Help>
-      <Item value="0" label="Disabled"/>
-      <Item value="1" label="Active (Default)"/>
-    </Value>
-    <Value genre="config" instance="1" index="7" value="0" label="Switch ON level" units="%" size="1" min="0" max="99" type="byte">
-      <Help>
-The parameter defines the dimming level when restored from the OFF state
-by push button. 
-0 = Restores last dim level (Default)
-1 - 99 = 1% - 99%
-	  </Help>
-    </Value>
-    <Value genre="config" instance="1" index="8" value="1" label="Dimming Duration" units="time" size="1" min="0" max="255" type="byte">
-      <Help>
-The parameter defines how long it takes to dim to the desired level.
-Note! Only Multilevel Switch Command Class is affected by this parameter. 
-0 = Disabled
-1 - 127 = Duration in seconds (1 - 127 seconds. Default is 1)
-128 - 255 = Duration in minutes (1 - 127 minutes)
-	  </Help>
-    </Value>
-    <Value genre="config" instance="1" index="9" value="60" label="Meter Report Interval" units="sec" size="2" min="0" max="32767" type="short">
-      <Help>
-The parameter defines the report interval for Power Metering.
-30 - 32767 = Duration in seconds (30 - 32 767. Default is 60)
-	  </Help>
-    </Value>
-    <Value genre="config" instance="1" index="10" value="50" label="Power restore level" units="%" size="1" min="1" max="99" type="byte">
-      <Help>
-The parameter defines the initial dimming level after power loss.
-1 - 99 = 1% - 99% Default is 50 (50%)
-	  </Help>
-    </Value>
-  </CommandClass>
-
-  <CommandClass id="133">
-    <Associations num_groups="3">
-      <Group index="1" label="Lifeline" max_associations="8" />
-      <Group index="2" label="Dimming level" max_associations="8" auto="true" />
-      <Group index="3" label="State of Device ON/OFF" max_associations="8" auto="true" />
-    </Associations>
-  </CommandClass>
-
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/019b:2200:0003</MetaDataItem>  
+    <MetaDataItem name="ProductPic">images/thermofloor/heatit_zdim.png</MetaDataItem>	
+    <MetaDataItem id="2200" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/3261</MetaDataItem>  
+    <MetaDataItem id="2200" name="Identifier" type="0003">Zdim</MetaDataItem>	
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3261/Manual_Heatit_Z-DIM_FW%201.0_Ver2019-A_ENG.pdf</MetaDataItem>	
+    <MetaDataItem name="Description">Z-Wave rotary dimmer for different light sources. The LED dimmer dims at low load without the light flickering. Dimmer LED from 1-200VA, 230V halogen and incandescent bulbs, dimmable LED drivers and electronic transformers. Not affected by additional starting currents. Need L + N conductor connected.
+The dimmer has end-turn function. This allows you to turn on the light and dimming with one dimmer, and then turn off the light with another dimmer. Convenient for example in stairs and corridors.
+The dimmer fits into standard Elko, Schneider Exxact and Gira System 55 frame systems.
+
+FUNCTIONS
+- Z-wave rotary dimmer
+- Scene controller
+- Dims:
+- LED
+- 230V halogen
+- Incandescent lightbulbs
+- Dimable LED-drivers
+- Electronic transformators
+- Starts at 1VA and dims up to 200VA LED
+- Trailing edge
+- Multiway switching option
+- Electronic thermal cutoff with automatic reset
+- Firmware updates (OTA)
+- Power metering
+- Supports encryption mode: S0, S2 Authenticated Class, S2 Unauthenticated Class
+
+CONNECTION
+1. Disconnect the power.
+2. Connect the live to the dimmer terminal marked "L".
+3. Connect the neutral to the dimmer terminal marked "N".
+4. Connect the neutral to the load terminal marked "N".
+5. Connect the load terminal marked "L" to the dimmer terminal marked (see wiring
+ diagram).
+6. Install the dimmer (A) in the wall box. Make sure that no wires are pinched.
+7. Attach the cover (B) with the supplied nut (C).
+8. Attach the button (D) with a simple push.
+To use the multiway function (stairway function) a 230VAC rated momentary switch
+can be connected as follows:
+9. Connect the live to the toggle switch terminal marked "L".
+10. Connect the toggle switch terminal marked to the dimmer terminal marked "S"
+ (see wiring diagram).
+
+TECHNICAL DATA
+Protocol Z-Wave, 868,4MHz
+Chip Z-Wave 500 chip
+SDK 6.71.03
+Rated voltage 230V AC 50Hz
+Power 1VA - 200VA
+Input current 0,9A
+Controls Push and rotary dimmer
+Operating temperature -20°C - 40 °C
+Connection Max. 2,5mm2
+Flush mounting depth 15mm
+IP Code IP 20
+Size (LxWxH) 84 x 84 x 43mm
+
+APPROVALS
+Z-Wave Plus
+CE
+EN 55015/A2: 2009, EN 61547:2009
+EN 61000-3-2/A2:2009
+EN 61000-3-3:2008
+EN 60669-2-1/A12:2010
+EN 60669-1:A2:2008
+EMC 2014/30/EU, RoHS 2011/65/EU
+LVD 2014/35/EU
+</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">INCLUSION/EXCLUSION
+Press the main button on dimmer 6 times in a rapid sequence. Heatit Z-DIM is now included in your Z-Wave network.</MetaDataItem>
+    <MetaDataItem id="2200" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="Name">Heatit Zdim</MetaDataItem>
+    <MetaDataItem name="ResetDescription">FACTORY RESET - RES
+By pressing and holding the main button for 20 seconds, the dimmer will perform
+a complete factory reset. The connected light source will blink once and go in the
+"OFF" state if successfully reset. NB! Please use this procedure only when the primary
+controller is missing or otherwise inoperable</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">INCLUSION/EXCLUSION
+Press the main button on dimmer 6 times in a rapid sequence. Heatit Z-DIM is now included in your Z-Wave network.</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Pål Kristensen - paalkr77@gmail.com" date="10 January 2020" revision="1">Initial release</Entry>
+      <Entry author="Pål Kristensen - paalkr77@gmail.com" date="11 January 2021" revision="2">Fixed COMMAND_CLASS_SWITCH_MULTILEVEL get commands</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="0" label="Connected Load" size="1" min="0" max="200" type="byte">
+      <Help>
+The parameter defines the value of connected load. Refer to Paragraph 8 "Power Metering". 
+0 = Default
+1 - 200 = 1-200 Watts connected load
+
+POWER METERING
+The Heatit Z-Dim has functionality to calculate power consumption. To enable this
+function, Parameter 1 "Connected load" should have a value greater than 0. This is an
+estimated value, therefore power consumption accuracy depends on load estimation.
+1. Estimate the load value (Watt) connected to the Heatit Z-Dim.
+2. Use this value in Parameter 1.
+Heatit Z-Dim can report accumulated (kWh) and instant (Watt), or only instant (Watt)
+power consumption. The report time interval can be altered by Parameter 9. 
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="2" value="20" label="Minimum Dim level" units="%" size="1" min="1" max="98" type="byte">
+      <Help>
+The parameter defines the lowest dimming level of the dimmer. The value must be lower than parameter 3 "Maximum Dim Level"	  
+1% - 98% Default is 20 (20%)
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="85" label="Maximum Dim level" units="%" size="1" min="2" max="99" type="byte">
+      <Help>
+The parameter defines the highest dimming level of the dimmer.
+The value must be higher than parameter 2 "Minimum Dim Level"
+2% - 99% Default is 85 (85%)	  
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="4" value="15" label="Total steps" units="step" size="1" min="5" max="255" type="byte">
+      <Help>
+The parameter defines how many steps it should take to dim from minimum
+to maximum dim level (One round = 20 steps).
+5 - 255 = 5-255 steps. Default is 15 (3/4 round)
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="5" value="0" label="Double press function" size="1" type="list">
+      <Help>The parameter defines the double press functionality. </Help>
+      <Item value="0" label="Central Scene notification (Default)"/>
+      <Item value="1" label="Dim to highest level"/>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="1" label="Scene controller" size="1" type="list">
+      <Help>Enables scene controller</Help>
+      <Item value="0" label="Disabled"/>
+      <Item value="1" label="Active (Default)"/>
+    </Value>
+    <Value genre="config" instance="1" index="7" value="0" label="Switch ON level" units="%" size="1" min="0" max="99" type="byte">
+      <Help>
+The parameter defines the dimming level when restored from the OFF state
+by push button. 
+0 = Restores last dim level (Default)
+1 - 99 = 1% - 99%
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="8" value="1" label="Dimming Duration" units="time" size="1" min="0" max="255" type="byte">
+      <Help>
+The parameter defines how long it takes to dim to the desired level.
+Note! Only Multilevel Switch Command Class is affected by this parameter. 
+0 = Disabled
+1 - 127 = Duration in seconds (1 - 127 seconds. Default is 1)
+128 - 255 = Duration in minutes (1 - 127 minutes)
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="9" value="60" label="Meter Report Interval" units="sec" size="2" min="0" max="32767" type="short">
+      <Help>
+The parameter defines the report interval for Power Metering.
+30 - 32767 = Duration in seconds (30 - 32 767. Default is 60)
+	  </Help>
+    </Value>
+    <Value genre="config" instance="1" index="10" value="50" label="Power restore level" units="%" size="1" min="1" max="99" type="byte">
+      <Help>
+The parameter defines the initial dimming level after power loss.
+1 - 99 = 1% - 99% Default is 50 (50%)
+	  </Help>
+    </Value>
+  </CommandClass>
+
+  <!-- COMMAND_CLASS_SWITCH_MULTILEVEL. This class is in the list reported by the device, but it does not respond to requests -->
+  <CommandClass id="38">
+    <Compatibility>
+      <GetSupported>false</GetSupported>
+    </Compatibility>
+  </CommandClass>
+
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="8" />
+      <Group index="2" label="Dimming level" max_associations="8" auto="true" />
+      <Group index="3" label="State of Device ON/OFF" max_associations="8" auto="true" />
+    </Associations>
+  </CommandClass>
+
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>true</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+
 </Product>
\ No newline at end of file
diff --git a/config/thermofloor/heatit021-v1.92.xml b/config/thermofloor/heatit021-v1.92.xml
new file mode 100644
index 00000000..e8f8832c
--- /dev/null
+++ b/config/thermofloor/heatit021-v1.92.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Product Revision="1"
+	xmlns="https://github.com/OpenZWave/open-zwave">
+	<MetaData>
+		<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/019B:0201:0003</MetaDataItem>
+		<MetaDataItem name="ProductPic">images/thermofloor/heatit021.png</MetaDataItem>
+		<MetaDataItem id="0201" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/1234/</MetaDataItem>
+		<MetaDataItem name="Description">Heatit Z-Wave is an electronic thermostat for mounting in a standard wall box. The thermostat has a built-in Z-Wave chip that 
+can be connected to Home Automation systems like Fibaro, Sensio, Vera, Zipato and others.
+The display will show the actual room temperature. By pressing the buttons, the display will show the set value.
+Heatit Z-Wave is equipped with a single-pole switch.
+The thermostat can handle loads up to 16A/3600Wat 230V. If the load is greater than this, the thermostat needs to be connected to a contactor. It can be used with two external temperature sensors.
+
+FUNCTIONS
+• Room sensor
+• Floor sensor
+• Temperature limiter
+• Power regulator
+• Z-Wave chip 500 series
+• Week program/setback temperature via gateway
+• Setback mode
+• 7-segment LCD-screen
+• Can be used in connection with diff erent NTC-sensors
+• Lock mode/child lock
+• Backlight
+• Calibration
+• 8 scenarios
+CONNECTION CLAMPS
+Use 1,5 mm² or 2,5 mm² cables according to power need.
+TECHNICAL DATA
+Display LED-display 3x 7-Seg 13.2mm CA white
+Rated voltage: 230V 50/60Hz
+Max. load: 3600W
+Max. current: 16A
+Power consumption: 1,5W
+Protection class: IP21
+Min/Max installation temp: -20°C to 40°C
+Min/Max operating temp: 5°C to 40°C
+Temperature range +5°C/+40°C
+Displayed temperature -30°C …. 60°C
+Floor min. limit 5°C (5°C…35°C)
+Floor max. limit 35°C (5°C…35°C)
+Air min. limit 5°C (5°C…40°C)
+Air max. limit 35°C (5°C…40°C)
+Regulator min. limit 0 (0…9)
+Power regulator P02 (P00…P10) cycle of 30 minutes
+Temperature setback Adjustable within temperature range.
+Temperature setback activation Pilot wire/Z-Wave user interface
+Hysteresis: 0,5°C
+Sensor values: 0°C 29,1 kOhm
+10°C 18,6 kOhm
+15°C 15,1 kOhm
+20°C 12,2 kOhm
+25°C 10,0 kOhm
+Switch: Single-pole
+Standard Color White RAL 9003 – Black RAL 9011
+Approvals CE – FIMKO - Z-Wave Plus
+		</MetaDataItem>
+		<MetaDataItem name="ExclusionDescription">INCLUSION/EXCLUSION
+To include the thermostat to your home automation gateway, press Center (confirm) for 10 seconds.
+The display will show OFF. Press Right (down) 4 times till you see Con in the display.
+Now start add device in your home automation software. Start inclusion mode by pressing Center (confirm) for approximately
+2 seconds. The inclusion/exclusion icon will appear in the display. Confirmation will show Inc/EcL in the display. If inclusion
+fails, Err (error) will appear.
+Leave programming mode by choosing ESC in menu. Your thermostat is ready for use with default settings.</MetaDataItem>
+		<MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/1182/Manual_Multireg%20Z-Wave_Ver2015-A.pdf</MetaDataItem>
+		<MetaDataItem id="0001" name="FrequencyName" type="0001">CEPT (Europe)</MetaDataItem>
+		<MetaDataItem name="Name">Heatit Z-Wave</MetaDataItem>
+		<MetaDataItem id="0001" name="Identifier" type="0001">TF021</MetaDataItem>
+		<MetaDataItem name="ResetDescription">FACTORY RESET - RES
+By pressing buttons Left and Center (up and confirm) for 20 seconds, the thermostat will perform a complete factory reset.
+NB! Please use this procedure only when the primary controller is missing or otherwise inoperable.</MetaDataItem>
+		<MetaDataItem name="InclusionDescription">INCLUSION/EXCLUSION
+To include the thermostat to your home automation gateway, press Center (confirm) for 10 seconds.
+The display will show OFF. Press Right (down) 4 times till you see Con in the display.
+Now start add device in your home automation software. Start inclusion mode by pressing Center (confirm) for approximately
+2 seconds. The inclusion/exclusion icon will appear in the display. Confirmation will show Inc/EcL in the display. If inclusion
+fails, Err (error) will appear.
+Leave programming mode by choosing ESC in menu. Your thermostat is ready for use with default settings.</MetaDataItem>
+		<MetaDataItem name="WakeupDescription">If Er2 appears in the display, touch any button to restart the display.</MetaDataItem>
+		<ChangeLog>
+			<Entry author="Pål Kristensen - paalkr77@gmail.com" date="11 January 2021" revision="1">Initial release</Entry>
+		</ChangeLog>
+	</MetaData>
+
+	<CommandClass id="32">
+		<Compatibility>
+			<Mapping>37</Mapping>
+		</Compatibility>
+	</CommandClass>
+	<CommandClass id="49">
+		<Value type="decimal" genre="user" instance="1" index="1" label="Internal Air Temperature Sensor" units="C" read_only="true" write_only="false"/>
+		<Value type="decimal" genre="user" instance="2" index="1" label="External Air Temperature Sensor" units="C" read_only="true" write_only="false"/>
+		<Value type="decimal" genre="user" instance="3" index="1" label="External Floor Temperature Sensor" units="C" read_only="true" write_only="false"/>
+		<Compatibility>
+			<Base>0</Base>
+			<CreateVars>true</CreateVars>
+		</Compatibility>
+	</CommandClass>
+	<CommandClass id="64">
+		<Value genre="user" index="0" instance="1" label="Mode" max="0" min="0" read_only="false" size="1" type="list" units="" value="0" write_only="false">
+			<Item label="Off" value="0"/>
+			<Item label="Heat" value="1"/>
+			<Item label="Cool" value="2"/>
+			<Item label="Energy Heat" value="11"/>
+		</Value>
+		<SupportedModes>
+			<Mode index="0" label="Off"/>
+			<Mode index="1" label="Heat"/>
+			<Mode index="2" label="Cool"/>
+			<Mode index="11" label="Energy Heat"/>
+		</SupportedModes>
+	</CommandClass>
+
+	<CommandClass id="67">
+		<Instance index="1"/>
+		<Value type="decimal" genre="user" instance="1" index="1" label="Heating" units="C" read_only="false" write_only="false" min="0" max="0" value="20"/>
+		<Value type="decimal" genre="user" instance="1" index="2" label="Cooling" units="C" read_only="false" write_only="false" min="0" max="0" value="21"/>
+		<Value type="decimal" genre="user" instance="1" index="11" label="Energy Heat" units="C" read_only="false" write_only="false" min="0" max="0" value="16"/>
+		<Compatibility>
+			<Base>0</Base>
+			<CreateVars>true</CreateVars>
+		</Compatibility>
+	</CommandClass>
+
+	<CommandClass id="112">
+		<Value type="list" genre="config" index="1" label="Operation mode" value="1" size="1">
+			<Help>Set operation mode</Help>
+			<Item label="Off" value="0"/>
+			<Item label="Heat" value="1"/>
+			<Item label="Cool" value="2"/>
+			<Item label="Energy save heat" value="11"/>
+		</Value>
+		<Value type="list" genre="config" index="2" label="Sensor mode" value="1" size="1">
+			<Help>Set sensor mode</Help>
+			<Item label="F - Floor sensor" value="0"/>
+			<Item label="A - Internal room sensor" value="1"/>
+			<Item label="AF - Internal room sensor and floor sensor" value="2"/>
+			<Item label="A2 - External room sensor" value="3"/>
+			<Item label="P - Power regulator" value="4"/>
+			<Item label="FP - Floor sensor and power regulator" value="5"/>
+		</Value>
+		<Value type="list" genre="config" index="3" label="Floor sensor type" value="0" size="1">
+			<Help>Floor sensor type (10K NTC Default)</Help>
+			<Item label="10k ntc" value="0"/>
+			<Item label="12k ntc" value="1"/>
+			<Item label="15k ntc" value="2"/>
+			<Item label="22k ntc" value="3"/>
+			<Item label="33k ntc" value="4"/>
+			<Item label="47k ntc" value="5"/>
+		</Value>
+		<Value type="byte" index="4" genre="config" label="DIFF l. Temperature control Hysteresis" min="0" max="30" size="1" value="5">
+			<Help>0-30 (0,3C - 3.0C)</Help>
+		</Value>
+		<Value type="short" index="5" genre="config" label="FLo: Floor min limit" min="50" max="400" size="2" value="50">
+			<Help>50-400 (5.0C - 40.0C)</Help>
+		</Value>
+		<Value type="short" index="6" genre="config" label="FHi: Floor max limit" min="50" max="400" size="2" value="400">
+			<Help>50-400 (5.0C - 40.0C)</Help>
+		</Value>
+		<Value type="short" index="7" genre="config" label="ALo: Air min limit" min="50" max="400" size="2" value="50">
+			<Help>50-400 (5.0C - 40.0C)</Help>
+		</Value>
+		<Value type="short" index="8" genre="config" label="AHi: Air max limit" min="50" max="400" size="2" value="400">
+			<Help>50-400 (5.0C - 40.0C)</Help>
+		</Value>
+		<Value type="byte" index="9" genre="config" label="PLo: Min power in FP-mode" min="0" max="9" size="1" value="0">
+			<Help>Min power 0-9 in FP-mode (Floor sensor and power regulator mode)</Help>
+		</Value>
+		<Value type="short" genre="config" instance="1" index="10" label="CO mode setpoint" size="2" min="50" max="400" value="210">
+			<Help>50-400 (5.0C - 40.0C)</Help>
+		</Value>
+		<Value type="short" genre="config" instance="1" index="11" label="ECO mode setpoint" size="2" min="50" max="400" value="180">
+			<Help>50-400 (5.0C - 40.0C)</Help>
+		</Value>
+		<Value type="byte" index="12" genre="config" label="P setting" min="0" max="10" size="1" value="2">
+			<Help>Power 0-10 in P-mode (Power regulator mode)</Help>
+		</Value>
+		<Value type="short" genre="config" instance="1" index="13" label="COOL setpoint" size="2" min="50" max="400" value="210">
+			<Help>Only if cooling is enabled. 50-400 (5.0C - 40.0C)</Help>
+		</Value>
+		<Value type="byte" index="14" genre="config" label="Room sensor calibration" min="0" max="40" size="1" value="0">
+			<Help>Temperature correction 0 - 4.0C (Default: 0). For positive value 40 = 4.0C. Negative value is not working (Adjust negativ calibration on thermostat)</Help>
+		</Value>
+		<Value type="byte" index="15" genre="config" label="Floor sensor calibration" min="0" max="40" size="1" value="0">
+			<Help>Temperature correction 0 - 4.0C (Default: 0). For positive value 40 = 4.0C. Negative value is not working (Adjust negativ calibration on thermostat)</Help>
+		</Value>
+		<Value type="byte" index="16" genre="config" label="External sensor calibration" min="0" max="40" size="1" value="0">
+			<Help>Temperature correction 0 - 4.0C (Default: 0). For positive value 40 = 4.0C. Negative value is not working (Adjust negativ calibration on thermostat)</Help>
+		</Value>
+		<Value type="short" index="17" genre="config" label="Temperature report interval" min="0" max="8640" size="2" value="6">
+			<Help> 0 (Report disabled) 1-8640 Multiply with 10 seconds, 10 seconds - 24 hours. Default is 6 (60 seconds)</Help>
+		</Value>
+		<Value type="byte" index="18" genre="config" label="Temperature report hysteresis" min="1" max="100" size="1" value="10">
+			<Help>1-100 (0.1C - 10C). Default is 10 (1.0C)</Help>
+		</Value>
+	</CommandClass>
+	<CommandClass id="133">
+		<Associations num_groups="5">
+			<Group index="1" max_associations="2" label="Lifeline"/>
+			<Group index="2" max_associations="2" label="On/Off control"/>
+			<Group index="3" max_associations="2" label="Multilevel sensor reports - Internal sensor" auto="true" />
+			<Group index="4" max_associations="2" label="Multilevel sensor reports - External sensor" />
+			<Group index="5" max_associations="2" label="Multilevel sensor reports - Floor sensor" auto="true" />
+		</Associations>
+	</CommandClass>
+
+	<!-- COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION_V2-->
+	<CommandClass id="142">
+		<Compatibility>
+			<ForceInstances>true</ForceInstances>
+		</Compatibility>
+	</CommandClass>
+
+	<!--COMMAND_CLASS_MULTI_CHANNEL_V2 Map endpoints to instances -->
+	<CommandClass id="96">
+		<Compatibility>
+			<MapRootToEndpoint>true</MapRootToEndpoint>
+		</Compatibility>
+	</CommandClass>
+</Product>
\ No newline at end of file
diff --git a/config/thermofloor/heatit021.xml b/config/thermofloor/heatit021.xml
index 8828667a..ae598237 100644
--- a/config/thermofloor/heatit021.xml
+++ b/config/thermofloor/heatit021.xml
@@ -1,8 +1,9 @@
-<Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="9" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/019B:0001:0001</MetaDataItem>
     <MetaDataItem name="ProductPic">images/thermofloor/heatit021.png</MetaDataItem>
     <MetaDataItem id="0001" name="ZWProductPage" type="0001">https://products.z-wavealliance.org/products/1234/</MetaDataItem>
+    <MetaDataItem id="0201" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/1182/</MetaDataItem>
     <MetaDataItem name="Description">Heatit Z-Wave is an electronic thermostat for mounting in a standard wall box. The thermostat has a built-in Z-Wave chip that 
 can be connected to Home Automation systems like Fibaro, Sensio, Vera, Zipato and others.
 The display will show the actual room temperature. By pressing the buttons, the display will show the set value.
@@ -51,8 +52,10 @@ fails, Err (error) will appear.
 Leave programming mode by choosing ESC in menu. Your thermostat is ready for use with default settings.</MetaDataItem>
     <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/1234/Manual_Multireg Z-Wave_Ver2015-A.pdf</MetaDataItem>
     <MetaDataItem id="0001" name="FrequencyName" type="0001">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="0201" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
     <MetaDataItem name="Name">Heatit Z-Wave</MetaDataItem>
     <MetaDataItem id="0001" name="Identifier" type="0001">TF021</MetaDataItem>
+    <MetaDataItem id="0201" name="Identifier" type="0003">TF021</MetaDataItem>
     <MetaDataItem name="ResetDescription">FACTORY RESET - RES
 By pressing buttons Left and Center (up and confirm) for 20 seconds, the thermostat will perform a complete factory reset.
 NB! Please use this procedure only when the primary controller is missing or otherwise inoperable.</MetaDataItem>
@@ -67,6 +70,7 @@ Leave programming mode by choosing ESC in menu. Your thermostat is ready for use
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="7">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1182/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="08 May 2019" revision="8">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1234/xml</Entry>
+      <Entry author="Gunnar Skjold - gunnar.skjold@gmail.com" date="15 Nov 2020" revision="9">Assigned this config to TF016 as well - https://products.z-wavealliance.org/products/1182/xml</Entry>
     </ChangeLog>
   </MetaData>
   <CommandClass id="64">
diff --git a/config/thermofloor/heatit058.xml b/config/thermofloor/heatit058.xml
new file mode 100644
index 00000000..a97cc9ab
--- /dev/null
+++ b/config/thermofloor/heatit058.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/019B:0203:0003</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/thermofloor/heatit058.png</MetaDataItem>
+    <MetaDataItem id="0203" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/3802/</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Adding the device:
+To add the thermostat to your home automation gateway, press Center (confirm) for 10 seconds. The display will show OFF. Press Right (down) 4 times till you see Con in the display. Now start add device in your home automation software. Start adding mode by pressing Center (confirm) button for approximately 2 seconds. The icon will appear in the display. Adding Mode is indicated in the display by some “circling” LED segments in the display until the timeout occurs after 20 seconds or the module has been added in the network. Confirmation will show Inc/EcL in the display. If adding fails, Err (error) will appear.</MetaDataItem>
+    <MetaDataItem id="0203" name="Identifier" type="0003">Z-TRM3</MetaDataItem>
+    <MetaDataItem name="Description">Heatit Z-TRM3 is equipped with a single pole switch and it fits most System 55 frames (Elko RS16, Schneider Exxact, Gira, Jung etc.). The thermostat can withstand a load of max 13A /2900W at 230V. At higher loads the thermostat must control a contactor. The thermostat may be connected to two wired external sensors.
+The thermostat has the capacity of up to 8 associations (relays, wall plugs etc.).
+The thermostat is designed for electrical heating.
+FEATURES
+Floor sensor
+External room sensor
+Temperature limiter
+Weekly program/setback via gateway or pilot wire
+Multilevel sensor command class
+Firmware updates (OTA)
+Power metering
+LED-diode
+Can be used in connection with different NTC-sensors
+Lock mode/child lock
+Calibration
+8 associations
+Supports encryption mode: S0, S2 Authenticated Class, S2 Unauthenticated Class</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/3802/Manual_Heatit_Z-TRM3_FW%204.0%20Ver2020-A_ENG.pdf</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Removing the device:
+To remove the thermostat to your home automation gateway, press Center (confirm) for 10 seconds. The display will show OFF. Press Right (down) 4 times till you see Con in the display. Now start remove device in your home automation software. Start removing mode by pressing Center (confirm) button for approximately 2 seconds. The icon will appear in the display. Removing Mode is indicated in the display by some “circling” LED segments in the display until the timeout occurs after 20 seconds or the module has been removed in the network. Confirmation will show Inc/EcL in the display. If removing fails, Err (error) will appear.</MetaDataItem>
+    <MetaDataItem id="0203" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="ResetDescription">By pressing buttons Right and Center (down and confirm) for 20 seconds, the thermostat will perform a complete factory reset.
+NB! Please use this procedure only when the primary controller/ gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="Name">Heatit Z-TRM3</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Sebastian Hatzl - sebihatzl@gmail.com" date="20 Aug 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3802/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="64">
+    <Value genre="user" index="0" instance="1" label="Mode" max="0" min="0" read_only="false" type="list" units="" value="0" write_only="false">
+      <Item label="Off" value="0"/>
+      <Item label="Heat" value="1"/>
+    </Value>
+    <SupportedModes>
+      <Mode index="0" label="Off"/>
+      <Mode index="1" label="Heat"/>
+    </SupportedModes>
+    <Compatibility/>
+  </CommandClass>
+  
+ <CommandClass id="49">  
+  	<Value type="decimal" genre="user" instance="1" index="1" label="Temperature sensor" units="C" read_only="true" write_only="false" min="0" max="0"/>
+  	<Value type="decimal" genre="user" instance="2" index="1" label="Temperature sensor" units="C" read_only="true" write_only="false" min="0" max="0" />
+  	<Value type="decimal" genre="user" instance="3" index="1" label="Temperature sensor" units="C" read_only="true" write_only="false" min="0" max="0" />
+  </CommandClass>
+	
+    <CommandClass id="67">
+       <Instance index="1"/>
+       <Value genre="user" index="1" instance="1" label="Heating setpoint" max="0" min="0" units="C" read_only="false" type="decimal" value="21.0" write_only="false"/>
+       <Compatibility>
+         <Base>0</Base>
+         <CreateVars>true</CreateVars>
+       </Compatibility>
+     </CommandClass>
+	
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="Operation mode" size="1" type="list" value="1">
+      <Help>Set operation mode</Help>
+      <Item label="Off" value="0"/>
+      <Item label="Heat" value="1"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Sensor mode" size="1" type="list" value="1">
+      <Help>Set sensor mode</Help>
+      <Item label="F - Floor sensor" value="0"/>
+      <Item label="A - Internal room sensor" value="1"/>
+      <Item label="AF - Internal room sensor with floor limitation" value="2"/>
+      <Item label="A2 - External room sensor" value="3"/>
+      <Item label="A2F - External sensor with floor limitation" value="4"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Floor sensor type" size="1" type="list" value="0">
+      <Help>Floor sensor type (10K NTC Default)</Help>
+      <Item label="10k ntc" value="0"/>
+      <Item label="12k ntc" value="1"/>
+      <Item label="15k ntc" value="2"/>
+      <Item label="22k ntc" value="3"/>
+      <Item label="33k ntc" value="4"/>
+      <Item label="47k ntc" value="5"/>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Temperature control Hysteresis" max="30" min="3" size="1" type="byte" value="5">
+      <Help>3-30 (0.3C - 3.0C) Default is 5 (0.5C)</Help>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="Floor minimum temperature limit" max="400" min="50" size="2" type="short" value="50">
+      <Help>50-400 (5.0C - 40.0C) Default is 50 (5.0C)</Help>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Floor maximum temperature limit" max="400" min="50" size="2" type="short" value="400">
+      <Help>50-400 (5.0C - 40.0C) Default is 400 (40.0C)</Help>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Air (A2) minimum temperature limit" max="400" min="50" size="2" type="short" value="50">
+      <Help>50-400 (5.0C - 40.0C) Default is 50 (5.0C)</Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="Air (A2) maximum temperature limit" max="400" min="50" size="2" type="short" value="400">
+      <Help>50-400 (5.0C - 40.0C) Default is 400 (40.0C)</Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Heating mode setpoint" max="400" min="50" size="2" type="short" value="210">
+      <Help>50 - 400 (5.0C - 40.0C) Default is 210 (21.0C)</Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Room sensor calibration (A)" max="255" min="0" size="1" type="byte" value="0">
+      <Help>-60 - 60 (-6.0C - 6.0C) Default is 0 (0.0C) To set a negative value, use 255 and subtract the desired value.</Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Floor sensor calibration" max="255" min="0" size="1" type="byte" value="0">
+      <Help>-60 - 60 (-6.0C - 6.0C) Default is 0 (0.0C) To set a negative value, use 255 and subtract the desired value.</Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="External sensor calibration" max="255" min="0" size="1" type="byte" value="0">
+      <Help>-60 - 60 (-6.0C - 6.0C) Default is 0 (0.0C) To set a negative value, use 255 and subtract the desired value.</Help>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Temperature display" size="1" type="list" value="0">
+      <Help>Show setpoint or calculated temperature on display(</Help>
+      <Item label="Display setpoint temperature (Default)" value="0"/>
+      <Item label="Display measured temperature" value="1"/>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="Button brightness - Dimmed state" max="100" min="0" size="1" type="byte" value="50">
+      <Help>0-100 (0 - 100%)</Help>
+    </Value>
+    <Value genre="config" index="15" instance="1" label="Button brightness - Active state" max="100" min="0" size="1" type="byte" value="100">
+      <Help>0-100 (0 - 100%)</Help>
+    </Value>
+    <Value genre="config" index="16" instance="1" label="Display brightness - Dimmed state" max="100" min="0" size="1" type="byte" value="50">
+      <Help>0-100 (0 - 100%)</Help>
+    </Value>
+    <Value genre="config" index="17" instance="1" label="Display brightness - Active state" max="100" min="0" size="1" type="byte" value="100">
+      <Help>0-100 (0 - 100%)</Help>
+    </Value>
+    <Value genre="config" index="18" instance="1" label="Temperature report interval" max="32767" min="0" size="2" type="short" value="60">
+      <Help>
+				0 (Report disabled)
+				30-32767 (30-32767 seconds)
+			</Help>
+    </Value>
+    <Value genre="config" index="19" instance="1" label="Temperature report hysteresis" max="100" min="1" size="1" type="byte" value="10">
+      <Help>0-100 (0.1C - 10.0C) Default is 10 (1.0C)</Help>
+    </Value>
+    <Value genre="config" index="20" instance="1" label="Meter report interval" max="32767" min="0" size="2" type="short" value="90">
+      <Help>
+				0 (Report disabled)
+				30-32767 (30-32767 seconds)
+	        </Help>
+    </Value>
+    <Value genre="config" index="21" instance="1" label="Meter report delta value" max="255" min="0" size="1" type="byte" value="10">
+      <Help>0-255 A delta value of 0 - 25.5 kWh will result in a metering report. Default is 10 (1.0 kWh)</Help>
+    </Value>
+    <Compatibility/>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="5">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="On/Off switch of internal relay" max_associations="5"/>
+      <Group index="3" label="Multilevel sensor reports - Internal sensor" max_associations="5"/>
+      <Group index="4" label="Multilevel sensor reports - External sensor" max_associations="5"/>
+      <Group index="5" label="Multilevel sensor reports - Floor sensor" max_associations="5"/>
+    </Associations>
+    <Compatibility/>
+  </CommandClass>
+  <!-- COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION_V2-->
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>true</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+  <!--COMMAND_CLASS_MULTI_CHANNEL_V2 Map endpoints to instances -->
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+</Product>
diff --git a/config/thermofloor/heatit204.xml b/config/thermofloor/heatit204.xml
new file mode 100644
index 00000000..fa0dac5f
--- /dev/null
+++ b/config/thermofloor/heatit204.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Heatit Z-Temp2</MetaDataItem>
+    <MetaDataItem name="Description">Heatit Z-Temp2 is a battery-operated thermostat designed for use with water based heating systems. Used in combination with the Heatit Z-Water regulator you can control your heating system with a Z-Wave primary controller/gateway with the use of Heatit Z-Water in combination with one or several Heatit Z-Temp2. </MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/019B:0204:0004</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://products.z-wavealliance.org/products/3860</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.heatit.com/z-wave/heatit-z-temp-2-2/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/thermofloor/heatit0204.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/3860/Manual_Heatit_Z-Temp2_FW%201.1_Ver2020-A_ENG.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">The thermostat is a FLIRS device. You are able to force a Node Information Frame using the same procedure as adding/removing procedure; "press the link button on the thermostat 3 times in a rapid sequence." </MetaDataItem>
+    <MetaDataItem name="InclusionDescription">There are two ways to add your devices in a Z-Wave network. * Standard (manual). Please refer to your primary controller/gateway manual on how to enter add mode. The device can only be added to the network if the primary controller is in add mode. When the primary controller/gateway is set to add mode press the link button on the thermostat 3 times in a rapid sequence. * SmartStart (automatic) Please refer to your primary controller/gateway to see if SmartStart is supported by the controller. SmartStart enabled products can be added into a Z-Wave network by scanning the Z-Wave QR-Code present on the product with a controller providing SmartStart inclusion. No further action is required and the SmartStart product will be added automatically within 10 minutes of being switched on in the network vicinity.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Remove. Please refer to your primary controller/gateway manual on how to enter remove mode. The device can only be removed from the network if the primary controller is in remove mode. When the primary controller/gateway is set to remove modus press the link button on the thermostat 3 times in a rapid sequence.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">By pressing and holding the link button for 20 seconds, the thermostat will perform a complete factory reset. rES will be displayed. NB! Please use this procedure only when the primary controller/gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem id="0204" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/XXXX/</MetaDataItem>
+    <MetaDataItem id="0204" name="FrequencyName" type="0004">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="0204" name="Identifier" type="0004">Z-Temp2</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Julien Ithurbide - jithurbide@gmail.com" date="26 Oct 2020" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3860/xml</Entry>
+    </ChangeLog>
+  </MetaData>
+ 
+      <!-- Thermostat -->
+          <!-- COMMAND_CLASS_THERMOSTAT_MODE 	0x40 	64   -->
+  <CommandClass id="64">
+    <Value genre="user" index="0" instance="1" label="Mode" max="0" min="0" read_only="false" type="list" units="" value="0" write_only="false">
+      <Item label="Off" value="0"/>
+      <Item label="Heat" value="1"/>
+    </Value>
+    <SupportedModes>
+      <Mode index="0" label="Off"/>
+      <Mode index="1" label="Heat"/>
+    </SupportedModes>
+    <Compatibility>
+      <Base>0</Base>
+      <CreateVars>true</CreateVars>
+    </Compatibility>
+  </CommandClass>
+
+      <!-- COMMAND_CLASS_THERMOSTAT_SETPOINT 	0x43 	67 -->  
+  <CommandClass id="67">
+    <Instance index="1"/>
+    <Value genre="user" index="1" instance="1" label="Heating setpoint" max="40" min="0" read_only="false" type="decimal" units="C" value="20" write_only="false"/>
+    <Compatibility>
+      <Base>0</Base>
+      <CreateVars>true</CreateVars>
+    </Compatibility>
+  </CommandClass>
+
+  
+  <CommandClass id="112">
+     <Value genre="config" index="1" instance="1" label="Temperature/ Humidity report interval" max="32767" min="30" size="2" type="short" value="900">
+      <Help>Used to adjust the time between report interval for Temperature and humidity reports. Min is 30, max is 32767 and default is 900</Help>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Temperature delta value" max="50" min="0" size="2" type="short" value="10">
+      <Help>Temperature delta value. Value 0 : Reporting temperature based on change is disabled. Real value : + 0.5 to + 5°C (Default 10 corresponding to  1.0°C)</Help>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Humidity delta value" max="50" min="0" size="2" type="short" value="10">
+      <Help>Humidity delta value. Value 0 : Reporting Humidity based on change is disabled. Real value : + 0.5 to + 5°C (Default 10 corresponding to 1.0°C)</Help>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Temperature offset settings" max="65535" min="0" size="2" type="short" value="0">
+      <Help>Calibrate the internal temperature sensor. NB! To set negative values; 65 535 – desired value + 1. Value: -100 to 100°C (Default 0, 0°C)</Help>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="Humidity offset settings" max="65535" min="0" size="2" type="short" value="0">
+      <Help>Calibrate the internal hunidity sensor. NB! To set negative values; 65 535 – desired value + 1. Value: -100 to 100°C (Default 0, 0°C)</Help>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Proximity sensor retrigger interval" max="270" min="2" size="2" type="short" value="10">
+      <Help>value 2 to 270 seconds (Default 10, 10 seconds)</Help>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Proximity sensor  Enable / Disable" max="1" min="0" size="2" type="short" value="1">
+      <Help>Disable or enable sensor. Value  0 disable, 1 enable </Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="LED maximum brightness" max="99" min="0" size="2" type="short" value="50">
+      <Help>Adjust the backlight of LCD display.</Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="LED turned on before timeout" max="300" min="3" size="2" type="short" value="3">
+      <Help>Adjust the time from proximity sensor / display touched until display goes to sleep.Value 3 to 300 seconds (Default 3, 3 seconds)</Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Temperature Control Hysteresis" max="30" min="3" size="2" type="short" value="5">
+      <Help>Adjust the delta values for the thermostat to turn on off heating .Value  0.3 to 3°C (Default 5, 0,5°C)</Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Minimum Temperature Limit" max="400" min="50" size="2" type="short" value="50">
+      <Help>Set the mimum temperature limit.Value 5 to 40°C (Default 50, 5°C)</Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Maximum Temperature Limit" max="400" min="50" size="2" type="short" value="400">
+      <Help>Set the maximum temperature limit.5 to 40°C (Default 400, 40°C)</Help>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="External Relay and Operating State update interval " max="240" min="0" size="2" type="short" value="0">
+      <Help>Set time on how often the devices sends Binary Switch Set and thermostat mode to gateway. Value 0 : Sends only when changed (Default). 1 to 240 minutes + When changed </Help>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="Report when presence is detected" max="1" min="0" size="2" type="short" value="400">
+      <Help>Decides if the thermostat sends temperature when presence is detected.Value 0 : Do not report to gateway when presence is detected, only at interval.(Default) 1 : Send temperature report to gateway when presence is detected.</Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="132">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Temperature Report" max_associations="5"/>
+      <Group index="3" label="Binary Switch Set (normally used to control external relays)." max_associations="5"/>
+    </Associations>
+  </CommandClass>
+ 
+</Product>
diff --git a/config/thermofloor/heatit20a.xml b/config/thermofloor/heatit20a.xml
new file mode 100644
index 00000000..8ccaaa04
--- /dev/null
+++ b/config/thermofloor/heatit20a.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<!--
+Heatit Z-Water
+https://products.z-wavealliance.org/products/3102
+-->
+<Product xmlns="https://github.com/OpenZWave/open-zwave" Revision="3">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/thermofloor/heatit20a.png</MetaDataItem>
+    <MetaDataItem id="020a" name="ZWProductPage" type="0003">https://products.z-wavealliance.org/products/3102/</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Adding the device:
+When the primary controller is set to add/remove modus press the &#x201D;INCLUSION&#x201D; button once on the device</MetaDataItem>
+    <MetaDataItem id="020a" name="Identifier" type="0003">Z-Water</MetaDataItem>
+    <MetaDataItem name="Description">Heatit Z-Water is equipped with 10 relay outputs and 4 analog inputs, and a Z-Wave radio for interfacing to the wireless
+Z-Wave network.
+The regulator can be power supplied from a 230V AC mains connection, and is able to deliver an output supply of 24V DC.
+Heatit Z-Water relay outputs are able to be freely controlled from the Z-Wave network, and can be used for several
+purposes, e.g. on/off control of light, control of valve actuators for an underfloor heating system, or control of other home
+automation systems.
+Heatit Z-Water inputs are analog inputs for interfacing simple temperature sensors; NTC, PT1000, etc.
+It is possible to configure the level and the indication of the status indicator LED in the front of the Heatit Z-Water
+regulator.</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&amp;filename=Manuals/3102/Manual_Heatit_Z-Water_analog%20inputs_FW%202.1_Ver2019-A_ENG.pdf</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Removing the device: When the primary controller is set to add/remove modus press the &#x201D;INCLUSION&#x201D; button once on the device</MetaDataItem>
+    <MetaDataItem id="020a" name="FrequencyName" type="0003">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem name="ResetDescription">By pressing buttons Right and Center (down and confirm) for 20 seconds, the thermostat will perform a complete factory reset.
+NB! Please use this procedure only when the primary controller/ gateway is missing or otherwise inoperable.</MetaDataItem>
+    <MetaDataItem name="Name">Heatit Z-Water</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Espen Throndsen - espenthrondsen@gmail.com" date="21 Oct 2019" revision="1">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3102/xml</Entry>
+      <Entry author="Lars Tobias Skjong-B&#xF8;rsting - larstobi@relatime.no" date="28 Jun 2020" revision="2">Added ProductPic</Entry>
+      <Entry author="Lars Tobias Skjong-B&#xF8;rsting - larstobi@relatime.no" date="12 Jul 2020" revision="3">Fixed errors</Entry>
+    </ChangeLog>
+  </MetaData>
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="status LED" size="1" type="list" value="1">
+      <Help>Set LED mode</Help>
+      <Item label="LED turned off" value="0"/>
+      <Item label="LED turned on.(default)" value="1"/>
+      <Item label="2 LED flashing at 1 second intervals (&#xBD; Hz)" value="2"/>
+      <Item label="3 LED flashing at &#xBD; second interval (1 Hz)" value="3"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Specifies the brightness level of the LED when it is on.(0-100) Default is 50" size="1" type="byte" value="50">
+      <Help>Set Brightnes</Help>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Thermistor type connected to input 1" size="1" type="list" value="0">
+      <Help>This parameter decides which kind of thermistor that is connected to the input.</Help>
+      <Item label="0 No thermistor, input is disabled" value="0"/>
+      <Item label="1 10K NTC. (PART NUMBER: TT02-10KC3-93D-3000R-TPH). (Default)" value="1"/>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Thermistor type connected to input 2" size="1" type="list" value="0">
+      <Help>This parameter decides which kind of thermistor that is connected to the input.</Help>
+      <Item label="0 No thermistor, input is disabled" value="0"/>
+      <Item label="1 10K NTC. (PART NUMBER: TT02-10KC3-93D-3000R-TPH). (Default)" value="1"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="Thermistor type connected to input 3" size="1" type="list" value="0">
+      <Help>This parameter decides which kind of thermistor that is connected to the input.</Help>
+      <Item label="0 No thermistor, input is disabled" value="0"/>
+      <Item label="1 10K NTC. (PART NUMBER: TT02-10KC3-93D-3000R-TPH). (Default)" value="1"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Thermistor type connected to input 4" size="1" type="list" value="0">
+      <Help>This parameter decides which kind of thermistor that is connected to the input.</Help>
+      <Item label="0 No thermistor, input is disabled" value="0"/>
+      <Item label="1 10K NTC. (PART NUMBER: TT02-10KC3-93D-3000R-TPH). (Default)" value="1"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Input 1 calibration" size="1" type="byte" max="255" min="0" value="0">
+      <Help>-40 - 40 (-4.0C - 4.0C) Default is 0 (0.0C) To set a negative value, use 255 and subtract the desired value.</Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="Input 2 calibration" size="1" type="byte" max="255" min="0" value="0">
+      <Help>-40 - 40 (-4.0C - 4.0C) Default is 0 (0.0C) To set a negative value, use 255 and subtract the desired value.</Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Input 3 calibration" size="1" type="byte" max="255" min="0" value="0">
+      <Help>-40 - 40 (-4.0C - 4.0C) Default is 0 (0.0C) To set a negative value, use 255 and subtract the desired value.</Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Input 4 calibration" size="1" type="byte" max="255" min="0" value="0">
+      <Help>-40 - 40 (-4.0C - 4.0C) Default is 0 (0.0C) To set a negative value, use 255 and subtract the desired value.</Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Input 1 Temperature report interval" max="8640" min="0" size="2" type="short" value="60">
+      <Help>
+				0 (Report disabled)
+        Multiply with 10 seconds, 10 seconds &#x2013; 24 hours. Default is 6 (60 seconds).</Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Input 2 Temperature report interval" max="8640" min="0" size="2" type="short" value="60">
+      <Help>
+				0 (Report disabled)
+        Multiply with 10 seconds, 10 seconds &#x2013; 24 hours. Default is 6 (60 seconds).</Help>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Input 3 Temperature report interval" max="8640" min="0" size="2" type="short" value="60">
+      <Help>
+				0 (Report disabled)
+        Multiply with 10 seconds, 10 seconds &#x2013; 24 hours. Default is 6 (60 seconds).</Help>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="Input 4 Temperature report interval" max="8640" min="0" size="2" type="short" value="60">
+      <Help>
+				0 (Report disabled)
+        Multiply with 10 seconds, 10 seconds &#x2013; 24 hours. Default is 6 (60 seconds).</Help>
+    </Value>
+    <Compatibility/>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="5">
+      <Group index="1" label="Lifeline. - Reset notification - Basic Report On / Off - Multilevel Sensor Report" max_associations="5"/>
+      <Group index="2" label="Sends Multilevel Sensor Reports for input 1" max_associations="5"/>
+      <Group index="3" label="Sends Multilevel Sensor Reports for input 2" max_associations="5"/>
+      <Group index="4" label="Sends Multilevel Sensor Reports for input 3" max_associations="5"/>
+      <Group index="5" label="Sends Multilevel Sensor Reports for input 4" max_associations="5"/>
+    </Associations>
+    <Compatibility/>
+  </CommandClass>
+  <!-- COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION_V2-->
+  <CommandClass id="142">
+    <Compatibility>
+      <ForceInstances>true</ForceInstances>
+    </Compatibility>
+  </CommandClass>
+  <!--COMMAND_CLASS_MULTI_CHANNEL_V2 Map endpoints to instances -->
+  <CommandClass id="96">
+    <Compatibility>
+      <MapRootToEndpoint>true</MapRootToEndpoint>
+    </Compatibility>
+  </CommandClass>
+</Product>
diff --git a/config/thermofloor/heatitz4.xml b/config/thermofloor/heatitz4.xml
new file mode 100644
index 00000000..0d1ead3a
--- /dev/null
+++ b/config/thermofloor/heatitz4.xml
@@ -0,0 +1,41 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+  <MetaData>
+    <MetaDataItem name="Name">Heatit Z-Push Button 4</MetaDataItem>
+    <MetaDataItem name="Description">The remote control is a Z-Wave device that can both control other Z-Wave devices and activate scenes in Gateways. Although it is controlling other devices, the device cannot act as Z-Wave network controller (primary or secondary) and will always need a Z-Wave network controller to be added into a Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/XXXX:XXXX:XXXX</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.heatit.com/z-wave/heatit-z-push-button-4/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.heatit.com/z-wave/heatit-z-push-button-4/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/thermofloor/Heatit-Z-Push-button-8-white.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.thermo-floor.no/media/multicase/documents/_tfasdokumentasjon/heatit%20controls/heatit%20z-push%20button/manual_heatit%20z-push_button%204%20_fw%201.26_ver2019-a_eng.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription">short press any button</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">set controller in inclusion mode press and hold down group 2 keys for 3 seconds</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">set controller in exclusion mode press and hold down group 2 keys for 3 seconds</MetaDataItem>
+    <MetaDataItem name="ResetDescription">press and hold down group 2 keys for more than 10 seconds use only if controller is unavailable</MetaDataItem>
+    <MetaDataItem id="0xa306" name="ZWProductPage" type="0x0300">https://products.z-wavealliance.org/products/3595</MetaDataItem>
+    <MetaDataItem id="0xa306" name="FrequencyName" type="0x0300">CEPT</MetaDataItem>
+    <MetaDataItem id="0xa306" name="Identifier" type="0x0300">45 126 82 (white) 45 126 83 (black)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jonas Sauge" date="26 August 2020" revision="1">add Heatit Z-Push Button 4</Entry>
+      <Entry author="Pål Kristensen - paalkr77@gmail.com" date="18 January 2021" revision="2">Fixed Association Groups</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+
+    <!-- Here is a Byte/Int/Short Value Sample -->
+    <Value genre="config" index="1" label="Factory reset"  max="21930" min="21930" type="int" units="" value="0" write_only="true">
+      <Help>
+			Set to 21930 to factory reset the device.
+			</Help>
+    </Value>
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="LifeLine" max_associations="5"/>
+      <Group index="2" label="Launch 1" max_associations="5"/>
+      <Group index="3" label="Launch 2" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/thermofloor/heatitz8.xml b/config/thermofloor/heatitz8.xml
index a32c80b3..72946c50 100644
--- a/config/thermofloor/heatitz8.xml
+++ b/config/thermofloor/heatitz8.xml
@@ -1,4 +1,4 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
   <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
   <MetaData>
     <MetaDataItem name="Name">Heatit Z-Push Button 8</MetaDataItem>
@@ -7,7 +7,7 @@
     <MetaDataItem name="ProductPage">https://www.heatit.com/z-wave/heatit-z-push-button-8/</MetaDataItem>
     <MetaDataItem name="ProductSupport">https://www.heatit.com/z-wave/heatit-z-push-button-8/</MetaDataItem>
     <MetaDataItem name="ProductPic">images/thermofloor/Heatit-Z-Push-button-8-white.png</MetaDataItem>
-    <MetaDataItem name="ProductManual">https://www.heatit.com/wp-content/uploads/2019/07/Manual_Heatit_Z-Push_Button_8_FW_1.26_Ver2019-A_ENG.pdf</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://www.thermo-floor.no/media/multicase/documents/_tfasdokumentasjon/heatit%20controls/heatit%20z-push%20button/manual_heatit_z-push_button_8_fw_1.26_ver2019-a_eng.pdf</MetaDataItem>
     <MetaDataItem name="WakeupDescription">short press any button</MetaDataItem>
     <MetaDataItem name="InclusionDescription">set controller in inclusion mode press and hold down group 2 keys for 3 seconds</MetaDataItem>
     <MetaDataItem name="ExclusionDescription">set controller in exclusion mode press and hold down group 2 keys for 3 seconds</MetaDataItem>
@@ -17,6 +17,7 @@
     <MetaDataItem id="0xa305" name="Identifier" type="0x0300">45 125 81 (white) 45 126 81 (black)</MetaDataItem>
     <ChangeLog>
       <Entry author="Jonathan Mos mosjonathan999@hotmail.com" date="03 January 2020" revision="1">Made config from manual and zwave alliance</Entry>
+      <Entry author="Pål Kristensen - paalkr77@gmail.com" date="18 January 2021" revision="2">Removed auto include controller to Association Groups</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
@@ -33,10 +34,10 @@
   <CommandClass id="133">
     <Associations num_groups="5">
       <Group index="1" label="LifeLine" max_associations="5"/>
-      <Group index="2" label="Launch 1" max_associations="5" auto="true"/>
-      <Group index="3" label="Launch 2" max_associations="5" auto="true"/>
-      <Group index="4" label="Launch 3" max_associations="5" auto="true"/>
-      <Group index="5" label="Launch 4" max_associations="5" auto="true"/>
+      <Group index="2" label="Launch 1" max_associations="5"/>
+      <Group index="3" label="Launch 2" max_associations="5"/>
+      <Group index="4" label="Launch 3" max_associations="5"/>
+      <Group index="5" label="Launch 4" max_associations="5"/>
     </Associations>
   </CommandClass>
 </Product>
diff --git a/config/thermofloor/heatitzm.xml b/config/thermofloor/heatitzm.xml
new file mode 100644
index 00000000..a249dc9b
--- /dev/null
+++ b/config/thermofloor/heatitzm.xml
@@ -0,0 +1,95 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+	<MetaData>
+		<MetaDataItem name="Name">Heatit ZM Single Relay 16A</MetaDataItem>
+		<MetaDataItem name="Description">Heatit ZM Single Relay is a high power relay for in-wall installations.
+		The relay allows you to control connected devices either through your Z-Wave network or via a wired switch. The module is equipped with a 16A relay and has a scene controller functionality.
+
+		The device can withstand a load of max 16A /3600W at 230VAC.
+
+		The Heatit ZM Single Relay has a power metering feature that allows you to monitor the power consumption of your connected devices.  </MetaDataItem>
+		<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/019B:3500:0004</MetaDataItem>
+		<MetaDataItem id="000A" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/4062/</MetaDataItem>
+		<MetaDataItem name="ProductPic">images/thermofloor/heatitzm.png</MetaDataItem>
+		<MetaDataItem id="000A" name="Identifier" type="0004">ZM Single Relay 16A</MetaDataItem>
+		<MetaDataItem name="InclusionDescription">Tripple Click the button</MetaDataItem>
+		<MetaDataItem id="000A" name="FrequencyName" type="0004">CEPT (Europe)</MetaDataItem>
+		<MetaDataItem name="ExclusionDescription">Tripple Click the button</MetaDataItem>
+		<MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=product_documents/4062/Manual_Heatit%20ZM%20Single%20Relay%2016A_Ver%202020-A_ENG.pdf</MetaDataItem>
+		<MetaDataItem name="ResetDescription">This device allows reset without any involvement of a Z-Wave controller.</MetaDataItem>
+		<ChangeLog>
+			<Entry author="Hans Rune Bue - email@hansrune.net" date="05 Dec 2021" revision="1">Initial version</Entry>
+			<Entry author="Hans Rune Bue - email@hansrune.net" date="06 Dec 2021" revision="2">Multiline help texts revised</Entry>
+		</ChangeLog>
+	</MetaData>
+	<CommandClass id="112">
+		<Value genre="config" index="1" instance="1" label="Load limit" max="16" min="1" size="1" type="byte" units="Ampere" value="16">
+			<Help>Ensures that the device does not draw more current than rated. Immunity for power consumption peaks</Help>
+		</Value>
+		<Value genre="config" index="2" instance="1" label="Power shutdown actions" size="2" min="0" type="short" max="32767" value="20">
+			<Help>
+			Decide how the device should react when the overload/overheating features has turned relay OFF:
+			0 - Disabled and will not retry. User needs to manually turn on afterwards. If temperature overload is on, device will not turn on until device has cooled down
+			>= 1 - After power shut down (param 1) device will try to turn back ON after delay specified here. (Time in minutes)
+			</Help>
+		</Value>
+		<Value genre="config" index="3" instance="1" label="Switch type" size="1" type="list" value="0">
+			<Help>Momentary or toggle switch</Help>
+			<Item label="Momentary" value="0"/>
+			<Item label="Toggle" value="1"/>
+		</Value>
+		<Value genre="config" index="4" instance="1" label="S1/Button operation" size="1" type="list" value="0">
+			<Help>S1 button operation </Help>
+			<Item label="Button turns load on/off and sends Meter report + Relay status" value="0"/>
+			<Item label="Button sends Meter report + Relay status, load can be only controlled wirelessly" value="1"/>
+		</Value>
+		<Value genre="config" index="5" instance="1" label="Scene notifications" size="1" type="list" value="0">
+			<Help>Decides if/what scene controller notifications the device sends to gateway </Help>
+			<Item label="Sends scene controller for S2. S1 disabled" value="0"/>
+			<Item label="Sends scene controller for S1. S2 disabled" value="1"/>
+			<Item label="Sends scene controller for S1 and S2" value="2"/>
+			<Item label="Scene controller deactivated" value="3"/>
+		</Value>
+		<Value genre="config" index="6" instance="1" label="Restore Power Level" size="1" type="list" value="2">
+			<Help>
+			Relay power level after power is restored from power-outage.
+			When device is from factory/factory reset the first state of the device should be OFF
+			</Help>
+			<Item label="Always OFF on restored power" value="0"/>
+			<Item label="Always ON on restored power" value="1"/>
+			<Item label="Restore last state on restored power (Default)" value="2"/>
+		</Value>
+		<Value genre="config" index="7" instance="1" label="Automatic Turn off" size="4" min="0" max="86400" type="int" value="0" units="seconds"> 
+			<Help>
+			0 for auto off disabled (default)
+			1-86400 for auto-off timeout in seconds
+			</Help>
+		</Value>
+		<Value genre="config" index="8" instance="1" label="Automatic Turn on" size="4" min="0" max="86400" type="int" value="0" units="seconds"> 
+			<Help>
+			0 for auto on disabled (default)
+			1-86400 for auto-on timeout in seconds
+			</Help>
+		</Value>
+		<Value genre="config" index="9" instance="1" label="Inverted Output" size="1" type="list" value="0">
+			<Help> Decides if the relay output should be inverted </Help>
+			<Item label="False" value="0"/>
+			<Item label="True" value="1"/>
+		</Value>
+		<Value genre="config" index="10" instance="1" label="Meter report interval" size="2" type="short" min="30" max="32767" value="900" units="seconds"> 
+			<Help>Time interval between consecutive meter reports. Meter reports can also be sent as a result of polling</Help>
+		</Value>
+		<Value genre="config" index="11" instance="1" label="Meter report delta value" size="2" type="short" min="5" max="3600" value="75" units="watts"> 
+			<Help>Meter report delta value</Help>
+		</Value>
+	</CommandClass>
+		<!-- Association Groups -->
+		<CommandClass id="133">
+		<Associations num_groups="5">
+			<Group index="1" label="Lifeline" max_associations="5"/>
+			<Group index="2" label="External Relay Control S1" max_associations="5"/>
+			<Group index="3" label="Control External Start/Stop S2" max_associations="5"/>
+			<Group index="4" label="External Relay Control S2" max_associations="5"/>
+			<Group index="5" label="Control External Start/Stop S2" max_associations="5"/>
+		</Associations>
+	</CommandClass>
+</Product>
diff --git a/config/trane/TZEMT400BB32MAA.xml b/config/trane/TZEMT400BB32MAA.xml
index dbc8f552..d0711f73 100644
--- a/config/trane/TZEMT400BB32MAA.xml
+++ b/config/trane/TZEMT400BB32MAA.xml
@@ -1,14 +1,15 @@
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/008B:5433:5452</MetaDataItem>
     <MetaDataItem name="ProductPic">images/trane/TZEMT400BB32MAA.png</MetaDataItem>
     <MetaDataItem id="5433" name="ZWProductPage" type="5452">https://products.z-wavealliance.org/products/107/</MetaDataItem>
     <MetaDataItem id="5433" name="FrequencyName" type="5452">U.S. / Canada / Mexico</MetaDataItem>
-    <MetaDataItem name="Name">Trane T500A - Thermostat</MetaDataItem>
+    <MetaDataItem name="Name">Trane TZEMT400BB - Thermostat</MetaDataItem>
     <MetaDataItem name="Description">Z-Wave enabled programmable communicating thermostat.</MetaDataItem>
     <MetaDataItem id="5433" name="Identifier" type="5452">Trane T500A</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/107/xml</Entry>
+      <Entry author="Keith Laidlaw - laidlaw1546@gmail.com" date="28 Oct 2020" revision="4">Remove (non-existent) config param id 161 to 199</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Trane Thermostat Model TZEMT400BB32MAA -->
@@ -302,133 +303,6 @@
 	      Default:  10
 	    </Help>
     </Value>
-    <Value genre="config" index="161" label="Unknown-161" max="" min="" type="byte" units="" value="1">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="162" label="Unknown-162" max="" min="" type="byte" units="" value="30">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="163" label="Unknown-163" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="166" label="Unknown-166" max="" min="" type="byte" units="" value="1">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="167" label="Unknown-167" max="" min="" type="byte" units="" value="1">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="162" label="Unknown-162" max="" min="" type="byte" units="" value="30">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="169" label="Unknown-169" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="170" label="Unknown-170" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="171" label="Unknown-171" max="" min="" type="byte" units="">
-      <Help>
-	      0x2c after reset
-	      0xf4 after reset
-	    </Help>
-    </Value>
-    <Value genre="config" index="172" label="Unknown-172" max="" min="" type="byte" units="">
-      <Help>
-	      0x2c after reset
-	      0xf4 after reset
-	    </Help>
-    </Value>
-    <Value genre="config" index="173" label="Unknown-173" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="174" label="Unknown-174" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="175" label="Unknown-175" max="" min="" type="byte" units="" value="1">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="176" label="Unknown-176" max="" min="" type="byte" units="" value="44">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="177" label="Unknown-177" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="178" label="Unknown-178" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="179" label="Unknown-179" max="" min="" type="byte" units="" value="1">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="180" label="Unknown-180" max="" min="" type="byte" units="" value="44">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="181" label="Unknown-181" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="182" label="Unknown-182" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="183" label="Unknown-183" max="" min="" type="byte" units="">
-      <Help>
-	      0xb8 after reset
-	      0xe4 after reset
-	    </Help>
-    </Value>
-    <Value genre="config" index="184" label="Unknown-184" max="" min="" type="byte" units="">
-      <Help>
-	      0xb8 after reset
-	      0xe4 after reset
-	    </Help>
-    </Value>
-    <Value genre="config" index="185" label="Schedule Enable" max="1" min="0" type="byte" units="" value="0">
-      <Help>
-	      When enabled (set to 1), the local thermostat's scheduler 
-	      function is enabled.
-	      Default:  0
-	    </Help>
-    </Value>
-    <Value genre="config" index="186" label="Unknown-186" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="187" label="Unknown-187" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="190" label="Unknown-190" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="191" label="Unknown-191" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="192" label="Unknown-192" max="" min="" type="byte" units="" value="0">
-      <Help>
-	      0xff after reset
-	    </Help>
-    </Value>
-    <Value genre="config" index="193" label="Unknown-193" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="194" label="Unknown-194" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="195" label="Unknown-195" max="" min="" type="byte" units="" value="0">
-      <Help>
-	      0xff after reset
-	    </Help>
-    </Value>
-    <Value genre="config" index="196" label="Unknown-196" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="197" label="Unknown-197" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
-    <Value genre="config" index="198" label="Unknown-198" max="" min="" type="byte" units="" value="0">
-      <Help>
-	      0xff after reset
-	    </Help>
-    </Value>
-    <Value genre="config" index="199" label="Unknown-199" max="" min="" type="byte" units="" value="0">
-      <Help></Help>
-    </Value>
     <Value genre="config" index="200" label="Unknown-200" max="" min="" type="byte" units="" value="0">
       <Help></Help>
     </Value>
diff --git a/config/vision/zp3102.xml b/config/vision/zp3102.xml
index 98410242..85316674 100644
--- a/config/vision/zp3102.xml
+++ b/config/vision/zp3102.xml
@@ -1,4 +1,4 @@
-<!-- Vision ZP3102 PIR Motion Sensor --><Product Revision="10" xmlns="https://github.com/OpenZWave/open-zwave">
+<!-- Vision ZP3102 PIR Motion Sensor --><Product Revision="11" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0109:0201:2002</MetaDataItem>
     <MetaDataItem name="ProductPic">images/vision/zp3102.png</MetaDataItem>
@@ -17,6 +17,7 @@
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="8">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/847/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 May 2019" revision="9">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1070/xml</Entry>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="24 May 2019" revision="10">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1702/xml</Entry>
+      <Entry author="Tao Gong - gongtao0607@gmail.com" date="12 Nov 2020" revision="11">Add undocumented config 5 to set temperature report change</Entry>
     </ChangeLog>
     <MetaDataItem id="0201" name="Identifier" type="2002">ZP 3102</MetaDataItem>
     <MetaDataItem id="0202" name="ZWProductPage" type="2002">https://products.z-wavealliance.org/products/728/</MetaDataItem>
@@ -58,6 +59,11 @@
     <Value genre="config" index="4" label="Temperature adjustment" max="255" min="0" type="byte" units="Degrees Celsius" value="0">
       <Help>-10 to -1, 0 to 10 (Signed decimal: 246 to 255, 0 to 10)</Help>
     </Value>
+    <Value genre="config" index="5" label="Temperature report +/- change" max="2" min="1" size="1" type="list" units="" value="2">
+      <Help>Report temperature update when the temperature changes: (default: +/- 2 Degree)</Help>
+      <Item label="+/- 1 Degree" value="1"/>
+      <Item label="+/- 2 Degree" value="2"/>
+    </Value>
   </CommandClass>
   <!-- COMMAND_CLASS_BASIC -->
   <CommandClass id="32">
diff --git a/config/wenzhou/tz77.xml b/config/wenzhou/tz77.xml
new file mode 100644
index 00000000..a276f307
--- /dev/null
+++ b/config/wenzhou/tz77.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/wenzhou/tz77.png</MetaDataItem>
+    <MetaDataItem name="Name">RGBW Dimmer Switch</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1) Have Z-Wave controller with exclusion mode; 2) Press the on/off button three times within 1.5 seconds to be excluded from the controller</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1) Have Z-Wave controller with inclusion mode; 2) Press the on/off button three times within 1.5 seconds to be included to the controller</MetaDataItem>
+    <MetaDataItem id="0302" name="Identifier" type="0311">TZ77</MetaDataItem>
+    <MetaDataItem name="Description">This insert switch module is a transceiver which is a Z-Wave enabled device and is fully compatible with any Z-Wave enabled network. Remote on/off control of the connected load is possible with other manufacturer's wireless controller. Each switch is designed to act as a repeater.</MetaDataItem>
+    <MetaDataItem id="0302" name="FrequencyName" type="0311">CEPT (Europe)</MetaDataItem>
+    <ChangeLog>
+      <Entry author="fratsloos" date="02 Feb 2021" revision="1">Created</Entry>
+      <Entry author="fratsloos" date="02 Feb 2021" revision="2">Fixed index of config variables</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Configuration  -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" label="Indicator light state" max="1" min="0" type="byte" value="1">
+      <Help>Change the state of indicator light. Default status of socket: LED is on as indicator when the load is off.</Help>
+    </Value>
+    <Value genre="config" index="2" label="Memory function" max="1" min="0" type="byte" value="1">
+      <Help>Socket status when powered on. Default with memory: the socket status is same as before when power on</Help>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" max_associations="5" label="Group 1" />
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/wenzhou/tze96.xml b/config/wenzhou/tze96.xml
new file mode 100644
index 00000000..debcd8d0
--- /dev/null
+++ b/config/wenzhou/tze96.xml
@@ -0,0 +1,33 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- TZE96 Plus Z-WAVE Color Touch Weekly Programming Heating Thermostat -->
+  <MetaData>
+    <MetaDataItem name="Name">Color Touch Weekly Programming Heating Thermostat</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://www.tkbhome.com/Z-WAVE-Color-Touch-Weekly-Programming-Heating-Thermostat_012_200.html</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/wenzhou/tze96.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">http://www.tkbhome.com/upimg/file/1124240362332.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Make sure the thermostat in the main interface is in OFF mode.
+2. Have Z-Wave the controller enter inclusion mode.
+3. Press Up button on thermostat 3 times in 1.5 seconds. The (Z) icon will twinkle at a certain interval.
+4. After the twinkle stop the (Z) icon displaying means the product is in the Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Make sure the thermostat in the main interface is in OFF mode.
+2. Have Z-Wave the controller enter exclusion mode.
+3. Press Up button on thermostat 3 times in 1.5 seconds. The (Z) icon will twinkle at a certain interval.
+4. After the twinkle stop the (Z) icon not displaying means the product is not the Z-Wave network.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Turning thermostat to OFF mode, press MENU for 3 seconds then go the last parameter setting page by pressing Next 3 times. Set the Restore parameter.</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="0001">TZE96</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Mathieu Cartoixa" date="27 December 2020" revision="1">http://www.tkbhome.com/Z-WAVE-Color-Touch-Weekly-Programming-Heating-Thermostat_012_200.html</Entry>
+      <Entry author="Jean-François Auger" date="2 January 2021" revision="2">fix image metadata element</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- Configuration Command Class  -->
+  <CommandClass id="112">
+    <!-- Memory Function -->
+    <Value genre="config" index="4" label="Memory Function" max="1" min="0" size="1" type="list" value="1">
+      <Help>The Memory Function recovers the operating mode after a power failure.</Help>
+      <Item label="Off" value="0"/>
+      <Item label="On" value="1"/>
+    </Value>
+  </CommandClass>
+</Product>
diff --git a/config/wink/wnk-mot1.xml b/config/wink/wnk-mot1.xml
new file mode 100644
index 00000000..2fe6e04d
--- /dev/null
+++ b/config/wink/wnk-mot1.xml
@@ -0,0 +1,84 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+  <MetaData>
+    <MetaDataItem name="Name">Motion Sensor</MetaDataItem>
+    <MetaDataItem name="Description">Battery powered Z-Wave Plus motion sensor</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/017F:0001:0101</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.wink.com/products/wink-motion-sensor/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.wink.com/help/products/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/wink/wnk-mot1.png</MetaDataItem>
+    <MetaDataItem name="ProductManual"><![CDATA[https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/2482/wink-motion-manual.pdf]]></MetaDataItem>
+    <MetaDataItem name="WakeupDescription"><!-- Short description on how to wake up the device if its battery powered --></MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Bring the sensor within range of your controller.
+    2. If the devices is new, remove the pull tab.  Otherwise remove, then replace the battery.
+    The LED will flash 5 times to indicate inclusion.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Remove the sensor cover by twisting counter clockwise.
+    2. Press the connect button (next to the battery) 3 times.
+    The LED will flash 5 times to indicate exclustion.
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">
+    1. Remove the sensor cover by twisting counter clockwise.
+    2. Hold the connect button (next to the battery) for 10 seconds until the LED blinks.
+    </MetaDataItem>
+    <MetaDataItem id="0001" name="ZWProductPage" type="0101">https://products.z-wavealliance.org/products/2482</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="0101">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="0101">WNK-MOT1</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Jeremy M. Johnson" date="21 June 202020" revision="1">Initial information based on Z-Wave alliance database information</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+
+    <Value genre="config" index="1" label="Sensitivity" max="255" min="8" type="byte" units="" value="255">
+      <Help>Motion sensor sensitivity Level. Valid values 8 to 255.</Help>
+    </Value>
+    <Value genre="config" index="2" label="Motion Cleared Time Delay" max="600" min="5" type="int" units="seconds" value="255">
+      <Help>Valid values 5 to 600 seconds (10 mins).</Help>
+    </Value>
+    <Value genre="config" index="3" label="Basic Set Level" max="255" min="0" type="byte" units="" value="255">
+      <Help>0: Turn Off
+      1 to 99: Dim Level
+      255: On
+      </Help>
+    </Value>
+    <Value genre="config" index="4" label="Enable/Disable Motion Detection" max="1" min="0" type="bool" units="" value="1">
+      <Help>On = Enable Motion Detection.</Help>
+    </Value>
+    <Value genre="config" index="5" label="Group 2 Ambient Light Threshold" max="1000" min="5" type="int" units="lux" value="1000">
+      <Help>Ambient Light Threshold for the Group 2 Association trigger.  Vaid values 5 to 1000 lux.</Help>
+    </Value>
+    <Value genre="config" index="6" label="Retrigger Interval" max="8" min="1" type="byte" units="seconds" value="8">
+      <Help>Prevent retriggering within the specified time period.  Valid values 1 to 8 seconds.</Help>
+    </Value>
+    <Value genre="config" index="7" label="Light Sensing Interval" max="3600" min="60" type="byte" units="seconds" value="3600">
+      <Help>Valid values 60 to 3600 seconds.</Help>
+    </Value>
+    <Value genre="config" index="8" label="Enable/Disable Group 2 Ambient Light Threshold" max="1" min="0" type="bool" units="" value="0">
+      <Help>On = Enable the Ambient Light Threshold when using the Group 2 Association.</Help>
+    </Value>
+    <Value genre="config" index="9" label="Ambient Light Sensitivity Level" max="255" min="0" type="byte" units="lux" value="255">
+      <Help>Valid values 0 to 255 lux.</Help>
+    </Value>
+    <Value genre="config" index="10" label="LED Indicator" max="1" min="0" type="bool" units="" value="1">
+      <Help>On = Enable the LED Indicator.</Help>
+    </Value>
+
+  </CommandClass>
+  <!-- A Example of Setting a Compatibility Flag on a CommandClass - In this case the Device Doesn't support Get for Alarm Class -->
+  <CommandClass id="113">
+    <Compatibility>
+      <GetSupported>false</GetSupported>
+    </Compatibility>
+  </CommandClass>
+  <!-- The Association Group Information -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" label="LifeLine" max_associations="5"/>
+      <Group index="2" label="BASIC_SET" max_associations="5"/>
+      <Group index="3" label="NOTIFICATION_REPORT" max_associations="5"/>
+      <Group index="4" label="SENSOR_BINARY_REPORT" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/wink/wnk-sir1p.xml b/config/wink/wnk-sir1p.xml
new file mode 100644
index 00000000..b5b7e323
--- /dev/null
+++ b/config/wink/wnk-sir1p.xml
@@ -0,0 +1,89 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
+  <MetaData>
+    <MetaDataItem name="Name">Siren</MetaDataItem>
+    <MetaDataItem name="Description">Battery-powered alarm, chime, and flash</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/017f:0001:0200</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.wink.com/products/wink-siren-and-chime/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.wink.com/help/products/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/wink/wnk-sir1p.png</MetaDataItem>
+	<MetaDataItem name="ProductManual"><![CDATA[https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/2482/wink-motion-manual.pdf]]></MetaDataItem>
+    <MetaDataItem name="WakeupDescription"><!-- Short description on how to wake up the device if its battery powered --></MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. For proper inclusion, bring the Motion Detector within range of your Controller.
+	2. Pull the tab on the side of the sensor to power on, or remove then re-install the batteries.
+	The LED indicator will flash five times indicating inclusion.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Remove the sensor cover by twisting it counterclockwise and be sure it is powered on.
+	2. Press the Connect Button on the bottom of the device next to the battery quickly 3 times in a row. 
+	The LED Indicator will flash five times indicating exclusion/disconnection.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">1. Remove the sensor cover by twisting it counterclockwise and be sure it is powered on.
+	2. Hold the Connect Button next to the battery for 10 seconds until the LED indicator blinks once, then release the button.
+	Only do this if the controller is disconnected or otherwise unreachable!</MetaDataItem>
+    <MetaDataItem id="0001" name="ZWProductPage" type="0200">https://products.z-wavealliance.org/products/2484</MetaDataItem>
+    <MetaDataItem id="0001" name="FrequencyName" type="0200">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="0001" name="Identifier" type="0200">WNK-SIR1P</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Dejan Zelic" date="9 July 2020" revision="1">Initial information based on Z-Wave alliance database information</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Configuration Command Class - All Configuration Parameters should be entered into the section below -->
+  <CommandClass id="112">
+
+    <Value genre="config" index="1" label="Primary Notification Volume Level" max="3" min="1" size="1" type="list" value="2">
+      <Help>Primary Notification Volume Level</Help>
+      <Item label="Low Volume" value="1"/>
+      <Item label="Medium Volume" value="2"/>
+      <Item label="High Volume" value="3"/>
+    </Value>
+
+	<Value genre="config" index="2" label="Primary Notification Length" max="3" min="-1" size="1" type="list" value="2">
+      <Help>Primary Notification Length</Help>
+      <Item label="Plays until battery dies" value="1"/>
+      <Item label="30 Sec" value="2"/>
+      <Item label="1 Min" value="3"/>
+      <Item label="5 Min" value="4"/>
+    </Value>
+
+	<Value genre="config" index="3" label="Secondary Notification Length" max="127" min="-128" type="byte" units="" value="1">
+      <Help>-128 to -2 Chime Duration (in Minutes; -128=128 min, -2=254 min)
+	  -1 Chime Will Not Play
+	  0 Does Not Stop
+      1 to 127 Chime Duration (in Minutes)
+      </Help>
+    </Value>
+
+	<Value genre="config" index="4" label="Secondary Notification Volume Level" max="3" min="1" size="1" type="list" value="2">
+      <Help>Secondary Notification Volume Level</Help>
+      <Item label="Low Volume" value="1"/>
+      <Item label="Medium Volume" value="2"/>
+      <Item label="High Volume" value="3"/>
+    </Value>
+
+	<Value genre="config" index="5" label="Primary Notification Sound" max="10" min="1" type="byte" units="" value="10">
+      <Help>1 to 10 Tone Index Number</Help>
+    </Value>
+
+	<Value genre="config" index="6" label="Secondary Notification Sound" max="10" min="1" type="byte" units="" value="10">
+      <Help>1 to 10 Tone Index Number</Help>
+    </Value>
+
+    <Value genre="config" index="7" label="Toggle Secondary Chime" max="2" min="1" size="1" type="list" value="1">
+      <Help>Short Help Description</Help>
+      <Item label="Primary Notification Will Play" value="1"/>
+      <Item label="Secondary Notification Will Play" value="2"/>
+    </Value>
+  </CommandClass>
+
+  <CommandClass id="113">
+    <Compatibility>
+      <GetSupported>false</GetSupported>
+    </Compatibility>
+  </CommandClass>
+
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="LifeLine" max_associations="5"/>
+      <Group index="2" label="Binary Switch Report" max_associations="5"/>
+      <Group index="3" label="Notification Report" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>
\ No newline at end of file
diff --git a/config/zooz/zen15.xml b/config/zooz/zen15.xml
index 25a0d15a..f4cf4277 100644
--- a/config/zooz/zen15.xml
+++ b/config/zooz/zen15.xml
@@ -1,4 +1,4 @@
-<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027A:000D:0101</MetaDataItem>
     <MetaDataItem name="ProductPic">images/zooz/zen15.png</MetaDataItem>
@@ -67,6 +67,7 @@ Press and HOLD the Z-Wave button for at least 3 seconds
 4. A new secure on / off device will be recognized by your Z-Wave controller</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="02 Jun 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2517/xml</Entry>
+      <Entry author="Vladimir Vukicevic - vladimir@pobox.com" date="22 Nov 2020" revision="3">Fix param 152 size.</Entry>
     </ChangeLog>
   </MetaData>
   <!-- Zooz ZEN15 Power Switch 
@@ -98,7 +99,7 @@ Press and HOLD the Z-Wave button for at least 3 seconds
     <Value genre="config" index="151" label="Power Report Value Threshold" max="65535" min="1" size="2" type="short" units="watts" value="0">
       <Help>Number of Watts the appliance needs to go over for the change to be reported</Help>
     </Value>
-    <Value genre="config" index="152" label="Power Report Percentage Threshold" max="255" min="1" size="4" type="int" units="%" value="10">
+    <Value genre="config" index="152" label="Power Report Percentage Threshold" max="255" min="1" size="1" type="byte" units="%" value="10">
       <Help>Percentage in power usage change the appliance needs to go over for the event to be reported (Default 10)</Help>
     </Value>
     <Value genre="config" index="171" label="Power Report Frequency" max="2678400" min="5" size="4" type="int" value="0">
diff --git a/config/zooz/zen16.xml b/config/zooz/zen16.xml
index 847a48ca..82e4f79f 100644
--- a/config/zooz/zen16.xml
+++ b/config/zooz/zen16.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="4" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="Name">Multirelay</MetaDataItem>
     <MetaDataItem name="Description">PRODUCT FEATURES:
@@ -38,6 +38,7 @@ SPECIFICATIONS:
     <ChangeLog>
       <Entry author="David Alden - dave@alden.name" date="16 Feb 2020" revision="2">Initial Metadata Import</Entry>
       <Entry author="Brad Parker - https://github.com/bepsoccer" date="6 May 2020" revision="3">Updated for firmware version 1.02</Entry>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="20 January 2021" revision="4">Updated for firmware version 1.03</Entry>
     </ChangeLog>
   </MetaData>
 
@@ -153,6 +154,29 @@ SPECIFICATIONS:
       <Item label="seconds" value="1"/>
       <Item label="hours" value="2"/>
     </Value>
+     <Value type="list" genre="config" index="21" label="Normally open/close for Relay 1" size="1" min="0" max="2" value="0">
+      <Help>Decide whether you'd like Relay 1 to be normally open (NO) or normally closed (NC). Default normally open.</Help>
+      <Item label="normally open (relay reports off when it's open / switch is off and on when it's closed / switch is on)" value="0"/>
+      <Item label="normally closed (relay reports off when it's open / switch is on and on when it's closed / switch is off)" value="1"/>
+      <Item label="normally closed (relay reports off when it's closed / switch is off and on when it's open / switch is on)" value="2"/>
+    </Value>
+    <Value type="list" genre="config" index="22" label="Normally open/close for Relay 2" size="1" min="0" max="2" value="0">
+      <Help>Decide whether you'd like Relay 2 to be normally open (NO) or normally closed (NC). Default normally open.</Help>
+      <Item label="normally open (relay reports off when it's open / switch is off and on when it's closed / switch is on)" value="0"/>
+      <Item label="normally closed (relay reports off when it's open / switch is on and on when it's closed / switch is off)" value="1"/>
+      <Item label="normally closed (relay reports off when it's closed / switch is off and on when it's open / switch is on)" value="2"/>
+    </Value>
+    <Value type="list" genre="config" index="23" label="Normally open/close for Relay 3" size="1" min="0" max="2" value="0">
+      <Help>Decide whether you'd like Relay 3 to be normally open (NO) or normally closed (NC). Default normally open.</Help>
+      <Item label="normally open (relay reports off when it's open / switch is off and on when it's closed / switch is on)" value="0"/>
+      <Item label="normally closed (relay reports off when it's open / switch is on and on when it's closed / switch is off)" value="1"/>
+      <Item label="normally closed (relay reports off when it's closed / switch is off and on when it's open / switch is on)" value="2"/>
+    </Value>
+    <Value type="list" genre="config" index="24" label="DC Motor Mode" size="1" min="0" max="1" value="0">
+      <Help>Sync Relay 1 and Relay 2 together to prevent them from being activated at the same time. Default disabled.</Help>
+      <Item label="DC motor mode disabled (relays will always turn on whenever activated)" value="0"/>
+      <Item label="DC motor mode enabled (relay checks the status of the other relay after being triggered and shuts the other relay off before activating so that only one of the relays is on at a time)" value="1"/>
+    </Value>
   </CommandClass>
 
   <!-- Association Groups -->
diff --git a/config/zooz/zen17.xml b/config/zooz/zen17.xml
new file mode 100644
index 00000000..1784b85e
--- /dev/null
+++ b/config/zooz/zen17.xml
@@ -0,0 +1,132 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Zooz ZEN17 Universal Relay</MetaDataItem>
+    <MetaDataItem name="Description"></MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:a00a:7000</MetaDataItem>
+    <MetaDataItem name="ProductPage"></MetaDataItem>
+    <MetaDataItem name="ProductSupport"></MetaDataItem>
+    <MetaDataItem name="ProductPic">images/zooz/zen17.png</MetaDataItem>
+    <MetaDataItem name="ProductManual"></MetaDataItem>
+    <MetaDataItem name="WakeupDescription"></MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Click the button on top of the device 3x quickly</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Click the button on top of the device 3x quickly</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Click the button on top of the device 4x quickly, the LED indicator will light up, then quickly click the button 4x again. The LED indicator will flash 3x to confirm successful reset and will then turn off.</MetaDataItem>
+    <MetaDataItem id="a00a" name="ZWProductPage" type="7000"><!-- url to https://products.z-wavealliance.org/products/XXXX/ page for this specific version of the device --></MetaDataItem>
+	  <!--product page not available as of March 2, 2021 -->
+    <MetaDataItem id="a00a" name="FrequencyName" type="7000">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="a00a" name="Identifier" type="7000">ZEN17</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="2 March 2021" revision="1">Initial configuration from Zooz</Entry>
+	  <Entry author="Jean-Francois Auger - nechry@gmail.com" date="4 feb 2021" revision="2">fix param size error</Entry>
+    </ChangeLog>
+  </MetaData>
+  
+    <!-- Configuration Parameters -->
+	<CommandClass id="112">
+		<Value type="list" genre="config" index="1" label="On Off status after power failure" size="1" min="0" max="4" value="1">
+			<Help>Set the on off status for the relays after power failure</Help>
+			<Item label="All relays forced to off" value="0"/>
+			<Item label="All relays remember and restore on/off status after power failure" value="1"/>
+			<Item label="All relays forced to on" value="2"/>
+			<Item label="Relay 1 remembers and restores on/off status after power failure, Relay 2 forced to on" value="3"/>
+			<Item label="Relay 2 remembers and restores on/off status after power failure, Relay 1 forced to on" value="4"/>
+		</Value>
+		<Value type="list" genre="config" index="2" label="Input type for relay 1" size="1" min="0" max="10" value="2">
+			<Help>Choose the wall switch or input type you want to connect to the S1 C terminals. Important: If you set this parameter to value 4-10, you'll need to exclude and re-include the device (without changing any settings) so that a child device is created for the input of your choice)</Help>
+			<Item label="momentary for lights only" value="0"/>
+			<Item label="toggle switch (light on when the switch is toggled up, light off when the switch is toggled down)" value="1"/>
+			<Item label="toggle switch (state changes whenever the switch is toggled)" value="2"/>
+			<Item label="garage door (momentary mode for Z-Wave control)" value="3"/>
+			<Item label="leak alarm (water sensor)" value="4"/>
+			<Item label="heat alarm" value="5"/>
+			<Item label="motion alert" value="6"/>
+			<Item label="open/close alert (door sensor)" value="7"/>
+			<Item label="CO alarm" value="8"/>
+			<Item label="CO2 alarm" value="9"/>
+			<Item label="on/off report (dry contact sensor/switch)" value="10"/>
+		</Value>
+		<Value type="list" genre="config" index="3" label="Input type for relay 2" size="1" min="0" max="10" value="2">
+			<Help>Choose the wall switch or input type you want to connect to the S1 C terminals. Important: If you set this parameter to value 4-10, you'll need to exclude and re-include the device (without changing any settings) so that a child device is created for the input of your choice)</Help>
+			<Item label="momentary for lights only" value="0"/>
+			<Item label="toggle switch (light on when the switch is toggled up, light off when the switch is toggled down)" value="1"/>
+			<Item label="toggle switch (state changes whenever the switch is toggled)" value="2"/>
+			<Item label="garage door (momentary mode for Z-Wave control)" value="3"/>
+			<Item label="leak alarm (water sensor)" value="4"/>
+			<Item label="heat alarm" value="5"/>
+			<Item label="motion alert" value="6"/>
+			<Item label="open/close alert (door sensor)" value="7"/>
+			<Item label="CO alarm" value="8"/>
+			<Item label="CO2 alarm" value="9"/>
+			<Item label="on/off report (dry contact sensor/switch)" value="10"/>
+		</Value>
+		<Value type="list" genre="config" index="5" label="LED indicator control" size="1" min="0" max="3" value="0">
+			<Help>Choose if you want the LED indicator to turn on when any of the relays are on or if all of them are off, or if you want it to remain on or off at all times.</Help>
+			<Item label="LED on when all relays off, LED off when any relay is on" value="0"/>
+			<Item label="LED off when all relays on, LED off when all relays are off" value="1"/>
+			<Item label="LED always off" value="2"/>
+			<Item label="LED always on" value="3"/>
+		</Value>
+		<Value type="int" genre="config" index="6" label="Auto turn-off timer for relay 1" size="4" min="0" max="65535" value="0" units="">
+			<Help>Use this parameter to set the time after which you want the device connected to relay 1 to automatically turn off once it has been turned on. The number entered as value corresponds to the unit type set by parameter 15 (minutes, seconds or hours)</Help>
+		</Value>
+		<Value type="int" genre="config" index="7" label="Auto turn-on timer for relay 1" size="4" min="0" max="65535" value="0" units="">
+			<Help>Use this parameter to set the time after which you want the device connected to relay 1 to automatically turn on once it has been turned off. The number entered as value corresponds to the unit type set by parameter 16 (minutes, seconds or hours)</Help>
+		</Value>
+		<Value type="int" genre="config" index="8" label="Auto turn-off timer for relay 2" size="4" min="0" max="65535" value="0" units="">
+			<Help>Use this parameter to set the time after which you want the device connected to relay 2 to automatically turn off once it has been turned on. The number entered as value corresponds to the unit type set by parameter 17 (minutes, seconds or hours)</Help>
+		</Value>
+		<Value type="int" genre="config" index="9" label="Auto turn-on timer for relay 2" size="4" min="0" max="65535" value="0" units="">
+			<Help>Use this parameter to set the time after which you want the device connected to relay 2 to automatically turn on once it has been turned off. The number entered as value corresponds to the unit type set by parameter 18 (minutes, seconds or hours)</Help>
+		</Value>
+		<Value type="list" genre="config" index="10" label="Input trigger for relay 1" size="1" min="0" max="1" value="1">
+			<Help>Choose if you'd like the connected input(switch) on S1 C / VC C to trigger the load connected to R1 or if you want to use the input reports for monitoring only and separate the output from the input.</Help>
+			<Item label="input trigger disabled" value="0"/>
+			<Item label="input trigger enabled" value="1"/>
+		</Value>
+		<Value type="list" genre="config" index="11" label="Input trigger for relay 2" size="1" min="0" max="1" value="1">
+			<Help>Choose if you'd like the connected input(switch) on S2 C / VC C to trigger the load connected to R2 or if you want to use the input reports for monitoring only and separate the output from the input.</Help>
+			<Item label="input trigger disabled" value="0"/>
+			<Item label="input trigger enabled" value="1"/>
+		</Value>
+		<Value type="list" genre="config" index="15" label="Auto turn-off timer unit for relay 1" size="1" min="0" max="2" value="0">
+			<Help>Choose between seconds, minutes and hours as the unit for the auto turn-off timer for relay 1 (parameter 6)</Help>
+			<Item label="minutes" value="0"/>
+			<Item label="seconds" value="1"/>
+			<Item label="hours" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="16" label="Auto turn-on timer unit for relay 1" size="1" min="0" max="2" value="0">
+			<Help>Choose between seconds, minutes and hours as the unit for the auto turn-on timer for relay 1 (parameter 7)</Help>
+			<Item label="minutes" value="0"/>
+			<Item label="seconds" value="1"/>
+			<Item label="hours" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="17" label="Auto turn-off timer unit for relay 2" size="1" min="0" max="2" value="0">
+			<Help>Choose between seconds, minutes and hours as the unit for the auto turn-off timer for relay 2 (parameter 8)</Help>
+			<Item label="minutes" value="0"/>
+			<Item label="seconds" value="1"/>
+			<Item label="hours" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="18" label="Auto turn-on timer unit for relay 2" size="1" min="0" max="2" value="0">
+			<Help>Choose between seconds, minutes and hours as the unit for the auto turn-on timer for relay 2 (parameter 9)</Help>
+			<Item label="minutes" value="0"/>
+			<Item label="seconds" value="1"/>
+			<Item label="hours" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="24" label="DC motor mode" size="1" min="0" max="1" value="0">
+			<Help>Sync R1 and R2 together to prevent them from being activated at the same time.</Help>
+			<Item label="DC motor mode disabled" value="0"/>
+			<Item label="DC motor mode enabled (relay will check the status of the other relay after being triggered and will shut the other relay off before activating so that only one of the relays is on at the same time)" value="1"/>
+			<Item label="hours" value="2"/>
+		</Value>
+	</CommandClass>
+	
+    <!-- Association Groups -->
+    <CommandClass id="133">
+      <Associations num_groups="3">
+        <Group index="1" label="Lifeline" max_associations="1"/>
+        <Group index="2" label="Group 2" max_associations="5"/>
+	    <Group index="3" label="Group 3" max_associations="5"/>
+      </Associations>
+    </CommandClass>
+	
+</Product>
\ No newline at end of file
diff --git a/config/zooz/zen20v2.xml b/config/zooz/zen20v2.xml
index 248dc866..d8e5c066 100644
--- a/config/zooz/zen20v2.xml
+++ b/config/zooz/zen20v2.xml
@@ -1,4 +1,4 @@
-<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027A:A004:A000</MetaDataItem>
     <MetaDataItem name="ProductPic">images/zooz/zen20v2.png</MetaDataItem>
@@ -37,6 +37,8 @@ NOTE: All previously recorded activity and custom settings EXCEPT for the kWh re
 4. You will see 7 or 8 new on/off devices in your app: 5 channels or on/off control, 2 channels for on/off monitoring (USB ports reporting charging/ charged status, no control), and possibly one master node to access and adjust advanced settings in.</MetaDataItem>
     <ChangeLog>
       <Entry author="Justin Hammond - Justin@dynam.ac" date="03 Jun 2019" revision="2">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3158/xml</Entry>
+      <Entry author="Brett Daugherty" date="22 Jul 2020" revision="3">Update parameters for firmware 2.0.3</Entry>
+
     </ChangeLog>
   </MetaData>
   <!-- https://products.z-wavealliance.org/products/3158 -->
@@ -152,6 +154,47 @@ NOTE: All previously recorded activity and custom settings EXCEPT for the kWh re
       <Item label="Normal" value="1"/>
       <Item label="Always Off" value="2"/>
     </Value>
+    <Value genre="config" index="28" label="Enable/Disable Energy Monitoring Reports" max="1" min="0" size="1" type="list" units="" value="1">
+      <Help>Disable or enable energy monitoring for the entire devie. None of the outlets will send any power or energy related reports back to the hub if energy monitoring is disabled. Use this optoin to minimize the amount or reports you want to receive from the Power Strip. (Firmware > 2.0.3)</Help>
+      <Item label="Energy monitoring reports disabled" value="0"/>
+      <Item label="Energy monitoring reports enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="29" label="Enable/Disable Energy Monitoring Reports for CH1" max="1" min="0" size="1" type="list" units="" value="1">
+      <Help>Disable or enabled energy monitoring for CH1. (Firmware > 2.03)</Help>
+      <Item label="Energy monitoring reports disabled" value="0"/>
+      <Item label="Energy monitoring reports enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="30" label="Enable/Disable Energy Monitoring Reports for CH2" max="1" min="0" size="1" type="list" units="" value="1">
+      <Help>Disable or enabled energy monitoring for CH2. (Firmware > 2.03)</Help>
+      <Item label="Energy monitoring reports disabled" value="0"/>
+      <Item label="Energy monitoring reports enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="31" label="Enable/Disable Energy Monitoring Reports for CH3" max="1" min="0" size="1" type="list" units="" value="1">
+      <Help>Disable or enabled energy monitoring for CH3. (Firmware > 2.03)</Help>
+      <Item label="Energy monitoring reports disabled" value="0"/>
+      <Item label="Energy monitoring reports enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="32" label="Enable/Disable Energy Monitoring Reports for CH4" max="1" min="0" size="1" type="list" units="" value="1">
+      <Help>Disable or enabled energy monitoring for CH4. (Firmware > 2.03)</Help>
+      <Item label="Energy monitoring reports disabled" value="0"/>
+      <Item label="Energy monitoring reports enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="33" label="Enable/Disable Energy Monitoring Reports for CH5" max="1" min="0" size="1" type="list" units="" value="1">
+      <Help>Disable or enabled energy monitoring for CH5. (Firmware > 2.03)</Help>
+      <Item label="Energy monitoring reports disabled" value="0"/>
+      <Item label="Energy monitoring reports enabled" value="1"/>
+    </Value>
+    <Value genre="config" index="34" label="Enable/Disable USB Reports" max="1" min="0" size="1" type="list" units="" value="0">
+      <Help>Disable or enable on/off reports send from the USB ports when a connected device is charging (drawing power) or not charging (not drawing power). (Firmware > 2.03)</Help>
+      <Item label="USB Reports Enabled" value="0"/>
+      <Item label="USB Reports Disabled" value="1"/>
+    </Value>
+    <Value genre="config" index="35" label="Electrical Current (A) Report Frequency" max="2678400" min="0" size="4" type="int" units="seconds" value="0">
+      <Help>0 = disabled; 30-2678400 = time in seconds to send current (A) report (Firmware > 2.03)</Help>
+    </Value>
+    <Value genre="config" index="36" label="Voltage (V) Report Frequency" max="2678400" min="0" size="4" type="int" units="seconds" value="2678400">
+      <Help>0 = disabled; 30-2678400 = time in seconds to send voltage (v) report (Firmware > 2.03)</Help>
+    </Value>
   </CommandClass>
   <!-- Association Groups -->
   <CommandClass id="133">
diff --git a/config/zooz/zen21v3.xml b/config/zooz/zen21v3.xml
index e17c47bd..ca3c9cd9 100644
--- a/config/zooz/zen21v3.xml
+++ b/config/zooz/zen21v3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="3">
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="4">
 	<MetaData>
 		<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:1e1c:b111</MetaDataItem>
 		<MetaDataItem name="ProductPic">images/zooz/zen21v3.png</MetaDataItem>
@@ -64,6 +64,7 @@ tap-tap-tap-and-hold: factory reset
 		<ChangeLog>
 			<Entry author="Brad Parker - https://github.com/bepsoccer" date="13 April 2020" revision="2">Updated for firmware version 3.04</Entry>
 			<Entry author="Matthew Grimes" date="12 June 2020" revision="3">Rename XML for correct hardware version</Entry>
+			<Entry author="Matthew Grimes" date="18 June 2020" revision="4">Update parameter 12 description</Entry>
 		</ChangeLog>
 	</MetaData>
 	<!-- Configuration Parameters -->
@@ -134,7 +135,7 @@ tap-tap-tap-and-hold: factory reset
 			<Item label="physical paddle and Z-Wave control disabled" value="2" />
 		</Value>
 		<Value type="list" genre="config" instance="1" index="12" label="3-Way Switch Type" units="" min="0" max="1" value="0" size="1">
-			<Help>Choose the type of 3-way switch you want to use with this dimmer in a 3-way set-up. Changing this setting can allow you to control brightness and dim the light from both 3-way locations. Use a regular momentary switch (like the Zooz ZAC99 accessory switch) if value is set to 2.</Help>
+			<Help>Choose the type of 3-way switch you want to use with this switch in a 3-way set-up.</Help>
 			<Item label="regular mechanical 3-way on/off switch(default)" value="0" />
 			<Item label="momentary switch, click once to change status (light on or off)" value="1" />
 		</Value>
diff --git a/config/zooz/zen23v3.xml b/config/zooz/zen23v3.xml
new file mode 100644
index 00000000..5ab2bb29
--- /dev/null
+++ b/config/zooz/zen23v3.xml
@@ -0,0 +1,138 @@
+<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">ZEN23 Toggle Switch V3</MetaDataItem>
+    <MetaDataItem name="Description">Product features:
+- Manual or remote on/off control from your mobile device or computer (when included to a Z-Wave gateway controller)
+- Z-Wave Plus with improved 500 chip for faster and safer wireless communication
+- Works with LED, CFL, and incandescent bulbs (minimum 15Watts on load required)
+- Based on simple and universal binary switch command class - supported by most Z-Wave controllers
+- May be associated and grouped with other Z-Wave devices for advanced home automation
+- Built-in Z-Wave signal repeater for a stronger and more reliable network 
+
+Specifications:
+- Z-Wave Signal Frequency: 908.42 MHz
+- Power: 120 V, 60 Hz
+- Maximum Load: 960W Incandescent, 150W LED and CFL bulbs, 1800W (15A) Resistive
+- Range: Up to 100 feet line of sight
+- Installation and Use: Indoor Only
+- Operating Temperature: 32-104° F (0-40° C)
+- Dimensions: 4 1/8" tall x 2 1/8" wide (with heat sink tabs,1 3/4" without the tabs) x 1 3/8" deep
+- Weight: 10 oz
+
+
+https://www.support.getzooz.com/kb/article/301-zen23-toggle-switch-change-log/
+https://www.support.getzooz.com/kb/article/317-zen23-on-off-toggle-switch-ver-3-05-advanced-settings/
+MANUAL CONTROL
+Toggle Up: 
+1 x tap: load on; Scene 1, attribute 00 (button 1)
+2 x tap: Scene 1, attribute 03 (button 3)
+3 x tap: enter inclusion (pairing) mode; Scene 1, attribute 04 (button 5)
+4 x tap: Scene 1, attribute 05 (button 7)
+6 x tap: change LED indicator mode (see parameter 2)
+10 x tap: change physical / Z-Wave control mode (see parameter 11)
+tap-tap-tap-and-hold: factory reset
+
+Toggle Down: 
+1 x tap: load off; Scene 2, attribute 00 (button 2)
+2 x tap: Scene 2, attribute 03 (button 4)
+3 x tap: enter exclusion (unpairing) mode; Scene 2, attribute 04 (button 6)
+4 x tap: Scene 2, attribute 05 (button 8)
+tap-tap-tap-and-hold: factory reset</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:251c:b111</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://getzooz.com/zooz-zen23-24-toggle-switch.html</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.support.getzooz.com/kb/tag/3/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/zooz/zen23v3.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://cdn.shopify.com/s/files/1/0218/7704/files/zooz-z-wave-plus-toggle-switch-zen23-ver3-manual.pdf?26</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Initiate inclusion at your hub. 2. Toggle up 3 times very quickly at the switch.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Put the Z-Wave hub into exclusion mode. 2. Toggle the switch down 3 times quickly.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">If your primary controller is missing or inoperable, you may need to reset the device to factory settings. To complete the reset process manually, toggle-toggle-toggle’n’hold down for at least 10 seconds.</MetaDataItem>
+    <MetaDataItem id="251c" name="FrequencyName" type="b111">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="251c" name="Identifier" type="b111">ZEN23v3</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="14 June 2020" revision="1">Initial configuration from Zooz product help pages</Entry>
+      <Entry author="FuzzyMistborn - https://github.com/FuzzyMistborn" date="09 February 2021" revision="2">Correct typo of Parameter 19 to Parameter 12</Entry>
+    </ChangeLog>
+  </MetaData>
+ 
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" instance="1" index="1" value="0" label="On/Off Toggle Orientation" units="" size="1" min="0" max="2" type="list">
+      <Help>Normal mode: Toggle up turns the light on, toggle down turns the light off. Reverse mode: Toggle up turns the light off, toggle down turns the light on. Toggle mode: Either direction toggles the light.</Help>
+      <Item value="0" label="Toggle up to turn the light on, toggle down to turn it off (default)"/>
+      <Item value="1" label="Toggle up to turn the light off, toggle down to turn it on"/>
+	  <Item value="2" label="Toggle up or down to turn light on/off (change state)"/>
+    </Value>
+    <Value genre="config" instance="1" index="3" value="0" label="Auto Turn-Off Timer" units="" size="1" min="0" max="1" type="list">
+      <Help>Use this parameter to enable or disable the auto turn-off timer function.</Help>
+      <Item value="0" label="Timer disabled (default)"/>
+      <Item value="1" label="Timer enabled"/>
+    </Value>
+    <Value genre="config" instance="1" index="4" value="60" label="Auto Turn-Off Timer Duration" units="minutes" size="4" min="1" max="65535" type="int">
+      <Help>Time, in minutes, for auto-off timer delay.</Help>
+    </Value>
+    <Value genre="config" instance="1" index="5" value="0" label="Auto Turn-On Timer" units="" size="1" min="0" max="1" type="list">
+      <Help>Use this parameter to enable or disable the auto turn-on timer function.</Help>
+      <Item value="0" label="Timer disabled (default)"/>
+      <Item value="1" label="Timer enabled"/>
+    </Value>
+    <Value genre="config" instance="1" index="6" value="60" label="Auto Turn-On Timer Duration" units="minutes" size="4" min="1" max="65535" type="int">
+      <Help>Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off.</Help>
+    </Value>
+	<Value type="list" genre="config" instance="1" index="7" label="Association Reports" units="" min="0" max="15" value="15" size="1">
+	  <Help>Choose which physical and Z-Wave triggers should prompt the switch to send a status change report to associated devices.</Help>
+	  <Item label="None" value="0" />
+	  <Item label="Physical tap on ZEN23 only" value="1" />
+	  <Item label="Physical tap on connected 3-way switch only" value="2" />
+	  <Item label="Physical tap on ZEN23 or connected 3-way switch" value="3" />
+	  <Item label="Z-Wave command from hub" value="4" />
+	  <Item label="Physical tap on ZEN23 or Z-Wave command from hub" value="5" />
+	  <Item label="Physical tap on connected 3-way switch or Z-Wave command from hub" value="6" />
+	  <Item label="Physical tap on ZEN23 / connected 3-way switch or Z-Wave command from hub" value="7" />
+	  <Item label="Timer only" value="8" />
+	  <Item label="Physical tap on ZEN23 or timer" value="9" />
+	  <Item label="Physical tap on connected 3-way switch or timer" value="10" />
+	  <Item label="Physical tap on ZEN23 / connected 3-way switch or timer" value="11" />
+	  <Item label="Z-Wave command from hub or timer" value="12" />
+	  <Item label="Physical tap on ZEN23, Z-Wave command from hub, or timer" value="13" />
+	  <Item label="Physical tap on ZEN23 / connected 3-way switch, Z-Wave command from hub, or timer" value="14" />
+	  <Item label="All of the above. (default)" value="15" />
+	</Value>
+    <Value genre="config" instance="1" index="8" value="2" label="On Off Status After Power Failure" units="" size="1" min="0" max="2" type="list">
+      <Help>Status after Power Failure</Help>
+      <Item value="0" label="Off"/>
+      <Item value="1" label="On"/>
+      <Item value="2" label="Restore"/>
+    </Value>
+    <Value genre="config" instance="1" index="9" value="0" label="Enable/Disable Scene Control" units="" size="1" min="0" max="1" type="list">
+      <Help>Enable or disable scene control functionality for quick double tap triggers.</Help>
+      <Item value="0" label="Scene control disabled (default)."/>
+      <Item value="1" label="Scene Control enabled"/>
+    </Value>
+    <Value genre="config" instance="1" index="11" value="1" label="Smart Bulb Mode: Enable/Disable Paddle / Z-Wave Control" units="" size="1" min="0" max="2" type="list">
+      <Help>Enable or disable manual on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through the physical switch.</Help>
+      <Item value="0" label="Physical toggle control disabled."/>
+      <Item value="1" label="Physical toggle control enabled (default)."/>
+      <Item value="2" label="Physical toggle and Z-Wave control disabled. NOTE: toggle the switch up 10 times quickly to change this mode."/>
+    </Value>
+	<Value type="list" genre="config" instance="1" index="13" label="Reporting behavior with disabled physical control" units="" min="0" max="1" value="0" size="1">
+      <Help>Set reporting behavior for disabled physical control.</Help>
+	  <Item label="Switch reports on/off status and changes LED indicator state even if physical and Z-Wave control is disabled (default)" value="0" />
+	  <Item label="Switch doesn't report on/off status or change LED indicator state when physical (and Z-Wave) control is disabled" value="1" />
+	</Value>
+	<Value type="list" genre="config" instance="1" index="12" label="3-Way Switch Type" units="" min="0" max="1" value="0" size="1">
+	  <Help>Choose the type of 3-way switch you want to use in a 3-way set-up.</Help>
+	  <Item label="Regular mechanical 3-way on/off switch, use the connected 3-way switch to turn the light on or off (default)" value="0" />
+	  <Item label="Momentary switch, click once to change status (light on or off)." value="1" />
+	</Value>
+  </CommandClass>
+ 
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" label="Lifeline" max_associations="1" />
+      <Group index="2" label="Group 2" max_associations="5" />
+      <Group index="3" label="Group 3" max_associations="5" />
+    </Associations>
+  </CommandClass>
+ 
+</Product>
diff --git a/config/zooz/zen24v2.xml b/config/zooz/zen24v2.xml
index fb294384..3fc6437a 100644
--- a/config/zooz/zen24v2.xml
+++ b/config/zooz/zen24v2.xml
@@ -1,4 +1,4 @@
-<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="Name">ZEN24 Dimmer Switch V2</MetaDataItem>
     <MetaDataItem name="Description">Product features:
@@ -52,6 +52,8 @@ tap-tap-tap-and-hold: factory reset</MetaDataItem>
     <MetaDataItem id="261c" name="Identifier" type="b112">ZEN24v2</MetaDataItem>
     <ChangeLog>
       <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="14 June 2020" revision="1">Initial configuration from Zooz product help pages</Entry>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="10 Feb 2021" revision="2">Fix minimum value for parameter 9</Entry>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="28 Feb 2021" revision="3">Fix maximum value for parameter 15</Entry>
     </ChangeLog>
   </MetaData>
  
@@ -104,7 +106,7 @@ tap-tap-tap-and-hold: factory reset</MetaDataItem>
       <Item value="1" label="On"/>
       <Item value="2" label="Restore"/>
     </Value>
-    <Value genre="config" instance="1" index="9" value="1" label="Ramp Rate Control" units="seconds" size="1" min="1" max="99" type="byte">
+    <Value genre="config" instance="1" index="9" value="1" label="Ramp Rate Control" units="seconds" size="1" min="0" max="99" type="byte">
       <Help>Adjust the physical ramp rate for your dimmer (fade-in / fade-out effect for on / off operation). Values correspond to the number of seconds it take for the dimmer to reach full brightness or turn off when operated manually. This setting is for physical taps only, see parameter 17 to adjust Z-Wave ramp rate. Values: 1 – 99 (seconds). 0 – instant on/off. Default: 1</Help>
     </Value>
     <Value genre="config" instance="1" index="10" value="1" label="Minimum Brightness" units="percent" size="1" min="1" max="99" type="byte">
@@ -129,11 +131,11 @@ tap-tap-tap-and-hold: factory reset</MetaDataItem>
       <Item value="1" label="Double tap to full / maximum brightness level disabled, single tap turns light on to last brightness level."/>
       <Item value="2" label="Double tap to full / maximum brightness level disabled, single tap turns light on to full / maximum brightness level."/>
     </Value>
-    <Value genre="config" instance="1" index="15" value="1" label="Smart Bulb Mode: Enable/Disable Paddle / Z-Wave Control" units="" size="1" min="0" max="1" type="list">
+    <Value genre="config" instance="1" index="15" value="1" label="Smart Bulb Mode: Enable/Disable Paddle / Z-Wave Control" units="" size="1" min="0" max="2" type="list">
       <Help>Enable or disable manual on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through the physical switch.</Help>
       <Item value="0" label="Physical toggle control disabled."/>
       <Item value="1" label="Physical toggle control enabled (default)."/>
-	  <Item value="2" label="Physical toggle and Z-Wave control disabled. NOTE: toggle the switch up 10 times quickly to change this mode."/>
+      <Item value="2" label="Physical toggle and Z-Wave control disabled. NOTE: toggle the switch up 10 times quickly to change this mode."/>
     </Value>
 	<Value type="byte" genre="config" instance="1" index="16" label="Physical Dimming Speed" units="" min="1" max="99" value="4">
 	  <Help>Set the time it takes to get from 0% to 100% brightness when pressing and holding the toggle (physical dimming). The number entered as value corresponds to the number of seconds. Default 4.</Help>
diff --git a/config/zooz/zen32.xml b/config/zooz/zen32.xml
new file mode 100644
index 00000000..3bbe6971
--- /dev/null
+++ b/config/zooz/zen32.xml
@@ -0,0 +1,172 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Zooz ZEN32 Scene Controller</MetaDataItem>
+    <MetaDataItem name="Description"></MetaDataItem>
+	<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:a008:7000</MetaDataItem>
+    <MetaDataItem name="ProductPage"></MetaDataItem>
+    <MetaDataItem name="ProductSupport"></MetaDataItem>
+    <MetaDataItem name="ProductPic">images/zooz/zen32.png</MetaDataItem>
+    <MetaDataItem name="ProductManual"></MetaDataItem>
+    <MetaDataItem name="WakeupDescription"></MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Click the large button 3 times quickly.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Click the large button 3 times quickly.</MetaDataItem>
+    <MetaDataItem name="ResetDescription"></MetaDataItem>
+    <MetaDataItem id="a008" name="ZWProductPage" type="7000"><!-- url to https://products.z-wavealliance.org/products/XXXX/ page for this specific version of the device --></MetaDataItem>
+	  <!--product page not available as of March. 1, 2021 -->
+    <MetaDataItem id="a008" name="FrequencyName" type="7000">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="a008" name="Identifier" type="7000">ZEN32</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="1 March 2021" revision="1">Initial configuration from Zooz</Entry>
+    </ChangeLog>
+  </MetaData>
+
+    <!-- Configuration Parameters -->
+	<CommandClass id="112">
+		<Value type="list" genre="config" index="1" label="LED indicator mode for relay" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="LED on when relay off, LED off when relay on" value="0"/>
+			<Item label="LED on when relay on, LED off when relay off" value="1"/>
+			<Item label="LED always off" value="2"/>
+			<Item label="LED always on" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="2" label="LED indicator mode for Button 1" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="LED on when dimmer off, LED off when dimmer on" value="0"/>
+			<Item label="LED on when dimmer on, LED off when dimmer off" value="1"/>
+			<Item label="LED always off" value="2"/>
+			<Item label="LED always on" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="3" label="LED indicator mode for Button 2" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="LED on when dimmer off, LED off when dimmer on" value="0"/>
+			<Item label="LED on when dimmer on, LED off when dimmer off" value="1"/>
+			<Item label="LED always off" value="2"/>
+			<Item label="LED always on" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="4" label="LED indicator mode for Button 3" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="LED on when dimmer off, LED off when dimmer on" value="0"/>
+			<Item label="LED on when dimmer on, LED off when dimmer off" value="1"/>
+			<Item label="LED always off" value="2"/>
+			<Item label="LED always on" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="5" label="LED indicator mode for Button 4" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="LED on when dimmer off, LED off when dimmer on" value="0"/>
+			<Item label="LED on when dimmer on, LED off when dimmer off" value="1"/>
+			<Item label="LED always off" value="2"/>
+			<Item label="LED always on" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="6" label="LED indicator color for relay" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="white" value="0"/>
+			<Item label="blue" value="1"/>
+			<Item label="green" value="2"/>
+			<Item label="red" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="7" label="LED indicator color for Button 1" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="white" value="0"/>
+			<Item label="blue" value="1"/>
+			<Item label="green" value="2"/>
+			<Item label="red" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="8" label="LED indicator color for Button 2" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="white" value="0"/>
+			<Item label="blue" value="1"/>
+			<Item label="green" value="2"/>
+			<Item label="red" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="9" label="LED indicator color for Button 3" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="white" value="0"/>
+			<Item label="blue" value="1"/>
+			<Item label="green" value="2"/>
+			<Item label="red" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="10" label="LED indicator color for Button 4" size="1" min="0" max="3" value="0">
+			<Help></Help>
+			<Item label="white" value="0"/>
+			<Item label="blue" value="1"/>
+			<Item label="green" value="2"/>
+			<Item label="red" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="11" label="LED indicator brightness for relay" size="1" min="0" max="2" value="0">
+			<Help></Help>
+			<Item label="bright (100%)" value="0"/>
+			<Item label="medium (60%)" value="1"/>
+			<Item label="low (30%)" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="12" label="LED indicator brightness for Button 1" size="1" min="0" max="2" value="0">
+			<Help></Help>
+			<Item label="bright (100%)" value="0"/>
+			<Item label="medium (60%)" value="1"/>
+			<Item label="low (30%)" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="13" label="LED indicator brightness for Button 2" size="1" min="0" max="2" value="0">
+			<Help></Help>
+			<Item label="bright (100%)" value="0"/>
+			<Item label="medium (60%)" value="1"/>
+			<Item label="low (30%)" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="14" label="LED indicator brightness for Button 3" size="1" min="0" max="2" value="0">
+			<Help></Help>
+			<Item label="bright (100%)" value="0"/>
+			<Item label="medium (60%)" value="1"/>
+			<Item label="low (30%)" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="15" label="LED indicator brightness for Button 4" size="1" min="0" max="2" value="0">
+			<Help></Help>
+			<Item label="bright (100%)" value="0"/>
+			<Item label="medium (60%)" value="1"/>
+			<Item label="low (30%)" value="2"/>
+		</Value>
+		<Value type="int" genre="config" index="16" label="Auto turn-off timer for relay" size="4" min="0" max="65535" value="0" units="minutes">
+			<Help>Set the time (in minutes) after which you want the switch to automatically turn off once it has been turned on.</Help>
+		</Value>
+		<Value type="int" genre="config" index="17" label="Auto turn-on timer for relay" size="4" min="0" max="65535" value="0" units="minutes">
+			<Help>Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off.</Help>
+		</Value>
+		<Value type="list" genre="config" index="18" label="State after power failure" size="1" min="0" max="2" value="0">
+			<Help></Help>
+			<Item label="Relay and buttons remember and restore last state" value="0"/>
+			<Item label="Relay and buttons forced to off after power failure" value="1"/>
+			<Item label="Relay and buttons forced to on after power failure" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="19" label="Disable / enable control on the relay" size="1" min="0" max="2" value="1">
+			<Help></Help>
+			<Item label="Disable local / physical control (from the button), enable Z-Wave control" value="0"/>
+			<Item label="Enable local / physical control (from the button), enable Z-Wave control" value="1"/>
+			<Item label="Disable local / physical control (from the button), disable Z-Wave control" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="20" label="Relay behavior with disabled local / Z-Wave control" size="1" min="0" max="1" value="1">
+			<Help></Help>
+			<Item label="report on/off status when button is pressed and change LED indicator status if Parameter 19 is set to value 0 or 2" value="0"/>
+			<Item label="DON’T report on/off status when button is pressed and DON’T change LED indicator status if Parameter 19 is set to value 0 or 2 (but the relay will always send central scene command)" value="1"/>
+		</Value>
+		<Value type="list" genre="config" index="21" label="3-way switch type" size="1" min="0" max="1" value="0">
+			<Help>Choose the type of 3-way switch you want to use with this switch in a 3-way set-up.</Help>
+			<Item label="regular mechanical 3-way on/off switch, use the connected 3-way switch to turn the light on or off (default)" value="0"/>
+			<Item label="momentary switch, click once to change status (light on or off)" value="1"/>
+		</Value>
+	</CommandClass>
+	
+    <!-- Association Groups -->
+    <CommandClass id="133">
+      <Associations num_groups="11">
+        <Group index="1" label="Group 1: Main button binary switch (Z-Wave) / basic set (button) lifeline to hub" max_associations="1"/>
+        <Group index="2" label="Group 2: Main button basic set (pressed only, doesn’t send anything when switch turned on via hub)" max_associations="5"/>
+	    <Group index="3" label="Group 3: Main button multilevel (held)" max_associations="5"/>
+		<Group index="4" label="Group 4: Small button #1 basic set (pressed)" max_associations="5"/>
+		<Group index="5" label="Group 5: Small button #1 multilevel (held) > in sequence > held = increase brightness, release = stop level, held = decrease brightness, release = stop level" max_associations="5"/>
+		<Group index="6" label="Group 6: Small button #2 basic set (pressed)" max_associations="5"/>
+		<Group index="7" label="Group 7: Small button #2 multilevel (held) > in sequence > held = increase brightness, release = stop level, held = decrease brightness, release = stop level" max_associations="5"/>
+		<Group index="8" label="Group 8: Small button #3 basic set (pressed)" max_associations="5"/>
+		<Group index="9" label="Group 9: Small button #3 multilevel (held) > in sequence > held = increase brightness, release = stop level, held = decrease brightness, release = stop level" max_associations="5"/>
+		<Group index="10" label="Group 10: Small button #4 basic set (pressed)" max_associations="5"/>
+		<Group index="11" label="Group 11: Small button #4 multilevel (held) > in sequence > held = increase brightness, release = stop level, held = decrease brightness, release = stop level" max_associations="5"/>
+      </Associations>
+    </CommandClass>
+	
+</Product>
diff --git a/config/zooz/zen34.xml b/config/zooz/zen34.xml
new file mode 100644
index 00000000..2a0e655e
--- /dev/null
+++ b/config/zooz/zen34.xml
@@ -0,0 +1,86 @@
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">ZEN34 Remote Switch</MetaDataItem>
+    <MetaDataItem name="Description">FEATURES:
+- Control Z-Wave devices or activate scenes with the multi-tap feature
+- Wire-free: the perfect add-on switch to put in an existing switch box or install on any flat surface
+- Scene Control (select hubs only): trigger up to 8 scenes or control up to 8 devices with multi-tap control.*
+- Smart bulb control: use scene control or direct association (for Z-Wave bulbs only) to turn your smart bulbs on and off through wireless signal instead of cutting power to them
+- New 700 Z-Wave chip: more range and faster speed than ever
+- Adjustable LED indicator: choose from 4 colors and 3 brightness levels
+- S2 security protocol and AES-128 bank-grade encryption
+
+SPECIFICATIONS:
+- Model Number: ZEN34
+- Z-Wave Signal Frequency: 908.42 MHz
+- Power: 2 x CR2032 batteries
+- Range: Up to 250 feet line of sight
+- Operating Temperature: 32-104° F (0-40° C)
+- Installation and Use: Indoor only</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:F001:0004</MetaDataItem>
+    <MetaDataItem name="ProductPage">http://www.getzooz.com/</MetaDataItem>
+    <MetaDataItem name="ProductSupport">http://www.support.getzooz.com/kb/section/185</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/zooz/zen34.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://opensmarthouse.org/zwavedatabase/1310/reference/zooz-zen34-manual-curves.pdf</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Put the primary controller into inclusion mode and click the upper paddle 6 times quickly. The LED indicator will blink blue during the process and light up green once added successfully. It will light up red if failed.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Put the primary controller into exclusion mode and click the lower paddle 6 times quickly.</MetaDataItem>
+	<MetaDataItem name="WakeupDescription">Click the upper paddle 7 times quickly. The LED indicator will stay solid blue during wakeup and will turn off when the device turns the Z-Wave radio off again.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">When your network's primary controller is missing or otherwise inoperable, you may need to reset the device to factory settings manually. In order to complete the process, make sure the device is powered, then taptap- tap'and'hold the upper paddle. The LED indicator will blink red 5 times to indicate successful reset.</MetaDataItem>
+    <MetaDataItem id="F001" name="Identifier" type="0004">ZEN34</MetaDataItem>
+    <MetaDataItem id="F001" name="FrequencyName" type="0004">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="F001" name="ZWProductPage" type="0004">https://products.z-wavealliance.org/products/xxxx</MetaDataItem>
+	  <!--product page not available as of 11/17/20 -->
+    <MetaDataItem id="F001" name="Identifier" type="7000">ZEN34</MetaDataItem>
+    <MetaDataItem id="F001" name="FrequencyName" type="7000">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="F001" name="ZWProductPage" type="7000">https://products.z-wavealliance.org/products/xxxx</MetaDataItem>
+	  <!--still unable to locate a product page as of Jan. 31, 2021 -->
+    <ChangeLog>
+      <Entry author="momo" date="16 Nov 2020" revision="1">Initial Metadata Import</Entry>
+      <Entry author="Matthew Grimes, https://github.com/cybergrimes" date="31 Jan 2021" revision="2">Update to include hardware run with different type code</Entry>
+      <Entry author="Matthew Grimes, https://github.com/cybergrimes" date="9 Feb 2021" revision="3">Fix small typo</Entry>
+    </ChangeLog>
+  </MetaData>
+
+  <!-- https://products.z-wavealliance.org/products/xxxx not yet available-->
+
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+	
+    <Value genre="config" index="1" value="1" label="LED Indicator Mode" size="1" min="0" max="3" type="list">
+      <Help>Choose the LED indicator mode for your Remote Switch</Help>
+      <Item value="0" label="LED always off"/>
+      <Item value="1" label="LED on when button is pressed"/>
+      <Item value="2" label="LED always on in color specified in parameter 2"/>
+      <Item value="3" label="LED always on in color specified in parameter 3"/>    
+	</Value>
+    <Value genre="config" index="2" value="1" label="LED color for UPPER paddle" size="1" min="0" max="6" type="list">
+      <Help>Choose the LED indicator color for the UPPER paddle remote control triggers</Help>
+      <Item value="0" label="white"/>
+      <Item value="1" label="blue"/>
+      <Item value="2" label="green"/>
+      <Item value="3" label="red"/>
+      <Item value="4" label="magenta"/>
+      <Item value="5" label="yellow"/>
+	  <Item value="6" label="cyan"/>
+	</Value>
+    <Value genre="config" index="3" value="1" label="LED color for LOWER paddle" size="1" min="0" max="6" type="list">
+      <Help>Choose the LED indicator color for the LOWER paddle remote control triggers</Help>
+      <Item value="0" label="white"/>
+      <Item value="1" label="blue"/>
+      <Item value="2" label="green"/>
+      <Item value="3" label="red"/>
+      <Item value="4" label="magenta"/>
+      <Item value="5" label="yellow"/>
+	  <Item value="6" label="cyan"/>
+	</Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="3">
+      <Group index="1" max_associations="1" label="Lifeline"/>
+      <Group index="2" max_associations="5" label="Basic Set"/>
+      <Group index="3" max_associations="5" label="Switch Multilevel"/>
+    </Associations>
+  </CommandClass>
+</Product>
diff --git a/config/zooz/zen71.xml b/config/zooz/zen71.xml
new file mode 100644
index 00000000..5b8c7e50
--- /dev/null
+++ b/config/zooz/zen71.xml
@@ -0,0 +1,142 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Zooz ZEN71 On Off Switch</MetaDataItem>
+    <MetaDataItem name="Description">FEATURES:
+- Control lights from the wall switch or wirelessly with Z-Wave 
+- On / off only for instant switching (get the dimmer here)
+- NEW in 700 series: smaller profile (just 1.1" deep) to fit easily in a crowded or shallow box; replaceable paddles (almond, brown, and black paddle kits available)
+- 700 chip: more range, faster signal, SmartStart inclusion + S2 security
+- Direct 3-Way Solution: no add-on switch needed, wires just like the ZEN21 model (Neutral required, 4-Way wiring possible if direct connection to load and line are in the same box, check before buying)
+- Works well in simple single pole installations
+- Adjustable LED indicator: choose the color and brightness that works for you!
+- Built-in range test tool: diagnose network issues straight from your switch
+- Scene control available on hubs that support multi-tap triggers*
+- Smart bulb mode: disable the relay for truly wireless control or use as a remote control / smart add-on switch
+- Restores on/off status after power failure
+- Compatible with LED, CFL, and incandescent bulbs (don't connect to tube lights or fans over 3A / 5 years old)
+- Stronger repeater to boost your Z-Wave network
+
+SPECIFICATIONS:
+- Z-Wave Frequency: 908.42 MHz (US)
+- Power: 120 VAC, 60 Hz
+- Maximum Loads: 960W Incandescent, 150W LED and CFL bulbs, 1800W (15A) Resistive, 3A fan motors
+- Z-Wave Range: Up to 200 feet line of sight between the Wireless Controller and the closest Z-Wave receiver module
+- Operating Temperature: 32-104° F (0-40° C)
+- Installation: Indoor use only
+
+MANUAL CONTROL:
+Upper Paddle: 
+1 x tap: load on; Scene 1, attribute 00
+2 x tap: Scene 1, attribute 03
+3 x tap: enter inclusion (pairing) mode (only if the switch is not included to the hub); Scene 1, attribute 04
+4 x tap: Scene 1, attribute 05
+5 x tap: Scene 1, attribute 06
+6 x tap: change LED indicator mode (see parameter 2)
+held: Scene 1, attribute 01
+released: Scene 1, attribute 02
+
+Lower Paddle: 
+1 x tap: load off; Scene 2, attribute 00
+2 x tap: Scene 2, attribute 03
+3 x tap: enter exclusion (unpairing) mode; Scene 2, attribute 04
+4 x tap: Scene 2, attribute 05
+5 x tap: Scene 2, attribute 06
+held: Scene 2, attribute 01
+released: Scene 2, attribute 02
+held for 10 seconds (LED indicator starts blinking): enter the setting menu >> 5 x tap down for factory reset; 5 x tap up to change LED bulb mode (see parameter 11); 2 x tap down to enable the range test tool.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:a001:7000</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.thesmartesthouse.com/products/zooz-700-series-z-wave-plus-on-off-light-switch-zen71</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.support.getzooz.com/kb/section/190/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/zooz/zen71.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://cdn.shopify.com/s/files/1/0218/7704/files/zooz-700-series-switch-zen71-manual.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription"></MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Click the upper paddle 3 times quickly. The LED indicator will blink blue during the process and light up green once added successfully. It will light up red if failed.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Click the lower paddle 3 times very quickly.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold the lower paddle for 10 seconds until the LED indicator starts blinking. Release paddle, and immediately after, tap the lower paddle 5 times to complete the reset. The LED indicator will flash blue 3 times and turn red for 3 seconds to confirm successful reset.</MetaDataItem>
+    <MetaDataItem id="a001" name="ZWProductPage" type="7000"><!-- url to https://products.z-wavealliance.org/products/XXXX/ page for this specific version of the device --></MetaDataItem>
+	  <!--product page not available as of Feb. 12, 2021 -->
+    <MetaDataItem id="a001" name="FrequencyName" type="7000">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="a001" name="Identifier" type="7000">ZEN71</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="12 February 2021" revision="1">Initial configuration from Zooz (firmware 1.01)</Entry>
+    </ChangeLog>
+  </MetaData>
+  
+    <!-- Configuration Parameters -->
+	<CommandClass id="112">
+		<Value type="list" genre="config" index="1" label="On/Off Paddle Orientation" size="1" min="0" max="2" value="0">
+			<Help>Normal mode: Upper paddle turns the light on, lower paddle turns the light off.  Reverse mode: Upper paddle turns the light off, lower paddle turns the light on.  Toggle mode: Either paddle toggles the light.</Help>
+			<Item label="Normal" value="0"/>
+			<Item label="Reverse" value="1"/>
+			<Item label="Toggle" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="2" label="LED Indication Control" size="1" min="0" max="3" value="0">
+			<Help>LED Indication light function.  Normal has the LED Indication on when the switch is off, off when the switch is on.</Help>
+			<Item label="Normal" value="0"/>
+			<Item label="Reverse" value="1"/>
+			<Item label="Always Off" value="2"/>
+			<Item label="Always On" value="3"/>
+		</Value>
+		<Value type="int" genre="config" index="3" label="Auto Turn-Off Timer" size="4" min="0" max="65535" value="0" units="minutes">
+			<Help>Set the time (in minutes) after which you want the switch to automatically turn off once it has been turned on.</Help>
+		</Value>
+		<Value type="int" genre="config" index="5" label="Auto Turn-On Timer" size="4" min="0" max="65535" value="0" units="minutes">
+			<Help>Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off.</Help>
+		</Value>
+		<Value type="list" genre="config" index="8" label="On Off Status After Power Failure" size="1" min="0" max="2" value="2">
+			<Help>Status after power failure.  Off: always turn light off.  On: always turn light on.  Restore: remember the latest state and restore that state.</Help>
+			<Item label="Off" value="0"/>
+			<Item label="On" value="1"/>
+			<Item label="Restore" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="9" label="Enable/Disable Scene Control" size="1" min="0" max="1" value="0">
+			<Help>Enable or disable scene control functionality for quick double tap triggers.</Help>
+			<Item label="Disabled" value="0"/>
+			<Item label="Enabled" value="1"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="11" label="Smart Bulb Mode: Enable/Disable Paddle / Z-Wave Control" units="" min="0" max="2" value="1" size="1">
+			<Help>Enable or disable local on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through paddles.</Help>
+			<Item label="physical paddle control disabled" value="0" />
+			<Item label="physical paddle control enabled (default)" value="1" />
+			<Item label="physical paddle and Z-Wave control disabled" value="2" />
+		</Value>
+		<Value type="list" genre="config" instance="1" index="12" label="3 Way Switch Type" units="" min="0" max="1" value="0" size="1">
+			<Help>Choose the type of 3-way switch you want to use with this switch in a 3-way set-up.</Help>
+			<Item label="Regular mechanical 3-way on/off switch, use the connected 3-way switch to turn the light on or off (default)" value="0"/>
+			<Item label="Momentary switch, click once to change status (light on or off)" value="1"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="13" label="Reporting behavior with disabled physical control" units="" min="0" max="1" value="0" size="1">
+			<Help>Set reporting behavior for disabled physical control.</Help>
+			<Item label="Switch reports on/off status and changes LED indicator state even if physical and Z-Wave control is disabled (default)" value="0"/>
+			<Item label="Switch doesn't report on/off status or change LED indicator state when physical (and Z-Wave) control is disabled" value="1"/>
+		</Value>
+		<Value type="list" genre="config" index="14" label="LED Indicator Color" size="1" min="0" max="3" value="0">
+			<Help>Choose the color of the LED indicator.</Help>
+			<Item label="White" value="0"/>
+			<Item label="Blue (default)" value="1"/>
+			<Item label="Green" value="2"/>
+			<Item label="Red" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="15" label="LED Indicator Brightness" size="1" min="0" max="2" value="1">
+			<Help>Choose the LED indicator's brightness level.</Help>
+			<Item label="Bright (100%)" value="0"/>
+			<Item label="Medium (60%)" value="1"/>
+			<Item label="Low (30%)" value="2"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="16" label="Association Reports" units="" min="0" max="1" value="1" size="1">
+			<Help>Choose how the switch reports its status back to the hub.</Help>
+			<Item label="Binary switch report for Z-Wave control, basic set report for paddle control" value="0"/>
+			<Item label="Binary switch report for both Z-Wave and paddle control (default)" value="1"/>
+		</Value>
+	</CommandClass>
+	
+    <!-- Association Groups -->
+    <CommandClass id="133">
+      <Associations num_groups="3">
+        <Group index="1" label="Lifeline" max_associations="1"/>
+        <Group index="2" label="Group 2" max_associations="5"/>
+	    <Group index="3" label="Group 3" max_associations="5"/>
+      </Associations>
+    </CommandClass>
+	
+</Product>
\ No newline at end of file
diff --git a/config/zooz/zen72.xml b/config/zooz/zen72.xml
new file mode 100644
index 00000000..0b861b38
--- /dev/null
+++ b/config/zooz/zen72.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product Revision="3" xmlns="https://github.com/OpenZWave/open-zwave">
+    <MetaData>
+      <MetaDataItem name="Name">Zooz ZEN72 Dimmer Switch</MetaDataItem>
+      <MetaDataItem name="Description">Product features:
+- Full brightness control of your lights, from the physical dimmer and via Z-Wave when added to your smart home hub (sold separately)
+- Works with any dimmable LED bulb that accepts triac (forward-phase) dimmers up to 150 W total and with any incandescent bulbs up to 500 W. NOT COMPATIBLE WITH LUMINUS, LITHONIA, OR FEIT BULBS.
+- NEW in 700 series: smaller in the back so it fits easier in shallow or crowded boxes; replace the standard white paddles with almond, brown, or black paddles (sold separately).
+- NEW 700 chip: the latest S2 security, SmartStart for instant pairing and more Z-Wave coverage than ever!
+- Direct 3-Way Solution: connects to an existing light switch for 2-point control, no add-on switch necessary! Wires just like the ZEN22 model. Neutral wire required, on/off control only from the secondary switch, use in 4-way installations only if you have direct connection to load and line in one box.
+- Scene control: multi-tap triggers available on select hubs*
+- Night Light Mode: press and hold the lower paddle when dimmer is off to turn the light on to low brightness
+- Double tap to full brightness: now fully adjustable double tap and single tap behavior*
+- Fully adjustable ramp rate*
+- Don't use with fan motors, receptacles, or tube lights!
+- Stronger signal repeater for a more reliable Z-Wave network
+- Choose the color and brightness level of the LED indicator*
+SPECIFICATIONS:
+- Model Number: ZEN72
+- Z-Wave Frequency: 908.42 MHz (US)
+- Power: 120 VAC, 60 Hz
+- Maximum Loads: 500W Incandescent, 150W LED
+- Range: Up to 200 feet line of sight
+- Operating Temperature: 32-104° F (0-40° C)
+- Installation and Use: Indoor only
+https://www.support.getzooz.com/kb/article/538-zen72-dimmer-switch-700-ver-1-02-advanced-settings/
+          
+MANUAL CONTROL
+Upper Paddle:
+1 x tap: load on to last / custom / full / max brightness; Scene 1, attribute 00
+2 x tap: on to full / max / custom brightness; Scene 1, attribute 03
+3 x tap: enter inclusion (pairing) mode (only if not included to Z-Wave network); Scene 1, attribute 04
+4 x tap: Scene 1, attribute 05
+5 x tap: Scene 1, attribute 06
+6 x tap: change LED indicator mode (see parameter 2)
+press and hold: increase brightness level; Scene 1, attribute 01
+release: Scene 1, attribute 02
+Lower Paddle:
+1 x tap: load off; Scene 2, attribute 00
+2 x tap: Scene 2, attribute 03
+3 x tap: enter exclusion (unpairing) mode; Scene 2, attribute 04
+4 x tap: Scene 2, attribute 05
+5 x tap: Scene 2, attribute 06
+press and hold: decrease brightness level; Scene 2, attribute 01
+press and hold when off: turn on to 20% brightness (night light mode)
+release: Scene 2, attribute 02
+held for 10 seconds (LED indicator starts blinking): enter the setting menu, 5 x tap down for factory reset; 5 x tap up to change LED bulb mode (see parameter 11); 2 x tap down to enable the range test tool.</MetaDataItem>    
+        <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:a002:7000</MetaDataItem>
+        <MetaDataItem name="ProductPage">https://www.thesmartesthouse.com/collections/light-switches/products/zooz-700-series-z-wave-plus-dimmer-zen72</MetaDataItem>
+        <MetaDataItem name="ProductSupport">https://www.support.getzooz.com/kb/section/195/</MetaDataItem>
+        <MetaDataItem name="ProductPic">images/zooz/zen72.png</MetaDataItem>
+        <MetaDataItem name="ProductManual">https://cdn.shopify.com/s/files/1/0218/7704/files/zooz-700-series-z-wave-dimmer-zen72-manual.pdf</MetaDataItem>
+        <MetaDataItem name="InclusionDescription">1. Initiate inclusion (pairing) in the app (or web interface) of your hub. 2. Tap the upper paddle on the switch 3 times quickly.</MetaDataItem>
+        <MetaDataItem name="ExclusionDescription">1. Bring your Z-Wave gateway (hub) close to the switch if possible 2. Put the Z-Wave hub into exclusion mode (not sure how to do that? ask@getzooz.com) 3. Tap the lower paddle on the switch 3 times quickly</MetaDataItem>
+        <MetaDataItem name="ResetDescription">If your primary controller is missing or inoperable, you may need to reset the device to factory settings. To complete the reset process manually, tap-tap-tap’n’hold the upper paddle for at least 10 seconds. The LED indicator will flash to confirm successful reset. NOTE: All previously recorded activity and custom settings will be erased from the device’s memory.</MetaDataItem>
+        <MetaDataItem id="A002" name="FrequencyName" type="A000">U.S. / Canada / Mexico</MetaDataItem>
+        <MetaDataItem id="A002" name="Identifier" type="7000">ZEN72</MetaDataItem>
+        <ChangeLog>
+            <Entry author="shbatm - support@shbatm.com" date="31 Jan 2021" revision="1">Initial Copy from ZEN27, not yet available on ZWAlliance website</Entry>
+            <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="9 Feb 2021" revision="2">Reorganize metadataitem entries, correct ProductPic, add missing metadataitems and start revision at 1</Entry>
+            <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="12 Feb 2021" revision="3">Fix a few configuration parameters for auto off/on timer.</Entry>
+        </ChangeLog>
+    </MetaData>
+    <!-- Configuration Parameters -->
+    <CommandClass id="112">
+        <Value type="list" genre="config" index="1" label="On/Off Paddle Orientation" size="1" min="0" max="2" value="0">
+            <Help>Normal mode: Upper paddle turns the light on, lower paddle turns the light off. Reverse mode: Upper paddle turns the light off, lower paddle turns the light on. Toggle mode: Either paddle toggles the light.</Help>
+            <Item label="Normal" value="0" />
+            <Item label="Reverse" value="1" />
+            <Item label="Toggle" value="2" />
+        </Value>
+        <Value type="list" genre="config" index="2" label="LED Indication Control" size="1" min="0" max="3" value="0">
+            <Help>LED Indication light function. Normal has the LED Indication on when the switch is off, off when the switch is on. </Help>
+            <Item label="Normal" value="0" />
+            <Item label="Reverse" value="1" />
+            <Item label="Always Off" value="2" />
+            <Item label="Always On" value="3" />
+        </Value>
+        <Value type="list" genre="config" instance="1" index="23" label="LED Indicator Color" size="1" min="0" max="3" value="1">
+            <Help>Choose the color of the LED indicator. Default: Blue</Help>
+            <Item label="White" value="0" />
+            <Item label="Blue" value="1" />
+            <Item label="Green" value="2" />
+            <Item label="Red" value="3" />
+        </Value>
+        <Value type="list" genre="config" instance="1" index="24" label="LED Indicator Brightness" size="1" min="0" max="2" value="1">
+            <Help>Choose the brightness of the LED indicator. Default: Medium</Help>
+            <Item label="Bright" value="0" />
+            <Item label="Medium" value="1" />
+            <Item label="Low" value="2" />
+        </Value>
+        <Value type="int" genre="config" index="3" label="Auto Turn-Off Timer" size="4" min="0" max="65535" value="0" units="minutes">
+            <Help>Set the time (in minutes) after which you want the switch to automatically turn off once it has been turned on.</Help>
+        </Value>
+        <Value type="int" genre="config" index="5" label="Auto Turn-On Timer" size="4" min="0" max="65535" value="60" units="minutes">
+            <Help>Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off.</Help>
+        </Value>
+        <Value type="list" genre="config" index="8" label="On Off Status After Power Failure" size="1" min="0" max="2" value="2">
+            <Help>Status after power failure. Off: always turn light off. On: always turn light on. Restore: remember the latest state and restore that state.</Help>
+            <Item label="Off" value="0" />
+            <Item label="On" value="1" />
+            <Item label="Restore" value="2" />
+        </Value>
+        <Value type="byte" genre="config" index="9" label="Ramp Rate Control" size="1" min="0" max="99" value="1" units="seconds">
+            <Help>Adjust the physical ramp rate for your dimmer (fade-in / fade-out effect for on / off operation). Values correspond to the number of seconds it take for the dimmer to reach full brightness or turn off when operated manually. This setting is for physical taps only, see parameter 17 to adjust Z-Wave ramp rate. Values: 1 – 99 (seconds). 0 – instant on/off. Default: 1</Help>
+        </Value>
+        <Value type="byte" genre="config" index="10" label="Minimum Brightness" size="1" min="1" max="99" value="1" units="%">
+            <Help>Set the minimum brightness level (in %) for your dimmer. You won't be able to dim the light below the set value.</Help>
+        </Value>
+        <Value type="byte" genre="config" index="11" label="Maximum Brightness" size="1" min="1" max="99" value="99" units="%">
+            <Help> Set the maximum brightness level (in %) for your dimmer. You won't be able to add brightness to the light beyond the set value. Note: if Parameter 12 is set to value "Full", Parameter 11 is automatically disabled.</Help>
+        </Value>
+        <Value type="list" genre="config" index="12" label="Double-Tap Function" size="1" min="0" max="3" value="0">
+            <Help>Upper Paddle Double-Tap action. When set to Full, turns light on to 100%. When set to Custom Level, the light will turn on to custom brightness elvel set in Parameter 18. If set to Maximum Level, turns light on to % set in Parameter 11. Disable will disable the double tap feature.</Help>
+            <Item label="Full" value="0" />
+            <Item label="Custom Level" value="1" />
+            <Item label="Maximum Level" value="2" />
+            <Item label="Disable" value="3" />
+        </Value>
+        <Value type="list" genre="config" index="25" label="Single-Tap Function" size="1" min="0" max="3" value="0">
+            <Help>Upper Paddle Single-Tap action. When set to Full, turns light on to 100%. When set to Custom Level, the light will turn on to custom brightness elvel set in Parameter 18. If set to Maximum Level, turns light on to % set in Parameter 11. If set to Last, turns light on to last brightness level (default).</Help>
+            <Item label="Last" value="0" />
+            <Item label="Custom Level" value="1" />
+            <Item label="Maximum Level" value="2" />
+            <Item label="Full" value="3" />
+        </Value>
+        <Value type="list" genre="config" index="13" label="Enable/Disable Scene Control" size="1" min="0" max="1" value="0">
+            <Help>Enable or Disable scene control functionality for quick double tap triggers.</Help>
+            <Item label="Disabled" value="0" />
+            <Item label="Enabled" value="1" />
+        </Value>
+        <Value type="list" genre="config" instance="1" index="15" label="Smart Bulb Mode: Enable/Disable Paddle / Z-Wave Control" units="" min="0" max="2" value="1" size="1">
+            <Help>Enable or disable local on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through paddles. NOTE: hold the lower paddle for 10 seconds until the LED indicator starts blinking, then within 2 seconds, tap the upper paddle 5 times quickly to change this mode. The LED indicator will stay solid green for 3 seconds to confirm the change.</Help>
+            <Item label="physical paddle control disabled" value="0" />
+            <Item label="physical paddle control enabled (default)" value="1" />
+            <Item label="physical paddle and Z-Wave control disabled" value="2" />
+        </Value>
+        <Value type="byte" genre="config" instance="1" index="16" label="Physical Dimming Speed" units="" min="1" max="99" value="4">
+            <Help>Set the time it takes to get from 0% to 100% brightness when pressing and holding the paddle (physical dimming). The number entered as value corresponds to the number of seconds. Default: 4</Help>
+        </Value>
+        <Value type="byte" genre="config" instance="1" index="18" label="Custom Brightness Level On" units="" min="0" max="99" value="0">
+            <Help>Set the custom brightness level (instead of the last set brightness level) you want the dimmer to come on to when you single tap the upper paddle. Default: 0 - last brightness level</Help>
+        </Value>
+        <Value type="list" genre="config" instance="1" index="20" label="Z-Wave tap and hold Control" units="" min="0" max="1" value="0" size="1">
+            <Help>Choose how you'd like the dimmer to report when paddles are tapped and held and physical / Z-Wave control is enabled or disabled.</Help>
+            <Item label="report each brightness level to hub when physical / Z-Wave control is disabled for physical dimming (final level only reported if physical / Z-Wave control is enabled)" value="0" />
+            <Item label="report final brightness level only for physical dimming, regardless of the physical / Z-Wave control mode" value="1" />
+        </Value>
+        <Value type="list" genre="config" instance="1" index="19" label="3-Way Switch Type" units="" min="0" max="3" value="0" size="1">
+            <Help>Choose the type of 3-way switch you want to use with this dimmer in a 3-way set-up. Changing this setting can allow you to control brightness and dim the light from both 3-way locations. Use a regular momentary switch (like the Zooz ZAC99 accessory switch) if value is set to 2.</Help>
+            <Item label="regular mechanical 3-way on/off switch, use the connected 3-way switch to turn the light off or on to the last brightness level, dimming only available from the Zooz Z-Wave dimmer and from the hub (or through voice control if smart speaker is integrated with your Z-Wave hub)" value="0" />
+            <Item label="regular mechanical 3-way on/off switch, tap the paddles once to change state (light on or off), tap the paddles twice quickly to turn light on to full brightness, tap the paddles quickly 3 times to enable a dimming sequence (the light will start dimming up and down in a loop) and tap the switch again to set the selected brightness level" value="1" />
+            <Item label="momentary switch, click once to change status (light on or off), click twice quickly to turn light on to full brightness, press and hold to adjust brightness (dim up / dim down in sequence)" value="2" />
+            <Item label="momentary switch, click once to change status (light on or off), click twice quickly to turn light on to full brightness, press and hold to adjust brightness (dim up / dim down in sequence but always reduce brightness after double click)" value="2" />
+        </Value>
+        <Value type="list" genre="config" instance="1" index="21" label="Reporting behavior with disabled physical control" units="" min="0" max="1" value="0" size="1">
+            <Help>Set reporting behavior for disabled physical control.</Help>
+            <Item label="switch reports on/off status and changes LED indicator state even if physical and Z-Wave control is disabled (default)" value="0" />
+            <Item label="switch doesn't report on/off status or change LED indicator state when physical (and Z-Wave) control is disabled" value="1" />
+        </Value>
+        <Value type="byte" genre="config" instance="1" index="22" label="Night Light Mode" units="" min="0" max="99" value="20">
+            <Help>Set the brightness level the dimmer will turn on to when off and when lower paddle is held DOWN for a second. Default: 20</Help>
+        </Value>
+    </CommandClass>
+    <!-- Association Groups -->
+    <CommandClass id="133">
+        <Associations num_groups="3">
+          <Group index="1" label="Lifeline" max_associations="1"/>
+          <Group index="2" label="Group 2" max_associations="5"/>
+	  <Group index="3" label="Group 3" max_associations="5"/>
+        </Associations>
+    </CommandClass>
+</Product>
diff --git a/config/zooz/zen76.xml b/config/zooz/zen76.xml
new file mode 100644
index 00000000..5de4dd3a
--- /dev/null
+++ b/config/zooz/zen76.xml
@@ -0,0 +1,140 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Zooz ZEN76 S2 On Off Switch</MetaDataItem>
+    <MetaDataItem name="Description">FEATURES:
+- Control your lights from the switch and via Z-Wave
+- Use with LED or incandescent lighting only: do NOT connect to switched receptacles, fans, or tube lights
+- NEW in 700 series: slimmer switch to fit shallow and crowded boxes (just 1.1" deep); almond, brown, and black paddles available (basic version comes in white)
+- NEW 700 chip: SmartStart inclusion, S2 security, more range than ever and super fast communication!
+- Simple Direct 3-Way or 4-Way: Still no add-on and use it in larger set-ups for multi-point control. Wires like the ZEN26 model with quicker and easy installation guaranteed. (Neutral wire required)
+- Scene Control on hubs that support multi-tap triggers*
+- Program the LED indicator with custom color and brightness level that fits your needs*
+- Smart range test mode: troubleshoot communication issues right from your switch
+- Immediate on/off status reports
+- Smart LED indicator makes pairing and set-up more intuitive (now control the LED mode with 6 clicks of any paddle!)
+- Restores status after power failure
+
+SPECIFICATIONS:
+- Model Number: ZEN76
+- Z-Wave Signal Frequency: 908.42 MHz (US)
+- Power: 120 VAC, 60 Hz
+- Range: Up to 200 feet line of sight
+- Operating Temperature: 32-104° F (0-40° C)
+- Installation: Indoor use only
+
+MANUAL CONTROL:
+Upper Paddle: 
+1 x tap: load on; Scene 1, attribute 00
+2 x tap: Scene 1, attribute 03
+3 x tap: enter inclusion (pairing) mode (only if the switch is not included to the hub); Scene 1, attribute 04
+4 x tap: Scene 1, attribute 05
+5 x tap: Scene 1, attribute 06
+6 x tap: change LED indicator mode (see parameter 2)
+held: Scene 1, attribute 01
+released: Scene 1, attribute 02
+
+Lower Paddle: 
+1 x tap: load off; Scene 2, attribute 00
+2 x tap: Scene 2, attribute 03
+3 x tap: enter exclusion (unpairing) mode; Scene 2, attribute 04
+4 x tap: Scene 2, attribute 05
+5 x tap: Scene 2, attribute 06
+held: Scene 2, attribute 01
+released: Scene 2, attribute 02
+held for 10 seconds (LED indicator starts blinking): enter the setting menu >> 5 x tap down for factory reset; 5 x tap up to change LED bulb mode (see parameter 11); 2 x tap down to enable the range test tool.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:a006:7000</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.thesmartesthouse.com/products/zooz-700-series-z-wave-plus-s2-on-off-wall-switch-zen76</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.support.getzooz.com/kb/section/207</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/zooz/zen76.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://cdn.shopify.com/s/files/1/0218/7704/files/zooz-700-series-z-wave-plus-s2-switch-zen76-manual.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription"></MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Click the upper paddle 3 times quickly. The LED indicator will blink blue during the process and light up green once added successfully. It will light up red if failed.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Click the lower paddle 3 times very quickly.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold the lower paddle for 10 seconds until the LED indicator starts blinking. Release paddle, and immediately after, tap the lower paddle 5 times to complete the reset. The LED indicator will flash blue 3 times and turn red for 3 seconds to confirm successful reset.</MetaDataItem>
+    <MetaDataItem id="a006" name="ZWProductPage" type="7000"><!-- url to https://products.z-wavealliance.org/products/XXXX/ page for this specific version of the device --></MetaDataItem>
+	  <!--product page not available as of Feb. 9, 2021 -->
+    <MetaDataItem id="a006" name="FrequencyName" type="7000">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="a006" name="Identifier" type="7000">ZEN76</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="9 February 2021" revision="1">Initial configuration from Zooz; firmware 1.01</Entry>
+    </ChangeLog>
+  </MetaData>
+  
+    <!-- Configuration Parameters -->
+	<CommandClass id="112">
+		<Value type="list" genre="config" index="1" label="On/Off Paddle Orientation" size="1" min="0" max="2" value="0">
+			<Help>Normal mode: Upper paddle turns the light on, lower paddle turns the light off.  Reverse mode: Upper paddle turns the light off, lower paddle turns the light on.  Toggle mode: Either paddle toggles the light.</Help>
+			<Item label="Normal" value="0"/>
+			<Item label="Reverse" value="1"/>
+			<Item label="Toggle" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="2" label="LED Indication Control" size="1" min="0" max="3" value="0">
+			<Help>LED Indication light function.  Normal has the LED Indication on when the switch is off, off when the switch is on.</Help>
+			<Item label="Normal" value="0"/>
+			<Item label="Reverse" value="1"/>
+			<Item label="Always Off" value="2"/>
+			<Item label="Always On" value="3"/>
+		</Value>
+		<Value type="int" genre="config" index="3" label="Auto Turn-Off Timer" size="4" min="0" max="65535" value="0" units="minutes">
+			<Help>Set the time (in minutes) after which you want the switch to automatically turn off once it has been turned on.</Help>
+		</Value>
+		<Value type="int" genre="config" index="5" label="Auto Turn-On Timer" size="4" min="0" max="65535" value="0" units="minutes">
+			<Help>Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off.</Help>
+		</Value>
+		<Value type="list" genre="config" index="8" label="On Off Status After Power Failure" size="1" min="0" max="2" value="2">
+			<Help>Status after power failure.  Off: always turn light off.  On: always turn light on.  Restore: remember the latest state and restore that state.</Help>
+			<Item label="Off" value="0"/>
+			<Item label="On" value="1"/>
+			<Item label="Restore" value="2"/>
+		</Value>
+		<Value type="list" genre="config" index="9" label="Enable/Disable Scene Control" size="1" min="0" max="1" value="0">
+			<Help>Enable or disable scene control functionality for quick double tap triggers.</Help>
+			<Item label="Disabled" value="0"/>
+			<Item label="Enabled" value="1"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="11" label="Smart Bulb Mode: Enable/Disable Paddle / Z-Wave Control" units="" min="0" max="2" value="1" size="1">
+			<Help>Enable or disable local on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through paddles.</Help>
+			<Item label="physical paddle control disabled" value="0" />
+			<Item label="physical paddle control enabled (default)" value="1" />
+			<Item label="physical paddle and Z-Wave control disabled" value="2" />
+		</Value>
+		<Value type="list" genre="config" instance="1" index="12" label="3 Way Switch Type" units="" min="0" max="1" value="0" size="1">
+			<Help>Choose the type of 3-way switch you want to use with this switch in a 3-way set-up.</Help>
+			<Item label="Regular mechanical 3-way on/off switch, use the connected 3-way switch to turn the light on or off (default)" value="0"/>
+			<Item label="Momentary switch, click once to change status (light on or off)" value="1"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="13" label="Reporting behavior with disabled physical control" units="" min="0" max="1" value="0" size="1">
+			<Help>Set reporting behavior for disabled physical control.</Help>
+			<Item label="Switch reports on/off status and changes LED indicator state even if physical and Z-Wave control is disabled (default)" value="0"/>
+			<Item label="Switch doesn't report on/off status or change LED indicator state when physical (and Z-Wave) control is disabled" value="1"/>
+		</Value>
+		<Value type="list" genre="config" index="14" label="LED Indicator Color" size="1" min="0" max="3" value="0">
+			<Help>Choose the color of the LED indicator.</Help>
+			<Item label="White" value="0"/>
+			<Item label="Blue (default)" value="1"/>
+			<Item label="Green" value="2"/>
+			<Item label="Red" value="3"/>
+		</Value>
+		<Value type="list" genre="config" index="15" label="LED Indicator Brightness" size="1" min="0" max="2" value="1">
+			<Help>Choose the LED indicator's brightness level.</Help>
+			<Item label="Bright (100%)" value="0"/>
+			<Item label="Medium (60%)" value="1"/>
+			<Item label="Low (30%)" value="2"/>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="16" label="Association Reports" units="" min="0" max="1" value="1" size="1">
+			<Help>Choose how the switch reports its status back to the hub.</Help>
+			<Item label="Binary switch report for Z-Wave control, basic set report for paddle control" value="0"/>
+			<Item label="Binary switch report for both Z-Wave and paddle control (default)" value="1"/>
+		</Value>
+	</CommandClass>
+	
+    <!-- Association Groups -->
+    <CommandClass id="133">
+      <Associations num_groups="3">
+        <Group index="1" label="Lifeline" max_associations="1"/>
+        <Group index="2" label="Group 2" max_associations="5"/>
+	<Group index="3" label="Group 3" max_associations="5"/>
+      </Associations>
+    </CommandClass>
+	
+</Product>
diff --git a/config/zooz/zen77.xml b/config/zooz/zen77.xml
new file mode 100644
index 00000000..e1e51596
--- /dev/null
+++ b/config/zooz/zen77.xml
@@ -0,0 +1,177 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="Name">Zooz ZEN77 S2 Dimmer Switch</MetaDataItem>
+    <MetaDataItem name="Description">FEATURES:
+- Use with LED bulbs up to 100 W or incandescent bulbs up to 300 W (do NOT connect to tube lights, fans, switched receptacles, or CFL bulbs)
+- NEW in 700 series: smaller form factor, fits better in shallow or crowded boxes (just 1.1" deep); get it with almond, brown, or black paddles (sold separately, basic version comes in white)
+- NEW 700 chip: the latest S2 security, SmartStart for easy pairing and faster communication with better Z-Wave range!
+- Simple Direct 3-Way or 4-Way: Less rewiring for more multi-point control scenarios like 4-ways and 5-ways where load and line are in separate boxes. Use it the same way as the ZEN27 dimmer. Neutral wire required.
+- Night Light Mode: press and hold the lower paddle when dimmer is off to turn the light on to low brightness
+- Scene Control (select hubs only): activate scenes and trigger other devices with multi-tap*
+- You choose the color and brightness level of the LED indicator*
+- Programmable double tap and single tap for truly customized control*
+- Adjustable ramp rate and maximum/minimum brightness levels*
+- OTA firmware updates for a future-proof device
+- Signal repeater will make your Z-Wave network more reliable
+
+SPECIFICATIONS:
+- Z-Wave Frequency: 908.42 MHz (US)
+- Power: 120 VAC, 60 Hz
+- Maximum Load: 100 W LED/CFL, 300 W incandescent
+- Z-Wave Range: Up to 200 feet line of sight
+- Operating Temperature: 32-104° F (0-40° C)
+- Installation: Indoor use only
+https://www.support.getzooz.com/kb/article/550-zen77-s2-dimmer-700-advanced-settings/
+
+MANUAL CONTROL:
+Upper Paddle: 
+1 x tap: load on to last / custom / full / max brightness; Scene 1, attribute 00
+2 x tap: on to full / max / custom brightness; Scene 1, attribute 03
+3 x tap: enter inclusion (pairing) mode (only if not included to Z-Wave network); Scene 1, attribute 04
+4 x tap: Scene 1, attribute 05
+5 x tap: Scene 1, attribute 06
+6 x tap: change LED indicator mode (see parameter 2)
+press and hold: increase brightness level; Scene 1, attribute 01
+release: Scene 1, attribute 02
+
+Lower Paddle: 
+1 x tap: load off; Scene 2, attribute 00
+2 x tap: Scene 2, attribute 03
+3 x tap: enter exclusion (unpairing) mode; Scene 2, attribute 04
+4 x tap: Scene 2, attribute 05
+5 x tap: Scene 2, attribute 06
+press and hold: decrease brightness level; Scene 2, attribute 01
+press and hold when off: turn on to 20% brightness (night light mode)
+release: Scene 2, attribute 02
+held for 10 seconds (LED indicator starts blinking): enter the setting menu >> 5 x tap down for factory reset; 5 x tap up to change LED bulb mode (see parameter 11); 2 x tap down to enable the range test tool.</MetaDataItem>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/027a:a007:7000</MetaDataItem>
+    <MetaDataItem name="ProductPage">https://www.thesmartesthouse.com/products/zooz-700-series-z-wave-plus-s2-dimmer-switch-zen77</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://www.support.getzooz.com/kb/section/208/</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/zooz/zen77.png</MetaDataItem>
+    <MetaDataItem name="ProductManual">https://cdn.shopify.com/s/files/1/0218/7704/files/zooz-700-series-z-wave-plus-s2-dimmer-zen77-manual.pdf</MetaDataItem>
+    <MetaDataItem name="WakeupDescription"></MetaDataItem>
+    <MetaDataItem name="InclusionDescription">Click the upper paddle 3 times quickly. The LED indicator will blink blue during the process and light up green once added successfully. It will light up red if failed.</MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">Click the lower paddle 3 times very quickly.</MetaDataItem>
+    <MetaDataItem name="ResetDescription">Press and hold the lower paddle for 10 seconds until the LED indicator starts blinking. Release paddle, and immediately after, tap the lower paddle 5 times to complete the reset. The LED indicator will flash blue 3 times and turn red for 3 seconds to confirm successful reset.</MetaDataItem>
+    <MetaDataItem id="a007" name="ZWProductPage" type="7000"><!-- url to https://products.z-wavealliance.org/products/XXXX/ page for this specific version of the device --></MetaDataItem>
+	  <!--product page not available as of Feb. 12, 2021 -->
+    <MetaDataItem id="a007" name="FrequencyName" type="7000">U.S. / Canada / Mexico</MetaDataItem>
+    <MetaDataItem id="a007" name="Identifier" type="7000">ZEN77</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Matthew Grimes - https://github.com/cybergrimes" date="12 February 2021" revision="1">Initial configuration from Zooz; firmware 1.02</Entry>
+    </ChangeLog>
+  </MetaData>
+  
+   <!-- Configuration Parameters -->
+	<CommandClass id="112">
+		<Instance index="1" />
+		<Value type="list" genre="config" index="1" label="On/Off Paddle Orientation" size="1" min="0" max="2" value="0">
+			<Help>Normal mode: Upper paddle turns the light on, lower paddle turns the light off. Reverse mode: Upper paddle turns the light off, lower paddle turns the light on. Toggle mode: Either paddle toggles the light.</Help>
+			<Item label="Normal" value="0" />
+			<Item label="Reverse" value="1" />
+			<Item label="Toggle" value="2" />
+		</Value>
+		<Value type="list" genre="config" index="2" label="LED Indication Control" size="1" min="0" max="3" value="0">
+			<Help>LED Indication light function. Normal has the LED Indication on when the switch is off, off when the switch is on. </Help>
+			<Item label="Normal" value="0" />
+			<Item label="Reverse" value="1" />
+			<Item label="Always Off" value="2" />
+			<Item label="Always On" value="3" />
+		</Value>
+		<Value type="list" genre="config" instance="1" index="23" label="LED Indicator Color" size="1" min="0" max="3" value="1">
+			<Help>Choose the color of the LED indicator. Default: Blue</Help>
+			<Item label="White" value="0" />
+			<Item label="Blue" value="1" />
+			<Item label="Green" value="2" />
+			<Item label="Red" value="3" />
+		</Value>
+		<Value type="list" genre="config" instance="1" index="24" label="LED Indicator Brightness" size="1" min="0" max="2" value="1">
+			<Help>Choose the brightness of the LED indicator. Default: Medium</Help>
+			<Item label="Bright" value="0" />
+			<Item label="Medium" value="1" />
+			<Item label="Low" value="2" />
+		</Value>
+		<Value type="int" genre="config" index="3" label="Auto Turn-Off Timer" size="4" min="0" max="65535" value="0" units="minutes">
+			<Help>Set the time (in minutes) after which you want the switch to automatically turn off once it has been turned on.</Help>
+		</Value>
+		<Value type="int" genre="config" index="5" label="Auto Turn-On Timer" size="4" min="0" max="65535" value="60" units="minutes">
+			<Help>Set the time (in minutes) after which you want the switch to automatically turn on once it has been turned off.</Help>
+		</Value>
+		<Value type="list" genre="config" index="8" label="On Off Status After Power Failure" size="1" min="0" max="2" value="2">
+			<Help>Status after power failure. Off: always turn light off. On: always turn light on. Restore: remember the latest state and restore that state.</Help>
+			<Item label="Off" value="0" />
+			<Item label="On" value="1" />
+			<Item label="Restore" value="2" />
+		</Value>
+		<Value type="byte" genre="config" index="9" label="Ramp Rate Control" size="1" min="0" max="99" value="1" units="seconds">
+			<Help>Adjust the physical ramp rate for your dimmer (fade-in / fade-out effect for on / off operation). Values correspond to the number of seconds it take for the dimmer to reach full brightness or turn off when operated manually. This setting is for physical taps only, see parameter 17 to adjust Z-Wave ramp rate. Values: 1 – 99 (seconds). 0 – instant on/off. Default: 1</Help>
+		</Value>
+		<Value type="byte" genre="config" index="10" label="Minimum Brightness" size="1" min="1" max="99" value="1" units="%">
+			<Help>Set the minimum brightness level (in %) for your dimmer. You won't be able to dim the light below the set value.</Help>
+		</Value>
+		<Value type="byte" genre="config" index="11" label="Maximum Brightness" size="1" min="1" max="99" value="99" units="%">
+			<Help> Set the maximum brightness level (in %) for your dimmer. You won't be able to add brightness to the light beyond the set value. Note: if Parameter 12 is set to value "Full", Parameter 11 is automatically disabled.</Help>
+		</Value>
+		<Value type="list" genre="config" index="12" label="Double-Tap Function" size="1" min="0" max="3" value="0">
+			<Help>Upper Paddle Double-Tap action. When set to Full, turns light on to 100%. When set to Custom Level, the light will turn on to custom brightness elvel set in Parameter 18. If set to Maximum Level, turns light on to % set in Parameter 11. Disable will disable the double tap feature.</Help>
+			<Item label="Full" value="0" />
+			<Item label="Custom Level" value="1" />
+			<Item label="Maximum Level" value="2" />
+			<Item label="Disable" value="3" />
+		</Value>
+		<Value type="list" genre="config" index="25" label="Single-Tap Function" size="1" min="0" max="3" value="0">
+			<Help>Upper Paddle Single-Tap action. When set to Full, turns light on to 100%. When set to Custom Level, the light will turn on to custom brightness elvel set in Parameter 18. If set to Maximum Level, turns light on to % set in Parameter 11. If set to Last, turns light on to last brightness level (default).</Help>
+			<Item label="Last" value="0" />
+			<Item label="Custom Level" value="1" />
+			<Item label="Maximum Level" value="2" />
+			<Item label="Full" value="3" />
+		</Value>
+		<Value type="list" genre="config" index="13" label="Enable/Disable Scene Control" size="1" min="0" max="1" value="0">
+			<Help>Enable or Disable scene control functionality for quick double tap triggers.</Help>
+			<Item label="Disabled" value="0" />
+			<Item label="Enabled" value="1" />
+		</Value>
+		<Value type="list" genre="config" instance="1" index="15" label="Smart Bulb Mode: Enable/Disable Paddle / Z-Wave Control" units="" min="0" max="2" value="1" size="1">
+			<Help>Enable or disable local on/off control. If enabled, you’ll only be able to control the connected light via Z-Wave. Scenes and other functionality will still be available through paddles. NOTE: hold the lower paddle for 10 seconds until the LED indicator starts blinking, then within 2 seconds, tap the upper paddle 5 times quickly to change this mode. The LED indicator will stay solid green for 3 seconds to confirm the change.</Help>
+			<Item label="physical paddle control disabled" value="0" />
+			<Item label="physical paddle control enabled (default)" value="1" />
+			<Item label="physical paddle and Z-Wave control disabled" value="2" />
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="16" label="Physical Dimming Speed" units="" min="1" max="99" value="4">
+			<Help>Set the time it takes to get from 0% to 100% brightness when pressing and holding the paddle (physical dimming). The number entered as value corresponds to the number of seconds. Default: 4</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="18" label="Custom Brightness Level On" units="" min="0" max="99" value="0">
+			<Help>Set the custom brightness level (instead of the last set brightness level) you want the dimmer to come on to when you single tap the upper paddle. Default: 0 - last brightness level</Help>
+		</Value>
+		<Value type="list" genre="config" instance="1" index="20" label="Z-Wave tap and hold Control" units="" min="0" max="1" value="0" size="1">
+			<Help>Choose how you'd like the dimmer to report when paddles are tapped and held and physical / Z-Wave control is enabled or disabled.</Help>
+			<Item label="report each brightness level to hub when physical / Z-Wave control is disabled for physical dimming (final level only reported if physical / Z-Wave control is enabled)" value="0" />
+			<Item label="report final brightness level only for physical dimming, regardless of the physical / Z-Wave control mode" value="1" />
+		</Value>
+		<Value type="list" genre="config" instance="1" index="19" label="3-Way Switch Type" units="" min="0" max="3" value="0" size="1">
+			<Help>Choose the type of 3-way switch you want to use with this dimmer in a 3-way set-up. Changing this setting can allow you to control brightness and dim the light from both 3-way locations. Use a regular momentary switch (like the Zooz ZAC99 accessory switch) if value is set to 2.</Help>
+			<Item label="regular mechanical 3-way on/off switch, use the connected 3-way switch to turn the light off or on to the last brightness level, dimming only available from the Zooz Z-Wave dimmer and from the hub (or through voice control if smart speaker is integrated with your Z-Wave hub)" value="0" />
+			<Item label="regular mechanical 3-way on/off switch, tap the paddles once to change state (light on or off), tap the paddles twice quickly to turn light on to full brightness, tap the paddles quickly 3 times to enable a dimming sequence (the light will start dimming up and down in a loop) and tap the switch again to set the selected brightness level" value="1" />
+			<Item label="momentary switch, click once to change status (light on or off), click twice quickly to turn light on to full brightness, press and hold to adjust brightness (dim up / dim down in sequence)" value="2" />
+			<Item label="momentary switch, click once to change status (light on or off), click twice quickly to turn light on to full brightness, press and hold to adjust brightness (dim up / dim down in sequence but always reduce brightness after double click)" value="2" />
+		</Value>
+		<Value type="list" genre="config" instance="1" index="21" label="Reporting behavior with disabled physical control" units="" min="0" max="1" value="0" size="1">
+			<Help>Set reporting behavior for disabled physical control.</Help>
+			<Item label="switch reports on/off status and changes LED indicator state even if physical and Z-Wave control is disabled (default)" value="0" />
+			<Item label="switch doesn't report on/off status or change LED indicator state when physical (and Z-Wave) control is disabled" value="1" />
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="22" label="Night Light Mode" units="" min="0" max="99" value="20">
+			<Help>Set the brightness level the dimmer will turn on to when off and when lower paddle is held DOWN for a second. Default: 20</Help>
+		</Value>
+	</CommandClass>
+	
+    <!-- Association Groups -->
+    <CommandClass id="133">
+      <Associations num_groups="3">
+        <Group index="1" label="Lifeline" max_associations="1"/>
+        <Group index="2" label="Group 2" max_associations="5"/>
+	    <Group index="3" label="Group 3" max_associations="5"/>
+      </Associations>
+    </CommandClass>
+	
+</Product>
diff --git a/config/zwave.me/ZME_WALLC-S.xml b/config/zwave.me/ZME_WALLC-S.xml
index 61038091..b8ccb2c0 100644
--- a/config/zwave.me/ZME_WALLC-S.xml
+++ b/config/zwave.me/ZME_WALLC-S.xml
@@ -1,8 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="3">
 
 <!-- Z-Wave.Me: ZME_WALLC-S Secure Wall Controller -->
+<MetaData>
+	<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0115:0101:0100</MetaDataItem>
+	<MetaDataItem name="ProductPic">images/zwave.me/zme_wallc_s.png</MetaDataItem>
+	<MetaDataItem id="0101" name="ZWProductPage" type="0100">https://products.z-wavealliance.org/products/1086/</MetaDataItem>
+	<MetaDataItem id="0101" name="FrequencyName" type="0100">CEPT (Europe)</MetaDataItem>
+	<MetaDataItem name="ResetDescription">Use this procedure only if the primary controller is missing or otherwise inoperable.
+(1) Turn the device into Management Mode by keeping all four buttons pushed for 5 seconds, (2) click on Button 3, (3) keep button 4 pushed for 4 seconds.</MetaDataItem>
+	<MetaDataItem name="ExclusionDescription">Re-Inclusion and Exclusion are performed by pushing button 1 in management mode.  Pushing all four buttons for 5 sec. turns the device into management mode (indicated by blinking green LED).</MetaDataItem>
+	<MetaDataItem id="0101" name="Identifier" type="0100">ZME_WALLC-S</MetaDataItem>
+	<MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/1086/ZME_WALLC-S-Manual.pdf</MetaDataItem>
+	<MetaDataItem name="WakeupDescription"> (1) Turn the device into Management Mode by keeping all four buttons pushed for 5 seconds, (2) click on Button 2. </MetaDataItem>
+	<MetaDataItem name="InclusionDescription">Place your primary controller in inclusion mode by following the manufacturer's instructions, then activate inclusion on the wall controller by pressing any one of the four buttons for one second.  Inclusion mode is indicated by the red/green blinking of the LEDs until the timeout occurs after 10 seconds.</MetaDataItem>
+	<MetaDataItem name="Description">The Z-Wave.Me Wall Controller is a Z-Wave device that can both control other Z-Wave devices and activate scenes. Although it is controlling other devices, the Wall Controller cannot act as Z-Wave network controller (primary or secondary) and will always need a Z-Wave network controller to be included into a Z-Wave network. The device can be used in different modes that are selected by configuration parameters:
 
+Control of groups of other Z-Wave devices using 'ON', 'OFF' and Dim commands.
+Activation of predefined scenes in Gateways or other Z-Wave devices.
+This device support secure communication when included by a controller that also supports secure communication. </MetaDataItem>
+	<MetaDataItem name="Name">ZME_WALLC-S Secure Wall Controller</MetaDataItem>
+	<ChangeLog>
+		<Entry author="Nouknouk - nouknouk@gmail.com" date="08 Dec 2020" revision="3">Initial Metadata</Entry>
+	</ChangeLog>
+</MetaData>
 	<!-- Configuration Parameters -->
 	<CommandClass id="112">
 		<Value type="list" index="1" genre="config" label="Button 1 and 3 pair mode" units="" min="0" max="2" size="1" value="1">
@@ -94,4 +115,3 @@
 	</CommandClass>
 
 </Product>
-		
diff --git a/config/zwave.me/razberry.xml b/config/zwave.me/razberry.xml
new file mode 100644
index 00000000..0d9b4048
--- /dev/null
+++ b/config/zwave.me/razberry.xml
@@ -0,0 +1,8 @@
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="ProductPic">images/zwave.me/razberry.png</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Daniel Brunt - daniel@brunt.ca" date="30 Jul 2020" revision="1">Initial metadata to add pic</Entry>
+    </ChangeLog>
+  </MetaData>
+</Product>
diff --git a/cpp/build/testconfig.pl b/cpp/build/testconfig.pl
index 99dd4d9f..3cf28179 100755
--- a/cpp/build/testconfig.pl
+++ b/cpp/build/testconfig.pl
@@ -143,6 +143,7 @@ foreach my $metadataitem ($data->{MetaData})
 			}
 			#now make sure required attributes have type/id entries
 			my %params = map { $_ => 1 } @metadatatypeneeded;
+			my $gotpic = 0;
 			foreach my $mdi (@{$metadataitem->{MetaDataItem}}) {
 				if (exists $params{$mdi->{name}}) {
 					if (!defined($mdi->{type})) {
@@ -152,8 +153,21 @@ foreach my $metadataitem ($data->{MetaData})
 						LogError($_[0], 11, "ID Identifier Required for $mdi->{name}");
 					}
 				}
+				if ($mdi->{name} eq 'ProductPic') {
+					$gotpic = 1;
+					if (defined($mdi->{content})) { 
+						if (!-e "config/$mdi->{content}" ) {
+							LogError($_[0], 12, "Image File Missing - config/$mdi->{content}");
+						}
+					} else {
+						LogError($_[0], 13, "Empty ProductPic Entry");
+					}
+					
+				}
+			}
+			if ($gotpic == 0) {
+				LogError($_[0], 13, "No ProductPic Entry in MetaData");
 			}
-			
 		}
 	}
      $data = $xml->XMLin($_[0], ForceArray => [ 'Value', 'MetaDataItem' ], KeyAttr => { CommandClass=>"id"});
diff --git a/cpp/build/testconfigversions.cfg b/cpp/build/testconfigversions.cfg
index 0e036a31..d52e77c7 100644
--- a/cpp/build/testconfigversions.cfg
+++ b/cpp/build/testconfigversions.cfg
@@ -7,6 +7,10 @@
                                             'Revision' => 2,
                                             'md5' => 'b2c96148fd6c97c1e7a0d07126d2a7a497b49b56105e00d311dcf885d204f44bbd0673a15b0041c894098cca56b8ccfdcb072946557bbd64877552beeb0e21c0'
                                           },
+               'config/2gig/ct200.xml' => {
+                                            'Revision' => 1,
+                                            'md5' => '7822e83cf1aa215d3ccad4d0103cc72a7a81c9a4501a068572bc65d3e7dd3631c3801dc3d554a4677d6b8b57758e42946b9cd2a5c614318c085f4ef6ade6d947'
+                                          },
                'config/2gig/ct30.xml' => {
                                            'Revision' => 4,
                                            'md5' => '783218e85cb8eadbb47fd3dfd1d9dc60ccd7f1bf63fd585d8fd1701cab9f3460b78afd48c30ff88bd1e6754e0f215a1f607e6a8d838b92b25fe8dad5c106ea9f'
@@ -92,17 +96,21 @@
                                                'md5' => 'eb39290e2085eb7493a88fba0f53782a588539d81810442fd1575d5065263e24b23e4711a2fd5df0bf7cae7ff380c605d785399e87aa658cac3f155a1d2ae667'
                                              },
                'config/Localization.xml' => {
-                                              'Revision' => 8,
-                                              'md5' => 'cb17fb84342208b79eaa2cf41563f96e50e07362708d04eb468598c1c0567fe8d3954d15b3120a79478f9639202df168a2b11fd8424aeaa170aa9a39a923b631'
+                                              'Revision' => 12,
+                                              'md5' => '3947ce48694ec51a18c15b5ffe9b02906df9929c44fd5ba2c4d3a860ea1f125e3255b7cf85f8a1be7334a5335b8f3615429a1a0a3fdef78157c00935eaa98a5b'
                                             },
                'config/NotificationCCTypes.xml' => {
-                                                     'Revision' => 9,
-                                                     'md5' => 'fe343cf0b94ab320774f1a8c161bc4ec5c0b3193f83067c8810cfdac36148c4c68ecad20a940514562158afdae22543fbb54f710406b070114f53606cfba4e94'
+                                                     'Revision' => 11,
+                                                     'md5' => '219e944370bea857e14dc25789bca29dde4a65f72b9d9b39a9ab187437cf80c70a876b399a45fd89f90b4da27f2ce3359f61f90d5605c4d53a14effb3ca28343'
                                                    },
                'config/SensorMultiLevelCCTypes.xml' => {
                                                          'Revision' => 4,
                                                          'md5' => '36aee27cf7888627f6d7a35604f782976d043aceda82cf1c90a830e19e297fae5ad7ac36de480a4c36af71c5ad94a5c7db52b2817cfc84cb760fcbb83bcba6f8'
                                                        },
+               'config/abus/SHRM10000.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => '65df614d199c1b62a17a141801d6723803af54ecb5fd0fd591a731ef8a80695f61532a484469dad55c100373d188816bb1642cb48f5dda8e1e9e81c40edfa66f'
+                                              },
                'config/act/lfm20.xml' => {
                                            'Revision' => 2,
                                            'md5' => 'f4c1366e3f7ee171137d2688de970a6e4ae2d4939c22267eda205405ce5e397c731cda516bd76225bab830e0c4cb998a4da44e249d468e88593a0151c41157eb'
@@ -284,8 +292,8 @@
                                               'md5' => 'eda5882a0b1e3f78c95e51496307d1867a1b3dc756a0b24f705155a3a1996659e67b6af65e60bd4b800548b4b1b6bb57ff591140f2062027545612efbf2a3cfa'
                                             },
                'config/aeotec/zw095.xml' => {
-                                              'Revision' => 5,
-                                              'md5' => '64029aa66434ff853d0f5b54dbab6c5ab5039f9307474a6a28bd2405fe318c98f4d3fda8a718fdbc9d8765f8ce7625f6b0f9d245491f90b3559144dc9535fe0b'
+                                              'Revision' => 6,
+                                              'md5' => '2e61f67c818ce40e29881dfc21ac53d6fc51b650d8394a615c02221664d47d53882a967581943faf9fd1b67f9c64ead25d0dee1d50ffc4893876c328ef449f35'
                                             },
                'config/aeotec/zw096.xml' => {
                                               'Revision' => 8,
@@ -304,20 +312,20 @@
                                               'md5' => 'c4775cc1e44d3580cf6cadede3c1dca34dc94d9cb573888775ded7da5f224035853690d715ce8c7de0031d1e5df637d0da1ff7c1c86957755f09b65bcd4677f5'
                                             },
                'config/aeotec/zw100.xml' => {
-                                              'Revision' => 24,
-                                              'md5' => 'd7844707b29f8fe526d94aca4b1a47a26a3639e8d4a681199bb2775024d2f273c7be634cba65062d1ba2000803491af6aa654bcf33969e7ab870ffc80ce6f673'
+                                              'Revision' => 25,
+                                              'md5' => '3260a03fd6b6656d02ce4d70755e72cd7af35b0e1ed1c95efed230c8ee7d5bc13443092e031977d114efad81e43b35af53ba965b9c12b6a8e5c30b1e4fc59b02'
                                             },
                'config/aeotec/zw111.xml' => {
-                                              'Revision' => 6,
-                                              'md5' => '8b12f9898911caa9368f6086a5c113b787bd6d14bf3101af07d187f8f1be8acd7b9f060e5de6355e0b1eb5d1582ca8f1fd2643a9bb3f530a04aa25077ba0d6b3'
+                                              'Revision' => 8,
+                                              'md5' => 'bdada4079cb3fe4bcc7bca5d831abc450e27f9ee4e38e36709df5e5b7adbb814846b7e660686fefd81f0b5524c382e1efb1ff43f0df77ca1374bbedacd1207c9'
                                             },
                'config/aeotec/zw112.xml' => {
                                               'Revision' => 6,
                                               'md5' => '5e832838a7292144bee049fa0cff287a4de781c55c1afa5a5471d98a00a22c6a796eef7b80bcb6ad6ca15b0e72a78e90ac6d82943aeeccdd8fc78befc3b2358d'
                                             },
                'config/aeotec/zw116.xml' => {
-                                              'Revision' => 6,
-                                              'md5' => 'aa24312b86df1e10ddedd71c0aa874f1e44fb49192b0481e4b973eca5a86d0e12071733ca51ad42f50d3ff09d2955952d3e0c11b2512770046795aa6ec9d7c88'
+                                              'Revision' => 8,
+                                              'md5' => 'acddde85a083a0bdba9a27da88fae9c7605d35cc8ef1109a1a4c8d91abaafd81c8510144cd6ae239a52290403bf73dfe46357e8ba3656ccbb761e7f3f56228d2'
                                             },
                'config/aeotec/zw117.xml' => {
                                               'Revision' => 5,
@@ -344,8 +352,8 @@
                                               'md5' => '9e98b12590da0c343fc75ebc18b1343e4df9120f292d46700666ba53e41ee99e6a6b196a2cf4e3b5a567a844499264e015381638c418d1d9adeda9e7117e599b'
                                             },
                'config/aeotec/zw132.xml' => {
-                                              'Revision' => 5,
-                                              'md5' => 'c3a5e7f00a8b3514fb9de7b12ecfba5f2c4f85529ef5266290adcc4c01be9e5009602fa3dee17d5787715aaf57a04434b8d6f6f49d49e9279ad5b21becf549b2'
+                                              'Revision' => 7,
+                                              'md5' => 'db49147ea64a88bc8106c1e88975523edf85c2e7e0b5ccccafb53ab438466f6a9cb6af75c4c17b7f5bf5cf10e6155cfa6f662d9b0b23726549d38f6d7c8e51a3'
                                             },
                'config/aeotec/zw139.xml' => {
                                               'Revision' => 5,
@@ -356,8 +364,8 @@
                                               'md5' => 'b64f170b079ae1340bd4a74ef3a88f0cdf66281fa28d656b46f408b183d04c8e6a67f584f90dd6f8b2aa1fc2b2039e32b936f6f947394d28002b3d3a2a47cadb'
                                             },
                'config/aeotec/zw141.xml' => {
-                                              'Revision' => 6,
-                                              'md5' => 'c9546f9c8571b995f501506ce5aea97e892e67f1aecc87713b2be9d561218fa97005f6da47409218ff9f3840f942bd83f69555af3b1860b45b133b72e5c392eb'
+                                              'Revision' => 8,
+                                              'md5' => '06b71d604f18c6a9a1dc5f7dd9ed31e561ad406814d96e2b2cf5d7242db12fc19ca5cea9d15901f8d22050fbdf9eb33c21099feacf53f692418d3f517fb27961'
                                             },
                'config/aeotec/zw162.xml' => {
                                               'Revision' => 8,
@@ -384,8 +392,8 @@
                                                'md5' => 'e63fd65924332e173ce34701ba86502affcfe1e5088cac0aeaa5755a0c1e73e335727b5bdc4730784c407f8022766fc0c220e8f07e36df8e6a44ca636abf67a8'
                                              },
                'config/aeotec/zwa002.xml' => {
-                                               'Revision' => 3,
-                                               'md5' => 'f8ae29516711f6eca7237df4095354a8ad6b69812f8032b157d875d6ec6a09cebdc03feb81e3933ddb6f7d41454b34f79b2f9b876601665c4c761f52d33da8dc'
+                                               'Revision' => 4,
+                                               'md5' => 'c32dbf9c909ee50b3d38f14594f163cb2e5b49873cf1cd551c3d1a0fdbfb7223466c2e70d14d1b95de5467797f6fc2141b0e8859fe6c3e2fe3231abd0aae1dce'
                                              },
                'config/aeotec/zwa003.xml' => {
                                                'Revision' => 4,
@@ -407,10 +415,30 @@
                                                'Revision' => 1,
                                                'md5' => '12234e354ac9b5378c93c1f5c32d642d29ff45ed6ae907c13d2a51c385f4340a1196a59b3419dd7901b48c592cb1693956e9d6e687b173d9d7a492221bec4a82'
                                              },
+               'config/aeotec/zwa009.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => 'dea1ef33d8f6ee2abbe83a0aabd9c9e22e4a9d86e0715f1ee90c8851ed135ff27521ddd6cc308cd09648e2aca4a498903054fd5ee66f3338098f9ce81fcef2f3'
+                                             },
+               'config/aeotec/zwa011.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => 'a67f8c997e6813f1772b4e980ad1580327d4f993fe007442580b9a37163bf732ddecd431fdd944e8d1f5841f9a55ad8cd43e4a5b5471709748b5974e7171e55e'
+                                             },
+               'config/aeotec/zwa012.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => 'bcfcf5d1a552ab8a8ac6ab7586f3de4cd7189d72a11e60bbad6b0038eb33f1d4acba164b625e7d8343b712aa27752fbe9f17f5ee9294ce82599e7abdf6c675f9'
+                                             },
+               'config/aeotec/zwa019.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => '5238b4e34afaa58b71c9b6c6e857b5b1a63e4645322cf0324cdc3556202dfc5d08979f5cdecc7989b851eb7db9aae6c2308bf7c3e7f56adb264c1f395d05e4cf'
+                                             },
                'config/aeotec/zwa021.xml' => {
                                                'Revision' => 2,
                                                'md5' => '1337565d4bb52206d7c29f16a04957d09e9f800da716907a5190841f6b69901f5fde754d7e9713d0ac97f2ef6ab7b563edb3f3fda6981e58757e5f2202ab50e0'
                                              },
+               'config/aeotec/zwa023.xml' => {
+                                               'Revision' => 2,
+                                               'md5' => '55f789365f3b8a4f1c84a44dc93cac26f2afff40963a4ea6dee8a69f9ca5b40d71d0ca73e5b9f6dd6a420d9f38c75bec5bd2b7800256d9d1169035b88e114315'
+                                             },
                'config/airlinemechanical/zds-ud10.xml' => {
                                                             'Revision' => 1,
                                                             'md5' => '028c79db0efa85f50283cb57a22462dac7d2e7024851b5d715ddb7f715d0012b8f993829ad542639294ab266b3017fb31a62ed8fec929dde8f401dd276dde67f'
@@ -431,26 +459,38 @@
                                                              'Revision' => 2,
                                                              'md5' => '4252c298eacb7e31a79c7c8fcee5e2d40b56d9bf865c8eeed53e3a29e8695508d38ffb83f558a41871e13af346c65cbdbc8a7de6caf7c5a1a67af59b5fb384b3'
                                                            },
+               'config/assa_abloy/ProSLKey-FreeDeadbolt.xml' => {
+                                                                  'Revision' => 2,
+                                                                  'md5' => '7a6771adb77b2bbcb11fa6e74733ff064b87311b1530dbfb048bb167d03e5a1b3880ad2d5fa59977080cc3c3b37f3624f457095ebc5770d97d4cf258d68cf0fd'
+                                                                },
                'config/assa_abloy/PushButtonDeadbolt.xml' => {
-                                                               'Revision' => 6,
-                                                               'md5' => 'eab93127aa1423d943e6e4bc2650b76a4a8d029d9c138011c5a713e919b4fd3e27981a73a87f35ddd2089775b925e6fb5d85976e318ccca676208bf5502570d1'
+                                                               'Revision' => 7,
+                                                               'md5' => 'a39dc67ada1bb3ea32c5be977f635cb4e5758e5006d54b84ef8cb9c8bb91a830718e94758b5701d07af4c17ec3c83a68af34069aaded0e9096f70311e15ae2c5'
                                                              },
                'config/assa_abloy/PushButtonLever.xml' => {
                                                             'Revision' => 1,
                                                             'md5' => '20533ba6551380cfb41ec7ef2e1dcec8c1b2d5e23b5ffcd87285c5a0945556989200c7bf25031cf8bdd3b39ae2c6a514565698acb3443c6bd6a3ed7ba583dbf6'
                                                           },
                'config/assa_abloy/TouchDeadbolt.xml' => {
-                                                          'Revision' => 12,
-                                                          'md5' => '5549c51c360f1f4c27305d6c1bda951e1a48d1072b1b1c6b3ddcbc1be8ab922fde48c3c633d58d44b64d42297da9c8093e0f475be98282745dc6d0f611d5b936'
+                                                          'Revision' => 13,
+                                                          'md5' => 'c29a547f859db492054de260d6d575cedfcaecd00aa612974e848e317cfe498eea5e95723e0e01f90ac8ddd8179144b83fe744b248cf54d2e19fc97a52cbfc68'
                                                         },
                'config/assa_abloy/TouchLever.xml' => {
-                                                       'Revision' => 2,
-                                                       'md5' => '922bb2b622dcc7c728da2fdca4d8e9bac4f3db7af115b259dcdf616addedd5a6b67dbecd5400d0a11335d8bc86b4444c25bfa755e84854988c7476c34ef986fd'
+                                                       'Revision' => 3,
+                                                       'md5' => 'f8ce232d1d46aadcc867c736a54218bd1cd15b54d2f2f819d190315cde7302e887ce23f0d111c4478bed6c3b0af9df91eabd9973313e9399e0516ca3cb66dbe9'
                                                      },
                'config/assa_abloy/nexTouch.xml' => {
                                                      'Revision' => 5,
                                                      'md5' => '56cacadad65e06642795966771dc7ab7058c34207ca34acd340e593156db7c10de265fbadb75c0f31574b696ebc74e4329d661f98e8e246ab16c91a55ab38e0e'
                                                    },
+               'config/assa_abloy/yrd1x0.xml' => {
+                                                   'Revision' => 14,
+                                                   'md5' => '72b0c1a02e59692b581f0f242a36b9c0c96f97d94217e7f391d219130f73df398abdc8370dcdffd74462d41b9aa1bf69498d0d04c3c147ed89a093970d25fef7'
+                                                 },
+               'config/assa_abloy/yrm276.xml' => {
+                                                   'Revision' => 1,
+                                                   'md5' => '85f0bb84ad6fc350a6e916a4931d91adc77427366f8394bf07de3c9ca1394bf5a5dce576d6a4dd107097017454e4397f800ac597bec7fee8047a69a1709b2d12'
+                                                 },
                'config/august/asl-03.xml' => {
                                                'Revision' => 2,
                                                'md5' => 'c20731a4c1ed5261983c163c619c36085cab448344caa87203a45f89938678cd755708bf67bb0bc997bc61120051ae0355e4465f7e50a83420f4fc12e9752ac0'
@@ -459,13 +499,21 @@
                                                        'Revision' => 1,
                                                        'md5' => '700da33bf896ed7250ae6e75b8f06885935c0398a3b60fcb96c28f0e8b61aec82bb83811a458893679da00db0864dea000f831b9128ff17a911e020bc93bf3ac'
                                                      },
+               'config/building36/b36-t10.xml' => {
+                                                    'Revision' => 2,
+                                                    'md5' => 'af740c48ea2d7fbd46bbcb97ae6605dcf3f16bfcb8c8f785339a9baf3c4c41206310d309d85c9df803fee06bf1d958110cbb3a90d7088d945de39d46d430c852'
+                                                  },
                'config/comfort/ucm.xml' => {
                                              'Revision' => 1,
                                              'md5' => '343e23824152ce111beb412a9b5ce0b40f90e12cad4fdc3b9e91267143e7dfa48f3b5901513401eb1b55bd986188c36d121c2fdd058f6ff91fcbb2c19f6fbfaf'
                                            },
+               'config/connecthome/ch-201.xml' => {
+                                                    'Revision' => 2,
+                                                    'md5' => 'a0ca60110b50b83dd53ed869fbe3cfafef1bbb1aa22c5cf96a85208370c55554d7af20b5a24eab3f2c81e333b9dea81a1134596def6254d9067a6f7de45d2e99'
+                                                  },
                'config/cooper/RF9501.xml' => {
-                                               'Revision' => 2,
-                                               'md5' => '0d6d2fd4e186dce9e6883597e539ee7f7836eca827e561afd80952ba6d4da16a074670fa8e1415470d1a258de2ef006130002d320cc01da83b0508defd10f2b1'
+                                               'Revision' => 3,
+                                               'md5' => '3607a09ae6cfb895c99875d96250165cc78a6072c12bc381ffa206792599f0a646e835ef535084c128e528453e4a23430d2ac0a6797aab7e6f1c56b0103ae28b'
                                              },
                'config/cooper/RF9505-T.xml' => {
                                                  'Revision' => 4,
@@ -476,13 +524,17 @@
                                                'md5' => '79e0f21a4292d455896bdb3b87401bfd6f405a6a2a795c8b77a4a01513aefeb17b72ed4595f3f84c2463f17b386bd1ecea67ebbe547e5f39472abeb3d831b805'
                                              },
                'config/cooper/RF9540-N.xml' => {
-                                                 'Revision' => 3,
-                                                 'md5' => 'fdd961e3e81614537798f94194860876637b8ecc4274f9725bbbe1fa6827b1fc60e4dad7ba4f5178dade79fa9950cae8ad91a9f0599d922c140c59711a9612a7'
+                                                 'Revision' => 5,
+                                                 'md5' => 'ee02b6f5fdaac0c1eabb44e093fa59d4962443a5d0c1f151ee4f00e9bc219d4224dc93e423f7fb6ff7a1342717644f71a689b301cbf29aec4eef49879f5a51c1'
                                                },
                'config/cooper/RF9542-Z.xml' => {
                                                  'Revision' => 3,
                                                  'md5' => '9b2bcec41e4a46a2a2558960b03f5a3e66db60d40832542bffa053f49c0f08c70e64151d2619f1328df23089028a83ed70dc17af9125b2299443e237957ebbee'
                                                },
+               'config/cooper/RF9601.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => '086da7deb18b8df7738a637822279549d2fe9618ebe7965c1d190fc83e0120e8050e1a2f9ec082b0b36bd5ee5589ce2d93e54d04c768238c5be40d88dd3dbd5e'
+                                             },
                'config/cooper/RFWC5.xml' => {
                                               'Revision' => 2,
                                               'md5' => '5e94896a472f7be22fe176de80f784d333bbf9a1afdcbed80094ecc1ae89c0b5cfcf47dc57731aa5312a87120b4d04934060ac3bf78aa39133118c6f1dc6d3a7'
@@ -576,8 +628,8 @@
                                                 'md5' => '057ea9034b5751fe492a27bf4deef6c5b73fd53406649552f8817fee341be6001bb776cb5012ae6f7d8f319ada161faa29243d32c8efef9d508b18ed80cf41f8'
                                               },
                'config/dlink/dch-z210.xml' => {
-                                                'Revision' => 1,
-                                                'md5' => '678962e8f2a0542d5170fe363a79ed563e98280a38620f67fb77f15d1242548c145004b746b28734b8fbc883df5a782b8e8fbef06cba8b7cb9130057c6eb99f0'
+                                                'Revision' => 2,
+                                                'md5' => '738b1bfcaa5f34d23eece8c2d95284c113abb0807197638d881f33afc49fe169036e68a702989bba4d64c49bdb038f6a764ff76e241884c25c339d251c4201c0'
                                               },
                'config/dlink/dch-z510.xml' => {
                                                 'Revision' => 3,
@@ -611,10 +663,18 @@
                                            'Revision' => 1,
                                            'md5' => '5ccce24dbb0b56cc6e5e5bbebc24e05da07750a24f64dd66a6a5cd5aec7d79a0ae59f854af5f4b40cc60806706f54cc007bb1c844346db0f91ac10c8e3b49a7e'
                                          },
+               'config/dome/0104.xml' => {
+                                           'Revision' => 3,
+                                           'md5' => 'e4121145912464763ef4ece86fb7f2ff8edc0c547329b1dc7d36e81717202be5b0b84ed5214bcaa31d8a2f5882b9f762d0892402dfb421f3bd80b8f81b4577e6'
+                                         },
                'config/dome/0201.xml' => {
                                            'Revision' => 4,
                                            'md5' => 'fee61cf3301b50c77758714649fa35f6d3bc3f1614124608577e3b47b897fc546fefb1a31520307f853c28726c5758cc3656d3ebe290b6ad858b43d4e99d7a64'
                                          },
+               'config/dome/dmex1.xml' => {
+                                            'Revision' => 1,
+                                            'md5' => '70b90962ec3fc43b50b827f6ac2fd8b9d112b8c979e6e42588dd5fa19eaa909fb4a9f66da21f3f9200358f4343785c41d6d561f6d1933a0a6587403421380627'
+                                          },
                'config/domitech/zb22uk.xml' => {
                                                  'Revision' => 2,
                                                  'md5' => '90c85ebfbaf16201c99bd09c957a408b944034a3626a5a5c2eced093e27e6e0a8afca3d8516d7f6ace2e3889b57e5fbe585219c74ecf7c8a127d3b860970c425'
@@ -659,6 +719,14 @@
                                                    'Revision' => 5,
                                                    'md5' => '4d7a77c213b0dea753512dcd30e3f6723f7d751d13801af9a0584a04f4182043275e3e47f268299ab44f91958356119c571a34d1022b70bf8bafc08fd717c67e'
                                                  },
+               'config/duco/DucoBox.xml' => {
+                                              'Revision' => 2,
+                                              'md5' => '7911f42a45b59bf2081ccf0dde356696d7586388f69e660e80ef72ef17516888ef9d74bff4deea0f03d721e27e43c2ac31ccea40bcdbe178a2a8163ce5bdbc3b'
+                                            },
+               'config/duco/Ducotronic_CO-RH_sensor.xml' => {
+                                                              'Revision' => 2,
+                                                              'md5' => '506b64e578667ead9c2ad64c896c0e44fe30efb228e6daa0144995f7ddaee1f0b7692e1447ddccb16d55bd9a2589a57afdfe164ca04873e7faf8db9cc598fcb7'
+                                                            },
                'config/duwi/05458.xml' => {
                                             'Revision' => 2,
                                             'md5' => 'aae2fb7ecd70a8670daf1f9a74a78e4a337da5e4477480607909a727385572371e7708e4cfcba1962c31231f23960db30dc182a74143f291366ddf9317b51e22'
@@ -687,9 +755,13 @@
                                            'Revision' => 2,
                                            'md5' => '29a2b8e9eadf09ee7af8441cdf46d97ab8df6271d2f1cc981acc73a9f4bd7dbf1f53449c6f71d052fa130fed9c1347a5b611b81adc46f305d704943472f54b87'
                                          },
+               'config/ecodim/0.7.xml' => {
+                                            'Revision' => 2,
+                                            'md5' => 'e334fccc67d01e2b271314e4749dfbfef299dee1dac04af6bfbc253b9fd676e43c0711322226c936ef6fdc026cca4c291ecf943fa7a6419fec816d5533e0abbe'
+                                          },
                'config/ecolink/doorwindow.xml' => {
-                                                    'Revision' => 6,
-                                                    'md5' => '8e9343a7dfd2aa2e38539833b88c9240607d168c9345686946c0d509584550130b40a40ffdeef5e8c86ea1561a138106345459ac034e7f98dcc67ea418a0a859'
+                                                    'Revision' => 8,
+                                                    'md5' => 'f328fc950eaa4b3055fff82625da805bcdc8708115a79f926b623432ac30d3482fd933e0e8a252086a61b3f48fd27cdd850aaa828f74f5a774e7e6b2ee272bfe'
                                                   },
                'config/ecolink/firefighter.xml' => {
                                                      'Revision' => 3,
@@ -711,6 +783,10 @@
                                                     'Revision' => 4,
                                                     'md5' => '59094a94ac42598b888a8a6edc2d87f08b0d47b174246fd4d22f46a71ebc1951edde9ae30a094d5502916e8381bfecb1d67d86fb9d54c9bbf91968585cf6ff3d'
                                                   },
+               'config/econet/ezw1204.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => 'fcbf2492b919363361339a98d7a9bdfd67618b9655cbf1795d8688924abf331ccb31ccc9169d05d5a541baf40e73e753f5d9a5e30a8cfd7f7149d69484038aee'
+                                              },
                'config/electronicsolutions/dbmz.xml' => {
                                                           'Revision' => 4,
                                                           'md5' => 'a73eed69c4692edfa8c192c3ff82849c84585689ff73f07d7497d1abbb5c8dc77a249c4e090f366d0ec8cbb8da63a4727758685e3c0012821f0918fe78b8ac5a'
@@ -752,8 +828,8 @@
                                                       'md5' => '6725ee78062fb147fca3f41f1868bb520abf637684dee1a2cf39c2257fde1d98d90eaa6a2a35f54f768e013557889552b2458e72f37b81079e39b84053b39182'
                                                     },
                'config/enerwave/zwnrsm2plus.xml' => {
-                                                      'Revision' => 1,
-                                                      'md5' => '88a742755d7eb4a455adf6378c70430bb73ef68deeb3099cc280087eb015eac40e426c7f8667cf073009a3c9abc92e695ed4933142726c28c7a24324f25f54ce'
+                                                      'Revision' => 2,
+                                                      'md5' => 'f89f47cf55c773b388c2694738955d138ae819b3962a6a2fab1c1a41039bdce7d474a7fac4503a42f4ca3b35040ae0c7795cb790379ba963b188272a4d2225e1'
                                                     },
                'config/eurotronic/eur_airquality.xml' => {
                                                            'Revision' => 2,
@@ -764,8 +840,8 @@
                                                        'md5' => 'fecc7214a3cb7334806e38686fa9e4635caefff7a7bac8cf98af1b1a6dedefaa33a7a943f6435d5ae8d2286d39a69c08b3fab173ed29fd367de5fba6b321886b'
                                                      },
                'config/eurotronic/eur_spiritz.xml' => {
-                                                        'Revision' => 5,
-                                                        'md5' => '0aa11f27796457c03ca1de6842ffb31d7727edb6ceebc689fe7c03a71b29445807e331a6cac4f2140ae1e0cde9355bfed6a52312afe84c25c1f2b61004021776'
+                                                        'Revision' => 6,
+                                                        'md5' => '0dd6650679d4f3fb99fd10c0d3e125fd2c3320edf88c3a808a6fdc0c5e3301034335c9469c2b278e1858dbef381c885a442e816b3a2d40aae119ac1bcadfebcc'
                                                       },
                'config/eurotronic/eur_stellaz.xml' => {
                                                         'Revision' => 4,
@@ -895,10 +971,22 @@
                                               'Revision' => 3,
                                               'md5' => 'c0dc3a85b7da4e3bd36a877f968ebe8f4315376349793d6d0f7e0d9b8bbbe1a888473c0261ba67dbbf6ada1f65459ef273e29e48643a30696a4ed0e2c0a674f8'
                                             },
+               'config/evolve/t-100.xml' => {
+                                              'Revision' => 1,
+                                              'md5' => '7f807187a53ec217bab2de7a8401670593d02226802cc5ef897fc7f7e5db58925deaa2c3ce12353305c8029b67aca240c0f03c55673f0c39265359b7f2f8e3ed'
+                                            },
                'config/fakro/arz.xml' => {
                                            'Revision' => 1,
                                            'md5' => '5983b72ce936031edbf95af40b9a1141b1a4b902d85387d1c93878a227cb850eba1616606f4acf2bb71d77d6d53943b43312ef960dd98586f6fa54c6765ecb0e'
                                          },
+               'config/fakro/arzsolar.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => '45ea7e674b111811160d58f2677a643e67e1c0e95baceb3f05b6256f4621f5efdf22740644e347689fddfbdefe9c024bc1fae47ce4411c194af79598e8ea2688'
+                                              },
+               'config/fakro/zrh12.xml' => {
+                                             'Revision' => 1,
+                                             'md5' => '27769984df864ecddd0076acd107085bf13267952adb28bd00c1b33b3a00556f935eb740adaedbcc2d74a20bb34af26e68390788e29012befc9485c08744c5f0'
+                                           },
                'config/fakro/zwp10.xml' => {
                                              'Revision' => 1,
                                              'md5' => 'c841afafac7b5636e538cf14bcc2c6ae28e30ee68aa865887559cc46a94a628d091fdeab1af02fe2b6068baddfc64c9689c70948a604985515d96efaca5c7d71'
@@ -936,12 +1024,12 @@
                                                'md5' => '21d87779df4aaf0c9619b9d3260b2e1500cda54534f89ebf272f154afdfb1fe2163107968376d9de8f43203e4a9ca45f0ffd1f5226d4690c443ca87edee630bb'
                                              },
                'config/fibaro/fgdw2.xml' => {
-                                              'Revision' => 4,
-                                              'md5' => '722542ab5ea6086a921290c5d01d7554e05fe93bc5bb467e562913ae6e1b989c807bb2eb6b172db4875e30fb8b68980395995c16626f7fb0a4f3af715fd5f687'
+                                              'Revision' => 5,
+                                              'md5' => 'bf766ffd85bf105faf0aa1e391d5d747d9fae52479fd52a3bb43dea64e5634113c730066ba200bd03e28922b7a1e04933edd53dc9c84d7f17164cbc378694597'
                                             },
                'config/fibaro/fgfs101.xml' => {
-                                                'Revision' => 3,
-                                                'md5' => '12015e24fc0e3ed9a40a9a36e372629d7a858917668b531852d52206ef0c52f438b70ae0c91310304ce004fbad8e0115fd875da1eb9ffef5c9323416f9d71cd3'
+                                                'Revision' => 4,
+                                                'md5' => 'e5e06eb03490aeeb0e25703fe67cb02cfca4046b8ac618012f3019c5b3468c74aab0daec6017b0265eb75ed637d229d9d1849aae8fa4b95b1b5f9c6c7b9b6f43'
                                               },
                'config/fibaro/fgfs101zw5.xml' => {
                                                    'Revision' => 8,
@@ -968,8 +1056,8 @@
                                              'md5' => '76242fb913189103b1a368f5a5e4329cd443136b0b38e67286867e4170cc75527549130b1683015b93fbce90a7c9f7a95b3a22d3913c322e4730f44078b1e1f9'
                                            },
                'config/fibaro/fgmszw5.xml' => {
-                                                'Revision' => 10,
-                                                'md5' => '47c434a0d05848c52c3ec693f491e978086eb90d926a00ffacd7056dd645bb1bc382ee348097e26613665b08429031aa94fe5d600810815431f530791dca9214'
+                                                'Revision' => 11,
+                                                'md5' => '0adefffe86619a91a05a0904132abd3e24c6d367986f082cd08ef0738d340814d209b631c32d1eab4752263f86086c2e0d4110020d1d1be456f12f4abe887ca8'
                                               },
                'config/fibaro/fgpb101.xml' => {
                                                 'Revision' => 6,
@@ -983,13 +1071,17 @@
                                                'Revision' => 4,
                                                'md5' => '10d3acdcfb6738324afa2f6c4c0547f29bf04634fbe774bedeb5c160c547168d5ffa1dbfc8740aa4c12c5b928ff2e9d8ca1ca99c5f7f2a366b6e037371a32e69'
                                              },
+               'config/fibaro/fgrgbw442.xml' => {
+                                                  'Revision' => 1,
+                                                  'md5' => '7e75383774d35228492d543a94cbcd4a9652e8cb6b934bab92dc6b1d5b634d518b70370c61cabe52c1ddcc55b741600e90dbdc0bc7982232b5ab641f2b914093'
+                                                },
                'config/fibaro/fgrgbwm441.xml' => {
                                                    'Revision' => 5,
                                                    'md5' => '302c58370d2f92b94036178c3c7e09e2506c3cb31ad92b6989a3599de87f80b51d0f33ebabff3a9ce2ae81512be294287265a21c48d0176e5db80eaafd541fd2'
                                                  },
                'config/fibaro/fgrm222.xml' => {
-                                                'Revision' => 5,
-                                                'md5' => '9afa4db8e041a54de279744aa81394c8e00cc17b675ce8212dbe06c3908b2af3065ae4c4f26183abadf9060abe8e04c209d69eb727bd3ad576051553218baf13'
+                                                'Revision' => 6,
+                                                'md5' => 'ce4f42d47c38e5743e77a783d0c1fe86ea66b97e5165b922cbb14d4cb66c5b77b6b28289a5bdbc49e1e4ea4fd1634d9afc57d0be660ac1e0d03e6abce02c049e'
                                               },
                'config/fibaro/fgs211.xml' => {
                                                'Revision' => 3,
@@ -1003,18 +1095,26 @@
                                                'Revision' => 11,
                                                'md5' => 'e41844de98b9d3c13bdce42661f3126dd742e92e834255ba4926a69a305a9d6e0f629ff16ad7018b1b299e03294b21a7b2250e68278c3f2e2f8134c46ffa3119'
                                              },
+               'config/fibaro/fgs214.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => '6c14728668387d7e7a905dc8c360966afe1155006a187fdaf27b639980d223d1e351f87a13cc1e1a8b00be318a73b74d4467b695aa40ef5f14b6ddec0e99f3f4'
+                                             },
                'config/fibaro/fgs221.xml' => {
                                                'Revision' => 4,
                                                'md5' => 'e0260bbc99a7eab473a1f80f9398602f6316c00f3f2177ea76bbaf240dbb831cfe7f2ce9caddec53a05655ac6e73b5c36db55f1218f8a0d2c2bd0a4c062c8f4b'
                                              },
                'config/fibaro/fgs222.xml' => {
-                                               'Revision' => 5,
-                                               'md5' => '4adea0927515ef9146d48192bf09fceb0132df7a8b770ebd89d5473b92a32c12fe500e47ba31acdfc28cfb520e4d43eba5b1fbe3fa49ef5331d8a433ca83de62'
+                                               'Revision' => 6,
+                                               'md5' => '1d4895013a2282e732c1bcb84c75157043064d95298f1469c54c133f504668ca818f1aa4ae2abada77a0712b7a62abed883f53d9ac81617f2c8e6cc7b6b07067'
                                              },
                'config/fibaro/fgs223.xml' => {
                                                'Revision' => 14,
                                                'md5' => 'a20bca0d2a4fbc249391a9e21197c4481e7d650d90cf6f52a9c10f6783b576b083a7979178ecff6e64e17a6266e197f155105a8b57c5346e404e99db3de395ed'
                                              },
+               'config/fibaro/fgs224.xml' => {
+                                               'Revision' => 2,
+                                               'md5' => '5b877ff52fef4c7db0dc43daf33b157d2a9c17caf310b9631465371d80f81bf73434aa5de944e3ce45349f52b4a4edab88461551ca39c6502f03e9255d0fe416'
+                                             },
                'config/fibaro/fgsd002.xml' => {
                                                 'Revision' => 7,
                                                 'md5' => 'caf23b9d5714c41757a472148801faff4face27a0b9963b74363bd2fc78827d2073f47f9e0f89745713d19234b48ea80ecdfe3e1c100a156962468403f7dfd6c'
@@ -1024,21 +1124,33 @@
                                                 'md5' => 'b3ddc92e51ee5a0ac5eba30f3cdba72f8c8aa114b2b474f3d7096d0092ccf9ae8ce6042e8f6182f4a07129a891e6dc83517be0d5d67bda91893ec0bb210f0f45'
                                               },
                'config/fibaro/fgt001.xml' => {
-                                               'Revision' => 5,
-                                               'md5' => '64b989c2046a0c572b8e25ee2c3c595e1a5c2eb52e9c6a29d96cbe0c71b33d4a46bd640e551564e6794aeab9a5e7a9a011c0e7430ab2b52de518ba9cac81c3b4'
+                                               'Revision' => 6,
+                                               'md5' => 'dcf003e4bbe58bc3e0e706801a0734095db4ecf5a40c73ce5dd03a2a3ae9cc6e6033c87ae08b6d7c8575de5ee8fb56541496c584d676c6203ca29a98546b98cb'
                                              },
+               'config/fibaro/fgwceu201.xml' => {
+                                                  'Revision' => 2,
+                                                  'md5' => '6da183adf79ba89f7e5c079eb320a2b8ca521d329e110e9f01b99a48bd14d8fb1c5608ec568d6fef648d1ee56ba0cef91257000ec7b2ae4b13b88524cd501391'
+                                                },
                'config/fibaro/fgwd111.xml' => {
                                                 'Revision' => 2,
                                                 'md5' => 'bf6d95da83aad31068f0f62fb3abf1d03481f63dcaa347f8fe6a38cc8d4a2bd9a3031722f9a4e73cd6823dc151fdf30772c4c3b5d4f06bdc6df3120389091057'
                                               },
                'config/fibaro/fgwds221.xml' => {
-                                                 'Revision' => 2,
-                                                 'md5' => 'cf74c8f1c18eb10c407b306c1b8d6faa536f8d9c1a7f21e1bb90c28e1502054b52a0970f820b118be2e235c34b57aeb66050b653255b48ea4aa1f811b4a20c7f'
+                                                 'Revision' => 4,
+                                                 'md5' => '9641565fe4eca688bb3f0b73acf0a425b1f301f68c67e5ec8af0255457e9ded311aa311c15152700e3fdf51363ea8c04ce397e79426b2c01d75ab8193d2aae16'
                                                },
+               'config/fibaro/fgwds221ss.xml' => {
+                                                   'Revision' => 1,
+                                                   'md5' => '044ec0227f23e478e9d8315100cd9a4bb6886f94e5b7dd8077133159ce99a042abb6075ccdd6a03639e2e4681f5a21cf0bc3a6005d143195de829c5b799bff78'
+                                                 },
                'config/fibaro/fgwoe.xml' => {
                                               'Revision' => 1,
                                               'md5' => '117d888dee07fa6b24bf1a69a144e631921c7f06ebdb0e90632560ecf45872eabdc82e2821d734f260585c660dfd47737c5948a44c9ed21674e13b8e1533824f'
                                             },
+               'config/fibaro/fgwpb121.xml' => {
+                                                 'Revision' => 1,
+                                                 'md5' => 'efc9063c630e257e314ab3676517cac800807248d605b92be342b98fcf4562c9cb7a872c71970fa4953950466a29c5b6dfefbc11077a7dd4fb209a99a4d267c6'
+                                               },
                'config/fibaro/fgwpe.xml' => {
                                               'Revision' => 6,
                                               'md5' => 'f099c34442fb3d67723c59cbec6b31d2d383686b583ac013607848e3d8dce2a9628dd96a10751a027cf8d18c4714b0272dab073dda20302b1dc5820f18273643'
@@ -1055,10 +1167,18 @@
                                                 'Revision' => 1,
                                                 'md5' => '14e1efc7dd30097da9adb3b5c69ea5c114ea63806004f553c701cf7833aeea730b4fc1cc30913b1cedcf1e2e88aa2f7785cef3384663df68a879a0a3a5b184e7'
                                               },
+               'config/firstalert/zcombo-g.xml' => {
+                                                     'Revision' => 1,
+                                                     'md5' => '3aafd7c7283dde9c093a55c0c6e0cc0c8f221e9b06f647cc151b97a4bd4296c2715e89d9c62886d275f213376e2e3052a23ce05ed027a181f054459fdef0e3cb'
+                                                   },
                'config/firstalert/zcombo.xml' => {
                                                    'Revision' => 2,
                                                    'md5' => '6550cacd482668a1c7561434bf094255cabe30b5beda26c406e2f9f5a772fb19176f2c0b28824f9015ee64b0d4f737f5f9b35ad2c133852f7286160ee337844d'
                                                  },
+               'config/firstalert/zsmoke.xml' => {
+                                                   'Revision' => 1,
+                                                   'md5' => '419d50ff831000b5b2ad8dccc3841dd89cd1145186c7180d98d3b5071b02dd4b94ce8c12c1471ba7cfa4243a3e46c63779f5e31d1559e95f571f471dcf32c2d2'
+                                                 },
                'config/followgood/swz-1002.xml' => {
                                                      'Revision' => 1,
                                                      'md5' => '3142c3cc8cd97d218a3f3a31d841d308ab0a51291fa2a57a3c13c3cc45cad79350d958463bd1667d596a99206c5759877a7423692e714437e922f9aba5bee6ee'
@@ -1119,14 +1239,22 @@
                                                         'Revision' => 3,
                                                         'md5' => '17ebbde5eba4998fad0e35f252461259606ca8e88d0eaca3437cb3ccabd36797b28671660bb7955349eaff19cf617d86f20318693d0766f7c56a14998d2c43a8'
                                                       },
+               'config/ge/12720.xml' => {
+                                          'Revision' => 1,
+                                          'md5' => 'dad8cc08440a1f5abde69cb6649d45eff1059ed7a8e58ca297192f20e89941f8fd09d2ab491781ae0ea2fe840123f782a0881a2ae75e3d79f7e0de6f63ab9710'
+                                        },
                'config/ge/12724-dimmer.xml' => {
-                                                 'Revision' => 9,
-                                                 'md5' => 'cdb1e185894f7a80aa5bc4e24aa8b0bef64519c19421b27836fc93d8df2107d981fa947801fc84ec312d0bda4048afb12772b478345805a425a101525d8d6a29'
+                                                 'Revision' => 11,
+                                                 'md5' => '6568fb1fe307b61db6b8a4f9f068124bf6dd7a9fae99a2fbdc008bd25a4a2a629e53b379f0ef1e589bda4c871ffbef5d8e48fc9ee4c8fa35a855d4a3fa6493c5'
                                                },
                'config/ge/12727.xml' => {
                                           'Revision' => 1,
                                           'md5' => '2f1fc4587bf2caf5d982f45535996a36bdb93adb7de8f089e9ca8bc042d91e45677bc2f5997d125b3eb1e93f533c00637ef6d7106a9c456878aa8523ac52dc07'
                                         },
+               'config/ge/14280-plugin-dimmer.xml' => {
+                                                        'Revision' => 0,
+                                                        'md5' => '62c479d852b5e22ba57306c3877ca58eb247528829d02022d8796c725a7b4964c5acc4f829ea807fff291182777ae271a29676145933fe78fe80f7873d597e2b'
+                                                      },
                'config/ge/14282-plugin-switch.xml' => {
                                                         'Revision' => 4,
                                                         'md5' => '72ec968ba6c64f65c48fc8ef9fa33f623717bda452d0685547735dea6240ef4efde6a1da95f683cd5fe1efdfaeea834a13412482a305c05423c21186c7edaa97'
@@ -1135,29 +1263,45 @@
                                           'Revision' => 2,
                                           'md5' => 'cd3edde334dc3c489b23b3148590077b6e4f3d2a50fd3530fac2e140a956ae6cc41ed1d435ea47388456d955d7fcccf0a399225d76d1e58796c36e406d42491c'
                                         },
+               'config/ge/14285.xml' => {
+                                          'Revision' => 1,
+                                          'md5' => 'f3a27a970ed353ce1eeb8c70a30b9cea0ec86e06fdc2a603291b92139b4ff200ba60af992b156660e7c8237e59b0bc2337ae517e22f821088c3ab1d80e3ee71a'
+                                        },
                'config/ge/14288-outlet.xml' => {
                                                  'Revision' => 3,
                                                  'md5' => 'd9fb1de64ede9d3da8730b73e67149d87f383aa45d878cb1fc54fe59cfc4b636577f35c58823484f3d5d830b0080aa69b4c86a934225c521e11a7f81ca07fb93'
                                                },
                'config/ge/14291-switch.xml' => {
-                                                 'Revision' => 5,
-                                                 'md5' => '341219ad5f6d3fb200034d60733383e2d2499c3486b2389b11984895a8ca577b817c9b986ebf875973424771aca68d1b1800df5d710e3dd4121963ab530c2140'
+                                                 'Revision' => 6,
+                                                 'md5' => '26fbb25b684f516c6ea4b2ec40af67ddd8d2d6870a65f18f4db0fd38b38eb508f8512da9dc96a4e0ffab200ae02be8cab9178a4617ea17fabd0ac63ee5bb2188'
                                                },
                'config/ge/14292-toggle-switch.xml' => {
-                                                        'Revision' => 4,
-                                                        'md5' => '499251768ad6b8c824d1a20f49270d9ecb1bf8681067654ffe6a795aa3a5b8ac314e3a75047fade9bfaa31dd57879b16556fe5c4e04ea82db570f99c0171e177'
+                                                        'Revision' => 5,
+                                                        'md5' => 'a0fa7333db77747a5a5cbc70860b04900739c52c015d8b4d6a45b36a275469285672f70719b7be61de3ee06a1845f9d876b89557aba862c8f3776cd9d67c18be'
                                                       },
                'config/ge/14294-dimmer.xml' => {
-                                                 'Revision' => 5,
-                                                 'md5' => '1328e3b4a3457a0d0627f9842b6a1c47439c98995ab05cd86b1a3bb0228f8051b5839a4e69275635715de08e7c816dd32968c3b6db310b139318e71871a7a24f'
+                                                 'Revision' => 8,
+                                                 'md5' => '0acd274b8f1f60d0c2a8b1a704977f27854a8f4346c97304fa89b90eb71aa1c4bbaf1c96d64d1b3b5b9b4d707c521555a173859d31ac733e9cd9b7fda28c270a'
                                                },
                'config/ge/14295-dimmer-toggle.xml' => {
                                                         'Revision' => 2,
                                                         'md5' => '936f319de3f6658b448d9c27ee2b6c639a5702fa2669a750ac841e13e2dc5fbfd1c686ae6805cc231b94607c36781d2bd7214ea81fdbdf10f11efd4a7f9c9848'
                                                       },
+               'config/ge/14298.xml' => {
+                                          'Revision' => 1,
+                                          'md5' => '24da4dcaab326eb2aec592f74c6db3e51d05108773b6613a6f415760a93fdd98be579834488335ed3efd2f987c20f316284b39b1a8c659f67e83895f50021044'
+                                        },
+               'config/ge/14322-dimmer-toggle.xml' => {
+                                                        'Revision' => 1,
+                                                        'md5' => '56f3d865b46562564dcf28bafb2449704e0b5df1ed57025d0cc54e0c865d4a7f8b926c03e0c60be4b47f1be0bac25a5e3ff5ab4a8706d0c910b8b710f9ca12a2'
+                                                      },
                'config/ge/26931-motion-switch.xml' => {
-                                                        'Revision' => 2,
-                                                        'md5' => '80cb83a0ed9a932b0fc85f6046fefd92065741aa6d9d764417a0718edf1d528680638842f199888b8c0c2986b7cf3b7930744ca309986668d1d605ce68b59d29'
+                                                        'Revision' => 3,
+                                                        'md5' => 'd29b700b0b98e93829596b71cc1888534dcd18dc13d057a25a6b5daf8792e156f1d1cd39d168cdf5a419ca6c890ce7bdb22fd341e06618a2e1f2456c4fc5426c'
+                                                      },
+               'config/ge/26932-motion-dimmer.xml' => {
+                                                        'Revision' => 3,
+                                                        'md5' => '536b5e0151fd2c4c31478e8da98ee7cd7e3e75233f45f2563f37e5463884d636521b67da7a2af87abab15590c877c2752192147b776cf85114aa4ffe8c0da23d'
                                                       },
                'config/ge/26933-motion-dimmer.xml' => {
                                                         'Revision' => 4,
@@ -1176,13 +1320,21 @@
                                           'md5' => '1a651b322ebaf4de9f8b5a03c9604cf55e6140cd1a64f45814e6e8818d83dc4e0988f7f8ffcd318ca3d9424f24e78250b742fa87025f682e22560e1774d18df8'
                                         },
                'config/ge/46201-switch.xml' => {
+                                                 'Revision' => 2,
+                                                 'md5' => '1ecb7e32a13de469936cf4bcb1fe12da5808a7a431caafe2687632755a8c7b031c6a14a8848ac11115fc2589c45ed408f7cb7bb0779133b028c5f66e201fd835'
+                                               },
+               'config/ge/46202-switch.xml' => {
                                                  'Revision' => 1,
-                                                 'md5' => '3ae4ec70a396a21c7b8e72f979c343f715f133b2a53d827b31f88ed45e17fd457dfef597c64b13bf36b688d21caf42c1e488971c2128a3baa8a5d9d4b887da13'
+                                                 'md5' => '0b52e54d014cf6ca5f94d2f0ac130236625b2ba575d8edb955a0a682b358a1c30b481f23b598c31349068aaa95a5a02ba76d074f7c0ac1ace38dc3134b584a3e'
                                                },
                'config/ge/46203-dimmer.xml' => {
                                                  'Revision' => 1,
                                                  'md5' => 'e66fa46f950b4533040b0bf24df89bde1fd624c7cd4ce92cd88721e31445e8cd41676f4dd0bc4587dbacd37a462bf9967651cc0bda71f1d7a6c089893c50fd92'
                                                },
+               'config/ge/46204-dimmer-toggle.xml' => {
+                                                        'Revision' => 1,
+                                                        'md5' => '3fc29dc416cf95fa427f0dadb5c5676bc42cdcf148072b0d4a7d37c1034180410c60ba767bfe27fb262a36c276de262e2ebdfd70ab0301fdcf2dd38e655250f0'
+                                                      },
                'config/ge/dimmer.xml' => {
                                            'Revision' => 15,
                                            'md5' => '69d688ae37c8887da28d801b24305f9bd81ee1f9b1cea214c492340ded4144263955f4325a229b33c22d5ac0a7f327b358cd0bf2100e4d096e9772822a0960a1'
@@ -1219,6 +1371,10 @@
                                                      'Revision' => 2,
                                                      'md5' => '15d627a3d9de686ec39e3cf2cda1adcb335cb6b38ae807106007a69416c45622ccbc9fa06f2b7ea4a9fed73646497f8600cf54e27e879ef90d71fda6fa19d452'
                                                    },
+               'config/goodway/td14010.xml' => {
+                                                 'Revision' => 3,
+                                                 'md5' => 'eb19987dcaa0c672fda5d4e7b340481176b132332a21b745628fd735597b6f88f6c6e2c8e662ac3380c0195dc42ebb4e29741f3b43801e3b0dcccadbefbf79e9'
+                                               },
                'config/gr/gr-302n.xml' => {
                                             'Revision' => 1,
                                             'md5' => 'a151aeaebddc3e1b697ea96f455aff329e374662ebb64849067dd74f50caf3a96d32750aeff1005f7df557fdb6a3f75aaf94190ace1566bae5bb25019719b0fd'
@@ -1243,6 +1399,10 @@
                                              'Revision' => 1,
                                              'md5' => '536a0b35500ee8ab596c1093763c408e4b7ec61bb808f73495f0c89e25e038522fd4f35d9869fe5dcf54c51109260d35a53bc525c446040110f771a0c4cda308'
                                            },
+               'config/graber/mcz1.xml' => {
+                                             'Revision' => 1,
+                                             'md5' => '3aaf4b40388aa6f23f2b0221f1707c02690cb63ae173fd990604c9456999b75fdaf82f4dacac5f98d2f02e6f21d85c76bc8582a3c728b19465c8d73b7a26a5a6'
+                                           },
                'config/graber/rsz1.xml' => {
                                              'Revision' => 1,
                                              'md5' => '598bdd923d527543430b89d86d2f0260c26a59017a3f44d7eeba00ce809bf01f9a0161041d1b9745a339dbab0f7f0d8f984504a74dad89921921454273e666e9'
@@ -1267,6 +1427,14 @@
                                                    'Revision' => 2,
                                                    'md5' => '280feec2b7433f743ebbacfe437dd6b1423b38777141a11f22433e29177b9280db33d2f15a26da0a9b0940c93c47d29dd874e7ae7b12565de709dd73ab669a9a'
                                                  },
+               'config/hab/iblindsV2.xml' => {
+                                               'Revision' => 2,
+                                               'md5' => '1d8c628927d098803b55085eafd213c946af427b6246eefdcdaf74ea576b17cc72c2d76f0ee6c1a238b509eb0b2dbdcd95fd0924997e760503f115ad65a3b6b7'
+                                             },
+               'config/hab/iblindsV3.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => 'ff25e0ca31e6e7b3a7ef6739e2175eb31b925b1fe663b1697df37710d07a8b7cf5056536b695f4a6c2a874ac2ede66318724d8f3592b8674ddbd2ecd7c0a0878'
+                                             },
                'config/hank/hkzw-dws01.xml' => {
                                                  'Revision' => 5,
                                                  'md5' => 'b11d36a38e54d9c4f36fde7224db3847a5e0bb09e5828ff9ef8802ef1c67000846513ad3e91b2cedcf19e91b95734b4d2864a4d44a32c32bab7b16e4a5adf46e'
@@ -1303,6 +1471,10 @@
                                                           'Revision' => 3,
                                                           'md5' => '6dc4cc5e720bb5c534f25510f20c134baffb3d4b1f68704d397bab9775b6b14397471dee6469f230ecb81afd79363837589a531be926a7d3e789e82b4c1c5a83'
                                                         },
+               'config/hank/hkzw-so08-smartplug.xml' => {
+                                                          'Revision' => 3,
+                                                          'md5' => '825fa7c75df29cad9ad3d2556e2b3c3eed5636ee0a4b2ca3af5eeb0542908373eac082b2db0839ec362d18332842add4fc09aca713629fed8c092e9dcf576fde'
+                                                        },
                'config/hank/scenecontroller1.xml' => {
                                                        'Revision' => 3,
                                                        'md5' => 'e748ff7ae3bb3358e80b863cdea2103275dbf536edbd538963502c7629aaa623c49b562d092cfbf4db17f7fa2f4b191223ad1e9513c86b58b937eb6504145f7c'
@@ -1384,8 +1556,8 @@
                                                         'md5' => 'cdd48d1045234e40dc257caa0df6eff883426833bb19d55587da53b78e9362eae2699f3cddf4b25f6aefbab24d06c0fe34ded0c7bd12b03853a2c965193a754b'
                                                       },
                'config/homeseer/hs-fs100plus.xml' => {
-                                                       'Revision' => 1,
-                                                       'md5' => 'f22c8e1b51b207c4dedf156b3bfc76e5577dfdd650eaaf96ee51952d5e42a555ab1b827f449be147bfc17fd3979f84356fd19d3ec4ed66c5dc3e639ee99afe34'
+                                                       'Revision' => 2,
+                                                       'md5' => 'a749528efc1e275c53dd5d2dcfac7f005798172775756a54676b25c732cd22db548d4c3ff45118904d08c3d34f6c4195a5528fefe74a98b13395d87f93336bdc'
                                                      },
                'config/homeseer/hs-ls100plus.xml' => {
                                                        'Revision' => 2,
@@ -1396,8 +1568,8 @@
                                                        'md5' => '528e313dab27daf86c92e7ecfbf311077842bdff72f662c308d0554a308691b9a9c5830bc08dab5a4860991053c6a73b05d5c21f1cf115a8c70c873adeb27a5d'
                                                      },
                'config/homeseer/hs-wd100plus.xml' => {
-                                                       'Revision' => 7,
-                                                       'md5' => '58dc37e456d17f71693c819806d931e2e71fa36811e384bb225e9fac00539a80aa0df1093c5b48a0b8c58de2bfd6d1e0bf3f20ff9e8aca331d6530962fad0240'
+                                                       'Revision' => 8,
+                                                       'md5' => 'dd1aeca42ff3c3465442a45a0da960632ea52301b5514cceec9e4d58b47a8fc18e7ddbfb1fe06b191ba10f32cb91d6671e125bde7ce8e99e5603703124b29f0b'
                                                      },
                'config/homeseer/hs-wd200plus.xml' => {
                                                        'Revision' => 2,
@@ -1423,13 +1595,25 @@
                                                    'Revision' => 1,
                                                    'md5' => '46f0c29d16537254242bd4458489767cd57709b2d0c5faf5ea6ba92778d35362c72e998352a92964c67c81b9b819d66cdac55131154028d5928f0842c96f920e'
                                                  },
+               'config/honeywell/2681-plugin-dimmer.xml' => {
+                                                              'Revision' => 1,
+                                                              'md5' => '45efb5ee352873cfb38af888b7cf532cd87108438131ed6b0645c2950a87429b560ae6794d48a58ced064ab46a9a32e5cade299a09bc49c30991df77b19e2f3d'
+                                                            },
+               'config/honeywell/3830-zw3107.xml' => {
+                                                       'Revision' => 1,
+                                                       'md5' => '198e8c84e3e9a1689bc73ba0f35ab36fff0960580f9e78adb75b89af347c834abe53237dce5817a328eb7b7afcb5f4e4ebbf44415e05c2d78749779c04b3d486'
+                                                     },
                'config/honeywell/39348-ZW4005.xml' => {
-                                                        'Revision' => 1,
-                                                        'md5' => 'f049f5fd6b0b8329aa26ac3f2e6751a68a261c163c001c076cc7b984662997fc2d3772c5b0c2f510e7f4d892bcf0db37275acc3b69405b553216279dbdaac285'
+                                                        'Revision' => 2,
+                                                        'md5' => '4d97e53273d973cc3207b3b9e19900a17cb13363ad8e82cfd055ad990604ee19a08128e933ab41be50016a933f83f1b8e4568d562b84d6fd523d76fa8b477861'
                                                       },
                'config/honeywell/39348-zw4008.xml' => {
+                                                        'Revision' => 2,
+                                                        'md5' => '9770a4da93a9a3f137296f4d82f7267a3e759c65f02c57c2d7f8a77311ba07f50ca738b94dcdb942183ca924b4629e4e6581971329911113df979fc69552d94f'
+                                                      },
+               'config/honeywell/39349-ZW1002.xml' => {
                                                         'Revision' => 1,
-                                                        'md5' => 'd018f4a7a4ae73124287863bf09d7100153963e3818df2a7c0732e0e03af0f19efe1537df5d2a93c699f080238c2a289bda1e0cb6decb640b2a596d0cf29282d'
+                                                        'md5' => 'a2fe0efafeb8f38685cff7e6fe32cbd5e9085c21b3c4901c568e085b56177b555478dc39a5db6668060d4da7bde6c6cfa678f55fa2fdd81e0a1a488d01be662c'
                                                       },
                'config/honeywell/39351-ZW3005.xml' => {
                                                         'Revision' => 2,
@@ -1444,24 +1628,24 @@
                                                         'md5' => '8fbcbc2963a36423b42e7dc2938168c5ae752eee37b35f0205ed4d2162f372e58d646bc8fa794e19221da9d3a0c39659cd4951cb5a30310f9ef7969af1fca9a6'
                                                       },
                'config/honeywell/39358-ZW4002.xml' => {
-                                                        'Revision' => 1,
-                                                        'md5' => 'b6f7878418a3328a3c0a0420ede62c0b1e508217b8c0730dc2f8b9afa408a3cdb32c1a3175cead6a5adca545561d39512ee8bb043344b89be6eeaf5c5b609263'
+                                                        'Revision' => 2,
+                                                        'md5' => 'f5b66553b75341237286f46e2c1d7665785f41ceb276a0caf152012ae06957310ae50b52c6caf955c188bceb18ec1ef4b1dda8a440f25624d4c3a668153aed5c'
                                                       },
                'config/honeywell/39449-ZW4106.xml' => {
-                                                        'Revision' => 1,
-                                                        'md5' => '7b853c60b739818ab2cd427c6068e7929d039ae0bf2872757defb8bf7445ac996825fc56c7ad9bfcda509d4f7deaed61a262a2cb24035fc9a63429d10271646f'
+                                                        'Revision' => 2,
+                                                        'md5' => '63bb116001f13ab496d811c8835018afde8421fd5b4856069d1dc00461d0b6b5e5bd254cc6721dffe5c51023829f64bbb1d41d2e1b2047729a508e1a44b37c94'
                                                       },
                'config/honeywell/lynx-touch-l5100.xml' => {
                                                             'Revision' => 2,
                                                             'md5' => '530fd1b4c43248f55ab6bcc788e80bda83eeeafa515f8b812e07b1f507399f163145ab3337d8f26d6bd7313de6028ad13502c7ae2d07f9b4ea8b4ca730cab0c0'
                                                           },
                'config/honeywell/th6320zw2003.xml' => {
-                                                        'Revision' => 3,
-                                                        'md5' => '8a0acbe77f563e0aae7ff5ad345c82d385af65bfa46d4b846209cfc03c49bf6c2895163092c1be788cdd17013cc7cf0dc74d8bb3c8e750546ffe9da63120e2ca'
+                                                        'Revision' => 4,
+                                                        'md5' => 'dfa3a4d3afb7baf806b7c97070e9c654e8a0f022cda21ad9c5755c1d6dc1f36700eb3137a4f77e61ba61a8323cae7c9779ff7a7dde49a84da0d27cb306d76f5b'
                                                       },
                'config/honeywell/th8320zw1000.xml' => {
-                                                        'Revision' => 3,
-                                                        'md5' => 'c834e9fe6e66d30d708b4c1861d2f63fab2a8d43680c9ac9a626be1a87dbccb2c30767fbcd72d0aac4d621df6a0c41e3c7c668e95c95c848a538f6943548cafe'
+                                                        'Revision' => 4,
+                                                        'md5' => '423c31e6fa2354ee987cbe7fa2d8f406ae04162bdeb1852eb8ed4c9f88790cb292fa4429488cc395368ebfa139512e6c4f1d24ad2467ed3adca0313fca5590e9'
                                                       },
                'config/horstmann/asrzw.xml' => {
                                                  'Revision' => 3,
@@ -1516,28 +1700,32 @@
                                                   'md5' => 'f9fbf4ae903cdd0ee79fd4e11621453ea66777e729e85d437bbe76892984eea29514b93574f11dde87c478c05122c4f125639e44753dca567cc597b0c79d38e0'
                                                 },
                'config/idlock/idlock150.xml' => {
-                                                  'Revision' => 3,
-                                                  'md5' => 'fb0f3c54e2ebb95fa12f98ab7390151b803b89f239dba61fe2cf64a14c8c97de916127408348298e85d5868e981da2919864d6a8d06be23463187d808814ff75'
+                                                  'Revision' => 4,
+                                                  'md5' => '4e8b8082701c3a3137ced8f7636c82058dd9b9942f28125b6dd1d3c3147b7c01ff8c15c982f0781e1fcd4089db341506e318dbf1066d7e780caa2b7a0b3fdf40'
                                                 },
                'config/ingersoll/dwzwave1.xml' => {
                                                     'Revision' => 2,
                                                     'md5' => '7fe244aa57c478f25638817f015d2d5d9f83a6f971014de80242a25fd94a35c1e98d3bcc0ad26b69a0677df64993614ee58ae7fe60e6c8af1afe713d4a152f71'
                                                   },
                'config/inovelli/lzw30-sn.xml' => {
-                                                   'Revision' => 7,
-                                                   'md5' => '312615d44c47627c4c834d5d0a384b370a9a56087add1cbb84c99ccc61009a0f2e642a74dd0eff0096fecf6bbb703ecebad4b894b10fd9672053398915b67dc7'
+                                                   'Revision' => 10,
+                                                   'md5' => '8b68e4082fda4419b715a2c8f7cf7daf97c9b71303ca5cd30ebe42f856e7d40d076eda2525c0c628e4b07797ad3165e87cbf996a73f29a53e9c53a76862d933e'
                                                  },
                'config/inovelli/lzw30.xml' => {
-                                                'Revision' => 5,
-                                                'md5' => '8208176e7ccc83f4d3844e46f9779deee793a2be79c9b4d67e0106eed0a92c6034165bd008f6df4b6a5c8a0dc2d06e751b2de2904bf603ba70ba6ec7b928de0b'
+                                                'Revision' => 8,
+                                                'md5' => '0287fced6b4962a11846d14f3dae6005ea4e7a530b61bfcda8769cb81878ea2603a9d1207efb8103771ca10f539d3f1daa103f8ebbe8178d9f138b9937202424'
                                               },
                'config/inovelli/lzw31-sn.xml' => {
-                                                   'Revision' => 1,
-                                                   'md5' => '14107cd291dbca25504ca6d40af016f85ee4de99a6b9ee3e65a2e0cb734c0ed67fae8526c92f1e80988902f02e666ab10dc4eb7678c31bf346670727bcea4810'
+                                                   'Revision' => 5,
+                                                   'md5' => 'cd2c997d830c5e66cb1f23856e6e60399b811a8489f1ec94a9d3a5edf6f65047d9105d8cf59709db0890c0140562cee4e88f19ba8b6afdf4e2587cf87e5863c4'
                                                  },
                'config/inovelli/lzw31.xml' => {
-                                                'Revision' => 1,
-                                                'md5' => 'caa6e167bc23c949ce9729e3d7588fd9c4daa3f64e8db9ee548293bd98ada5022af8649b9811944714b5727117381d5b6ce18fcd73ee9048076cee120bfc69c6'
+                                                'Revision' => 4,
+                                                'md5' => '7fa5513084ea2e9c7231c1df9d2e912a6ba0d472115922a1db29f6faae6027b6a4b1ef4aa82eab3f52fc1aa1d49fdb549eb8a2bdfcb40564a9b6ecc6c5798921'
+                                              },
+               'config/inovelli/lzw36.xml' => {
+                                                'Revision' => 9,
+                                                'md5' => 'fc8d2062384870d955f1711fff7c3a3e4207f444da331210e57bac51147af9177bb7f03c2bc89a4c1f4aaa24fb17611fac637bab760a542b9ffd743e68ffe192'
                                               },
                'config/inovelli/lzw40.xml' => {
                                                 'Revision' => 1,
@@ -1551,6 +1739,10 @@
                                                 'Revision' => 2,
                                                 'md5' => '8a255b9f1762edab6edf809ac54964910f02427f3c215bb1def2741e8737b5479eb7ae3673be4f222558f3d70af66e3394ba16958dd9cb1dfd3e3b0c57122aa1'
                                               },
+               'config/inovelli/lzw45.xml' => {
+                                                'Revision' => 7,
+                                                'md5' => '06c8a460ef78d26a073341a0561641b98f7bb3b1cdd95e56b1f4ad7a28ab34ca3930a232ba023307090017e1fe85d5d83c8d3a0b0fb93dd4050a81c1f48e972c'
+                                              },
                'config/inovelli/lzw60.xml' => {
                                                 'Revision' => 1,
                                                 'md5' => 'd279c5b9dee85d2886f21b484af5ebd146c8189e480b6b676da38a0a3545c08194fab6a6c0b6c4de8f3cf145f2906d774af4bc703cb2dab9815f8d53f05c8b01'
@@ -1560,8 +1752,8 @@
                                                   'md5' => 'f5789891f9adf7716e6dec82b5764c2869b48fc626b54b9d7bc8eb894368b980c6831073858d82a6155297b4349fb415d39fe4e8a9680cf163802d78fa9e6eaa'
                                                 },
                'config/inovelli/nzw30.xml' => {
-                                                'Revision' => 3,
-                                                'md5' => '77be34d9bd689e34ca3922e6b3bbbd05412afcd2a7d72d8d6d0966920213c754a9a5491692a76bdec0ffdaf5bb044fb8b178c942aa5c2cf0ca86c9d0373ba95c'
+                                                'Revision' => 4,
+                                                'md5' => '8f9ed256dc1f56fa42124713e38259ad5ec3a332d51ecc51c99013af7e036cc3b217033a2f9344737282dbddee796fe08975dd15e8e680e619ba21205b1d0f27'
                                               },
                'config/inovelli/nzw31.xml' => {
                                                 'Revision' => 3,
@@ -1619,22 +1811,38 @@
                                               'Revision' => 1,
                                               'md5' => '6c73035dfad876c339cd6433337ec8b822da99ec5e4cee641f7c0bea712b18118e58243764df11200aa7745e1ef4fbe38b77f3df17b8a81ec7bc1350d379d57b'
                                             },
+               'config/kwikset/888.xml' => {
+                                             'Revision' => 2,
+                                             'md5' => '8e5c2437c10c94ecf8fb026f9e028a0cbc4b3709ce15d7df37abf9e777478436c2fb1feee5a935d8a41e98f1e9adc52530a2f702d08a8caaa80e33b5bc486f5b'
+                                           },
+               'config/kwikset/910.xml' => {
+                                             'Revision' => 1,
+                                             'md5' => 'fc4d9468508bb971bd24eb0e6b658e08760e04b60e23fbda089a1087e3fd167c92e994ee8c344e8317a5485d81821ed0716f3c2d9dfa21e74ae79785a6eb337b'
+                                           },
                'config/kwikset/914c.xml' => {
                                               'Revision' => 2,
                                               'md5' => '5724dcb1df68c2809fa3136f2fae556df59be5c75af1fe8283b3aec92239a422f36180f55aafe0589333e759e89b5d1d22b02f10fa0caa27d44b8f1b0f5edf18'
                                             },
+               'config/kwikset/916.xml' => {
+                                             'Revision' => 1,
+                                             'md5' => '4f011b843c8e07c72cd0af17a0b4ec1fa8764fcf8ea9e9106a283cd3afc7aa99d8c890ec0429bdae05fef29af0a4f9ba0172c8cce9faf203e774837d6d4758a4'
+                                           },
                'config/kwikset/smartcode.xml' => {
-                                                   'Revision' => 14,
-                                                   'md5' => 'ebdc34b0bbc28dfe0fba9a646885a4f1311664b85e267dddf02cdcd3f7012ce915f2c4ee8a88fe460e804c8faadfb6e03bbd691fe767547de0be4ce8fc8126a7'
+                                                   'Revision' => 15,
+                                                   'md5' => '25b10ac756242e227b2772b31101c9dd64a27dc5250b9923e8eaa3a56880911455af70bfdf8254d3d349ee9ff5b1f0d4e0339ce3dc143b66f602b0f43f568d0f'
                                                  },
                'config/leviton/dz15s.xml' => {
-                                               'Revision' => 4,
-                                               'md5' => '732a89135dc8ae080edff82c4662d60b69b1e94980c01e6a3201dd91ace0ffc58fd61bf621317410476325f304be2d78688a020a0f89a1d0736893232a6679e7'
+                                               'Revision' => 5,
+                                               'md5' => 'b7a57c24f9a19bc37086084b95a1bc541b8425f1877883e69e19008b41ee08ea0e9dbe854c9a2bb4e72d42f5972eb74eb768513d62a41d5f903e431cdef4bcb8'
                                              },
                'config/leviton/dz6hd.xml' => {
                                                'Revision' => 4,
                                                'md5' => '48977e685e55b815ff14870d049d84b7046fb76e55afff21055e6374a612971eb43f9ce51aee02f763b17cb77893b33d37abfe838af55b518d045ac2635ff2f0'
                                              },
+               'config/leviton/dzpa1.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => '44eab79bb9fe2c858b333d7e162c4f62258890cfa3ac7751ea5c7256bf2008421faa0bac4651fe03f33cf467fa7f872e3b38c2b5fa97a8dd902451977c793769'
+                                             },
                'config/leviton/dzpd3.xml' => {
                                                'Revision' => 3,
                                                'md5' => '56d3f1600de0802f82cc66f25306024d84aab6539f74cc12062304bb9975d5b5d605ce6c88e3b4112a68f2673c76a5a525e91f83a8ae0d6ecc487b7bd16f86c3'
@@ -1671,17 +1879,33 @@
                                                'Revision' => 3,
                                                'md5' => '9fa98d67f20fb67b25548993f0d004319d0c2978465226c1ff359a2dbf6a75919484eeaf45ba1a78c7b8ac72191538e5e3ea36e4f8cfa392eb0e2b8bf8a0e0d5'
                                              },
+               'config/leviton/vrpa1.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => '4444a13410fde75516d45b600d68209dcbbb9fcb9f2506a135deac78a9183882768a4511e599282b3a85a0fdb51278053fe1d022332f4d1c84034ba3e8241810'
+                                             },
+               'config/leviton/vrpd3.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => '366fe2489351c4de06bacb6c212861d56959e4b2d9cb455cce9ce3b2efedf7aa1f52c4c6ef22f29f70cc76558ed6e7b92bd349a19dca045f79ce294ca93728d8'
+                                             },
                'config/leviton/vrs15.xml' => {
                                                'Revision' => 1,
                                                'md5' => 'd89c5ecc71d6fabce275e8cda97edc9d42ba989269c1d4046ea530280ce5ca5d941956538b1f224030a6f34fb007b25d680c2c7570d6c088dd0e763e04f379f1'
                                              },
+               'config/leviton/zw15r.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => 'd0ba74846bbb01a3c552944cc6e5fd2122479779f26a6e94472c1fdf866342d44cb57ea3fca7134979dbd82fdccfb8a27837dd91fa185f7e7ff804a9d4d1cbea'
+                                             },
+               'config/leviton/zw4sf.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => '4cf229a4bab0b12de915d005488ecf28d388a875266615b94a690442458b98c09967cb8558762065abfb2dd9558e0da294ccb5152b213f7b3958c4593d80ebff'
+                                             },
                'config/linear/GC-TBZ48.xml' => {
                                                  'Revision' => 3,
                                                  'md5' => 'bae62218e942cd6e768c236ca9d90864f53afba4f142fb30d2d399dbc5ac864a6b2ec94f371d4a845774db0463d00d45d6faea7c272b593bd04c706ff578a69a'
                                                },
                'config/linear/LB60Z-1.xml' => {
-                                                'Revision' => 5,
-                                                'md5' => '7af77dcbc2dfec7eda52a38d8cd7042444141b0ad8f48cf29ad69903e4b0f609e6ccdcf042e14651c7485211aea9c07898a09ec9601f68df64f1ebf91fdd9d95'
+                                                'Revision' => 6,
+                                                'md5' => '8696980f7aa7f96a1c5b2be399c0093b306309e668d3be229d64891d2fb19dc3c95dc2f084ca6ed45a2c2d9837c2d77dc1a26211bd25249c55b56fc06a163301'
                                               },
                'config/linear/PD300Z-2.xml' => {
                                                  'Revision' => 1,
@@ -1719,6 +1943,10 @@
                                                 'Revision' => 2,
                                                 'md5' => '4431cdf404d513158d1f7b9f62644ef45818a5cbce27b27a18ab0bfc631c11884996556a41b82c6242dd5c574f005a80e68b8bafe144659d10bde6304aea0a5c'
                                               },
+               'config/linear/WT00Z5-1.xml' => {
+                                                 'Revision' => 1,
+                                                 'md5' => '378756bb646f7f84f3161a324289670142281a97fb074e7dd0123c7182a0b61963ee01f0f0feed71a0f9fcd11d4f2f458ad671710433187eead121085cb242d7'
+                                               },
                'config/linear/gd00z-7.xml' => {
                                                 'Revision' => 2,
                                                 'md5' => '48a5f7d3b0d0cafd025fc035680a298e8afce80831940ff003b46cfbd3a8056e781474e5a6d247bcbbd6cd74ce9d4c04475b7445dee870401ee912c3e6056c9e'
@@ -1728,8 +1956,8 @@
                                                'md5' => '88bf6abcbe1a82e590f415571cb96d9304ef77fedc43eea98b372142c84f79b94d001b87398f5610290d3c19ba79e59d856874f0b3fd3c65d2ffaea750d7e971'
                                              },
                'config/logicsoft/ZDB5100.xml' => {
-                                                   'Revision' => 1,
-                                                   'md5' => 'a2b206fae0917a7903cbce47d216449567e24dcbdf481c4b4b3a0856fd09d9d0c2959df86bfb12a4bd58c43634ca7cfec9948dd699e34fcd8e53d28a1cec5261'
+                                                   'Revision' => 5,
+                                                   'md5' => '3145ca4b1a0d82f196c79590e28841826165c6c0c6a018260d7506c743bb16b424265e3ac56e36da8755385442f27222fc9983c5a4ce5974fe5d215927f623cb'
                                                  },
                'config/logicsoft/ZHC5002.xml' => {
                                                    'Revision' => 1,
@@ -1740,13 +1968,17 @@
                                                    'md5' => '4d34aeaaea917c229bedbb737e4de1550b2d7db5f9e61566a1c0a39966b6442d381d01f93714e12aae1404797d36854274cc4063dd7424b00d27da238b17a36a'
                                                  },
                'config/manufacturer_specific.xml' => {
-                                                       'Revision' => 98,
-                                                       'md5' => '01c643b6c91707af17bca58dd42576bcfc269a2da4b0dc9cb111823f43dea1c9551061515e9825132b901fa9233ab4367933930d2c3a55418a1280561a154424'
+                                                       'Revision' => 172,
+                                                       'md5' => '9109b76dd1cc60709e13492d0261bbfe15603474a03ed681591e696f8bc036c9346d7cc01571cc70fc455c8c32d9ca9c121c9510257fc1952eaec3017066b3b2'
                                                      },
                'config/mcohome/a8-9.xml' => {
                                               'Revision' => 1,
                                               'md5' => 'd1809616fec114edc52eab80314654c8644550fecaec881193460099bface47dc976da727f2d2b0ed6b06fdea1560a942ba2bf230752722ec64c210ed8ce95db'
                                             },
+               'config/mcohome/mh10pm25wd.xml' => {
+                                                    'Revision' => 0,
+                                                    'md5' => 'ebef8141b4a35af56a90ca212206de80c39e15825c9f1a1101c24e6432d47644609b5d2d95dc19b7dd656fd3dc103fb487910f56f4bc032870290aba77ad4189'
+                                                  },
                'config/mcohome/mh7h.xml' => {
                                               'Revision' => 3,
                                               'md5' => '03ca338b59a9e520891497741c0c25dd562734b3f6367a4eac65aaa739351a409004c95faab888ae84c523ce1721d9b5842a9f365554dedf6faf6ed9fb6c7cb9'
@@ -1755,10 +1987,18 @@
                                                  'Revision' => 2,
                                                  'md5' => 'adeca64ab2864dedb92249a76413d32feaf0712385a53289c2c8c7778ea4e0b74403a191dc10c6de4aa3bac2a9d5f0b940d214efba597080483d3045ddf2be71'
                                                },
+               'config/mcohome/mh8fceu0803.xml' => {
+                                                     'Revision' => 1,
+                                                     'md5' => '5e41a956638d5e67045b75513486c36b2e439ad3a37e8970125c14009efbb65cc194e5c0e49d78c81b55bd601a8d0739d31d16a8a2a49c26679186485bc3a0e8'
+                                                   },
                'config/mcohome/mh9co2.xml' => {
                                                 'Revision' => 2,
                                                 'md5' => '663b2cbf6cbf61244da0704e8882d0d39a5c95be197d7b29f1d9a494f139e4c3cd50a7f6571fbd3815cae78378716652dec606a69a40300e286e4df45995dd5c'
                                               },
+               'config/mcohome/mhdt411.xml' => {
+                                                 'Revision' => 3,
+                                                 'md5' => '5358c4702375567b723991acc1f6b126d1264a09712f6828be6294183d799dfee7d0b66a02bb1b200c2a4f9097c64568a6d6fc0ce04dbf8c4f42f255c10d6fcf'
+                                               },
                'config/mcohome/mhp210.xml' => {
                                                 'Revision' => 1,
                                                 'md5' => 'ef4a59bae64c999292ce1f3307af32bec1203cd74c1bf69a990d036e670c9e02fe75b441e4e58cc52a7f563a6c5aa854c36479c06da46db4a6962d1f8c8648c6'
@@ -1771,6 +2011,10 @@
                                                 'Revision' => 1,
                                                 'md5' => '3cb80a2f92e58623f3c390ceb6dac6a4195a12bfce6726ea417ac28d2c80b337da8b79047436b1a34bee629b34e5cec6df3193e8acaab4c0866dd0e3ba5471dd'
                                               },
+               'config/mcohome/mhs220.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => 'c44d7297cce33fe821e92f35dd4e27a164db8a2f8ed3be6dba7bafc5e98629f836d92c2c32509de7cad48d4e56c2b4f095a7626e244e523e5f557317c21cb49c'
+                                              },
                'config/mcohome/mhs311.xml' => {
                                                 'Revision' => 2,
                                                 'md5' => '4ce93d5bcf48f3a80f31d8293f4b2501f5541c2d74f1d09b35f1a6db7fee94bb14a375c3b443ab0582c325bddc0e0ad343eda1dce9948e16d356a51688980ba0'
@@ -1792,8 +2036,8 @@
                                                 'md5' => '0f893961cd58ae4f3f58e1efadfac230430412427a7fc49d7137cb9fb8d708ed5ad46d74f022db2f651e3490662516366c24666d61545c68e14dd94429ed4bb7'
                                               },
                'config/mcohome/mhs513.xml' => {
-                                                'Revision' => 3,
-                                                'md5' => '23c319ccfdd895d705187b39750010325021be243c639a024a6ade944aacb6820cb3e4c433cf0e4b61fc2da444c3931e5ccfef355f8ec07c61a0a9a0f463971a'
+                                                'Revision' => 4,
+                                                'md5' => '05db47a894784963b58626ccbe4f09ca637e2819b26a0bffa0e7255ab058406eb4563e8aa88f45c09a46b9c15963a01b2c87bbe619463341a8fee64a590ccfb9'
                                               },
                'config/merten/5044xx.xml' => {
                                                'Revision' => 1,
@@ -1824,13 +2068,45 @@
                                                           'md5' => '702416a0165005b37d576d5fb029a5cf057406bcac8cd0e26092aebdb728a4ffb98da456fae6e06794275b0421444ec20415292300f988d0c19a808f29b41bcc'
                                                         },
                'config/namron/1402756.xml' => {
+                                                'Revision' => 2,
+                                                'md5' => '97ae44eefb3bf39b5ba125efa3124c040934209a3c61f6815212c41b7ff3fca862454dfd2cc3eba0c6c29dc12d3ede6a97d499dc466863ec74c94c64fa32cd4b'
+                                              },
+               'config/namron/4512710.xml' => {
                                                 'Revision' => 1,
-                                                'md5' => '33ad22573f7a1563a9f1a1d9e32edd47331771d578be803e879da31b15dacd21cb9d24fada73fbe10f650dcc194c0dba44cec1cf1f00314284fba9f5857d1e99'
+                                                'md5' => '6bdd47c7a0ba829e89cf2735e720bf2b62020f228a4e80df237c1b454707ea7aa7898e916bcad430ac313d38206e9862b5a51748ec3138368c2b5fb643d93d15'
                                               },
+               'config/namron/4512712.xml' => {
+                                                'Revision' => 2,
+                                                'md5' => 'a82b5f87b0be78f05917547ca8ca358d6d2ff484a3aab865597fc8fa8d59dac81498693d0768f4aa8aa7fdf45ce115edf96a6ad17cee09d9ef37941f803a2ade'
+                                              },
+               'config/namron/4512714.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => '223ddb325b70ed7abe9898aa74521b6ad263a45e6a4be4f6842af04d0093d300451ca1d9b07e392c129195e425f431b8faf5fadcb7c32ecc74096699419a8446'
+                                              },
+               'config/namron/4512715.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => '601c713a6cef0fa0e5d92bbfe6fa0d6201b60959a5a1d427cf7280d73921d658ee5fdc703b003d42ba2ce3c000848c1cdd507bd9385a435ff93c1888d3fb1ca5'
+                                              },
+               'config/namron/4512720.xml' => {
+                                                'Revision' => 2,
+                                                'md5' => 'c53b0beebcd8ef019da86791c1e6eebf632ed92c9fda51a6881b52dfeadf1b6e0c9809ef6c4072234ed73ee9b679cee5530866bd04916c27441e7d195a4a5c8d'
+                                              },
+               'config/namron/4512724.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => '10edb9b98013bac7754fd68151bef8b684dff2ad17d14b71cd6831f386a1e98aef64ff83138cdd28bf6bd1ab6526ca40b87e310beed25e9ed4a857b21e689b3f'
+                                              },
+               'config/nei/ms11z.xml' => {
+                                           'Revision' => 1,
+                                           'md5' => '798d15de5a67cd238320459d17b73b168fdc269de623ccaf21d84c84d353fdb15efb693c10bf43075e555b7011344200e8111352250bc7bf688f4298d981e8b2'
+                                         },
                'config/nexia/db100z.xml' => {
                                               'Revision' => 2,
                                               'md5' => 'a85e3b5dd39faff1bd76dc1f73f3b3527eacea0e1e1c70aa6d6e879533219b9e8034fc872b2553a12c7144152781389f3d055927a62565814695db853b87bf8e'
                                             },
+               'config/nexia/th100nx.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => 'fc72b207417e4c992ceadb75f0b87a6480a6becde57f7ff9e3e625ad066a5fe75bb0f2ba2b8b9e24f12843b04d66f37a599f84a3551956a723ab4eaeb6934fb2'
+                                             },
                'config/nodon/asp3100SmartPlug.xml' => {
                                                         'Revision' => 4,
                                                         'md5' => '7c24be4705939a05a678db1c9d8a569abd97f9d074abff0cac479f92fd7235bc95439f0371d0767e72220ca1281cb1beb526eb4e0f68184d7ca29fc3fe620259'
@@ -1872,12 +2148,12 @@
                                             'md5' => '1495bc054f8821256e12b70cc4aadd76e55b1d5a15ce26912e2df6a9b7246bab73968e723ae994c7e0ef923a293b46f8f72760e8c3ebb8fb32ffed7fa73e8caf'
                                           },
                'config/oomi/ft112.xml' => {
-                                            'Revision' => 1,
-                                            'md5' => '71993a5374bf28fa2c1fdd9fd191847187c85a76ae5679a0740c7ea8d540cceaae8bf439ad15119665e26483a839f02834c3a5f8da3811b986db13ed6ab18382'
+                                            'Revision' => 2,
+                                            'md5' => '3a44eec10683cc26fcd878e9f02c715173f91b7dd37954803f81f1b93460212f6ad0b113261b4afa1150d39df39691a6f27bd74d8fe11a0c8fb459a1acdad2cf'
                                           },
                'config/oomi/ft118.xml' => {
-                                            'Revision' => 1,
-                                            'md5' => '3b5ba0be2a1cac7b052a2d8c9fb9f65e2c8c0b4eaeb676ef61d09c8a7b2490e78e7c88237c155c5731a63e871706aecbcf8ed9241e141f1816f7b6c5abfc915a'
+                                            'Revision' => 2,
+                                            'md5' => '3e98d700b6909d74f4e753880a4cae27929a324993943c9b3d6d9070805bc18360631450f2c6ac36e4081fdf5147b717c5163b4c29238e7973c037f50ab38782'
                                           },
                'config/permundo/psc132zw.xml' => {
                                                    'Revision' => 1,
@@ -2067,6 +2343,18 @@
                                                 'Revision' => 5,
                                                 'md5' => '0f18166b3561a3bc65c5f53f8a26fd2776b6adb2d01367a7be5ef11800cf3bb1877ec2e8ba6db6170c6faa9ce4654ece1259e4d9095354da2595b8ff4b100aa0'
                                               },
+               'config/q-light/q-light_puck.xml' => {
+                                                      'Revision' => 2,
+                                                      'md5' => '0e726ac3a95dade8cef628abc82fe71f6a9b22b6331d6844d548e14106e7c70b8100cbc2e6a9e8b99c70614269da30f15f56d0db8d410e092113a3c7bb284453'
+                                                    },
+               'config/q-light/q-light_zerodim.xml' => {
+                                                         'Revision' => 2,
+                                                         'md5' => '4d7ea7bb60f06aa3a79a1e7327530e5e5ea5cb99213684f09626d8f7204ac5aa03069ec4728b5c8eff44faf7d65dc6a0ce2383e72f386fa0417af1f359141ed3'
+                                                       },
+               'config/q-light/q-light_zerodim_2pol.xml' => {
+                                                              'Revision' => 2,
+                                                              'md5' => '09b34de566e3854dea8839bab6b7c3d45e4732a3c27fc7ed839fb596dc1dc80331019e83822faab3cb46a8abae18b080ef29c328e77f55dc3796455d48fbbcc2'
+                                                            },
                'config/qees/reto-dimmer-plus.xml' => {
                                                        'Revision' => 8,
                                                        'md5' => '944ab5c363ba7722f0f870782bf9d20bc75040fa21820db080040b538794f8574140ff0960ca218273810e596df193f76a7ee2fb4412f8ba2b2cce7fa18fb431'
@@ -2075,6 +2363,10 @@
                                                          'Revision' => 6,
                                                          'md5' => 'd1f4c2dd9454ae4b1edc810c6d732bf042447334700deb17d9fb82d7330544e376d055c7e96a75a88bd2911cced8337c3d76041946ebb6e011b4b68d3d780dcf'
                                                        },
+               'config/qolsys/qz2140-840.xml' => {
+                                                   'Revision' => 1,
+                                                   'md5' => 'cda505a60a5855fa591303809c3d6e7bb1d471a274522a014fb42571e7e81c551374f5227b8c4e544553f981b8a44d2176786aab59f872ef62791401ed39a902'
+                                                 },
                'config/qubino/ZMNHAA2.xml' => {
                                                 'Revision' => 1,
                                                 'md5' => '080174f8dbebe8e5e80bb84601cd153946b7a014450bd04eb52cac0351dcf326b6b5c139385a42c055e1f01a09a41e1baf19586b66fe20e975ab6e7ab5b87e8d'
@@ -2096,8 +2388,8 @@
                                                 'md5' => '94f11e408312da4a3104d120112bb697bf53a9c5877f3eb73128e480f23e217aa72bac2bc0752f2595a68d26dceb22573beb7f4a98938149e73facd854e21114'
                                               },
                'config/qubino/ZMNHCDx.xml' => {
-                                                'Revision' => 7,
-                                                'md5' => '7133bddad00285e714e0469b6ebb11bdf1bae84de2393fc512520ffcbb93c1d204646327ed6b2e50da1c23fd423361a4550af9ecde4aa587890d8261f09dbf9e'
+                                                'Revision' => 8,
+                                                'md5' => '70c37e94bb435fb029af0b55829db7e244ec7beead5939bc19c25fe525ebebe677a974d1d920699ac74b1a4b62643f5818b317a07b78f00d8ae792cb4da73e11'
                                               },
                'config/qubino/ZMNHDA2.xml' => {
                                                 'Revision' => 4,
@@ -2108,8 +2400,8 @@
                                                 'md5' => 'de18029a1539e10dd15fc85ede084182e1cfcbc78325602ca6e5b428884f6db6ce1bebdbea331a8ca0f4ba133828c09f13ce6c1f8486871a5ca9c17258358ba1'
                                               },
                'config/qubino/ZMNHHDx.xml' => {
-                                                'Revision' => 2,
-                                                'md5' => '190639b81177c88bd4a340e96d83578085f35ede860d7bc613bc879e4baff907c951d498696a52d84659936714855efae2a62e183d279957e3a8bda14d949a26'
+                                                'Revision' => 3,
+                                                'md5' => '1670fc7355688ae031018b28e6b3c184b3efa84a964b6d7b435175842e43a1ff445c5cdc7a336f71203fbd4d53ad9169a61968fac2b760db7339d9d5b58538b0'
                                               },
                'config/qubino/ZMNHIA2.xml' => {
                                                 'Revision' => 2,
@@ -2143,6 +2435,10 @@
                                                 'Revision' => 3,
                                                 'md5' => '5024808b8551691103b25c05fe37ae3b49499a38fe0491bcd492accab0eb346b7e810c3132cd67e1920ed0d971f07dd9303a3b774276aab38ac04610fe5dbd50'
                                               },
+               'config/qubino/ZMNHMDx.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => '10bb3f3f11e86e4ec0e164e74e69f990864cd9fd76a4b407b1c26c54f5bcd5f16c3dc08482988b4f557f244da5cbb61b6555d5b1496d5ce3d7086868cd4ba3bc'
+                                              },
                'config/qubino/ZMNHNDx.xml' => {
                                                 'Revision' => 6,
                                                 'md5' => 'a10317520ca58616369d1d7782640ffeb84fb778c781f3bb39e7d6a0f22cfdad7aedb65b781f632e36c2c9837188019d00bb8b6509bc022719a64a77ea2c6277'
@@ -2152,8 +2448,8 @@
                                                 'md5' => '9e267442a84763403fc4c9ba6088fa59a067e1a5a362300efdcae287697426a53b5b705fde59ae5c106091923fbe51b2856e9c9bdc7bbe9f9601d7dde7878e8c'
                                               },
                'config/qubino/ZMNHQDx.xml' => {
-                                                'Revision' => 3,
-                                                'md5' => 'aed017546cd5fc0c949204f13abd51a71460b00459eb9c2deebb4d4256620ab6172abd4ffe56d66b1ad3cd880828e144e12fd813ea4a55adfd82c239726bd00d'
+                                                'Revision' => 4,
+                                                'md5' => 'ecf378103c01da6f196ffc99fdfe30ab93dd71d1b08e89577cc123664dcfa331a9116f2a6dac65b1d75bf76df45b5f44f4f09c041b0d410d1497d00a39d8f4f2'
                                               },
                'config/qubino/ZMNHSDx.xml' => {
                                                 'Revision' => 5,
@@ -2192,8 +2488,8 @@
                                                 'md5' => 'ca3b0bf60934b0454f40989634f116d0d4c486ff21db65d3cd2e0bedbf68aa1bfb8578337c8dfa250da807b2588b8331cfda2464a9c54fc8b9717d801d866538'
                                               },
                'config/qubino/ZMNKADx.xml' => {
-                                                'Revision' => 1,
-                                                'md5' => 'efce6f9ecb60b7608173d1f808080521b319ed475f6f662133502ff58b17d8d9d47290b8700d03d9c0d8d7ed62ec7b75e9997deac13670e02c083315d12a1cfb'
+                                                'Revision' => 2,
+                                                'md5' => 'ab2ef82408481add2f186cdff6d5316994da84f7d1f25727ec6538909d3b54503c44e90a0ec69f69fd9fa44a6e12fd7cdfa290b52d6b2af30ac5fbb99ca0bde7'
                                               },
                'config/qubino/ZMNKIDx.xml' => {
                                                 'Revision' => 1,
@@ -2244,8 +2540,8 @@
                                                  'md5' => 'fbac42632e85ac10571db822206b25d8c793e3a1c5e16783f822b094c68411f3742eea8d7b3657a2937f6c406e8184f624b80967acf3c1e31b8bc881dedc359c'
                                                },
                'config/remotec/zts-500.xml' => {
-                                                 'Revision' => 4,
-                                                 'md5' => '9897b20e553a4979e362a639021215c4377d8212c46de5f6929b37ec4ee810f82c9e4ed6958f3d4ceedee249966e623a21ef84059803e8fb5a68fe73c2df7348'
+                                                 'Revision' => 5,
+                                                 'md5' => 'baf19a0efb011787fe52ba1d4947a9a7affee275b48752084d343bddfcdce9c1e95c1457ba18d56652256d2ec93a9ddcf81c025ec760a3d20e351248b02dfc91'
                                                },
                'config/remotec/zurc.xml' => {
                                               'Revision' => 4,
@@ -2267,9 +2563,17 @@
                                              'Revision' => 1,
                                              'md5' => '59652dc6da375fc15e84a385f1d90799e3fc7d6a6295d5f2eb6b28d2d965029a6eae376a21e326b3ce9d85dab066a46282db1a7edaeea29344d075d880c87601'
                                            },
+               'config/ring/contact-sensor-v2.xml' => {
+                                                        'Revision' => 2,
+                                                        'md5' => '1f51fedc85cebb63a19943c3635ef4a33748d37e9c37bda8c0370ae204903ba9325af12ca3b6ef22a32d01d929d02e97bf48c81fdb09b1c003bcf95f171ab479'
+                                                      },
+               'config/ring/motion-detector-v2.xml' => {
+                                                         'Revision' => 1,
+                                                         'md5' => '40691ad61c15ad9d6cf90f46b2e04e707809db8f5db55250dacce93c19bf6c2057d1ba4b190995e40c044bc4f9f6bd2fa226b5b54935d1a6649632da0bc21d4b'
+                                                       },
                'config/schlage/BE468.xml' => {
-                                               'Revision' => 1,
-                                               'md5' => 'b5394f171f4ac0441a01efa1b79945eb4d6a04aff4a7b91a5b25f6214c0d9615a5a88b30e13b523d5cfd252e4b8dd45fa30478cc1fbf78138a1b6ada34594aa2'
+                                               'Revision' => 2,
+                                               'md5' => '4b373a2ecad0691860087e425fea93ca9914330abef2b1b90ee39b4f8b6fd7298a832578640873ba6662383801e04601a8335062f20f4f787eff432c233ac31c'
                                              },
                'config/schlage/BE468ZP.xml' => {
                                                  'Revision' => 2,
@@ -2280,8 +2584,8 @@
                                                'md5' => 'aef83d8b45e8e4e4e66a4cac2c15f42bda6b1502dea3eca462854b387720571b11f6bc43b8c2684aa31886ab3c1e29d5e167308907080ecc6cf1e273b020bbf0'
                                              },
                'config/schlage/BE469ZP.xml' => {
-                                                 'Revision' => 2,
-                                                 'md5' => '3cef5311c3333e70360024e65d3d654051062df8493670fc10f81f0a30c5bea705a455ef87c8e606c6e6734bc024b672de22f96ee726472794e194d3263bf509'
+                                                 'Revision' => 3,
+                                                 'md5' => 'b0d05fedf2a1624f715fa0bb19927c29dc57cd3e17dea0697f410c562aece8405f968536f64f6de2a0b4d373ec39aeb13d2de77adcfdfbb7667e5e52b5137d8f'
                                                },
                'config/schlage/fe599.xml' => {
                                                'Revision' => 1,
@@ -2312,17 +2616,25 @@
                                                      'md5' => 'af10355b77d03b65fadf93f853057ded42d39a421df623b45dec230e9b55b34aef95eeded78e70212c02ae9e71745b45e63978706a3093d14a7f391a9177b560'
                                                    },
                'config/shenzen_neo/ls01ch.xml' => {
-                                                    'Revision' => 1,
-                                                    'md5' => '27118871f8fd4290219a3f2988620725e14515fe70545b90e47940f78cd8f41ab72675a8401848d9899a0f712dafa52d8eb5ece68d633cf3556bb3b2af9f6a19'
+                                                    'Revision' => 2,
+                                                    'md5' => '59404ff10eff881692c709bbcec4717aff3179e546253171970482f37188a1f38f77fc3f6231841b5d1c47d8d7fd8983138a53e98cb3b2532b34f9d31ee8f4b5'
                                                   },
                'config/shenzen_neo/ls02ch.xml' => {
-                                                    'Revision' => 1,
-                                                    'md5' => '54536587d5b748daabf86c94f72a62e6558c67a244f4da46e4c9dd63ba369b8c240a7f5f678ff58ea23dacf11913bfa1a23a11db265e715a089dc2f5e3fd3d7b'
+                                                    'Revision' => 2,
+                                                    'md5' => '9d83ab76ccbac89e559c98979142ead8da4851cff7529fb3ed5cfb9b7cb9f393f7ecb823be8c50e768862449b2310e6facec1c4979e8569c147df21541716d41'
+                                                  },
+               'config/shenzen_neo/ls03ch.xml' => {
+                                                    'Revision' => 2,
+                                                    'md5' => 'a0777d5e97620acc8b2b93df1adf51c848a45c379bd4e900ac3c9d9b8b61446273e2afb917faa71248c5ac467513b75050e0f6fbc5c3dc43f3aeadbd0eb85ca3'
                                                   },
                'config/shenzen_neo/nas-ab01z.xml' => {
                                                        'Revision' => 4,
                                                        'md5' => '11df6cacff870c04677b5fc3a3828281d6e59506d09c1696ded074a4a607b87f8f96a42277dd409f64d3f8a91ced972f4ada74a32bfd304e07c19a1bef427a2c'
                                                      },
+               'config/shenzen_neo/nas-cs01z.xml' => {
+                                                       'Revision' => 1,
+                                                       'md5' => 'ee9fd5fec7a2c813577ec684901961f3544684b85ad911002798cab563ee5dbab42014cf4ee41f240ae1a2e0095951cc31509a29e9aea602dfaeca8ee323d46d'
+                                                     },
                'config/shenzen_neo/nas-ds01z.xml' => {
                                                        'Revision' => 4,
                                                        'md5' => 'dfd1992f3edf1e2b0c8e4f4afb6d99575ccfe2ea7c0042668fedccf540993fa39743f9bf969a5038d57dca3e1ab0749d28e1cb0be35272c71248b82625f99c09'
@@ -2332,25 +2644,41 @@
                                                        'md5' => 'cbfd1220724bf3a460a69f6f278903ed790a8bf2dfd704e7a3d1e4c6467d1898a636ecd08bff6f8c1b855706268073648e8fb96f015bec3eec2b035c243089ed'
                                                      },
                'config/shenzen_neo/nas-pd02z.xml' => {
+                                                       'Revision' => 3,
+                                                       'md5' => '2e766627891bbf6bc2a188f6542acbea522b6bb0515c9179fb329a095fcdc9e381efcaa2ec712adfa60bc41f61d7c493ef90f3533760c8cfc0e6cef8bf5bd0bc'
+                                                     },
+               'config/shenzen_neo/nas-pd03z.xml' => {
                                                        'Revision' => 2,
-                                                       'md5' => '506ecedfdee089d52ff07117b0208dfaa2aca5a72d71d07ee4ce417a7760a1c8bde3139a5cb82c950b240de0528a3382eb59ec30ed3a4e530f71a7b69f765ba1'
+                                                       'md5' => '8ffca12a6fe2f5e1d524c36dc327023c29ab75b9f0291e706d449b78b3391d6d05456b330fdf21d0630acc102e8962f58aa615450ee53bcf7c6fdde8e8c3fc6c'
                                                      },
                'config/shenzen_neo/nas-rc01z.xml' => {
                                                        'Revision' => 1,
                                                        'md5' => 'd11ecf14ca8722b1e59f5cb5b20303be9bf66786e9a1d18038f2f0c760f8aeca673b31b993bda0369ed662cc96dfd3b314e8aff94e6fd8b1f2e981f51d90dbef'
                                                      },
+               'config/shenzen_neo/nas-sc03ze.xml' => {
+                                                        'Revision' => 1,
+                                                        'md5' => '4c3dae5db0aa2bc3141fa3a5a41e94fc8c77988e269dbdc20b9017802e48809fbc0d572418035a913781eb5272d88365ba2bd316bec056a1e1b0459cb0b1e7b6'
+                                                      },
                'config/shenzen_neo/nas-wr01z.xml' => {
-                                                       'Revision' => 5,
-                                                       'md5' => 'b98d36d9c20d3d44f588519b788ee9b58a51361b8185561810bd2e62691955316c46467c1d27ea75b458ea91491bd4c789f05ae4e2cbdf8a24bd03359bf04f11'
+                                                       'Revision' => 6,
+                                                       'md5' => 'ff8d4fa4f5296969721ed7f4a70fb471eca86a227194456a9efb4390b97a365840d171e89d683916e2afd722256e34063dd186f530770d26e110e0c8c3d6de0e'
                                                      },
                'config/shenzen_neo/nas-wr01ze.xml' => {
-                                                        'Revision' => 1,
-                                                        'md5' => 'c17eb0cfba1f1b8f72da898a978fb0dcc0f2293f36c5d06e0967211f8f8d938707a94b1381bbfa9e6b5d6db9ca24240854d0a75e94994ca3a9708ff89643a524'
+                                                        'Revision' => 2,
+                                                        'md5' => '09b5e4644764a9d6fc5482d100ea24d81ec17adc3a436fc7ad0a11259a9b7a770cb7a29b01b6027df1a984ea13a9dde264a49acdb425597260c0699920ecb33d'
                                                       },
                'config/shenzen_neo/nas-ws02z.xml' => {
                                                        'Revision' => 2,
                                                        'md5' => '7eccf1cbebc601996e0d6a552217c0b1dc8883cc78fdddb088303888d15832f7734d08f43c0991e8c9535a9dccc1e4b6f509802ed972477b4e45d499f45bbd5c'
                                                      },
+               'config/shenzen_saykey/sk-3007-05.xml' => {
+                                                           'Revision' => 1,
+                                                           'md5' => '8f7ab98b4ab3f08f2d56bf834a8dc001973d58b06672ad049426a332b32bfb8072817ff714e22e89f57bcfda113651eb809c8d0e9010f035176feb5050af4bef'
+                                                         },
+               'config/simon/10002020-13X.xml' => {
+                                                    'Revision' => 1,
+                                                    'md5' => 'd2164162991f71803dffa110f7a4c65fc181cb8563b63097f07362a1cac2e2ac4a88ec775dad27c875b82b28ac3197822c1a69e08ac0e21c7bf2aefe04107e22'
+                                                  },
                'config/simon/10002034-13X.xml' => {
                                                     'Revision' => 3,
                                                     'md5' => '8bb9641949c548b619a32d4169dd3f3b14367fd98bcc0168ffb6402fab467d0821f1a011e5be2987eab93ccad87692aaea9a63ee568722dc05e69c4a22359485'
@@ -2359,6 +2687,10 @@
                                                     'Revision' => 2,
                                                     'md5' => '0235c61b4520955df553e5ff62cefbb1a9afd866c63152503893d7bdcd98e9cf7d3a5f6dba69d3b307508ff5eca5cd33acaaf5e1716b89fdad748a9658af7445'
                                                   },
+               'config/simon/10002080-13X.xml' => {
+                                                    'Revision' => 1,
+                                                    'md5' => '1a3e7b1f9a01b6f74c66c28754902b29aaee0da9ef780f720f5c3a41eab26d41b5998eb96fd94420c291b72331e2f4982cb092277d90d209fb0501ece3c613d7'
+                                                  },
                'config/smartthings/pgc401m.xml' => {
                                                      'Revision' => 1,
                                                      'md5' => 'a4e6e5c467601d118de320aaba5443876d46288e5eac6a0eda63bda9df4398efeee59385724c9ea007d0e3c91b8f7f6025157257a8995c79193a24938e8b1c7b'
@@ -2391,6 +2723,26 @@
                                                  'Revision' => 3,
                                                  'md5' => 'd50042a91f9b2fa3e64d618b8caa2f64ea8ec9c74e7fa82840556dc4d5a8ce1b8d8de840c008ff36619d0cb31393f066dd8a7c286af328ae66ffe0d6b5816221'
                                                },
+               'config/sunricher/srzv9001k12dimz4.xml' => {
+                                                            'Revision' => 1,
+                                                            'md5' => '6b8efae2405b4520f0825ea4959244b607cb52fc20b9b0d288e57626057484089968806e94d85e0bb45b35ddfa24622fbf3a5e9a5653cbae419bf94be56a5572'
+                                                          },
+               'config/sunricher/srzv9001k12dimz5.xml' => {
+                                                            'Revision' => 1,
+                                                            'md5' => 'd14a319efd47406428b3cd0ad80956677c101dc153047aa431883ab88ba949bcdca9bb34a3d8bccaf093e80e4e49938380483f9cec54419138bab69fd9b586c4'
+                                                          },
+               'config/sunricher/srzv9001k2dim.xml' => {
+                                                         'Revision' => 1,
+                                                         'md5' => '41d10f53ad831e0c2fc8f41fbac2c190f16b367c62b26477a2eb14e168e39af1adac020c25a1852544e142baba6e0f459429fb5f9fd05942e368039b08e28a4a'
+                                                       },
+               'config/sunricher/srzv9001k4dim.xml' => {
+                                                         'Revision' => 1,
+                                                         'md5' => 'bf389f5cf7a510d2a12729585ea31ffead4f8a38ff7a4fa75c9aeb9ad7f6b1c748b5846b3e4270e381c266f091294c98431c7e7ffff582b4d8a3f2c73e54f460'
+                                                       },
+               'config/sunricher/srzv9001k4dimg2.xml' => {
+                                                           'Revision' => 1,
+                                                           'md5' => '1885a9182c782e2dc890aba1e3ad0b6b1f7f409aec258809f21dae57e2c52d6e299eb1afc85c7ab86b642d59378fa50a445195b41432239c03c780885a67df25'
+                                                         },
                'config/sunricher/srzv9001k8.xml' => {
                                                       'Revision' => 1,
                                                       'md5' => '3bac22970afda1d7629827057b92df49076f16258e76ee02674f0aaf0046a847642edb2c794740f2b8b1e9f38d0c2ec3932259b2803ff416f461757214bd0686'
@@ -2399,18 +2751,38 @@
                                                            'Revision' => 2,
                                                            'md5' => '211998372694c7f418d774c3dab739339f07167bb37faa972ce076e4de2391dcfe369ea1ea335d35a9db66f9dce34ea0ac3dad054f2f734c864e1462cb0f5d1d'
                                                          },
+               'config/sunricher/srzv9001tccteu.xml' => {
+                                                          'Revision' => 1,
+                                                          'md5' => '9d5e9dcce650ab14636ee926ff6fbb2aad0ee2db3d661192c1d438184656b942dd1a68a14eb6c98337bb2fc021ad36e9755c1e9661b631cd83606e708d20212e'
+                                                        },
                'config/sunricher/srzv9003t4rgbweu.xml' => {
                                                             'Revision' => 1,
                                                             'md5' => 'a8754c4d9762da7d89d509475ce8f495f3e6d8a857c0dd38b10c0afbef1838ef96e417426edafb67403a011bc388c0dc80454fd64de935d9de38f642dc7bb9f6'
                                                           },
+               'config/sunricher/srzv9100aa.xml' => {
+                                                      'Revision' => 1,
+                                                      'md5' => 'ce5b3d47d946173fbb99e491614fae353e440732c22bb7208655c44a7e5374ff49ed2ca8f6e39844e43eae88fde38a0aaa057b9770ad90cc8703355cb61c9706'
+                                                    },
                'config/sunricher/srzv9101sachpeu.xml' => {
                                                            'Revision' => 2,
                                                            'md5' => 'cfa47e28a8463496354a30d2998b5b11dab834b2ffa1b8e91a687d2ec4e9e41ef73d38d058dd60911aa69cb1164808da94b88d627744250e5abd576ea5f8d1fa'
                                                          },
+               'config/sunricher/srzv9101sachpswitch.xml' => {
+                                                               'Revision' => 1,
+                                                               'md5' => '3851b6d24fdb58fe341d96c8faa16ed3f584e6a76b741ff8623b692082004602199196458bf1c123c5b1a54f1031369d6ab12db18925d240e277b27a1e307fdb'
+                                                             },
+               'config/sunricher/zv2835rac.xml' => {
+                                                     'Revision' => 1,
+                                                     'md5' => 'ab598e4f8d3d9b654023428799d1a381f5fcd8d1cf1c97bde4512b8f310be7f026294f7798eb17cdcd07072058be5c8514fec23f5ef713dfbd3d4a5efaf4129d'
+                                                   },
                'config/sunricher/zv9101.xml' => {
                                                   'Revision' => 2,
                                                   'md5' => 'adb7779262cbea1eb2832f78e67b253cade102bcf7fd24aa14db965dbde11a8ff073ee654c7bf1af0c2c4f44507b97feffdf142ed8261ff163ada4d766b0d906'
                                                 },
+               'config/sunricher/zv9101fa.xml' => {
+                                                    'Revision' => 1,
+                                                    'md5' => '1831cf691c954aa9546e99e5f8218b2d05d2aec3c850ee0bbf543947fbde7bfcf20b8e47fb232b4e43d2c6245aa15c94602b1efe48b1553b5daf75a6adeaa9cc'
+                                                  },
                'config/swiid/swiidinter.xml' => {
                                                   'Revision' => 3,
                                                   'md5' => '66525f843d8663f34af93e65b6979059e294139474aa3f63974f1ddb5e29c431e87ae0deb220a40169028a5e9e7c8553d2b24587afb905703ff14ffb0e6252ab'
@@ -2420,12 +2792,16 @@
                                                  'md5' => '1de9d7c988ff7753ddf936270a4a2abe3e1de1d5e7e546da3f7c02619dec1f875029af669c9607f398f2634833d0b1f40a34e72cf3c8b2898a644e46f980930c'
                                                },
                'config/technisat/03009496.xml' => {
-                                                    'Revision' => 1,
-                                                    'md5' => 'cc4037b25215feb65c2fe73adc2de319107224b6350ffe1d35273f176386247f12c38d82169b460cea87c148fec6554e98d021b55e46eb6eb13225ed92676b9e'
+                                                    'Revision' => 2,
+                                                    'md5' => '0bd0aad3afe3672049f401e80f8a37579716823e07c924ac161f865a453c2ed1a0013ebf018d841afe915cb95fa582dd74ebe12efae9bf7707d87205d9cc2df7'
+                                                  },
+               'config/technisat/03009497.xml' => {
+                                                    'Revision' => 2,
+                                                    'md5' => '34c5e7919ba864bac4fa474f24c6d345cefb5bab88e0d1799a6001f6bec1d5aa928377ade84b8440aff857a1e1748939bd3c7a81eb3d0f541c98a83e54e48231'
                                                   },
                'config/technisat/03009499.xml' => {
-                                                    'Revision' => 1,
-                                                    'md5' => '916b52f3fc07fd3d1ab2bf291212227db65f591b3a0c7fc70f47db572e1ab1d9f01d9815b1f597686666dd1abf719c1cd1537f5aef165ff044bd40fe5b8314fc'
+                                                    'Revision' => 2,
+                                                    'md5' => '19371e5b7799c19a07ba4a16bf4d5c546e5fdc8ad9dd728276f415a930cae3c66f0249f310e8e331b4f0a6f9a7551f344cf8c11d699fc6f639c5f6450e356159'
                                                   },
                'config/telldus/tzdw100.xml' => {
                                                  'Revision' => 2,
@@ -2444,28 +2820,52 @@
                                             'md5' => 'b065d0460c3da5e6bab88657b36d0c840db877c3c0c89c26313d7fd4bd12f7f57af2045cf89bcd689449989f0902f3ae3c6487fa9842dc45ca4538931e4a134e'
                                           },
                'config/thermofloor/heatit-zdim.xml' => {
-                                                         'Revision' => 1,
-                                                         'md5' => '29fc827fce0ac074d0508e2b677861d3d795f7000a5650596cbd6c4f7eaf30b4ed88915f82a0cf0946a2d302bb5def71f258e0b960a59b16571aac1d3ac13ec2'
+                                                         'Revision' => 2,
+                                                         'md5' => '627f5761aa76f8e6046e8f0e82d4d6b50a1395f76afb05936ffc2b42f95fcc15d490b4f33d0083e2300d8de65a9b05e66ceea516776ca911c2473e8f46bdbd10'
                                                        },
+               'config/thermofloor/heatit021-v1.92.xml' => {
+                                                             'Revision' => 1,
+                                                             'md5' => '9839f51c4a1fd1c63a2d12843f73c341c329222b6032895805026752671aa2d58d7513c3d07cd7a9090e6dc7866faa19f7d7efb20f3e37253de0ad6ac1604dea'
+                                                           },
                'config/thermofloor/heatit021.xml' => {
-                                                       'Revision' => 8,
-                                                       'md5' => 'f95dd11de5275bd29d3ba1f459bb463ab3d1280d82a23a428486abdd6be9244bb79ee66e2c0c1218512402f7acc8aebca81d9acf2ae674173e20b100002c276e'
+                                                       'Revision' => 9,
+                                                       'md5' => 'ccb695b1d42cabdee7c16337e69ddc495f7b7ce6bdb208be7f2158c273c566957299a0406037539830b47cdcc853f20f015a3c91976dbf9a76db672fbfd30faf'
                                                      },
                'config/thermofloor/heatit056.xml' => {
                                                        'Revision' => 3,
                                                        'md5' => 'd248ea9d79f6da656599bd9237cedde63af5d5789075d9dce1e355980053d8c25d7439a9de79778280f6086588b595f1bb91313e2ca0e42b9bf850c84c78a925'
                                                      },
+               'config/thermofloor/heatit058.xml' => {
+                                                       'Revision' => 1,
+                                                       'md5' => '99b5766881cd43d7ca0bd73e3492c11fbbdbdbfc74a7783ba78e44aa6ec97b84d85ac675bf04ed33403abe4e2a9e741a25264d8a7699261038e7b9f143624336'
+                                                     },
+               'config/thermofloor/heatit204.xml' => {
+                                                       'Revision' => 1,
+                                                       'md5' => '874663630d7aa76d3b5a0c4161cd8ead079ad2fe2dcbc8e9fbf8e6f6cc9acc21083e3441e3b36f6427459ce208cfc209304f3dca22b364e88adec579c79c4174'
+                                                     },
+               'config/thermofloor/heatit20a.xml' => {
+                                                       'Revision' => 3,
+                                                       'md5' => 'c230bb573e64439be9d40720f4c5a72e901018078ab9d778aaac156666e248686706fe9d81f7b19a9ada774d9284a8a05c4ef1ef2aed9fb5a762c5c05ad1547e'
+                                                     },
+               'config/thermofloor/heatitz4.xml' => {
+                                                      'Revision' => 2,
+                                                      'md5' => '2be6250742eb2ed930e0aef28513fb85da3dd37f00824a45c0a7af60797954ec46ccb32df5e4ec15a18e48e8cfe199639f77405d76749455d7850d0869be816b'
+                                                    },
                'config/thermofloor/heatitz8.xml' => {
-                                                      'Revision' => 1,
-                                                      'md5' => 'b55218c2be64c855325a1f781e259d016ca1adeaf0fab563e58ec6a5b0131f5fb88bfedb810cc40555d0e95e90a5c26ff2ff26d870242be4e01ed85c5868bb7c'
+                                                      'Revision' => 2,
+                                                      'md5' => '1fd512de745b166c79f9d16742f87c10b86ef0c259b504f3d2cb9ac081c22ed96c292a68394a5a7be110aafffa67ee82cb54d2f28e6d1c48cf51ff26fc32428f'
+                                                    },
+               'config/thermofloor/heatitzm.xml' => {
+                                                      'Revision' => 2,
+                                                      'md5' => 'f824351dae1ad1ff2401004f06b391c690f5c93a746b5ffec10bbe7e9ae27621144937d27e599d28335b050ed91780d930ac66d45d70b52fa1d4c1bcbc892d52'
                                                     },
                'config/trane/TZEMT400AB32MAA.xml' => {
                                                        'Revision' => 3,
                                                        'md5' => '84e5b345ec16db7d5f5c042815674ccc0ed3eba634ff2be99fbbd6b429fb27828a9a2353281bc2979ae43fbe0a86eebab4030b571d1cb03021ffeb678b7a2f04'
                                                      },
                'config/trane/TZEMT400BB32MAA.xml' => {
-                                                       'Revision' => 3,
-                                                       'md5' => 'daac367b1c11b52d9dad3cf8432b9485d818618526b7062b3a6d72b699d473927338a7dffec29dcbaaff5cc90ba9261e361b3240eddaa4b72e7c00529ae69193'
+                                                       'Revision' => 4,
+                                                       'md5' => '79a3d5ac283db2152c07a4ea52077b69ea83ea0b82e01265367130a649bba9c506777ca0d226ce8d8f43d4b296d1315ff4fac3030b90f3b3f9b1419b186c3fc7'
                                                      },
                'config/trane/TZEMT524AA21MA.xml' => {
                                                       'Revision' => 3,
@@ -2544,8 +2944,8 @@
                                                   'md5' => '3e86f5e2fd0bd4a9e2ce3c433e017909efbf006ef6c542328907584531bda2f060264e2fa8c30a9b9d9ae644b772d67bff969a7067f8ca5669c789d360ed75a0'
                                                 },
                'config/vision/zp3102.xml' => {
-                                               'Revision' => 10,
-                                               'md5' => '5ab5e86cad871f1ec4153281ad321e3f387f7e49c41f684c1c9503fe29644ae7b91493bc13a4be07c8325bca365aeb05eef22322d9acdf9dae5c84888b4a0833'
+                                               'Revision' => 11,
+                                               'md5' => 'df1f51d8eede5ca5f9fccd106a2b194692280eb96f383ebdfab4035632bccb3b6a8e0c1a0d44f3abbd7b18e9fcb3a91befae4cd35d7659937eff93116ae4526b'
                                              },
                'config/vision/zp3111.xml' => {
                                                'Revision' => 6,
@@ -2655,6 +3055,10 @@
                                               'Revision' => 1,
                                               'md5' => 'c468eb5e6431d0b66ff94aa18bbdfd225ef03a95dead2458078dca813074e34b206c949bb685c05a9767f24b508a22e6a1f1a702f1bd591256d1f236acfa2e92'
                                             },
+               'config/wenzhou/tz77.xml' => {
+                                              'Revision' => 2,
+                                              'md5' => 'df47b99135b0b10975717373c17b9feb15cfbba1a4c21542f939950495c5bab2f3fa285237bec363192728b8db58d4f9b00fe3d8d6f1ec9edf93517ae01a9025'
+                                            },
                'config/wenzhou/tz78.xml' => {
                                               'Revision' => 2,
                                               'md5' => 'c796f0198124f0fe0f76e7e0f97956464f6360648ec188c09d54593cc41041b0a7b45ccc8416bb22aca8cd644b22976ab87ff7f121714a42f72d3414a5300d06'
@@ -2667,6 +3071,10 @@
                                               'Revision' => 7,
                                               'md5' => '571fe7897815e47fd1b640f2bdd741b9daee276510e8348bd6e9002e018a8e16c67b00c94ca6f3d0ce15c847c61ae2eaa0146772b7a8c330aab89f31935ed3b3'
                                             },
+               'config/wenzhou/tze96.xml' => {
+                                               'Revision' => 2,
+                                               'md5' => 'f98162d3e7d76b60d0ca68d0ad1e4f5f66259b63715e54df16f19fd10b2c572660fbd60bda464e6e2940b1b66bedb442ce95fd75dd6ec48e4b200027d390887a'
+                                             },
                'config/widom/DRY.xml' => {
                                            'Revision' => 2,
                                            'md5' => 'dbc331ba0466621612841ab0934432f3c8a7f8e1ba8747047c171690458ba373fc426d217749327f972de6e933d02270abd135a659f096b80968f55fe3d49848'
@@ -2699,6 +3107,14 @@
                                             'Revision' => 4,
                                             'md5' => '810972a874be37eb108bad40e4ddcd4b55ed3a0deeead8e011cbfeb051df44015a6af4e298d4f206f4ee08fb83dcb7a29bf01c56d069c9748821235b4a6c36a3'
                                           },
+               'config/wink/wnk-mot1.xml' => {
+                                               'Revision' => 1,
+                                               'md5' => 'ae12eda098b6ce28ea5dc3614d24217dad04f2ab61bf3c2da40dd23ad8d5ffe4cd65b7544f29b8ecc23e514f90df168152d133ac12c873657c0b09e44a77fbaf'
+                                             },
+               'config/wink/wnk-sir1p.xml' => {
+                                                'Revision' => 1,
+                                                'md5' => '352c501c9d64d726cc42a4fa095b659d22f83e57bea8062b247e35c0c30358a1e321c82a511eb45fd633fc0d3205f38e9a7353e8ecf5f00d572b2ec3c0776059'
+                                              },
                'config/zipato/MiniKeypad.xml' => {
                                                    'Revision' => 3,
                                                    'md5' => '1137446900ed79f792ef14c677ae4e99aeca62b977ef3acfcacf114784f6ea82f09471d7c498c977cdc92228cd3e2903afc445f0782186766c7ae21f2dfdf5cd'
@@ -2736,32 +3152,32 @@
                                             'md5' => 'c96f925786747bb098e22f5ecb671dc52d51736dd1e8c9a83ab84a77bcb9abe6bae0da1f86af32970da18b2f2f3e987bd2ce4bd1cfa5444f702b5ea32e2dca72'
                                           },
                'config/zooz/zen15.xml' => {
-                                            'Revision' => 2,
-                                            'md5' => 'fc33bd7bbe32980ecf49082d92401742b4c19a8906a736a99feb4ad5208cecda504f443aa3fcdb21fcea2de6702db39d876215fb3a2e827dfa7c05ce15568ddd'
+                                            'Revision' => 3,
+                                            'md5' => 'bee21869106becfe025892a4f334af530450727b855ffe9418a110bfec9534a4855eca768f82f2c2ad3a8c0e78caf0cba704f1570850bcb28dcb506a1eddb2bc'
                                           },
                'config/zooz/zen16.xml' => {
-                                            'Revision' => 3,
-                                            'md5' => '55ba12c1055f187247ebc19314fc2c883023127712cfd38d3bf9ee2e802eb31ee28b61276c122c69e79e6832ccd67bf55a5363a844e7896b23cf900b49619428'
+                                            'Revision' => 4,
+                                            'md5' => 'eab1371f2c81d3dac4edeb677afee22eb684fa157dff73bc89e95c93e0421abd949c382b4f2d2203bf6d4d981e913ed31a3080e649694ffdba1ece3fdc46295a'
+                                          },
+               'config/zooz/zen17.xml' => {
+                                            'Revision' => 2,
+                                            'md5' => 'c2cf58e4c44fba886e7470fdcc8559ed3f574c3e6f34c02a87094d82df463db20996182e56df000eb211022259fcc7aa2a7cad0089783ed511422bccc287bff5'
                                           },
                'config/zooz/zen20.xml' => {
                                             'Revision' => 2,
                                             'md5' => 'ac2c564441a145b501c401ca5fbb62806ae9d69a354bf2abebce04f50e6017c10d3f5d3465975ac771cb047b31d4bca8e1fde9f5c910a36d0bb958c3c1b57826'
                                           },
                'config/zooz/zen20v2.xml' => {
-                                              'Revision' => 2,
-                                              'md5' => 'fe4cd67071d47c622e7cb9ac99b34c43865d8387df219347649fc2ff2b73b11c8763450abee39fbf884be7297ca5b286276dd3b69b5bc93f38b068ef12911821'
+                                              'Revision' => 3,
+                                              'md5' => '24682aa795ae957a903d0b7f75dffa0262dcf814c5373eeb3fd09f6ef434713de998a70f928a0eb6d0c511d6f6011ae07dcbc2ea84b603b73820516daf4396b6'
                                             },
                'config/zooz/zen21.xml' => {
                                             'Revision' => 3,
                                             'md5' => '047323e2ed1a3e5340c052d40737fbdb2d2790e225e002f7d58fa3ad32f592da3e2a8cc0f3dd6cc6f06f7b6b505378482be7125db0a335e56abfd478c1cb398b'
                                           },
-               'config/zooz/zen21v2.xml' => {
-                                              'Revision' => 2,
-                                              'md5' => '004dd989826be59c166af2103c5363c53be87aada839dc7b54c5396c8b9e75f00c4103a975f759fbd05aa24160844ec5f6c3960df2a56f40b40691c1db0c8420'
-                                            },
                'config/zooz/zen21v3.xml' => {
-                                              'Revision' => 3,
-                                              'md5' => '0233d5754faa63f2af070fcb4c51938c76732c60310372ef72f0d257f51b2d480acde41dd06ae7496b945a5891afded5fbe970848d3e2958956ec31bde95f319'
+                                              'Revision' => 4,
+                                              'md5' => '4ae74d9c845b8404d9b87e42f30283452762f82842dac619e7f3ffa05b91dc191351c950caba575c2e05b60e9a47cd66d2ea8c6f361a8c15bc9efe939f81e434'
                                             },
                'config/zooz/zen22.xml' => {
                                             'Revision' => 2,
@@ -2775,13 +3191,17 @@
                                             'Revision' => 1,
                                             'md5' => 'b5609b50b35f91a81c21293680581f6a5bfd69cadfdc7987d41f1a41380553d7250fc4ac75d00b2057cf7ec54f5a8479bbe793682e2fcfe207aaa301889fce6f'
                                           },
+               'config/zooz/zen23v3.xml' => {
+                                              'Revision' => 2,
+                                              'md5' => '1760d6685c1bdba5b9dc8310c443d8b9badfe505c3b0800ece20d8951d6f35833036d883e4777635449754d0a97618e43d80af9b801d80512bf78b298a18d606'
+                                            },
                'config/zooz/zen24.xml' => {
                                             'Revision' => 1,
                                             'md5' => '818d5a9b417d8e06cb5864ec4859d82d30d5d2e6e91bbd4672ac3fd84b20585b8c8529c327e0ac49359276674bf7e3cd15f0ac4f812896bf334c24963f6abd18'
                                           },
                'config/zooz/zen24v2.xml' => {
-                                              'Revision' => 1,
-                                              'md5' => '7d82148b7087c8f8fc0e22d5e2a6a26b0bbc8c9085e413e772536fc7f323a7137ba6769fe8ac277528325e42b23771b82a521f8c5f38b22d16e75fd102a4c1ef'
+                                              'Revision' => 3,
+                                              'md5' => '7e5357ea8bfd73d38525c27b3cacf13c157a5a036cc54b0f2cc01d04d39f0ac2c916e6ff28bdc3fd47a1fa2b2fdbf4c17ac89dc9adff4e36a245251ad896ad51'
                                             },
                'config/zooz/zen25.xml' => {
                                             'Revision' => 1,
@@ -2803,6 +3223,30 @@
                                             'Revision' => 2,
                                             'md5' => 'a4ee0ec974ffa1fe6c1e46f0610ad8a2623504b1f52b5d20efdcf665548ca4229d0c9a6c782e5da97b4869dfd2f38b5640f6748424b91f8516dc7cffbf5a0799'
                                           },
+               'config/zooz/zen32.xml' => {
+                                            'Revision' => 1,
+                                            'md5' => '44780a6b6961e573dbe019f6b8c40608694908c2047e0c5801e5ca5af0f074447b17e60d90ad2a6bb3ece3c7a023f974507aa3af2b50ee89aa48fd5b953266c6'
+                                          },
+               'config/zooz/zen34.xml' => {
+                                            'Revision' => 3,
+                                            'md5' => 'd5fa659b35e2b666f4127ae68be223e21808e9828629b29d1fe7abe24b40b6dcf33b6af2ad0ba06eef6975a14b4d65f078940b956ce58f94281cdf0116f01dcd'
+                                          },
+               'config/zooz/zen71.xml' => {
+                                            'Revision' => 1,
+                                            'md5' => '532785efd4cddfb32361dfd76d09d403882b7df7073a05546df9b03fc9d7e46132596c2889f4674d2ddfe71a221bb64d2b5c8689e6ba5335be2b4f6b1a7509dd'
+                                          },
+               'config/zooz/zen72.xml' => {
+                                            'Revision' => 3,
+                                            'md5' => 'd90c8971f61267ff65180507bd10e92fbd9086a6599b63bf0ba0820c85b2e7568938129a1f918c8b195636b1fe8f7520ac007b0d808b79210741949293465100'
+                                          },
+               'config/zooz/zen76.xml' => {
+                                            'Revision' => 1,
+                                            'md5' => 'ad4c7d4bde0b987ab90cf12038946d95c464473145a16c7082c013ec0f4a258274f6d7a9cd2197d4d990f8fc3726e56dc946b3a835158ebe48ab2bd3f9273713'
+                                          },
+               'config/zooz/zen77.xml' => {
+                                            'Revision' => 1,
+                                            'md5' => '26355b030745a5bac773e0aceaf8813c34f1137ba67e95e843455521a0035cbbe68d37aabfdfbeac0570d150c6a4756b6a93667f45e73339f612fb0aeb247843'
+                                          },
                'config/zooz/zse08.xml' => {
                                             'Revision' => 1,
                                             'md5' => '78ecc6bdf19ce151d87a328949b4ce16e59bf6fd20212d4a7fd23da700e177259b8903bba5150f87c71f7d6ec4b140855c5337b5053cc358b0e2e8c5c41885dc'
@@ -2872,8 +3316,8 @@
                                                   'md5' => 'bfa124a8d90e7fc44894600c87a61831533dd38a39af56190580464bbaf15665b677a7386266d050f607d138d672b0852c57fe4a1dc0ac188bfd26c2cfb437c7'
                                                 },
                'config/zwave.me/ZME_WALLC-S.xml' => {
-                                                      'Revision' => 2,
-                                                      'md5' => '1eb2739365ccfacb4720a2c9698e8980a1afa9391486294870d577174bd4a3cdfaf8f235ae26215c9498990c81d7657df263c64a94261b0725f3fc3649f3dc36'
+                                                      'Revision' => 3,
+                                                      'md5' => '621f081bad2efff30abef88abeebf5e28f06c9bdd01d1dec4231839666d836e08e50a83a3b839322e8916135ba362175dd2727c05f1338dd4f4204e4608ffa24'
                                                     },
                'config/zwave.me/ZME_WCD2.xml' => {
                                                    'Revision' => 3,
@@ -2895,6 +3339,10 @@
                                                       'Revision' => 4,
                                                       'md5' => '91374eeabd5950ae498de528ee67309d78f87bc3f2d18b1cb73e06f4d16f660eb0099e583397e7003a0a5796d7261f5f5ec029ba67ef683319d35c20da4cd3a3'
                                                     },
+               'config/zwave.me/razberry.xml' => {
+                                                   'Revision' => 1,
+                                                   'md5' => '5cf581246a71ff451015e9286788a0398788494bdb014ea7a77efd3d4b36e6c7b5ebc9ce2e05471b35a59539ebb5927c75575d56bcb34d99a2e3507f492eb3c6'
+                                                 },
                'config/zwave.me/zme_raz5.xml' => {
                                                    'Revision' => 2,
                                                    'md5' => 'cdfd903cab9349c17a53d25ff8210d42a5f9197ebbe8fd3e654dc5caedc12c40e96bcb3fadfdf72ce3e05d59c99de58fd21858be5ca8c2c820c8d315e3415149'
diff --git a/cpp/build/winRT/vs2015/OpenZWave.vcxproj b/cpp/build/winRT/vs2015/OpenZWave.vcxproj
index f511f189..311aff9e 100644
--- a/cpp/build/winRT/vs2015/OpenZWave.vcxproj
+++ b/cpp/build/winRT/vs2015/OpenZWave.vcxproj
@@ -169,7 +169,7 @@
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;E:\GitHub\OpenZWave\openzwave-dotnet-uwp\open-zwave\cpp\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;..\..\..\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -189,7 +189,7 @@ exit 0</Command>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;E:\GitHub\OpenZWave\openzwave-dotnet-uwp\open-zwave\cpp\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;..\..\..\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -209,7 +209,7 @@ exit 0</Command>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>LITTLE_ENDIAN;WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;E:\GitHub\OpenZWave\openzwave-dotnet-uwp\open-zwave\cpp\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;..\..\..\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -230,7 +230,7 @@ exit 0</Command>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>LITTLE_ENDIAN;WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;E:\GitHub\OpenZWave\openzwave-dotnet-uwp\open-zwave\cpp\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;..\..\..\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -250,7 +250,7 @@ exit 0</Command>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>LITTLE_ENDIAN;WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;E:\GitHub\OpenZWave\openzwave-dotnet-uwp\open-zwave\cpp\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;..\..\..\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -271,7 +271,7 @@ exit 0</Command>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>LITTLE_ENDIAN;WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;E:\GitHub\OpenZWave\openzwave-dotnet-uwp\open-zwave\cpp\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;..\..\..\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -291,7 +291,7 @@ exit 0</Command>
       <CompileAsWinRT>true</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;E:\GitHub\OpenZWave\openzwave-dotnet-uwp\open-zwave\cpp\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\tinyxml;..\..\..\src;..\..\..\hidapi\hidapi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -332,6 +332,7 @@ exit 0</Command>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\src\platform\winRT\HidControllerWinRT.h" />
     <ClInclude Include="..\..\..\src\aes\aes.h" />
     <ClInclude Include="..\..\..\src\aes\aesopt.h" />
     <ClInclude Include="..\..\..\src\aes\aestab.h" />
@@ -357,12 +358,13 @@ exit 0</Command>
     <ClInclude Include="..\..\..\src\Defs.h" />
     <ClInclude Include="..\..\..\src\Driver.h" />
     <ClInclude Include="..\..\..\src\DNSThread.h" />
-    <ClInclude Include="..\..\..\src\platform\winRT\FileOpsImpl.h" />
+    <ClInclude Include="..\..\..\src\SensorMultiLevelCCTypes.h" />
     <ClInclude Include="..\..\..\src\TimerThread.h" />
     <ClInclude Include="..\..\..\src\Http.h" />
     <ClInclude Include="..\..\..\src\Group.h" />
     <ClInclude Include="..\..\..\src\Localization.h" />
     <CIInclude Include="..\..\..\src\NotificationCCTypes.h" />
+    <CIInclude Include="..\..\..\src\SensorMultiLevelCCTypes.h" />
     <ClInclude Include="..\..\..\src\Manager.h" />
     <ClInclude Include="..\..\..\src\ManufacturerSpecificDB.h" />
     <ClInclude Include="..\..\..\src\Msg.h" />
@@ -370,6 +372,7 @@ exit 0</Command>
     <ClInclude Include="..\..\..\src\Notification.h" />
     <ClInclude Include="..\..\..\src\Options.h" />
     <ClInclude Include="..\..\..\src\platform\FileOps.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\FileOpsImpl.h" />
     <ClInclude Include="..\..\..\src\ZWSecurity.h" />
     <ClInclude Include="..\..\..\src\platform\Controller.h" />
     <ClInclude Include="..\..\..\src\platform\DNS.h" />
@@ -384,9 +387,15 @@ exit 0</Command>
     <ClInclude Include="..\..\..\src\platform\Thread.h" />
     <ClInclude Include="..\..\..\src\platform\TimeStamp.h" />
     <ClInclude Include="..\..\..\src\platform\Wait.h" />
-    <ClInclude Include="..\..\..\src\platform\winRT\HidControllerWinRT.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\DNSImpl.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\EventImpl.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\LogImpl.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\MutexImpl.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\SerialControllerImpl.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\ThreadImpl.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\TimeStampImpl.h" />
+    <ClInclude Include="..\..\..\src\platform\winRT\WaitImpl.h" />
     <ClInclude Include="..\..\..\src\Scene.h" />
-    <ClInclude Include="..\..\..\src\SensorMultiLevelCCTypes.h" />
     <ClInclude Include="..\..\..\src\Utils.h" />
     <ClInclude Include="..\..\..\src\value_classes\ValueButton.h" />
     <ClInclude Include="..\..\..\src\value_classes\ValueRaw.h" />
@@ -451,6 +460,7 @@ exit 0</Command>
     <ClInclude Include="..\..\..\src\command_classes\WakeUp.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\src\platform\winRT\HidControllerWinRT.cpp" />
     <ClCompile Include="..\..\..\src\aes\aescrypt.c">
 	  <CompileAsWinRT>false</CompileAsWinRT>
 	</ClCompile>
@@ -482,21 +492,12 @@ exit 0</Command>
     <ClCompile Include="..\..\..\src\CompatOptionManager.cpp" />
     <ClCompile Include="..\..\..\src\Driver.cpp" />
     <ClCompile Include="..\..\..\src\DNSThread.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\DNSImpl.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\EventImpl.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\FileOpsImpl.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\HidControllerWinRT.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\LogImpl.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\MutexImpl.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\SerialControllerImpl.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\ThreadImpl.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\TimeStampImpl.cpp" />
-    <ClCompile Include="..\..\..\src\platform\winRT\WaitImpl.cpp" />
     <ClCompile Include="..\..\..\src\TimerThread.cpp" />
     <ClCompile Include="..\..\..\src\Http.cpp" />
     <ClCompile Include="..\..\..\src\Group.cpp" />
     <ClCompile Include="..\..\..\src\Localization.cpp" />
     <ClCompile Include="..\..\..\src\NotificationCCTypes.cpp" />
+    <ClCompile Include="..\..\..\src\SensorMultiLevelCCTypes.cpp" />
     <ClCompile Include="..\..\..\src\Manager.cpp" />
     <ClCompile Include="..\..\..\src\ManufacturerSpecificDB.cpp" />
     <ClCompile Include="..\..\..\src\Msg.cpp" />
@@ -517,8 +518,16 @@ exit 0</Command>
     <ClCompile Include="..\..\..\src\platform\Thread.cpp" />
     <ClCompile Include="..\..\..\src\platform\TimeStamp.cpp" />
     <ClCompile Include="..\..\..\src\platform\Wait.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\DNSImpl.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\EventImpl.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\FileOpsImpl.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\LogImpl.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\MutexImpl.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\SerialControllerImpl.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\ThreadImpl.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\TimeStampImpl.cpp" />
+    <ClCompile Include="..\..\..\src\platform\winRT\WaitImpl.cpp" />
     <ClCompile Include="..\..\..\src\Scene.cpp" />
-    <ClInclude Include="..\..\..\src\SensorMultiLevelCCTypes.cpp" />
     <ClCompile Include="..\..\..\src\Utils.cpp" />
     <ClCompile Include="..\..\..\src\value_classes\ValueButton.cpp" />
     <ClCompile Include="..\..\..\src\value_classes\ValueRaw.cpp" />
@@ -586,157 +595,7 @@ exit 0</Command>
     <ClCompile Include="..\..\windows\winversion.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <Xml Include="config\2gig\ct100.xml" />
-    <Xml Include="config\2gig\ct101.xml" />
-    <Xml Include="config\2gig\ct30.xml" />
-    <Xml Include="config\act\lfm20.xml" />
-    <Xml Include="config\act\zdm230.xml" />
-    <Xml Include="config\act\zdw103.xml" />
-    <Xml Include="config\act\zdw232.xml" />
-    <Xml Include="config\act\zir010.xml" />
-    <Xml Include="config\act\zrp110.xml" />
-    <Xml Include="config\act\zrw103.xml" />
-    <Xml Include="config\aeotec\alms.xml" />
-    <Xml Include="config\aeotec\doorwindow.xml" />
-    <Xml Include="config\aeotec\dsd31.xml" />
-    <Xml Include="config\aeotec\hdss_gen5.xml" />
-    <Xml Include="config\aeotec\hem.xml" />
-    <Xml Include="config\aeotec\hemg2.xml" />
-    <Xml Include="config\aeotec\keyfob.xml" />
-    <Xml Include="config\aeotec\keyfob2.xml" />
-    <Xml Include="config\aeotec\minimote.xml" />
-    <Xml Include="config\aeotec\msesv2.xml" />
-    <Xml Include="config\aeotec\multisensor_gen5.xml" />
-    <Xml Include="config\aeotec\panicbtn.xml" />
-    <Xml Include="config\aeotec\recessed_doorsensor.xml" />
-    <Xml Include="config\aeotec\recessed_doorsensor_gen5.xml" />
-    <Xml Include="config\aeotec\ses.xml" />
-    <Xml Include="config\aeotec\ses2.xml" />
-    <Xml Include="config\aeotec\watersensor.xml" />
-    <Xml Include="config\assa_abloy\RealLivingCapTouch.xml" />
-    <Xml Include="config\BeNext\1poleswitch.xml" />
-    <Xml Include="config\BeNext\2poleswitch.xml" />
-    <Xml Include="config\BeNext\AlarmSound.xml" />
-    <Xml Include="config\BeNext\BuiltinDimmer.xml" />
-    <Xml Include="config\BeNext\DoorSensor.xml" />
-    <Xml Include="config\BeNext\EnergySwitch.xml" />
-    <Xml Include="config\BeNext\Molite.xml" />
-    <Xml Include="config\BeNext\PluginDimmer.xml" />
-    <Xml Include="config\BeNext\SceneController.xml" />
-    <Xml Include="config\BeNext\TagReader.xml" />
-    <Xml Include="config\cooper\RF9505-T.xml" />
-    <Xml Include="config\cooper\RF9540-N.xml" />
-    <Xml Include="config\danfoss\living.xml" />
-    <Xml Include="config\danfoss\z.xml" />
-    <Xml Include="config\device_classes.xml" />
-    <Xml Include="config\dragontech\wd-100.xml" />
-    <Xml Include="config\duwi\ZWES1000.xml" />
-    <Xml Include="config\duwi\ZWESJ300.xml" />
-    <Xml Include="config\eurotronic\eur_stellaz.xml" />
-    <Xml Include="config\everspringct\hsm02.xml" />
-    <Xml Include="config\everspring\an145.xml" />
-    <Xml Include="config\everspring\an158.xml" />
-    <Xml Include="config\everspring\se812.xml" />
-    <Xml Include="config\everspring\sf812.xml" />
-    <Xml Include="config\everspring\sm103.xml" />
-    <Xml Include="config\everspring\sp103.xml" />
-    <Xml Include="config\everspring\sp814.xml" />
-    <Xml Include="config\everspring\st814.xml" />
-    <Xml Include="config\everspring\st815.xml" />
-    <Xml Include="config\everspring\tse03.xml" />
-    <Xml Include="config\evolve\lrm-as.xml" />
-    <Xml Include="config\evolve\lsm-15.xml" />
-    <Xml Include="config\evolve\ltm-5.xml" />
-    <Xml Include="config\fibaro\fgbs001.xml" />
-    <Xml Include="config\fibaro\fgd211.xml" />
-    <Xml Include="config\fibaro\fgfs101.xml" />
-    <Xml Include="config\fibaro\fgk001.xml" />
-    <Xml Include="config\fibaro\fgms.xml" />
-    <Xml Include="config\fibaro\fgr221.xml" />
-    <Xml Include="config\fibaro\fgrgbwm441.xml" />
-    <Xml Include="config\fibaro\fgrm222.xml" />
-    <Xml Include="config\fibaro\fgs211.xml" />
-    <Xml Include="config\fibaro\fgs212.xml" />
-    <Xml Include="config\fibaro\fgs221.xml" />
-    <Xml Include="config\fibaro\fgs222.xml" />
-    <Xml Include="config\fibaro\fgsd002.xml" />
-    <Xml Include="config\fibaro\fgss101.xml" />
-    <Xml Include="config\fibaro\fgwpe.xml" />
-    <Xml Include="config\frostdale\fdn2nxx.xml" />
-    <Xml Include="config\ge\dimmer.xml" />
-    <Xml Include="config\ge\dimmer_module.xml" />
-    <Xml Include="config\ge\relay.xml" />
-    <Xml Include="config\greenwave\powernode1.xml" />
-    <Xml Include="config\greenwave\powernode6.xml" />
-    <Xml Include="config\homeseer\hsm100.xml" />
-    <Xml Include="config\homeseer\ztroller.xml" />
-    <Xml Include="config\honeywell\th8320zw1000.xml" />
-    <Xml Include="config\horstmann\hrt4zw.xml" />
-    <Xml Include="config\intermatic\ca8900.xml" />
-    <Xml Include="config\iris\rangeextender.xml" />
-    <Xml Include="config\leviton\rzi10.xml" />
-    <Xml Include="config\leviton\vrcpg.xml" />
-    <Xml Include="config\leviton\vrf01.xml" />
-    <Xml Include="config\leviton\vri06.xml" />
-    <Xml Include="config\leviton\vri10.xml" />
-    <Xml Include="config\manufacturer_specific.xml" />
-    <Xml Include="config\nodon\asp3100SmartPlug.xml" />
-    <Xml Include="config\northq\nq92021.xml" />
-    <Xml Include="config\options.xml" />
-    <Xml Include="config\philio\pan04.xml" />
-    <Xml Include="config\philio\psm02.xml" />
-    <Xml Include="config\philio\pst02-1c.xml" />
-    <Xml Include="config\philio\pst02-b.xml" />
-    <Xml Include="config\philio\pst02.xml" />
-    <Xml Include="config\polycontrol\doorlock.xml" />
-    <Xml Include="config\polycontrol\keypad.xml" />
-    <Xml Include="config\popp\123580.xml" />
-    <Xml Include="config\popp\123601.xml" />
-    <Xml Include="config\popp\123658.xml" />
-    <Xml Include="config\qees\reto-plugin-switch.xml" />
-    <Xml Include="config\qubino\ZMNHAA2.xml" />
-    <Xml Include="config\qubino\ZMNHBA2.xml" />
-    <Xml Include="config\qubino\ZMNHCA2.xml" />
-    <Xml Include="config\qubino\ZMNHDA2.xml" />
-    <Xml Include="config\qubino\ZMNHIA2.xml" />
-    <Xml Include="config\qubino\ZMNHJA2.xml" />
-    <Xml Include="config\rcs\em52-zw.xml" />
-    <Xml Include="config\rcs\pm12-zw.xml" />
-    <Xml Include="config\rcs\therm0005.xml" />
-    <Xml Include="config\rcs\therm0007.xml" />
-    <Xml Include="config\rcs\therm0009.xml" />
-    <Xml Include="config\remotec\zfm-80.xml" />
-    <Xml Include="config\remotec\zurc.xml" />
-    <Xml Include="config\remotec\zxt-120.xml" />
-    <Xml Include="config\schlagelink\itemp.xml" />
-    <Xml Include="config\schlagelink\minikeypad.xml" />
-    <Xml Include="config\swiid\swiidinter.xml" />
-    <Xml Include="config\swiid\swiidplug.xml" />
-    <Xml Include="config\trane\TZEMT400AB32MAA.xml" />
-    <Xml Include="config\trane\TZEMT400BB32MAA.xml" />
-    <Xml Include="config\vision\zd2102.xml" />
-    <Xml Include="config\vision\zm1601eu.xml" />
-    <Xml Include="config\vision\zp3102.xml" />
-    <Xml Include="config\vision\zs5101eu.xml" />
-    <Xml Include="config\vitrum\vitrumBS.xml" />
-    <Xml Include="config\waynedalton\WDTC-20.xml" />
-    <Xml Include="config\wenzhou\sm103.xml" />
-    <Xml Include="config\wenzhou\tsp01.xml" />
-    <Xml Include="config\wenzhou\tz65d.xml" />
-    <Xml Include="config\wenzhou\tz66d.xml" />
-    <Xml Include="config\wenzhou\tz67.xml" />
-    <Xml Include="config\wenzhou\tz88.xml" />
-    <Xml Include="config\widom\UBS104.xml" />
-    <Xml Include="config\zipato\MiniKeypad.xml" />
-    <Xml Include="config\zipato\RGBBulb.xml" />
-    <Xml Include="config\zwave.me\iTemp.xml" />
-    <Xml Include="config\zwave.me\kfob.xml" />
-    <Xml Include="config\zwave.me\ZME_05431.xml" />
-    <Xml Include="config\zwave.me\ZME_06433.xml" />
-    <Xml Include="config\zwave.me\ZME_06436.xml" />
-    <Xml Include="config\zwave.me\ZME_064435.xml" />
-    <Xml Include="config\zwave.me\ZME_WALLC-S.xml" />
-    <Xml Include="config\zwave.me\ZME_WCD2.xml" />
+    <Xml Include="config\**\*.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/cpp/src/Driver.cpp b/cpp/src/Driver.cpp
index 448ec437..84124da9 100644
--- a/cpp/src/Driver.cpp
+++ b/cpp/src/Driver.cpp
@@ -89,7 +89,8 @@ using namespace OpenZWave;
 // 02: 01-12-2011 - Command class m_afterMark sense corrected, and attribute named to match.
 // 03: 08-04-2011 - Changed command class instance handling for non-sequential MultiChannel endpoints.
 // 04: 12-07-2019 - Changed Interview Order
-uint32 const c_configVersion = 4;
+// 05: 10-07-2020 - Duration ValueID's changed from Byte to Int. Invalidate Any previous caches. 
+uint32 const c_configVersion = 5;
 
 static char const* c_libraryTypeNames[] =
 { "Unknown",			// library type 0
@@ -201,14 +202,12 @@ Driver::~Driver()
 
 	m_dnsThread->Stop();
 	m_dnsThread->Release();
-	delete m_dns;
 
 	m_driverThread->Stop();
 	m_driverThread->Release();
 
 	m_timerThread->Stop();
 	m_timerThread->Release();
-	delete m_timer;
 
 	m_sendMutex->Release();
 
@@ -295,6 +294,10 @@ Driver::~Driver()
 	delete this->AuthKey;
 	delete this->EncryptKey;
 	delete this->m_httpClient;
+	delete this->m_timer;
+	delete this->m_dns;
+
+
 }
 
 //-----------------------------------------------------------------------------
@@ -618,6 +621,7 @@ bool Driver::ReadCache()
 	string filename = userPath + string(str);
 
 	TiXmlDocument doc;
+	doc.SetCondenseWhiteSpace(false);
 	if (!doc.LoadFile(filename.c_str(), TIXML_ENCODING_UTF8))
 	{
 		return false;
@@ -7003,6 +7007,17 @@ bool Driver::startMFSDownload(string configfile)
 	return m_httpClient->StartDownload(download);
 }
 
+bool Driver::startDownload(string target, string file)
+{
+	Internal::HttpDownload *download = new Internal::HttpDownload();
+	download->url = "http://download.db.openzwave.com/" + file;
+	download->filename = target;
+	download->operation = Internal::HttpDownload::Image;
+	Log::Write(LogLevel_Info, "Queuing download for %s (Node %d)", download->url.c_str(), download->node);
+	return m_httpClient->StartDownload(download);
+}
+
+
 bool Driver::refreshNodeConfig(uint8 _nodeId)
 {
 	Internal::LockGuard LG(m_nodeMutex);
@@ -7075,6 +7090,7 @@ void Driver::ReloadNode(uint8 const _nodeId)
 	string filename = userPath + string(str);
 
 	TiXmlDocument doc;
+	doc.SetCondenseWhiteSpace(false);
 	if (doc.LoadFile(filename.c_str(), TIXML_ENCODING_UTF8))
 	{
 		doc.SetUserData((void *) filename.c_str());
@@ -7120,6 +7136,10 @@ void Driver::processDownload(Internal::HttpDownload *download)
 		else if (download->operation == Internal::HttpDownload::MFSConfig)
 		{
 			m_mfs->mfsConfigDownloaded(this, download->filename);
+		} 
+		else if (download->operation == Internal::HttpDownload::Image) 
+		{
+			m_mfs->fileDownloaded(this, download->filename);
 		}
 	}
 	else
@@ -7133,6 +7153,10 @@ void Driver::processDownload(Internal::HttpDownload *download)
 		{
 			m_mfs->mfsConfigDownloaded(this, download->filename, false);
 		}
+		else if (download->operation == Internal::HttpDownload::Image) 
+		{
+			m_mfs->fileDownloaded(this, download->filename, false);
+		}
 		Notification* notification = new Notification(Notification::Type_UserAlerts);
 		notification->SetUserAlertNotification(Notification::Alert_ConfigFileDownloadFailed);
 		QueueNotification(notification);
diff --git a/cpp/src/Driver.h b/cpp/src/Driver.h
index a41fb20b..cdca6b00 100644
--- a/cpp/src/Driver.h
+++ b/cpp/src/Driver.h
@@ -990,6 +990,7 @@ namespace OpenZWave
 			bool setHttpClient(Internal::i_HttpClient *client);
 		private:
 			bool startConfigDownload(uint16 _manufacturerId, uint16 _productType, uint16 _productId, string configfile, uint8 node = 0);
+			bool startDownload(string target, string file);
 			bool startMFSDownload(string configfile);
 			bool refreshNodeConfig(uint8 node);
 			void processDownload(Internal::HttpDownload *);
diff --git a/cpp/src/Http.cpp b/cpp/src/Http.cpp
index b2c2e375..d37af823 100644
--- a/cpp/src/Http.cpp
+++ b/cpp/src/Http.cpp
@@ -88,6 +88,7 @@ namespace OpenZWave
 				case HttpDownload::File:
 				case HttpDownload::Config:
 				case HttpDownload::MFSConfig:
+				case HttpDownload::Image:
 					/* make sure it has everything */
 					if ((transfer->url.size() <= 0) || (transfer->filename.size() <= 0))
 					{
diff --git a/cpp/src/Http.h b/cpp/src/Http.h
index 6f3128e7..21e082a8 100644
--- a/cpp/src/Http.h
+++ b/cpp/src/Http.h
@@ -57,7 +57,8 @@ namespace OpenZWave
 					None,
 					File,
 					Config,
-					MFSConfig
+					MFSConfig,
+					Image
 				};
 				DownloadType operation;
 				enum Status
diff --git a/cpp/src/Manager.cpp b/cpp/src/Manager.cpp
index a23ed684..60c2a84c 100644
--- a/cpp/src/Manager.cpp
+++ b/cpp/src/Manager.cpp
@@ -3094,7 +3094,7 @@ bool Manager::SetValue(ValueID const& _id, string const& _value)
 				case ValueID::ValueType_Schedule:
 				case ValueID::ValueType_Button:
 				{
-					OZW_ERROR(OZWException::OZWEXCEPTION_CANNOT_CONVERT_VALUEID, "ValueID passed to GetValueFloatPrecision is not a Decimal Value");
+					OZW_ERROR(OZWException::OZWEXCEPTION_INVALID_VALUEID, "ValueID passed to SetValue cannot be set on Schedule or Button");
 					break;
 				}
 			}
diff --git a/cpp/src/ManufacturerSpecificDB.cpp b/cpp/src/ManufacturerSpecificDB.cpp
index 96af8c47..77d670cf 100644
--- a/cpp/src/ManufacturerSpecificDB.cpp
+++ b/cpp/src/ManufacturerSpecificDB.cpp
@@ -316,29 +316,34 @@ namespace OpenZWave
 				if (c->GetConfigPath().size() > 0)
 				{
 					string path = configPath + c->GetConfigPath();
-
-					/* check if we are downloading already */
-					std::list<string>::iterator iter = std::find(m_downloading.begin(), m_downloading.end(), path);
-					/* check if the file exists */
-					if (iter == m_downloading.end() && !Internal::Platform::FileOps::Create()->FileExists(path))
-					{
-						Log::Write(LogLevel_Warning, "Config File for %s does not exist - %s", c->GetProductName().c_str(), path.c_str());
-						/* try to download it */
-						if (driver->startConfigDownload(c->GetManufacturerId(), c->GetProductType(), c->GetProductId(), path))
+					if (!Internal::Platform::FileOps::Create()->FileExists(path)) { 
+						/* check if we are downloading already */
+						std::list<string>::iterator iter = std::find(m_downloading.begin(), m_downloading.end(), path);
+						/* check if the file exists */
+						if (iter == m_downloading.end())
 						{
-							m_downloading.push_back(path);
+							Log::Write(LogLevel_Warning, "Config File for %s does not exist - %s", c->GetProductName().c_str(), path.c_str());
+							/* try to download it */
+							if (driver->startConfigDownload(c->GetManufacturerId(), c->GetProductType(), c->GetProductId(), path))
+							{
+								m_downloading.push_back(path);
+							}
+							else
+							{
+								Log::Write(LogLevel_Warning, "Can't download file %s", path.c_str());
+								Notification* notification = new Notification(Notification::Type_UserAlerts);
+								notification->SetUserAlertNotification(Notification::Alert_ConfigFileDownloadFailed);
+								driver->QueueNotification(notification);
+							}
 						}
-						else
+						else if (iter != m_downloading.end())
 						{
-							Log::Write(LogLevel_Warning, "Can't download file %s", path.c_str());
-							Notification* notification = new Notification(Notification::Type_UserAlerts);
-							notification->SetUserAlertNotification(Notification::Alert_ConfigFileDownloadFailed);
-							driver->QueueNotification(notification);
+							Log::Write(LogLevel_Debug, "Config file for %s already queued", c->GetProductName().c_str());
 						}
 					}
-					else if (iter != m_downloading.end())
+					else 
 					{
-						Log::Write(LogLevel_Debug, "Config file for %s already queued", c->GetProductName().c_str());
+						checkConfigFileContents(driver, path);	
 					}
 				}
 			}
@@ -368,6 +373,64 @@ namespace OpenZWave
 			}
 		}
 
+		void ManufacturerSpecificDB::checkConfigFileContents(Driver *driver, string file) 
+		{
+			string configPath;
+			Options::Get()->GetOptionAsString("ConfigPath", &configPath);
+			TiXmlDocument* pDoc = new TiXmlDocument();
+			if (!pDoc->LoadFile(file.c_str(), TIXML_ENCODING_UTF8))
+			{
+				delete pDoc;
+				Log::Write(LogLevel_Info, "Unable to load %s", file.c_str());
+				return;
+			}
+			pDoc->SetUserData((void *) file.c_str());
+			TiXmlElement const* root = pDoc->RootElement();
+
+			TiXmlElement const* metaDataElement = root->FirstChildElement("MetaData");
+			if (metaDataElement) {
+				TiXmlElement const* metaDataItem = metaDataElement->FirstChildElement("MetaDataItem");
+				while (metaDataItem) {
+					char const *str = metaDataItem->Attribute("name");
+					if (str && !strcmp(str, "ProductPic"))
+					{
+						str = metaDataItem->GetText();
+						if (str) 
+						{ 
+							string imagefile = configPath + str;
+							if (!Internal::Platform::FileOps::Create()->FileExists(imagefile)) 
+							{ 
+								/* check if we are downloading already */
+								std::list<string>::iterator iter = std::find(m_downloading.begin(), m_downloading.end(), imagefile);
+								/* check if the file exists */
+								if (iter == m_downloading.end())
+								{
+									if (driver->startDownload(imagefile, metaDataItem->GetText())) {
+										Log::Write(LogLevel_Info, "Missing Picture %s - Starting Download", imagefile.c_str());
+										m_downloading.push_back(imagefile);
+									}
+								}
+							}
+						}
+					}
+					metaDataItem = metaDataItem->NextSiblingElement("MetaDataItem");
+				}				
+			}
+		}
+
+		void ManufacturerSpecificDB::fileDownloaded(Driver *, string file, bool success) 
+		{
+			/* check if we are downloading already */
+			std::list<string>::iterator iter = std::find(m_downloading.begin(), m_downloading.end(), file);
+			if (iter != m_downloading.end())
+			{
+				m_downloading.erase(iter);
+			}	
+			checkInitialized();		
+		}
+
+
+
 		void ManufacturerSpecificDB::mfsConfigDownloaded(Driver *driver, string file, bool success)
 		{
 			/* check if we are downloading already */
diff --git a/cpp/src/ManufacturerSpecificDB.h b/cpp/src/ManufacturerSpecificDB.h
index 3d05e24b..04cecee3 100644
--- a/cpp/src/ManufacturerSpecificDB.h
+++ b/cpp/src/ManufacturerSpecificDB.h
@@ -142,6 +142,7 @@ namespace OpenZWave
 				void checkConfigFiles(Driver *);
 				void configDownloaded(Driver *, string file, uint8 node, bool success = true);
 				void mfsConfigDownloaded(Driver *, string file, bool success = true);
+				void fileDownloaded(Driver *, string file, bool success = true);
 				bool isReady();
 				bool updateConfigFile(Driver *, Node *);
 				bool updateMFSConfigFile(Driver *);
@@ -151,6 +152,7 @@ namespace OpenZWave
 				void LoadConfigFileRevision(ProductDescriptor *product);
 				ManufacturerSpecificDB();
 				~ManufacturerSpecificDB();
+				void checkConfigFileContents(Driver *driver, string file);
 
 				Internal::Platform::Mutex* m_MfsMutex; /**< Mutex to ensure its accessed by a single thread at a time */
 
diff --git a/cpp/src/Msg.cpp b/cpp/src/Msg.cpp
index 9a4c9c3f..b11227d1 100644
--- a/cpp/src/Msg.cpp
+++ b/cpp/src/Msg.cpp
@@ -33,6 +33,7 @@
 #include "ZWSecurity.h"
 #include "platform/Log.h"
 #include "command_classes/MultiInstance.h"
+#include "command_classes/Supervision.h"
 #include "command_classes/Security.h"
 #include "aes/aescpp.h"
 
@@ -50,7 +51,7 @@ namespace OpenZWave
 //-----------------------------------------------------------------------------
 		Msg::Msg(string const& _logText, uint8 _targetNodeId, uint8 const _msgType, uint8 const _function, bool const _bCallbackRequired, bool const _bReplyRequired,			// = true
 				uint8 const _expectedReply,			// = 0
-				uint8 const _expectedCommandClassId	// = 0
+				uint8 const _expectedCommandClassId // = 0
 				) :
 				m_logText(_logText), m_bFinal(false), m_bCallbackRequired(_bCallbackRequired), m_callbackId(0), m_expectedReply(0), m_expectedCommandClassId(_expectedCommandClassId), m_length(4), m_targetNodeId(_targetNodeId), m_sendAttempts(0), m_maxSendAttempts( MAX_TRIES), m_instance(1), m_endPoint(0), m_flags(0), m_encrypted(false), m_noncerecvd(false), m_homeId(0), m_resendDuetoCANorNAK(false)
 		{
@@ -102,6 +103,19 @@ namespace OpenZWave
 			}
 		}
 
+//-----------------------------------------------------------------------------
+// <Msg::SetSupervision>
+// Encapsulate the data inside a Supervision message
+//-----------------------------------------------------------------------------
+		void Msg::SetSupervision(uint8 _supervision_session_id)
+		{
+			if (_supervision_session_id != Internal::CC::Supervision::StaticNoSessionId())
+			{
+				m_supervision_session_id = _supervision_session_id;
+				m_flags |= m_Supervision;
+			}
+		}
+
 //-----------------------------------------------------------------------------
 // <Msg::Append>
 // Add a byte to the message
@@ -135,6 +149,12 @@ namespace OpenZWave
 				return;
 			}
 
+			// Deal with Supervision encapsulation
+			if ((m_flags & m_Supervision) != 0)
+			{
+				SupervisionEncap();
+			}
+
 			// Deal with Multi-Channel/Instance encapsulation
 			if ((m_flags & (m_MultiChannel | m_MultiInstance)) != 0)
 			{
@@ -280,6 +300,33 @@ namespace OpenZWave
 			}
 		}
 
+//-----------------------------------------------------------------------------
+// <Msg::SupervisionEncap>
+// Encapsulate the data inside a Supervision message
+//-----------------------------------------------------------------------------
+		void Msg::SupervisionEncap()
+		{
+			char str[256];
+			if (m_buffer[3] != FUNC_ID_ZW_SEND_DATA)
+			{
+				return;
+			}
+
+			for (uint32 i = m_length - 1; i >= 6; --i)
+			{
+				m_buffer[i + 4] = m_buffer[i];
+			}
+			m_buffer[6] = Internal::CC::Supervision::StaticGetCommandClassId();
+			m_buffer[7] = Internal::CC::Supervision::SupervisionCmd_Get;
+			m_buffer[8] = Internal::CC::Supervision::SupervisionMoreStatusUpdates_MoreReports | m_supervision_session_id;
+			m_buffer[9] = m_buffer[5];
+			m_buffer[5] += 4;
+			m_length += 4;
+
+			snprintf(str, sizeof(str), "Supervisioned (session=%d): %s", m_supervision_session_id, m_logText.c_str());
+			m_logText = str;
+		}
+
 //-----------------------------------------------------------------------------
 // <Node::GetDriver>
 // Get a pointer to our driver
diff --git a/cpp/src/Msg.h b/cpp/src/Msg.h
index 8a0bbb6c..dbaa127d 100644
--- a/cpp/src/Msg.h
+++ b/cpp/src/Msg.h
@@ -54,6 +54,7 @@ namespace OpenZWave
 				{
 					m_MultiChannel = 0x01,		// Indicate MultiChannel encapsulation
 					m_MultiInstance = 0x02,		// Indicate MultiInstance encapsulation
+					m_Supervision = 0x04,		// Indicate Supervision encapsulation
 				};
 
 				Msg(string const& _logtext, uint8 _targetNodeId, uint8 const _msgType, uint8 const _function, bool const _bCallbackRequired, bool const _bReplyRequired = true, uint8 const _expectedReply = 0, uint8 const _expectedCommandClassId = 0);
@@ -62,6 +63,7 @@ namespace OpenZWave
 				}
 
 				void SetInstance(OpenZWave::Internal::CC::CommandClass * _cc, uint8 const _instance);	// Used to enable wrapping with MultiInstance/MultiChannel during finalize.
+				void SetSupervision(uint8 _session_id);
 
 				void Append(uint8 const _data);
 				void AppendArray(const uint8* const _data, const uint8 _length);
@@ -215,7 +217,7 @@ namespace OpenZWave
 				{
 					m_homeId = homeId;
 				}
-				void setResendDuetoCANorNAK() 
+				void setResendDuetoCANorNAK()
 				{
 					m_resendDuetoCANorNAK = true;
 				}
@@ -231,6 +233,7 @@ namespace OpenZWave
 			private:
 
 				void MultiEncap();						// Encapsulate the data inside a MultiInstance/Multicommand message
+				void SupervisionEncap();				// Encapsulate the data inside a Supervision message
 				string m_logText;
 				bool m_bFinal;
 				bool m_bCallbackRequired;
@@ -249,6 +252,7 @@ namespace OpenZWave
 				uint8 m_instance;
 				uint8 m_endPoint;				// Endpoint to use if the message must be wrapped in a multiInstance or multiChannel command class
 				uint8 m_flags;
+				uint8 m_supervision_session_id;
 
 				bool m_encrypted;
 				bool m_noncerecvd;
diff --git a/cpp/src/Node.cpp b/cpp/src/Node.cpp
index 7a669236..0ecd05a0 100644
--- a/cpp/src/Node.cpp
+++ b/cpp/src/Node.cpp
@@ -58,6 +58,7 @@
 #include "command_classes/NodeNaming.h"
 #include "command_classes/NoOperation.h"
 #include "command_classes/Version.h"
+#include "command_classes/Supervision.h"
 #include "command_classes/SwitchAll.h"
 #include "command_classes/ZWavePlusInfo.h"
 #include "command_classes/DeviceResetLocally.h"
@@ -479,12 +480,6 @@ void Node::AdvanceQueries()
 				}
 				else
 				{
-					Internal::CC::ManufacturerSpecific* cc = static_cast<Internal::CC::ManufacturerSpecific*>(GetCommandClass(Internal::CC::ManufacturerSpecific::StaticGetCommandClassId()));
-					if (cc)
-					{
-						cc->SetInstance(1);
-						cc->ReLoadConfigXML();
-					}
 					m_queryStage = QueryStage_Static;
 					m_queryRetries = 0;
 				}
@@ -1824,26 +1819,6 @@ void Node::SetSecuredClasses(uint8 const* _data, uint8 const _length, uint32 con
 					pCommandClass->SetInstance(_instance);
 				else
 					pCommandClass->SetInstance(1);
-
-				/* set our Static Request Flags */
-				uint8 request = 0;
-
-				if (GetCommandClass(Internal::CC::MultiInstance::StaticGetCommandClassId()))
-				{
-					// Request instances
-					request |= (uint8) Internal::CC::CommandClass::StaticRequest_Instances;
-				}
-
-				if (GetCommandClass(Internal::CC::Version::StaticGetCommandClassId()))
-				{
-					// Request versions
-					request |= (uint8) Internal::CC::CommandClass::StaticRequest_Version;
-				}
-
-				if (request)
-				{
-					pCommandClass->SetStaticRequest(request);
-				}
 			}
 		}
 		else
@@ -1858,6 +1833,7 @@ void Node::SetSecuredClasses(uint8 const* _data, uint8 const _length, uint32 con
 			Log::Write(LogLevel_Info, m_nodeId, "    %s (Unsecured) - %s", it->second->GetCommandClassName().c_str(), it->second->IsInNIF() ? "InNIF" : "NotInNIF");
 	}
 
+	SetStaticRequests();
 }
 //-----------------------------------------------------------------------------
 // <Node::UpdateNodeInfo>
@@ -4074,3 +4050,35 @@ void Node::WriteMetaDataXML(TiXmlElement *mdElement)
 		mdElement->LinkEndChild(cl);
 	}
 }
+
+//-----------------------------------------------------------------------------
+// <Node::CreateSupervisionSession>
+// Generate a new session id for Supervision encapsulation, if supported
+//-----------------------------------------------------------------------------
+uint8 Node::CreateSupervisionSession(uint8 _command_class_id, uint8 _index)
+{
+	if (Internal::CC::CommandClass* cc = GetCommandClass(Internal::CC::Supervision::StaticGetCommandClassId()))
+	{
+		return cc->CreateSupervisionSession(_command_class_id, _index);
+	}
+	else
+	{
+		return Internal::CC::Supervision::StaticNoSessionId();
+	}
+}
+
+//-----------------------------------------------------------------------------
+// <Node::GetSupervisionIndex>
+// Get the index used by a session
+//-----------------------------------------------------------------------------
+uint32 Node::GetSupervisionIndex(uint8 _session_id)
+{
+	if (Internal::CC::CommandClass* cc = GetCommandClass(Internal::CC::Supervision::StaticGetCommandClassId()))
+	{
+		return cc->GetSupervisionIndex(_session_id);
+	}
+	else
+	{
+		return Internal::CC::Supervision::StaticNoIndex();
+	}
+}
diff --git a/cpp/src/Node.h b/cpp/src/Node.h
index 9fbd0f42..bae66efb 100644
--- a/cpp/src/Node.h
+++ b/cpp/src/Node.h
@@ -911,6 +911,10 @@ namespace OpenZWave
 			void WriteMetaDataXML(TiXmlElement*);
 			map<MetaDataFields, string> m_metadata;
 			map<uint32_t, ChangeLogEntry> m_changeLog;
+
+		public:
+			uint8 CreateSupervisionSession(uint8 _command_class_id, uint8 _index);
+			uint32 GetSupervisionIndex(uint8 _session_id);
 	};
 
 } //namespace OpenZWave
diff --git a/cpp/src/Scene.cpp b/cpp/src/Scene.cpp
index 96197a57..d0e8bd46 100644
--- a/cpp/src/Scene.cpp
+++ b/cpp/src/Scene.cpp
@@ -325,14 +325,15 @@ namespace OpenZWave
 //-----------------------------------------------------------------------------
 		void Scene::RemoveValues(uint32 const _homeId)
 		{
-			again: for (vector<SceneStorage*>::iterator it = m_values.begin(); it != m_values.end(); ++it)
+			for (auto it = m_values.begin(); it != m_values.end();)
 			{
 				if ((*it)->m_id.GetHomeId() == _homeId)
 				{
 					delete *it;
-					m_values.erase(it);
-					goto again;
+					it = m_values.erase(it);
 				}
+				else
+					it++;
 			}
 			// If the scene is now empty, delete it.
 			if (m_values.empty())
@@ -352,14 +353,15 @@ namespace OpenZWave
 				Scene *scene = Scene::Get(i);
 				if (scene != NULL)
 				{
-					again: for (vector<SceneStorage*>::iterator it = scene->m_values.begin(); it != scene->m_values.end(); ++it)
+					for (auto it = scene->m_values.begin(); it != scene->m_values.end();)
 					{
 						if ((*it)->m_id.GetHomeId() == _homeId && (*it)->m_id.GetNodeId() == _nodeId)
 						{
 							delete *it;
-							scene->m_values.erase(it);
-							goto again;
+							it = scene->m_values.erase(it);
 						}
+						else
+							it++;
 					}
 					// If the scene is now empty, delete it.
 					if (scene->m_values.empty())
diff --git a/cpp/src/ValueIDIndexesDefines.def b/cpp/src/ValueIDIndexesDefines.def
index dc099f05..a2358329 100644
--- a/cpp/src/ValueIDIndexesDefines.def
+++ b/cpp/src/ValueIDIndexesDefines.def
@@ -1597,7 +1597,9 @@ ENUM(ValueID_Index_BarrierOperator,
 		Visual = 4
 	);
 ENUM(ValueID_Index_Basic,
-		Set = 0
+		Set = 0,
+		Target = 1,
+		Duration = 2
 	);
 ENUM(ValueID_Index_BasicWindowCovering,
 		Open = 0,
@@ -1885,7 +1887,8 @@ ENUM(ValueID_Index_Color,
 		Color = 0,
 		Index = 1,
 		Channels_Capabilities = 2,
-		Duration = 4
+		Duration = 4,
+		Target = 5
 	);
 ENUM(ValueID_Index_Configuration,
 		Parameter_1 = 1,
@@ -2170,7 +2173,119 @@ ENUM(ValueID_Index_EnergyProduction,
 		Time = 3
 	);
 ENUM(ValueID_Index_Indicator,
-		Indicator = 0
+		Indicator = 0,
+		Armed = 1,
+		Not_Armed,
+		Ready,
+		Fault,
+		Busy,
+		Enter_ID,
+		Enter_PIN,
+		Code_Accepted,
+		Code_Not_Accepted,
+		Armed_Stay,
+		Armed_Away,
+		Alarming,
+		Alarming_Burglar,
+		Alarming_Smoke_Fire,
+		Alarming_Carbon_Monoxide,
+		Bypass_Challenge,
+		Entry_Delay,
+		Exit_Delay,
+		Alarming_Medical,
+		Alarming_Freeze_Warning,
+		Alarming_Water_Leak,
+		Alarming_Panic,
+		Zone_1_Armed = 0x20,
+		Zone_2_Armed,
+		Zone_3_Armed,
+		Zone_4_Armed,
+		Zone_5_Armed,
+		Zone_6_Armed,
+		Zone_7_Armed,
+		Zone_8_Armed,
+		LCD_Backlight = 0x30,
+		Button_Backlight_Letters = 0x40,
+		Button_Backlight_Digits,
+		Button_Backlight_Command,
+		Button_1_Indication,
+		Button_2_Indication,
+		Button_3_Indication,
+		Button_4_Indication,
+		Button_5_Indication,
+		Button_6_Indication,
+		Button_7_Indication,
+		Button_8_Indication,
+		Button_9_Indication,
+		Button_10_Indication,
+		Button_11_Indication,
+		Button_12_Indication,
+		Node_Identify = 0x50,
+		Generic_Event_Sound_Notification_1 = 0x60,
+		Generic_Event_Sound_Notification_2,
+		Generic_Event_Sound_Notification_3,
+		Generic_Event_Sound_Notification_4,
+		Generic_Event_Sound_Notification_5,
+		Generic_Event_Sound_Notification_6,
+		Generic_Event_Sound_Notification_7,
+		Generic_Event_Sound_Notification_8,
+		Generic_Event_Sound_Notification_9,
+		Generic_Event_Sound_Notification_10,
+		Generic_Event_Sound_Notification_11,
+		Generic_Event_Sound_Notification_12,
+		Generic_Event_Sound_Notification_13,
+		Generic_Event_Sound_Notification_14,
+		Generic_Event_Sound_Notification_15,
+		Generic_Event_Sound_Notification_16,
+		Generic_Event_Sound_Notification_17,
+		Generic_Event_Sound_Notification_18,
+		Generic_Event_Sound_Notification_19,
+		Generic_Event_Sound_Notification_20,
+		Generic_Event_Sound_Notification_21,
+		Generic_Event_Sound_Notification_22,
+		Generic_Event_Sound_Notification_23,
+		Generic_Event_Sound_Notification_24,
+		Generic_Event_Sound_Notification_25,
+		Generic_Event_Sound_Notification_26,
+		Generic_Event_Sound_Notification_27,
+		Generic_Event_Sound_Notification_28,
+		Generic_Event_Sound_Notification_29,
+		Generic_Event_Sound_Notification_30,
+		Generic_Event_Sound_Notification_31,
+		Generic_Event_Sound_Notification_32,
+		Manufacturer_Defined_Indicator_1 = 0x80,
+		Manufacturer_Defined_Indicator_2,
+		Manufacturer_Defined_Indicator_3,
+		Manufacturer_Defined_Indicator_4,
+		Manufacturer_Defined_Indicator_5,
+		Manufacturer_Defined_Indicator_6,
+		Manufacturer_Defined_Indicator_7,
+		Manufacturer_Defined_Indicator_8,
+		Manufacturer_Defined_Indicator_9,
+		Manufacturer_Defined_Indicator_10,
+		Manufacturer_Defined_Indicator_11,
+		Manufacturer_Defined_Indicator_12,
+		Manufacturer_Defined_Indicator_13,
+		Manufacturer_Defined_Indicator_14,
+		Manufacturer_Defined_Indicator_15,
+		Manufacturer_Defined_Indicator_16,
+		Manufacturer_Defined_Indicator_17,
+		Manufacturer_Defined_Indicator_18,
+		Manufacturer_Defined_Indicator_19,
+		Manufacturer_Defined_Indicator_20,
+		Manufacturer_Defined_Indicator_21,
+		Manufacturer_Defined_Indicator_22,
+		Manufacturer_Defined_Indicator_23,
+		Manufacturer_Defined_Indicator_24,
+		Manufacturer_Defined_Indicator_25,
+		Manufacturer_Defined_Indicator_26,
+		Manufacturer_Defined_Indicator_27,
+		Manufacturer_Defined_Indicator_28,
+		Manufacturer_Defined_Indicator_29,
+		Manufacturer_Defined_Indicator_30,
+		Manufacturer_Defined_Indicator_31,
+		Manufacturer_Defined_Indicator_32,
+		Buzzer = 0xF0
 	);
 ENUM(ValueID_Index_Language,
 		Language = 0,
diff --git a/cpp/src/ValueIDIndexesDefines.h b/cpp/src/ValueIDIndexesDefines.h
index 48053dcc..035343ef 100644
--- a/cpp/src/ValueIDIndexesDefines.h
+++ b/cpp/src/ValueIDIndexesDefines.h
@@ -21,7 +21,9 @@ struct ValueID_Index_BarrierOperator { enum _enumerated { Command = 0, Label = 1
 
 
 
-struct ValueID_Index_Basic { enum _enumerated { Set = 0 }; _enumerated _value; ValueID_Index_Basic(_enumerated value) : _value(value) { } operator _enumerated() const { return _value; } const char* _to_string() const { for (size_t index = 0; index < _count; ++index) { if (_values()[index] == _value) return _names()[index]; } return NULL; } static const size_t _count = 1; static const int* _values() { static const int values[] = { (ignore_assign)Set = 0, }; return values; } static const char* const* _names() { static const char* const raw_names[] = { "Set = 0", }; static char* processed_names[_count]; static bool initialized = false; if (!initialized) { for (size_t index = 0; index < _count; ++index) { size_t length = std::strcspn(raw_names[index], " =\t\n\r"); processed_names[index] = new char[length + 1]; strncpy( processed_names[index], raw_names[index], length); processed_names[index][length] = '\0'; } } return processed_names; } };;
+struct ValueID_Index_Basic { enum _enumerated { Set = 0, Target = 1, Duration = 2 }; _enumerated _value; ValueID_Index_Basic(_enumerated value) : _value(value) { } operator _enumerated() const { return _value; } const char* _to_string() const { for (size_t index = 0; index < _count; ++index) { if (_values()[index] == _value) return _names()[index]; } return NULL; } static const size_t _count = 3; static const int* _values() { static const int values[] = { (ignore_assign)Set = 0, (ignore_assign)Target = 1, (ignore_assign)Duration = 2, }; return values; } static const char* const* _names() { static const char* const raw_names[] = { "Set = 0", "Target = 1", "Duration = 2", }; static char* processed_names[_count]; static bool initialized = false; if (!initialized) { for (size_t index = 0; index < _count; ++index) { size_t length = std::strcspn(raw_names[index], " =\t\n\r"); processed_names[index] = new char[length + 1]; strncpy( processed_names[index], raw_names[index], length); processed_names[index][length] = '\0'; } } return processed_names; } };;
+
+
 
 
 struct ValueID_Index_BasicWindowCovering { enum _enumerated { Open = 0, Close = 1 }; _enumerated _value; ValueID_Index_BasicWindowCovering(_enumerated value) : _value(value) { } operator _enumerated() const { return _value; } const char* _to_string() const { for (size_t index = 0; index < _count; ++index) { if (_values()[index] == _value) return _names()[index]; } return NULL; } static const size_t _count = 2; static const int* _values() { static const int values[] = { (ignore_assign)Open = 0, (ignore_assign)Close = 1, }; return values; } static const char* const* _names() { static const char* const raw_names[] = { "Open = 0", "Close = 1", }; static char* processed_names[_count]; static bool initialized = false; if (!initialized) { for (size_t index = 0; index < _count; ++index) { size_t length = std::strcspn(raw_names[index], " =\t\n\r"); processed_names[index] = new char[length + 1]; strncpy( processed_names[index], raw_names[index], length); processed_names[index][length] = '\0'; } } return processed_names; } };;
@@ -38,7 +40,8 @@ struct ValueID_Index_Clock { enum _enumerated { Day = 0, Hour = 1, Minute = 2 };
 
 
 
-struct ValueID_Index_Color { enum _enumerated { Color = 0, Index = 1, Channels_Capabilities = 2, Duration = 4 }; _enumerated _value; ValueID_Index_Color(_enumerated value) : _value(value) { } operator _enumerated() const { return _value; } const char* _to_string() const { for (size_t index = 0; index < _count; ++index) { if (_values()[index] == _value) return _names()[index]; } return NULL; } static const size_t _count = 4; static const int* _values() { static const int values[] = { (ignore_assign)Color = 0, (ignore_assign)Index = 1, (ignore_assign)Channels_Capabilities = 2, (ignore_assign)Duration = 4, }; return values; } static const char* const* _names() { static const char* const raw_names[] = { "Color = 0", "Index = 1", "Channels_Capabilities = 2", "Duration = 4", }; static char* processed_names[_count]; static bool initialized = false; if (!initialized) { for (size_t index = 0; index < _count; ++index) { size_t length = std::strcspn(raw_names[index], " =\t\n\r"); processed_names[index] = new char[length + 1]; strncpy( processed_names[index], raw_names[index], length); processed_names[index][length] = '\0'; } } return processed_names; } };;
+struct ValueID_Index_Color { enum _enumerated { Color = 0, Index = 1, Channels_Capabilities = 2, Duration = 4, Target = 5 }; _enumerated _value; ValueID_Index_Color(_enumerated value) : _value(value) { } operator _enumerated() const { return _value; } const char* _to_string() const { for (size_t index = 0; index < _count; ++index) { if (_values()[index] == _value) return _names()[index]; } return NULL; } static const size_t _count = 5; static const int* _values() { static const int values[] = { (ignore_assign)Color = 0, (ignore_assign)Index = 1, (ignore_assign)Channels_Capabilities = 2, (ignore_assign)Duration = 4, (ignore_assign)Target = 5, }; return values; } static const char* const* _names() { static const char* const raw_names[] = { "Color = 0", "Index = 1", "Channels_Capabilities = 2", "Duration = 4", "Target = 5", }; static char* processed_names[_count]; static bool initialized = false; if (!initialized) { for (size_t index = 0; index < _count; ++index) { size_t length = std::strcspn(raw_names[index], " =\t\n\r"); processed_names[index] = new char[length + 1]; strncpy( processed_names[index], raw_names[index], length); processed_names[index][length] = '\0'; } } return processed_names; } };;
+
 
 
 
@@ -62,9 +65,7 @@ struct ValueID_Index_EnergyProduction { enum _enumerated { Instant = 0, Total =
 
 
 
-struct ValueID_Index_Indicator { enum _enumerated { Indicator = 0 }; _enumerated _value; ValueID_Index_Indicator(_enumerated value) : _value(value) { } operator _enumerated() const { return _value; } const char* _to_string() const { for (size_t index = 0; index < _count; ++index) { if (_values()[index] == _value) return _names()[index]; } return NULL; } static const size_t _count = 1; static const int* _values() { static const int values[] = { (ignore_assign)Indicator = 0, }; return values; } static const char* const* _names() { static const char* const raw_names[] = { "Indicator = 0", }; static char* processed_names[_count]; static bool initialized = false; if (!initialized) { for (size_t index = 0; index < _count; ++index) { size_t length = std::strcspn(raw_names[index], " =\t\n\r"); processed_names[index] = new char[length + 1]; strncpy( processed_names[index], raw_names[index], length); processed_names[index][length] = '\0'; } } return processed_names; } };;
-
-
+struct ValueID_Index_Indicator { enum _enumerated { Indicator = 0, Armed = 1, Not_Armed, Ready, Fault, Busy, Enter_ID, Enter_PIN, Code_Accepted, Code_Not_Accepted, Armed_Stay, Armed_Away, Alarming, Alarming_Burglar, Alarming_Smoke_Fire, Alarming_Carbon_Monoxide, Bypass_Challenge, Entry_Delay, Exit_Delay, Alarming_Medical, Alarming_Freeze_Warning, Alarming_Water_Leak, Alarming_Panic, Zone_1_Armed = 0x20, Zone_2_Armed, Zone_3_Armed, Zone_4_Armed, Zone_5_Armed, Zone_6_Armed, Zone_7_Armed, Zone_8_Armed, LCD_Backlight = 0x30, Button_Backlight_Letters = 0x40, Button_Backlight_Digits, Button_Backlight_Command, Button_1_Indication, Button_2_Indication, Button_3_Indication, Button_4_Indication, Button_5_Indication, Button_6_Indication, Button_7_Indication, Button_8_Indication, Button_9_Indication, Button_10_Indication, Button_11_Indication, Button_12_Indication, Node_Identify = 0x50, Generic_Event_Sound_Notification_1 = 0x60, Generic_Event_Sound_Notification_2, Generic_Event_Sound_Notification_3, Generic_Event_Sound_Notification_4, Generic_Event_Sound_Notification_5, Generic_Event_Sound_Notification_6, Generic_Event_Sound_Notification_7, Generic_Event_Sound_Notification_8, Generic_Event_Sound_Notification_9, Generic_Event_Sound_Notification_10, Generic_Event_Sound_Notification_11, Generic_Event_Sound_Notification_12, Generic_Event_Sound_Notification_13, Generic_Event_Sound_Notification_14, Generic_Event_Sound_Notification_15, Generic_Event_Sound_Notification_16, Generic_Event_Sound_Notification_17, Generic_Event_Sound_Notification_18, Generic_Event_Sound_Notification_19, Generic_Event_Sound_Notification_20, Generic_Event_Sound_Notification_21, Generic_Event_Sound_Notification_22, Generic_Event_Sound_Notification_23, Generic_Event_Sound_Notification_24, Generic_Event_Sound_Notification_25, Generic_Event_Sound_Notification_26, Generic_Event_Sound_Notification_27, Generic_Event_Sound_Notification_28, Generic_Event_Sound_Notification_29, Generic_Event_Sound_Notification_30, Generic_Event_Sound_Notification_31, Generic_Event_Sound_Notification_32, Manufacturer_Defined_Indicator_1 = 0x80, Manufacturer_Defined_Indicator_2, Manufacturer_Defined_Indicator_3, Manufacturer_Defined_Indicator_4, Manufacturer_Defined_Indicator_5, Manufacturer_Defined_Indicator_6, Manufacturer_Defined_Indicator_7, Manufacturer_Defined_Indicator_8, Manufacturer_Defined_Indicator_9, Manufacturer_Defined_Indicator_10, Manufacturer_Defined_Indicator_11, Manufacturer_Defined_Indicator_12, Manufacturer_Defined_Indicator_13, Manufacturer_Defined_Indicator_14, Manufacturer_Defined_Indicator_15, Manufacturer_Defined_Indicator_16, Manufacturer_Defined_Indicator_17, Manufacturer_Defined_Indicator_18, Manufacturer_Defined_Indicator_19, Manufacturer_Defined_Indicator_20, Manufacturer_Defined_Indicator_21, Manufacturer_Defined_Indicator_22, Manufacturer_Defined_Indicator_23, Manufacturer_Defined_Indicator_24, Manufacturer_Defined_Indicator_25, Manufacturer_Defined_Indicator_26, Manufacturer_Defined_Indicator_27, Manufacturer_Defined_Indicator_28, Manufacturer_Defined_Indicator_29, Manufacturer_Defined_Indicator_30, Manufacturer_Defined_Indicator_31, Manufacturer_Defined_Indicator_32, Buzzer = 0xF0 }; _enumerated _value; ValueID_Index_Indicator(_enumerated value) : _value(value) { } operator _enumerated() const { return _value; } const char* _to_string() const { for (size_t index = 0; index < _count; ++index) { if (_values()[index] == _value) return _names()[index]; } return NULL; } static const size_t _count = 113; static const int* _values() { static const int values[] = { (ignore_assign)Indicator = 0, (ignore_assign)Armed = 1, (ignore_assign)Not_Armed, (ignore_assign)Ready, (ignore_assign)Fault, (ignore_assign)Busy, (ignore_assign)Enter_ID, (ignore_assign)Enter_PIN, (ignore_assign)Code_Accepted, (ignore_assign)Code_Not_Accepted, (ignore_assign)Armed_Stay, (ignore_assign)Armed_Away, (ignore_assign)Alarming, (ignore_assign)Alarming_Burglar, (ignore_assign)Alarming_Smoke_Fire, (ignore_assign)Alarming_Carbon_Monoxide, (ignore_assign)Bypass_Challenge, (ignore_assign)Entry_Delay, (ignore_assign)Exit_Delay, (ignore_assign)Alarming_Medical, (ignore_assign)Alarming_Freeze_Warning, (ignore_assign)Alarming_Water_Leak, (ignore_assign)Alarming_Panic, (ignore_assign)Zone_1_Armed = 0x20, (ignore_assign)Zone_2_Armed, (ignore_assign)Zone_3_Armed, (ignore_assign)Zone_4_Armed, (ignore_assign)Zone_5_Armed, (ignore_assign)Zone_6_Armed, (ignore_assign)Zone_7_Armed, (ignore_assign)Zone_8_Armed, (ignore_assign)LCD_Backlight = 0x30, (ignore_assign)Button_Backlight_Letters = 0x40, (ignore_assign)Button_Backlight_Digits, (ignore_assign)Button_Backlight_Command, (ignore_assign)Button_1_Indication, (ignore_assign)Button_2_Indication, (ignore_assign)Button_3_Indication, (ignore_assign)Button_4_Indication, (ignore_assign)Button_5_Indication, (ignore_assign)Button_6_Indication, (ignore_assign)Button_7_Indication, (ignore_assign)Button_8_Indication, (ignore_assign)Button_9_Indication, (ignore_assign)Button_10_Indication, (ignore_assign)Button_11_Indication, (ignore_assign)Button_12_Indication, (ignore_assign)Node_Identify = 0x50, (ignore_assign)Generic_Event_Sound_Notification_1 = 0x60, (ignore_assign)Generic_Event_Sound_Notification_2, (ignore_assign)Generic_Event_Sound_Notification_3, (ignore_assign)Generic_Event_Sound_Notification_4, (ignore_assign)Generic_Event_Sound_Notification_5, (ignore_assign)Generic_Event_Sound_Notification_6, (ignore_assign)Generic_Event_Sound_Notification_7, (ignore_assign)Generic_Event_Sound_Notification_8, (ignore_assign)Generic_Event_Sound_Notification_9, (ignore_assign)Generic_Event_Sound_Notification_10, (ignore_assign)Generic_Event_Sound_Notification_11, (ignore_assign)Generic_Event_Sound_Notification_12, (ignore_assign)Generic_Event_Sound_Notification_13, (ignore_assign)Generic_Event_Sound_Notification_14, (ignore_assign)Generic_Event_Sound_Notification_15, (ignore_assign)Generic_Event_Sound_Notification_16, (ignore_assign)Generic_Event_Sound_Notification_17, (ignore_assign)Generic_Event_Sound_Notification_18, (ignore_assign)Generic_Event_Sound_Notification_19, (ignore_assign)Generic_Event_Sound_Notification_20, (ignore_assign)Generic_Event_Sound_Notification_21, (ignore_assign)Generic_Event_Sound_Notification_22, (ignore_assign)Generic_Event_Sound_Notification_23, (ignore_assign)Generic_Event_Sound_Notification_24, (ignore_assign)Generic_Event_Sound_Notification_25, (ignore_assign)Generic_Event_Sound_Notification_26, (ignore_assign)Generic_Event_Sound_Notification_27, (ignore_assign)Generic_Event_Sound_Notification_28, (ignore_assign)Generic_Event_Sound_Notification_29, (ignore_assign)Generic_Event_Sound_Notification_30, (ignore_assign)Generic_Event_Sound_Notification_31, (ignore_assign)Generic_Event_Sound_Notification_32, (ignore_assign)Manufacturer_Defined_Indicator_1 = 0x80, (ignore_assign)Manufacturer_Defined_Indicator_2, (ignore_assign)Manufacturer_Defined_Indicator_3, (ignore_assign)Manufacturer_Defined_Indicator_4, (ignore_assign)Manufacturer_Defined_Indicator_5, (ignore_assign)Manufacturer_Defined_Indicator_6, (ignore_assign)Manufacturer_Defined_Indicator_7, (ignore_assign)Manufacturer_Defined_Indicator_8, (ignore_assign)Manufacturer_Defined_Indicator_9, (ignore_assign)Manufacturer_Defined_Indicator_10, (ignore_assign)Manufacturer_Defined_Indicator_11, (ignore_assign)Manufacturer_Defined_Indicator_12, (ignore_assign)Manufacturer_Defined_Indicator_13, (ignore_assign)Manufacturer_Defined_Indicator_14, (ignore_assign)Manufacturer_Defined_Indicator_15, (ignore_assign)Manufacturer_Defined_Indicator_16, (ignore_assign)Manufacturer_Defined_Indicator_17, (ignore_assign)Manufacturer_Defined_Indicator_18, (ignore_assign)Manufacturer_Defined_Indicator_19, (ignore_assign)Manufacturer_Defined_Indicator_20, (ignore_assign)Manufacturer_Defined_Indicator_21, (ignore_assign)Manufacturer_Defined_Indicator_22, (ignore_assign)Manufacturer_Defined_Indicator_23, (ignore_assign)Manufacturer_Defined_Indicator_24, (ignore_assign)Manufacturer_Defined_Indicator_25, (ignore_assign)Manufacturer_Defined_Indicator_26, (ignore_assign)Manufacturer_Defined_Indicator_27, (ignore_assign)Manufacturer_Defined_Indicator_28, (ignore_assign)Manufacturer_Defined_Indicator_29, (ignore_assign)Manufacturer_Defined_Indicator_30, (ignore_assign)Manufacturer_Defined_Indicator_31, (ignore_assign)Manufacturer_Defined_Indicator_32, (ignore_assign)Buzzer = 0xF0, }; return values; } static const char* const* _names() { static const char* const raw_names[] = { "Indicator = 0", "Armed = 1", "Not_Armed", "Ready", "Fault", "Busy", "Enter_ID", "Enter_PIN", "Code_Accepted", "Code_Not_Accepted", "Armed_Stay", "Armed_Away", "Alarming", "Alarming_Burglar", "Alarming_Smoke_Fire", "Alarming_Carbon_Monoxide", "Bypass_Challenge", "Entry_Delay", "Exit_Delay", "Alarming_Medical", "Alarming_Freeze_Warning", "Alarming_Water_Leak", "Alarming_Panic", "Zone_1_Armed = 0x20", "Zone_2_Armed", "Zone_3_Armed", "Zone_4_Armed", "Zone_5_Armed", "Zone_6_Armed", "Zone_7_Armed", "Zone_8_Armed", "LCD_Backlight = 0x30", "Button_Backlight_Letters = 0x40", "Button_Backlight_Digits", "Button_Backlight_Command", "Button_1_Indication", "Button_2_Indication", "Button_3_Indication", "Button_4_Indication", "Button_5_Indication", "Button_6_Indication", "Button_7_Indication", "Button_8_Indication", "Button_9_Indication", "Button_10_Indication", "Button_11_Indication", "Button_12_Indication", "Node_Identify = 0x50", "Generic_Event_Sound_Notification_1 = 0x60", "Generic_Event_Sound_Notification_2", "Generic_Event_Sound_Notification_3", "Generic_Event_Sound_Notification_4", "Generic_Event_Sound_Notification_5", "Generic_Event_Sound_Notification_6", "Generic_Event_Sound_Notification_7", "Generic_Event_Sound_Notification_8", "Generic_Event_Sound_Notification_9", "Generic_Event_Sound_Notification_10", "Generic_Event_Sound_Notification_11", "Generic_Event_Sound_Notification_12", "Generic_Event_Sound_Notification_13", "Generic_Event_Sound_Notification_14", "Generic_Event_Sound_Notification_15", "Generic_Event_Sound_Notification_16", "Generic_Event_Sound_Notification_17", "Generic_Event_Sound_Notification_18", "Generic_Event_Sound_Notification_19", "Generic_Event_Sound_Notification_20", "Generic_Event_Sound_Notification_21", "Generic_Event_Sound_Notification_22", "Generic_Event_Sound_Notification_23", "Generic_Event_Sound_Notification_24", "Generic_Event_Sound_Notification_25", "Generic_Event_Sound_Notification_26", "Generic_Event_Sound_Notification_27", "Generic_Event_Sound_Notification_28", "Generic_Event_Sound_Notification_29", "Generic_Event_Sound_Notification_30", "Generic_Event_Sound_Notification_31", "Generic_Event_Sound_Notification_32", "Manufacturer_Defined_Indicator_1 = 0x80", "Manufacturer_Defined_Indicator_2", "Manufacturer_Defined_Indicator_3", "Manufacturer_Defined_Indicator_4", "Manufacturer_Defined_Indicator_5", "Manufacturer_Defined_Indicator_6", "Manufacturer_Defined_Indicator_7", "Manufacturer_Defined_Indicator_8", "Manufacturer_Defined_Indicator_9", "Manufacturer_Defined_Indicator_10", "Manufacturer_Defined_Indicator_11", "Manufacturer_Defined_Indicator_12", "Manufacturer_Defined_Indicator_13", "Manufacturer_Defined_Indicator_14", "Manufacturer_Defined_Indicator_15", "Manufacturer_Defined_Indicator_16", "Manufacturer_Defined_Indicator_17", "Manufacturer_Defined_Indicator_18", "Manufacturer_Defined_Indicator_19", "Manufacturer_Defined_Indicator_20", "Manufacturer_Defined_Indicator_21", "Manufacturer_Defined_Indicator_22", "Manufacturer_Defined_Indicator_23", "Manufacturer_Defined_Indicator_24", "Manufacturer_Defined_Indicator_25", "Manufacturer_Defined_Indicator_26", "Manufacturer_Defined_Indicator_27", "Manufacturer_Defined_Indicator_28", "Manufacturer_Defined_Indicator_29", "Manufacturer_Defined_Indicator_30", "Manufacturer_Defined_Indicator_31", "Manufacturer_Defined_Indicator_32", "Buzzer = 0xF0", }; static char* processed_names[_count]; static bool initialized = false; if (!initialized) { for (size_t index = 0; index < _count; ++index) { size_t length = std::strcspn(raw_names[index], " =\t\n\r"); processed_names[index] = new char[length + 1]; strncpy( processed_names[index], raw_names[index], length); processed_names[index][length] = '\0'; } } return processed_names; } };;
 struct ValueID_Index_Language { enum _enumerated { Language = 0, Country = 1 }; _enumerated _value; ValueID_Index_Language(_enumerated value) : _value(value) { } operator _enumerated() const { return _value; } const char* _to_string() const { for (size_t index = 0; index < _count; ++index) { if (_values()[index] == _value) return _names()[index]; } return NULL; } static const size_t _count = 2; static const int* _values() { static const int values[] = { (ignore_assign)Language = 0, (ignore_assign)Country = 1, }; return values; } static const char* const* _names() { static const char* const raw_names[] = { "Language = 0", "Country = 1", }; static char* processed_names[_count]; static bool initialized = false; if (!initialized) { for (size_t index = 0; index < _count; ++index) { size_t length = std::strcspn(raw_names[index], " =\t\n\r"); processed_names[index] = new char[length + 1]; strncpy( processed_names[index], raw_names[index], length); processed_names[index][length] = '\0'; } } return processed_names; } };;
 
 
diff --git a/cpp/src/command_classes/Alarm.cpp b/cpp/src/command_classes/Alarm.cpp
index 4ccc5e62..f5027eb4 100644
--- a/cpp/src/command_classes/Alarm.cpp
+++ b/cpp/src/command_classes/Alarm.cpp
@@ -240,7 +240,7 @@ namespace OpenZWave
 
 						uint8 NotificationType = _data[5];
 						uint8 NotificationEvent = _data[6];
-						bool NotificationSequencePresent = ((_data[7] & 0x80) == 1);
+						bool NotificationSequencePresent = (_data[7] & 0x80);
 						uint8 EventParamLength = (_data[7] & 0x1F);
 						uint8 NotificationSequence = 0;
 						if (NotificationSequencePresent)
diff --git a/cpp/src/command_classes/Basic.cpp b/cpp/src/command_classes/Basic.cpp
index b0d33214..38899304 100644
--- a/cpp/src/command_classes/Basic.cpp
+++ b/cpp/src/command_classes/Basic.cpp
@@ -36,6 +36,7 @@
 #include "platform/Log.h"
 
 #include "value_classes/ValueByte.h"
+#include "value_classes/ValueInt.h"
 #include "command_classes/NoOperation.h"
 
 #include "tinyxml.h"
@@ -74,6 +75,8 @@ namespace OpenZWave
 			{
 				CommandClass::ReadXML(_ccElement);
 				SetMapping(m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING));
+				if (m_com.GetFlagBool(COMPAT_FLAG_BASIC_SETASREPORT))
+					SetAfterMark();
 			}
 
 //-----------------------------------------------------------------------------
@@ -102,6 +105,9 @@ namespace OpenZWave
 			bool Basic::RequestValue(uint32 const _requestFlags, uint16 const _dummy1,	// = 0 (not used)
 					uint8 const _instance, Driver::MsgQueue const _queue)
 			{
+				if (IsAfterMark())
+					return false;
+
 				if (m_com.GetFlagBool(COMPAT_FLAG_GETSUPPORTED))
 				{
 					Msg* msg = new Msg("BasicCmd_Get", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
@@ -141,16 +147,39 @@ namespace OpenZWave
 					Log::Write(LogLevel_Info, GetNodeId(), "Received Basic report from node %d: level=%d", GetNodeId(), _data[1]);
 					if (!m_com.GetFlagBool(COMPAT_FLAG_BASIC_IGNOREREMAPPING) && m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING) != 0)
 					{
-						UpdateMappedClass(_instance, m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING), _data[1]);
-					}
-					else if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_Basic::Set)))
-					{
-						value->OnValueRefreshed(_data[1]);
-						value->Release();
+						/* update our Mapped Class with the Target Values */
+						if (GetVersion() >= 2 && _length >= 4)
+							UpdateMappedClass(_instance, m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING), _data[2]);
+						else
+							UpdateMappedClass(_instance, m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING), _data[1]);
 					}
-					else
-					{
-						Log::Write(LogLevel_Warning, GetNodeId(), "No Valid Mapping for Basic Command Class and No ValueID Exported. Error?");
+					else 
+					{ 
+						if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_Basic::Set)))
+						{
+							/* Set the Target Value, if it is present */
+							if (_length >= 4)
+								value->SetTargetValue(_data[2], _data[3]);
+							value->OnValueRefreshed(_data[1]);
+							value->Release();
+						}
+						else
+						{
+							Log::Write(LogLevel_Warning, GetNodeId(), "No Valid Mapping for Basic Command Class and No ValueID Exported. Error?");
+						}
+						if (_length >= 4)
+						{
+							if (Internal::VC::ValueByte* target = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_Basic::Target)))
+							{
+								target->OnValueRefreshed(_data[2]);
+								target->Release();
+							}
+							if (Internal::VC::ValueInt* duration = static_cast<Internal::VC::ValueInt *>(GetValue(_instance, ValueID_Index_Basic::Duration)))
+							{
+								duration->OnValueRefreshed(decodeDuration(_data[3]));
+								duration->Release();
+							}
+						}
 					}
 					return true;
 				}
@@ -162,16 +191,37 @@ namespace OpenZWave
 						Log::Write(LogLevel_Info, GetNodeId(), "Received Basic set from node %d: level=%d. Treating it as a Basic report.", GetNodeId(), _data[1]);
 						if (!m_com.GetFlagBool(COMPAT_FLAG_BASIC_IGNOREREMAPPING) && m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING) != 0)
 						{
-							UpdateMappedClass(_instance, m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING), _data[1]);
-						}
-						else if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_Basic::Set)))
-						{
-							value->OnValueRefreshed(_data[1]);
-							value->Release();
+							/* update our Mapped Class with the Target Values */
+							if (GetVersion() >= 2 && _length >= 4)
+								UpdateMappedClass(_instance, m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING), _data[2]);
+							else
+								UpdateMappedClass(_instance, m_com.GetFlagByte(COMPAT_FLAG_BASIC_MAPPING), _data[1]);
 						}
-						else
+						else 
 						{
-							Log::Write(LogLevel_Warning, GetNodeId(), "No Valid Mapping for Basic Command Class and No ValueID Exported. Error?");
+							if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_Basic::Set)))
+							{
+								value->OnValueRefreshed(_data[1]);
+								value->Release();
+							}
+							else
+							{
+								Log::Write(LogLevel_Warning, GetNodeId(), "No Valid Mapping for Basic Command Class and No ValueID Exported. Error?");
+							}
+							
+							if (_length >= 4)
+							{
+								if (Internal::VC::ValueByte* target = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_Basic::Target)))
+								{
+									target->OnValueRefreshed(_data[2]);
+									target->Release();
+								}
+								if (Internal::VC::ValueInt* duration = static_cast<Internal::VC::ValueInt *>(GetValue(_instance, ValueID_Index_Basic::Duration)))
+								{
+									duration->OnValueRefreshed(decodeDuration(_data[3]));
+									duration->Release();
+								}
+							}
 						}
 					}
 					else
@@ -196,7 +246,7 @@ namespace OpenZWave
 //-----------------------------------------------------------------------------
 			bool Basic::SetValue(Internal::VC::Value const& _value)
 			{
-				if (ValueID::ValueType_Byte == _value.GetID().GetType())
+				if (ValueID_Index_Basic::Set == _value.GetID().GetIndex())
 				{
 					Internal::VC::ValueByte const* value = static_cast<Internal::VC::ValueByte const*>(&_value);
 
@@ -227,7 +277,12 @@ namespace OpenZWave
 					Log::Write(LogLevel_Info, GetNodeId(), "COMMAND_CLASS_BASIC is not mapped to another CC. Exposing ValueID");
 					if (Node* node = GetNodeUnsafe())
 					{
-						node->CreateValueByte(ValueID::ValueGenre_Basic, GetCommandClassId(), _instance, ValueID_Index_Basic::Set, "Basic", "", false, false, 0, 0);
+						node->CreateValueByte(ValueID::ValueGenre_Basic, GetCommandClassId(), _instance, ValueID_Index_Basic::Set, "Basic", "", IsAfterMark(), false, 0, 0);
+						if ((GetVersion() >= 2) || (IsAfterMark()))
+						{
+							node->CreateValueByte(ValueID::ValueGenre_Basic, GetCommandClassId(), _instance, ValueID_Index_Basic::Target, "Basic Target", "", true, false, 0, 0);
+							node->CreateValueInt(ValueID::ValueGenre_Basic, GetCommandClassId(), _instance, ValueID_Index_Basic::Duration, "Basic Duration", "", true, false, 0, 0);
+						}
 					}
 				}
 
@@ -278,6 +333,8 @@ namespace OpenZWave
 						Log::Write(LogLevel_Info, GetNodeId(), "    COMMAND_CLASS_BASIC will be mapped to %s", ccstr.c_str());
 						m_com.SetFlagByte(COMPAT_FLAG_BASIC_MAPPING, _commandClassId);
 						RemoveValue(1, ValueID_Index_Basic::Set);
+						RemoveValue(1, ValueID_Index_Basic::Target);
+						RemoveValue(1, ValueID_Index_Basic::Duration);
 					}
 					res = true;
 				}
diff --git a/cpp/src/command_classes/Basic.h b/cpp/src/command_classes/Basic.h
index 4e947815..6e8b13f2 100644
--- a/cpp/src/command_classes/Basic.h
+++ b/cpp/src/command_classes/Basic.h
@@ -83,6 +83,12 @@ namespace OpenZWave
 
 					void Set(uint8 const _level);
 
+					virtual uint8 GetMaxVersion() override
+					{
+						return 2;
+					}
+
+
 				protected:
 					virtual void CreateVars(uint8 const _instance) override;
 
diff --git a/cpp/src/command_classes/CentralScene.cpp b/cpp/src/command_classes/CentralScene.cpp
index 891ff1e4..d0888945 100644
--- a/cpp/src/command_classes/CentralScene.cpp
+++ b/cpp/src/command_classes/CentralScene.cpp
@@ -209,7 +209,7 @@ namespace OpenZWave
 						identical = _data[2] & 0x01;
 						Log::Write(LogLevel_Detail, GetNodeId(), "CentralScene: all scenes identical? %i", identical);
 						if (GetVersion() >= 3)
-							m_slowrefresh = (_data[2] & 0x80) == 1 ? true : false;
+							m_slowrefresh = (_data[2] & 0x80) ? true : false;
 					}
 
 					if (Internal::VC::ValueInt* value = static_cast<Internal::VC::ValueInt*>(GetValue(_instance, ValueID_Index_CentralScene::SceneCount)))
diff --git a/cpp/src/command_classes/Color.cpp b/cpp/src/command_classes/Color.cpp
index 07149a08..fe97a028 100644
--- a/cpp/src/command_classes/Color.cpp
+++ b/cpp/src/command_classes/Color.cpp
@@ -305,7 +305,9 @@ namespace OpenZWave
 						}
 
 						if (GetVersion() > 1)
-							node->CreateValueByte(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_Color::Duration, "Duration", "Sec", false, false, 255, 0);
+							node->CreateValueInt(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_Color::Duration, "Duration", "Sec", false, false, -1, 0);
+						if (GetVersion() > 2)
+							node->CreateValueString(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_Color::Target, "Target Color", helpstr, true, false, "#000000", 0);
 
 					}
 					return true;
@@ -339,6 +341,8 @@ namespace OpenZWave
 						}
 					}
 					m_colorvalues[coloridx] = _data[2];
+					if (GetVersion() >= 3)
+						m_colorTargetValues[coloridx] = _data[3];
 
 					/* test if there are any more valid coloridx */
 					for (uint8 idx = coloridx + 1; idx < 9; idx++)
@@ -352,287 +356,272 @@ namespace OpenZWave
 						m_refreshinprogress = false;
 
 					/* if we get here, then we can update our ValueID */
+
+					string colorStr = decodeColor(m_colorvalues);
+
 					if (Internal::VC::ValueString* color = static_cast<Internal::VC::ValueString*>(GetValue(_instance, ValueID_Index_Color::Color)))
 					{
-						/* create a RGB[W] String */
-						std::stringstream ss;
-						std::stringstream ssbuf;
-						bool usingbuf = false;
-						uint16_t f_capabilities = m_dom.GetFlagShort(STATE_FLAG_COLOR_CHANNELS);
-						ss << "#";
-						/* do R */
-						if ((f_capabilities) & (1 << (COLORIDX_RED)))
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_RED];
-						else
-							ss << "00";
-						/* do G */
-						if ((f_capabilities) & (1 << (COLORIDX_GREEN)))
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_GREEN];
-						else
-							ss << "00";
-						/* do B */
-						if ((f_capabilities) & (1 << (COLORIDX_BLUE)))
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_BLUE];
-						else
-							ss << "00";
-
-						/* if both whites are present.... */
-						if (((f_capabilities) & (1 << (COLORIDX_WARMWHITE))) && ((f_capabilities) & (1 << (COLORIDX_COLDWHITE))))
-						{
-							/* append them both */
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_WARMWHITE];
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_COLDWHITE];
-						}
-						else if ((f_capabilities) & (1 << (COLORIDX_WARMWHITE)))
-						{
-							/* else, if the warm white is present, append that */
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_WARMWHITE];
-						}
-						else if ((f_capabilities) & (1 << (COLORIDX_COLDWHITE)))
-						{
-							/* else, if the cold white is present, append that */
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_COLDWHITE];
-						}
-						else
-						{
-							/* we put 0000 into our buffer to represent both Warm and Cold white */
-							ssbuf << "0000";
-							usingbuf = true;
-						}
-						if ((f_capabilities) & (1 << (COLORIDX_AMBER)))
-						{
-							/* if AMBER is present, append our buffer if needed */
-							if (usingbuf)
-							{
-								ss << ssbuf.str();
-								ssbuf.str("");
-								ssbuf.clear();
-								usingbuf = false;
-							}
-							/* and then our Color */
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_AMBER];
-						}
-						else
-						{
-							/* put 00 into our buffer */
-							ssbuf << "00";
-							usingbuf = true;
-						}
-						if ((f_capabilities) & (1 << (COLORIDX_CYAN)))
+						Log::Write(LogLevel_Info, GetNodeId(), "Received a updated Color from Device: %s", colorStr.c_str());
+						if (GetVersion() >= 3)
+							color->SetTargetValue(decodeColor(m_colorTargetValues), _data[4]);
+						color->OnValueRefreshed(colorStr);
+						color->Release();
+					}
+					/* if we got a updated Color Index Value - Update our ValueID */
+					if (Internal::VC::ValueList* coloridx = static_cast<Internal::VC::ValueList*>(GetValue(_instance, ValueID_Index_Color::Index)))
+					{
+						if ((m_dom.GetFlagShort(STATE_FLAG_COLOR_CHANNELS)) & (1 << (COLORIDX_INDEXCOLOR)))
 						{
-							/* if CYAN is present, append our buffer if needed */
-							if (usingbuf)
-							{
-								ss << ssbuf.str();
-								ssbuf.str("");
-								ssbuf.clear();
-								usingbuf = false;
-							}
-							/* and then our Color */
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_CYAN];
-						}
+							coloridx->OnValueRefreshed(m_colorvalues[COLORIDX_INDEXCOLOR]);
+						} 
 						else
 						{
-							/* put 00 into our buffer */
-							ssbuf << "00";
-							usingbuf = true;
+							coloridx->OnValueRefreshed(decodeColorList(colorStr));
 						}
-						if ((f_capabilities) & (1 << (COLORIDX_PURPLE)))
+						coloridx->Release();
+					}
+					if (GetVersion() >= 3) 
+					{
+						string colorTargetStr = decodeColor(m_colorTargetValues);
+
+						if (Internal::VC::ValueString* color = static_cast<Internal::VC::ValueString*>(GetValue(_instance, ValueID_Index_Color::Target)))
 						{
-							/* if PURPLE is present, append our buffer if needed */
-							if (usingbuf)
-							{
-								ss << ssbuf.str();
-								ssbuf.str("");
-								ssbuf.clear();
-								usingbuf = false;
-							}
-							/* and then our Color */
-							ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_PURPLE];
+							Log::Write(LogLevel_Info, GetNodeId(), "Received a updated Color Target from Device: %s", colorStr.c_str());
+							color->OnValueRefreshed(colorStr);
+							color->Release();
 						}
-						/* No need for a else case here as COLORIDX_PURPLE is the last color. If its not supported, we
-						 * don't put anything in our Color String
-						 */
+					}
 
-						Log::Write(LogLevel_Info, GetNodeId(), "Received a updated Color from Device: %s", ss.str().c_str());
-						color->OnValueRefreshed(string(ss.str()));
-						color->Release();
+					return true;
+				}
+				return false;
+			}
 
-						/* if we don't support the Color Index then fake it */
-						if (!(f_capabilities & (1 << (COLORIDX_INDEXCOLOR))))
-						{
-							if (Internal::VC::ValueList* coloridx = static_cast<Internal::VC::ValueList*>(GetValue(_instance, ValueID_Index_Color::Index)))
-							{
-								/* it supports the AMBER/CYAN/PURPLE Channels */
-								if (f_capabilities > 31)
-								{
-									/* Custom */
-									coloridx->OnValueRefreshed(17);
-									coloridx->Release();
-									return true;
-								}
-								if ((f_capabilities) & (1 << (COLORIDX_WARMWHITE)))
-								{
-									if (ss.str().substr(0, 9) == "#000000FF")
-									{
-										/* Warm White */
-										coloridx->OnValueRefreshed(2);
-										coloridx->Release();
-										return true;
-									}
-								}
-								if ((f_capabilities) & (1 << (COLORIDX_COLDWHITE)))
-								{
-									if (ss.str().substr(0, 11) == "#00000000FF")
-									{
-										/* Cool White */
-										coloridx->OnValueRefreshed(1);
-										coloridx->Release();
-										return true;
-									}
-								}
-								if (ss.str().substr(0, 7) == "#000000")
-								{
-									/* off */
-									coloridx->OnValueRefreshed(0);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#FFFFFF")
-								{
-									/* White */
-									coloridx->OnValueRefreshed(1);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#FF9329")
-								{
-									/* warm white */
-									coloridx->OnValueRefreshed(2);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#FF0000")
-								{
-									/* red */
-									coloridx->OnValueRefreshed(3);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#00FF00")
-								{
-									/* lime */
-									coloridx->OnValueRefreshed(4);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#0000FF")
-								{
-									/* blue */
-									coloridx->OnValueRefreshed(5);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#FFFF00")
-								{
-									/* yellow */
-									coloridx->OnValueRefreshed(6);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#00FFFF")
-								{
-									/* Cyan */
-									coloridx->OnValueRefreshed(7);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#FF00FF")
-								{
-									/* Magenta */
-									coloridx->OnValueRefreshed(8);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#C0C0C0")
-								{
-									/* Silver */
-									coloridx->OnValueRefreshed(9);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#808080")
-								{
-									/* gray */
-									coloridx->OnValueRefreshed(10);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#800000")
-								{
-									/* maroon */
-									coloridx->OnValueRefreshed(11);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#808000")
-								{
-									/* Olive */
-									coloridx->OnValueRefreshed(12);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#008000")
-								{
-									/* green */
-									coloridx->OnValueRefreshed(13);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#800080")
-								{
-									/* purple */
-									coloridx->OnValueRefreshed(14);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#008080")
-								{
-									/* teal */
-									coloridx->OnValueRefreshed(15);
-									coloridx->Release();
-									return true;
-								}
-								else if (ss.str().substr(0, 7) == "#000080")
-								{
-									/* navy */
-									coloridx->OnValueRefreshed(16);
-									coloridx->Release();
-									return true;
-								}
-								else
-								{
-									/* custom */
-									coloridx->OnValueRefreshed(17);
-									coloridx->Release();
-									return true;
-								}
+			uint8 Color::decodeColorList(string colorStr)
+			{
+				uint16_t f_capabilities = m_dom.GetFlagShort(STATE_FLAG_COLOR_CHANNELS);
 
-							}
+				/* if we don't support the Color Index then fake it */
+				if (!(f_capabilities & (1 << (COLORIDX_INDEXCOLOR))))
+				{
+					/* it supports the AMBER/CYAN/PURPLE Channels */
+					if (f_capabilities > 31)
+					{
+						/* Custom */
+						return 17;
+					}
+					if ((f_capabilities) & (1 << (COLORIDX_WARMWHITE)))
+					{
+						if (colorStr.substr(0, 9) == "#000000FF")
+						{
+							/* Warm White */
+							return 2;
 						}
 					}
-					/* if we got a updated Color Index Value - Update our ValueID */
-					if ((m_dom.GetFlagShort(STATE_FLAG_COLOR_CHANNELS)) & (1 << (COLORIDX_INDEXCOLOR)))
+					if ((f_capabilities) & (1 << (COLORIDX_COLDWHITE)))
 					{
-						if (Internal::VC::ValueList* coloridx = static_cast<Internal::VC::ValueList*>(GetValue(_instance, ValueID_Index_Color::Index)))
+						if (colorStr.substr(0, 11) == "#00000000FF")
 						{
-							coloridx->OnValueRefreshed(m_colorvalues[COLORIDX_INDEXCOLOR]);
-							coloridx->Release();
+							/* Cool White */
+							return 1;
 						}
 					}
-					return true;
+					if (colorStr.substr(0, 7) == "#000000")
+					{
+						/* off */
+						return 0;
+					}
+					else if (colorStr.substr(0, 7) == "#FFFFFF")
+					{
+						/* White */
+						return 1;
+					}
+					else if (colorStr.substr(0, 7) == "#FF9329")
+					{
+						/* warm white */
+						return 2;
+					}
+					else if (colorStr.substr(0, 7) == "#FF0000")
+					{
+						/* red */
+						return 3;
+					}
+					else if (colorStr.substr(0, 7) == "#00FF00")
+					{
+						/* lime */
+						return 4;
+					}
+					else if (colorStr.substr(0, 7) == "#0000FF")
+					{
+						/* blue */
+						return 5;
+					}
+					else if (colorStr.substr(0, 7) == "#FFFF00")
+					{
+						/* yellow */
+						return 6;
+					}
+					else if (colorStr.substr(0, 7) == "#00FFFF")
+					{
+						/* Cyan */
+						return 7;
+					}
+					else if (colorStr.substr(0, 7) == "#FF00FF")
+					{
+						/* Magenta */
+						return 8;
+					}
+					else if (colorStr.substr(0, 7) == "#C0C0C0")
+					{
+						/* Silver */
+						return 9;
+					}
+					else if (colorStr.substr(0, 7) == "#808080")
+					{
+						/* gray */
+						return 10;
+					}
+					else if (colorStr.substr(0, 7) == "#800000")
+					{
+						/* maroon */
+						return 11;
+					}
+					else if (colorStr.substr(0, 7) == "#808000")
+					{
+						/* Olive */
+						return 12;
+					}
+					else if (colorStr.substr(0, 7) == "#008000")
+					{
+						/* green */
+						return 13;
+					}
+					else if (colorStr.substr(0, 7) == "#800080")
+					{
+						/* purple */
+						return 14;
+					}
+					else if (colorStr.substr(0, 7) == "#008080")
+					{
+						/* teal */
+						return 15;
+					}
+					else if (colorStr.substr(0, 7) == "#000080")
+					{
+						/* navy */
+						return 16;
+					}
+					else
+					{
+						/* custom */
+						return 17;
+					}
 				}
-				return false;
+				return 17;
+			}
+
+			string Color::decodeColor(uint8 valueArray[9])
+			{
+				/* create a RGB[W] String */
+				std::stringstream ss;
+				std::stringstream ssbuf;
+				bool usingbuf = false;
+				uint16_t f_capabilities = m_dom.GetFlagShort(STATE_FLAG_COLOR_CHANNELS);
+				ss << "#";
+				/* do R */
+				if ((f_capabilities) & (1 << (COLORIDX_RED)))
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_RED];
+				else
+					ss << "00";
+				/* do G */
+				if ((f_capabilities) & (1 << (COLORIDX_GREEN)))
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_GREEN];
+				else
+					ss << "00";
+				/* do B */
+				if ((f_capabilities) & (1 << (COLORIDX_BLUE)))
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_BLUE];
+				else
+					ss << "00";
+
+				/* if both whites are present.... */
+				if (((f_capabilities) & (1 << (COLORIDX_WARMWHITE))) && ((f_capabilities) & (1 << (COLORIDX_COLDWHITE))))
+				{
+					/* append them both */
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_WARMWHITE];
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_COLDWHITE];
+				}
+				else if ((f_capabilities) & (1 << (COLORIDX_WARMWHITE)))
+				{
+					/* else, if the warm white is present, append that */
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_WARMWHITE];
+				}
+				else if ((f_capabilities) & (1 << (COLORIDX_COLDWHITE)))
+				{
+					/* else, if the cold white is present, append that */
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_COLDWHITE];
+				}
+				else
+				{
+					/* we put 0000 into our buffer to represent both Warm and Cold white */
+					ssbuf << "0000";
+					usingbuf = true;
+				}
+				if ((f_capabilities) & (1 << (COLORIDX_AMBER)))
+				{
+					/* if AMBER is present, append our buffer if needed */
+					if (usingbuf)
+					{
+						ss << ssbuf.str();
+						ssbuf.str("");
+						ssbuf.clear();
+						usingbuf = false;
+					}
+					/* and then our Color */
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_AMBER];
+				}
+				else
+				{
+					/* put 00 into our buffer */
+					ssbuf << "00";
+					usingbuf = true;
+				}
+				if ((f_capabilities) & (1 << (COLORIDX_CYAN)))
+				{
+					/* if CYAN is present, append our buffer if needed */
+					if (usingbuf)
+					{
+						ss << ssbuf.str();
+						ssbuf.str("");
+						ssbuf.clear();
+						usingbuf = false;
+					}
+					/* and then our Color */
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_CYAN];
+				}
+				else
+				{
+					/* put 00 into our buffer */
+					ssbuf << "00";
+					usingbuf = true;
+				}
+				if ((f_capabilities) & (1 << (COLORIDX_PURPLE)))
+				{
+					/* if PURPLE is present, append our buffer if needed */
+					if (usingbuf)
+					{
+						ss << ssbuf.str();
+						ssbuf.str("");
+						ssbuf.clear();
+						usingbuf = false;
+					}
+					/* and then our Color */
+					ss << std::setw(2) << std::uppercase << std::hex << std::setfill('0') << (int) m_colorvalues[COLORIDX_PURPLE];
+				}
+				/* No need for a else case here as COLORIDX_PURPLE is the last color. If its not supported, we
+				* don't put anything in our Color String
+				*/
+			return ss.str();
 			}
 
 //-----------------------------------------------------------------------------
@@ -758,12 +747,12 @@ namespace OpenZWave
 					}
 					if (GetVersion() > 1)
 					{
-						uint8 duration = 0;
-						if (Internal::VC::ValueByte *valduration = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), ValueID_Index_Color::Duration)))
+						uint32 duration = 15300;
+						if (Internal::VC::ValueInt *valduration = static_cast<Internal::VC::ValueInt *>(GetValue(_value.GetID().GetInstance(), ValueID_Index_Color::Duration)))
 						{
 							duration = valduration->GetValue();
 						}
-						msg->Append(duration);
+						msg->Append(encodeDuration(duration));
 					}
 					msg->Append(GetDriver()->GetTransmitOptions());
 					GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
@@ -797,12 +786,12 @@ namespace OpenZWave
 						msg->Append(index);
 						if (GetVersion() > 1)
 						{
-							uint8 duration = 0;
-							if (Internal::VC::ValueByte *valduration = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), ValueID_Index_Color::Duration)))
+							uint32 duration = 15300;
+							if (Internal::VC::ValueInt *valduration = static_cast<Internal::VC::ValueInt *>(GetValue(_value.GetID().GetInstance(), ValueID_Index_Color::Duration)))
 							{
 								duration = valduration->GetValue();
 							}
-							msg->Append(duration);
+							msg->Append(encodeDuration(duration));
 						}
 						msg->Append(GetDriver()->GetTransmitOptions());
 						GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
@@ -1070,12 +1059,12 @@ namespace OpenZWave
 						}
 						if (GetVersion() > 1)
 						{
-							uint8 duration = 0;
-							if (Internal::VC::ValueByte *valduration = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), ValueID_Index_Color::Duration)))
+							uint32 duration = 0;
+							if (Internal::VC::ValueInt *valduration = static_cast<Internal::VC::ValueInt *>(GetValue(_value.GetID().GetInstance(), ValueID_Index_Color::Duration)))
 							{
 								duration = valduration->GetValue();
 							}
-							msg->Append(duration);
+							msg->Append(encodeDuration(duration));
 						}
 						msg->Append(GetDriver()->GetTransmitOptions());
 						GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
@@ -1085,9 +1074,9 @@ namespace OpenZWave
 				else if (ValueID_Index_Color::Duration == _value.GetID().GetIndex())
 				{
 					Log::Write(LogLevel_Info, GetNodeId(), "Color::SetValue - Setting Color Fade Duration");
-					Internal::VC::ValueByte const* value = static_cast<Internal::VC::ValueByte const*>(&_value);
-					uint8 _duration = value->GetValue();
-					if (Internal::VC::ValueByte * m_value = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), ValueID_Index_Color::Duration)))
+					Internal::VC::ValueInt const* value = static_cast<Internal::VC::ValueInt const*>(&_value);
+					int32 _duration = value->GetValue();
+					if (Internal::VC::ValueInt * m_value = static_cast<Internal::VC::ValueInt *>(GetValue(_value.GetID().GetInstance(), ValueID_Index_Color::Duration)))
 					{
 						m_value->OnValueRefreshed(_duration);
 						m_value->Release();
diff --git a/cpp/src/command_classes/Color.h b/cpp/src/command_classes/Color.h
index 96c54ab6..104ace81 100644
--- a/cpp/src/command_classes/Color.h
+++ b/cpp/src/command_classes/Color.h
@@ -82,12 +82,15 @@ namespace OpenZWave
 
 				protected:
 					virtual void CreateVars(uint8 const _instance) override;
+					string decodeColor(uint8 valueArray[9]);
+					uint8 decodeColorList(string color);
 
 				private:
 					Color(uint32 const _homeId, uint8 const _nodeId);
 					bool m_refreshinprogress;
 					uint8 m_coloridxcount;
 					uint8 m_colorvalues[9];
+					uint8 m_colorTargetValues[9];
 			};
 		} // namespace CC
 	} // namespace Internal
diff --git a/cpp/src/command_classes/CommandClass.cpp b/cpp/src/command_classes/CommandClass.cpp
index 41b2a0c7..e222d69d 100644
--- a/cpp/src/command_classes/CommandClass.cpp
+++ b/cpp/src/command_classes/CommandClass.cpp
@@ -90,20 +90,10 @@ namespace OpenZWave
 				}
 				while (!m_RefreshClassValues.empty())
 				{
-					for (unsigned int i = 0; i < m_RefreshClassValues.size(); i++)
+					multimap<uint16, RefreshValue *>::iterator it;
+					for (it = m_RefreshClassValues.begin(); it != m_RefreshClassValues.end(); it++)
 					{
-						RefreshValue *rcc = m_RefreshClassValues.at(i);
-						while (!rcc->RefreshClasses.empty())
-						{
-							delete rcc->RefreshClasses.back();
-							rcc->RefreshClasses.pop_back();
-						}
-						//			for (unsigned int j = 0; j < rcc->RefreshClasses.size(); i++)
-						//			{
-						//				delete rcc->RefreshClasses[j];
-						//			}
-						rcc->RefreshClasses.clear();
-						delete rcc;
+						delete it->second;
 					}
 					m_RefreshClassValues.clear();
 				}
@@ -291,21 +281,25 @@ namespace OpenZWave
 			{
 
 				char const* str;
-				bool ok = false;
-				const char *genre;
-				RefreshValue *rcc = new RefreshValue();
-				rcc->cc = GetCommandClassId();
-				genre = _ccElement->Attribute("Genre");
-				rcc->genre = Internal::VC::Value::GetGenreEnumFromName(genre);
+				uint16 sourceIdx;
+				bool ok = true;
 				int temp;
-				_ccElement->QueryIntAttribute("Instance", &temp);
-				rcc->instance = (uint8) temp;
 				_ccElement->QueryIntAttribute("Index", &temp);
-				rcc->index = (uint16) temp;
-				Log::Write(LogLevel_Info, GetNodeId(), "Value Refresh triggered by CommandClass: %s, Genre: %d, Instance: %d, Index: %d for:", GetCommandClassName().c_str(), rcc->genre, rcc->instance, rcc->index);
+				sourceIdx = (uint16) temp;
+
+				/* check if we have a entry already */
+				if (m_RefreshClassValues.find(sourceIdx) != m_RefreshClassValues.end())
+				{
+						Log::Write(LogLevel_Warning, GetNodeId(), "TriggerRefreshValue - A Entry already exists for CC %s Index %d", GetCommandClassName().c_str(), sourceIdx);
+						return;
+				}
+
+
+				Log::Write(LogLevel_Info, GetNodeId(), "Value Refresh triggered by CommandClass: %s, Index: %d for:", GetCommandClassName().c_str(), sourceIdx);
 				TiXmlElement const* child = _ccElement->FirstChildElement();
 				while (child)
 				{
+					ok = true;
 					str = child->Value();
 					if (str)
 					{
@@ -314,35 +308,44 @@ namespace OpenZWave
 							RefreshValue *arcc = new RefreshValue();
 							if (child->QueryIntAttribute("CommandClass", &temp) != TIXML_SUCCESS)
 							{
-								Log::Write(LogLevel_Warning, GetNodeId(), "    Invalid XML - CommandClass Attribute is wrong type or missing");
+								Log::Write(LogLevel_Warning, GetNodeId(), "\tInvalid XML - CommandClass Attribute is wrong type or missing");
 								child = child->NextSiblingElement();
 								continue;
 							}
 							arcc->cc = (uint8) temp;
 							if (child->QueryIntAttribute("RequestFlags", &temp) != TIXML_SUCCESS)
 							{
-								Log::Write(LogLevel_Warning, GetNodeId(), "    Invalid XML - RequestFlags Attribute is wrong type or missing");
-								child = child->NextSiblingElement();
-								continue;
-							}
-							arcc->genre = (uint8) temp;
-							if (child->QueryIntAttribute("Instance", &temp) != TIXML_SUCCESS)
-							{
-								Log::Write(LogLevel_Warning, GetNodeId(), "    Invalid XML - Instance Attribute is wrong type or missing");
+								Log::Write(LogLevel_Warning, GetNodeId(), "\tInvalid XML - RequestFlags Attribute is wrong type or missing");
 								child = child->NextSiblingElement();
 								continue;
 							}
-							arcc->instance = (uint8) temp;
+							arcc->requestflags = (uint8) temp;
 							if (child->QueryIntAttribute("Index", &temp) != TIXML_SUCCESS)
 							{
-								Log::Write(LogLevel_Warning, GetNodeId(), "    Invalid XML - Index Attribute is wrong type or missing");
+								Log::Write(LogLevel_Warning, GetNodeId(), "\tInvalid XML - Index Attribute is wrong type or missing");
 								child = child->NextSiblingElement();
 								continue;
 							}
 							arcc->index = (uint16) temp;
-							Log::Write(LogLevel_Info, GetNodeId(), "    CommandClass: %s, RequestFlags: %d, Instance: %d, Index: %d", CommandClasses::GetName(arcc->cc).c_str(), arcc->genre, arcc->instance, arcc->index);
-							rcc->RefreshClasses.push_back(arcc);
-							ok = true;
+							/* check for Duplicates */
+							multimap<uint16, RefreshValue *>::iterator it;
+							for (it = m_RefreshClassValues.begin(); it != m_RefreshClassValues.end(); it++)
+							{
+								uint16 idx = it->first;
+								RefreshValue *rv = it->second;
+								if ((idx == sourceIdx) && (rv->cc == arcc->cc) && (rv->requestflags == arcc->requestflags) && (rv->index == arcc->index))
+								{
+									Log::Write(LogLevel_Warning, GetNodeId(), "\tTarget Exists: CC %s Index %d", CommandClasses::GetName(arcc->cc).c_str(), arcc->index);
+									delete arcc;
+									ok = false;
+									break;
+								}
+							}
+							if (ok)
+							{
+								Log::Write(LogLevel_Info, GetNodeId(), "\tCommandClass: %s, RequestFlags: %d, Index: %d", CommandClasses::GetName(arcc->cc).c_str(), arcc->requestflags, arcc->index);
+								m_RefreshClassValues.insert(std::make_pair(sourceIdx, arcc));
+							}
 						}
 						else
 						{
@@ -351,15 +354,6 @@ namespace OpenZWave
 					}
 					child = child->NextSiblingElement();
 				}
-				if (ok == true)
-				{
-					m_RefreshClassValues.push_back(rcc);
-				}
-				else
-				{
-					Log::Write(LogLevel_Warning, GetNodeId(), "Failed to add a RefreshClassValue from XML");
-					delete rcc;
-				}
 			}
 
 //-----------------------------------------------------------------------------
@@ -370,30 +364,24 @@ namespace OpenZWave
 
 			bool CommandClass::CheckForRefreshValues(Internal::VC::Value const* _value)
 			{
-				if (m_RefreshClassValues.empty())
-				{
-					//Log::Write(LogLevel_Debug, GetNodeId(), "Bailing out of CheckForRefreshValues");
+				/* if there are no values here... */
+				if (m_RefreshClassValues.find(_value->GetID().GetIndex()) == m_RefreshClassValues.end())
 					return false;
-				}
+
 				Node* node = GetNodeUnsafe();
 				if (node != NULL)
 				{
-					for (uint32 i = 0; i < m_RefreshClassValues.size(); i++)
+					multimap<uint16, RefreshValue *>::iterator it;
+					for (it = m_RefreshClassValues.find(_value->GetID().GetIndex()); it != m_RefreshClassValues.end(); it++)
 					{
-						RefreshValue *rcc = m_RefreshClassValues.at(i);
-						//Log::Write(LogLevel_Debug, GetNodeId(), "Checking Value Against RefreshClassList: CommandClass %s = %s, Genre %d = %d, Instance %d = %d, Index %d = %d", CommandClasses::GetName(rcc->cc).c_str(), CommandClasses::GetName(_value->GetID().GetCommandClassId()).c_str(), rcc->genre, _value->GetID().GetGenre(), rcc->instance, _value->GetID().GetInstance(), rcc->index, _value->GetID().GetIndex());
-						if ((rcc->genre == _value->GetID().GetGenre()) && (rcc->instance == _value->GetID().GetInstance()) && (rcc->index == _value->GetID().GetIndex()))
+						RefreshValue *rcc = it->second;
+						/* just to be sure we have the right index */
+						if (it->first != _value->GetID().GetIndex())
+							return false;
+						Log::Write(LogLevel_Debug, GetNodeId(), "Requesting Refresh of Value: CommandClass: %s Instance %d, Index %d", CommandClasses::GetName(rcc->cc).c_str(), _value->GetID().GetInstance(), rcc->index);
+						if (CommandClass* cc = node->GetCommandClass(rcc->cc))
 						{
-							/* we got a match..... */
-							for (uint32 j = 0; j < rcc->RefreshClasses.size(); j++)
-							{
-								RefreshValue *arcc = rcc->RefreshClasses.at(j);
-								Log::Write(LogLevel_Debug, GetNodeId(), "Requesting Refresh of Value: CommandClass: %s Genre %d, Instance %d, Index %d", CommandClasses::GetName(arcc->cc).c_str(), arcc->genre, arcc->instance, arcc->index);
-								if (CommandClass* cc = node->GetCommandClass(arcc->cc))
-								{
-									cc->RequestValue(arcc->genre, arcc->index, arcc->instance, Driver::MsgQueue_Send);
-								}
-							}
+							cc->RequestValue(rcc->requestflags, rcc->index, _value->GetID().GetInstance(), Driver::MsgQueue_Send);
 						}
 					}
 				}
@@ -451,23 +439,29 @@ namespace OpenZWave
 					}
 				}
 				// Write out the TriggerRefreshValue if it exists
-				for (uint32 i = 0; i < m_RefreshClassValues.size(); i++)
-				{
-					RefreshValue *rcc = m_RefreshClassValues.at(i);
-					TiXmlElement* RefreshElement = new TiXmlElement("TriggerRefreshValue");
-					_ccElement->LinkEndChild(RefreshElement);
-					RefreshElement->SetAttribute("Genre", Internal::VC::Value::GetGenreNameFromEnum((ValueID::ValueGenre) rcc->genre));
-					RefreshElement->SetAttribute("Instance", rcc->instance);
-					RefreshElement->SetAttribute("Index", rcc->index);
-					for (uint32 j = 0; j < rcc->RefreshClasses.size(); j++)
-					{
-						RefreshValue *arcc = rcc->RefreshClasses.at(j);
+				multimap<uint16, RefreshValue *>::iterator it;
+				uint16 sourceidx = 0;
+				TiXmlElement* RefreshElement = nullptr;
+
+				for (it = m_RefreshClassValues.begin(); it != m_RefreshClassValues.end(); it++)
+				{
+					RefreshValue *rcc = it->second;
+					if (sourceidx != it->first) { 
+						RefreshElement = new TiXmlElement("TriggerRefreshValue");
+						_ccElement->LinkEndChild(RefreshElement);
+						RefreshElement->SetAttribute("Index", it->first);
+						sourceidx = it->first;
+					}
+					if (RefreshElement) {
 						TiXmlElement *ClassElement = new TiXmlElement("RefreshClassValue");
 						RefreshElement->LinkEndChild(ClassElement);
-						ClassElement->SetAttribute("CommandClass", arcc->cc);
-						ClassElement->SetAttribute("RequestFlags", arcc->genre);
-						ClassElement->SetAttribute("Instance", arcc->instance);
-						ClassElement->SetAttribute("Index", arcc->index);
+						ClassElement->SetAttribute("CommandClass", rcc->cc);
+						ClassElement->SetAttribute("RequestFlags", rcc->requestflags);
+						ClassElement->SetAttribute("Index", rcc->index);
+					}
+					else
+					{
+						Log::Write(LogLevel_Warning, GetNodeId(), "CommandClass::WriteXML: - RefreshElement was empty for index %d", it->first);
 					}
 				}
 			}
@@ -568,6 +562,37 @@ namespace OpenZWave
 				return res;
 			}
 
+//-----------------------------------------------------------------------------
+// <CommandClass::decodeDuration>
+// Decode the Duration Field to Seconds - CC:0000.00.00.11.016
+//-----------------------------------------------------------------------------
+
+			uint32 CommandClass::decodeDuration(uint8 data) const
+			{
+				if (data <= 0x7f)
+					return data;
+				if ((data > 0x7f) && (data <= 0xFD))
+					return ((data - 0x7F)*60);
+				 /* a 0xFE means Unknown Duration
+				  * and 0xFF is Reserved - So lets return -1 (to wrap our Int)
+				 */
+				return -1;
+			}
+
+			uint8 CommandClass::encodeDuration(uint32 seconds) const
+			{
+				if (seconds <= 0x7f)
+					return (seconds & 0xFF);
+				/* 7620 seconds is the max that can fit into our scale, so anything above that, use it as the Default Duration 
+				* its 7620 as we only can go upto 127 minutes - See https://github.com/OpenZWave/open-zwave/issues/1321#issuecomment-656532282 */ 
+				if (seconds > 7620)
+					return 0xFF;
+				/* if we get here, seconds is always going to be at least 2 minutes - 0x7F(127) is > 2 minutes */
+				return (uint8)0x79 + ((seconds/60) & 0xFF);
+			}
+
+
+
 //-----------------------------------------------------------------------------
 // <CommandClass::AppendValue>
 // Add a value to a message as a sequence of bytes
diff --git a/cpp/src/command_classes/CommandClass.h b/cpp/src/command_classes/CommandClass.h
index 30c3b54e..4dc194a8 100644
--- a/cpp/src/command_classes/CommandClass.h
+++ b/cpp/src/command_classes/CommandClass.h
@@ -149,6 +149,13 @@ namespace OpenZWave
 					virtual bool supportsMultiInstance() {
 						return true;
 					}
+					virtual uint8 CreateSupervisionSession(uint8 _command_class_id, uint8 _index) {
+						return 0;
+					}
+					virtual uint32 GetSupervisionIndex(uint8 _session_id) {
+						return 0;
+					}
+					virtual void SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance) {};
 
 					void SetInstances(uint8 const _instances);
 					void SetInstance(uint8 const _endPoint);
@@ -203,7 +210,8 @@ namespace OpenZWave
 
 					// Helper methods
 					string ExtractValue(uint8 const* _data, uint8* _scale, uint8* _precision, uint8 _valueOffset = 1) const;
-
+					uint32 decodeDuration(uint8 data) const;
+					uint8 encodeDuration(uint32 seconds) const;
 					/**
 					 *  Append a floating-point value to a message.
 					 *  \param _msg The message to which the value should be appended.
@@ -220,10 +228,8 @@ namespace OpenZWave
 					typedef struct RefreshValue
 					{
 							uint8 cc;
-							uint8 genre;
-							uint8 instance;
+							uint8 requestflags;
 							uint16 index;
-							std::vector<RefreshValue *> RefreshClasses;
 					} RefreshValue;
 
 				protected:
@@ -242,7 +248,7 @@ namespace OpenZWave
 					map<uint8, uint8> m_endPointMap;
 					map<uint8, string> m_instanceLabel;
 					bool m_SecureSupport; 	// Does this commandclass support secure encryption (eg, the Security CC doesn't encrypt itself, so it doesn't support encryption)
-					std::vector<RefreshValue *> m_RefreshClassValues; // what Command Class Values should we refresh ?
+					multimap<uint16, RefreshValue *> m_RefreshClassValues; // what Command Class Values should we refresh ?
 					string m_commandClassLabel;
 					//-----------------------------------------------------------------------------
 					// Record which items of static data have been read from the device
diff --git a/cpp/src/command_classes/CommandClasses.cpp b/cpp/src/command_classes/CommandClasses.cpp
index d8748cae..41345ce7 100644
--- a/cpp/src/command_classes/CommandClasses.cpp
+++ b/cpp/src/command_classes/CommandClasses.cpp
@@ -70,6 +70,7 @@
 #include "command_classes/SensorBinary.h"
 #include "command_classes/SensorMultilevel.h"
 #include "command_classes/SoundSwitch.h"
+#include "command_classes/Supervision.h"
 #include "command_classes/SwitchAll.h"
 #include "command_classes/SwitchBinary.h"
 #include "command_classes/SwitchMultilevel.h"
@@ -226,6 +227,7 @@ namespace OpenZWave
 				cc.Register(SensorBinary::StaticGetCommandClassId(), SensorBinary::StaticGetCommandClassName(), SensorBinary::Create);
 				cc.Register(SensorMultilevel::StaticGetCommandClassId(), SensorMultilevel::StaticGetCommandClassName(), SensorMultilevel::Create);
 				cc.Register(SoundSwitch::StaticGetCommandClassId(), SoundSwitch::StaticGetCommandClassName(), SoundSwitch::Create);
+				cc.Register(Supervision::StaticGetCommandClassId(), Supervision::StaticGetCommandClassName(), Supervision::Create);
 				cc.Register(SwitchAll::StaticGetCommandClassId(), SwitchAll::StaticGetCommandClassName(), SwitchAll::Create);
 				cc.Register(SwitchBinary::StaticGetCommandClassId(), SwitchBinary::StaticGetCommandClassName(), SwitchBinary::Create);
 				cc.Register(SwitchMultilevel::StaticGetCommandClassId(), SwitchMultilevel::StaticGetCommandClassName(), SwitchMultilevel::Create);
diff --git a/cpp/src/command_classes/Indicator.cpp b/cpp/src/command_classes/Indicator.cpp
index 32b646ab..ee2f45b7 100644
--- a/cpp/src/command_classes/Indicator.cpp
+++ b/cpp/src/command_classes/Indicator.cpp
@@ -34,6 +34,7 @@
 #include "platform/Log.h"
 
 #include "value_classes/ValueByte.h"
+#include "value_classes/ValueBool.h"
 
 namespace OpenZWave
 {
@@ -46,8 +47,171 @@ namespace OpenZWave
 			{
 				IndicatorCmd_Set = 0x01,
 				IndicatorCmd_Get = 0x02,
-				IndicatorCmd_Report = 0x03
+				IndicatorCmd_Report = 0x03,
+				IndicatorCmd_Supported_Get = 0x04,
+				IndicatorCmd_Supported_Report = 0x05,
+				IndicatorCmd_Description_Get = 0x06,
+				IndicatorCmd_Description_Report = 0x07
 			};
+			std::map<uint32, string> IndicatorTypes = { 
+				{ValueID_Index_Indicator::Indicator, "Indicator"},
+				{ValueID_Index_Indicator::Armed, "Indicator: Armed"},
+				{ValueID_Index_Indicator::Not_Armed, "Indicator: Not Armed"},
+				{ValueID_Index_Indicator::Ready, "Indicator: Ready"},
+				{ValueID_Index_Indicator::Fault, "Indicator: Fault"},
+				{ValueID_Index_Indicator::Busy, "Indicator: Busy"},
+				{ValueID_Index_Indicator::Enter_ID, "Indicator: Enter ID"},
+				{ValueID_Index_Indicator::Enter_PIN, "Indicator: Enter PIN"},
+				{ValueID_Index_Indicator::Code_Accepted, "Indicator: Code Accepted"},
+				{ValueID_Index_Indicator::Code_Not_Accepted, "Indicator: Code Not Accepted"},
+				{ValueID_Index_Indicator::Armed_Stay, "Indicator: Armed Stay"},
+				{ValueID_Index_Indicator::Armed_Away, "Indicator: Armed Away"},
+				{ValueID_Index_Indicator::Alarming, "Indicator: Alarming"},
+				{ValueID_Index_Indicator::Alarming_Burglar, "Indicator: Alarming: Burglar"},
+				{ValueID_Index_Indicator::Alarming_Smoke_Fire, "Indicator: Alarming: Smoke/Fire"},
+				{ValueID_Index_Indicator::Alarming_Carbon_Monoxide, "Indicator: Alarming: Carbon Monoxide"},
+				{ValueID_Index_Indicator::Bypass_Challenge, "Indicator: Bypass Challenge"},
+				{ValueID_Index_Indicator::Entry_Delay, "Indicator: Entry Delay"},
+				{ValueID_Index_Indicator::Exit_Delay, "Indicator: Exit Delay"},
+				{ValueID_Index_Indicator::Alarming_Medical, "Indicator: Alarming: Medical"},
+				{ValueID_Index_Indicator::Alarming_Freeze_Warning, "Indicator: Alarming: Freeze Warning"},
+				{ValueID_Index_Indicator::Alarming_Water_Leak, "Indicator: Alarming: Water Leak"},
+				{ValueID_Index_Indicator::Alarming_Panic, "Indicator: Alarming: Panic"},
+				{ValueID_Index_Indicator::Zone_1_Armed, "Indicator: Zone 1 Armed"},
+				{ValueID_Index_Indicator::Zone_2_Armed, "Indicator: Zone 2 Armed"},
+				{ValueID_Index_Indicator::Zone_3_Armed, "Indicator: Zone 3 Armed"},
+				{ValueID_Index_Indicator::Zone_4_Armed, "Indicator: Zone 4 Armed"},
+				{ValueID_Index_Indicator::Zone_5_Armed, "Indicator: Zone 5 Armed"},
+				{ValueID_Index_Indicator::Zone_6_Armed, "Indicator: Zone 6 Armed"},
+				{ValueID_Index_Indicator::Zone_7_Armed, "Indicator: Zone 7 Armed"},
+				{ValueID_Index_Indicator::Zone_8_Armed, "Indicator: Zone 8 Armed"},
+				{ValueID_Index_Indicator::LCD_Backlight, "Indicator: LCD Backlight"},
+				{ValueID_Index_Indicator::Button_Backlight_Letters, "Indicator: Button: Backlight Letters"},
+				{ValueID_Index_Indicator::Button_Backlight_Digits, "Indicator: Button: Backlight Digits"},
+				{ValueID_Index_Indicator::Button_Backlight_Command, "Indicator: Button: Backlight Command"},
+				{ValueID_Index_Indicator::Button_1_Indication, "Indicator: Button 1"},
+				{ValueID_Index_Indicator::Button_2_Indication, "Indicator: Button 2"},
+				{ValueID_Index_Indicator::Button_3_Indication, "Indicator: Button 3"},
+				{ValueID_Index_Indicator::Button_4_Indication, "Indicator: Button 4"},
+				{ValueID_Index_Indicator::Button_5_Indication, "Indicator: Button 5"},
+				{ValueID_Index_Indicator::Button_6_Indication, "Indicator: Button 6"},
+				{ValueID_Index_Indicator::Button_7_Indication, "Indicator: Button 7"},
+				{ValueID_Index_Indicator::Button_8_Indication, "Indicator: Button 8"},
+				{ValueID_Index_Indicator::Button_9_Indication, "Indicator: Button 9"},
+				{ValueID_Index_Indicator::Button_10_Indication, "Indicator: Button 10"},
+				{ValueID_Index_Indicator::Button_11_Indication, "Indicator: Button 11"},
+				{ValueID_Index_Indicator::Button_12_Indication, "Indicator: Button 12"},
+				{ValueID_Index_Indicator::Node_Identify, "Indicator: Node Identify"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_1, "Indicator: Generic Event Sound Notification 1"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_2, "Indicator: Generic Event Sound Notification 2"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_3, "Indicator: Generic Event Sound Notification 3"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_4, "Indicator: Generic Event Sound Notification 4"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_5, "Indicator: Generic Event Sound Notification 5"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_6, "Indicator: Generic Event Sound Notification 6"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_7, "Indicator: Generic Event Sound Notification 7"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_8, "Indicator: Generic Event Sound Notification 8"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_9, "Indicator: Generic Event Sound Notification 9"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_10, "Indicator: Generic Event Sound Notification 10"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_11, "Indicator: Generic Event Sound Notification 11"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_12, "Indicator: Generic Event Sound Notification 12"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_13, "Indicator: Generic Event Sound Notification 13"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_14, "Indicator: Generic Event Sound Notification 14"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_15, "Indicator: Generic Event Sound Notification 15"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_16, "Indicator: Generic Event Sound Notification 16"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_17, "Indicator: Generic Event Sound Notification 17"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_18, "Indicator: Generic Event Sound Notification 18"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_19, "Indicator: Generic Event Sound Notification 19"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_20, "Indicator: Generic Event Sound Notification 20"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_21, "Indicator: Generic Event Sound Notification 21"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_22, "Indicator: Generic Event Sound Notification 22"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_23, "Indicator: Generic Event Sound Notification 23"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_24, "Indicator: Generic Event Sound Notification 24"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_25, "Indicator: Generic Event Sound Notification 25"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_26, "Indicator: Generic Event Sound Notification 26"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_27, "Indicator: Generic Event Sound Notification 27"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_28, "Indicator: Generic Event Sound Notification 28"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_29, "Indicator: Generic Event Sound Notification 29"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_30, "Indicator: Generic Event Sound Notification 30"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_31, "Indicator: Generic Event Sound Notification 31"},
+				{ValueID_Index_Indicator::Generic_Event_Sound_Notification_32, "Indicator: Generic Event Sound Notification 32"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_1, "Indicator: Manufacturer Defined Indicator 1"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_2, "Indicator: Manufacturer Defined Indicator 2"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_3, "Indicator: Manufacturer Defined Indicator 3"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_4, "Indicator: Manufacturer Defined Indicator 4"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_5, "Indicator: Manufacturer Defined Indicator 5"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_6, "Indicator: Manufacturer Defined Indicator 6"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_7, "Indicator: Manufacturer Defined Indicator 7"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_8, "Indicator: Manufacturer Defined Indicator 8"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_9, "Indicator: Manufacturer Defined Indicator 9"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_10, "Indicator: Manufacturer Defined Indicator 10"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_11, "Indicator: Manufacturer Defined Indicator 11"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_12, "Indicator: Manufacturer Defined Indicator 12"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_13, "Indicator: Manufacturer Defined Indicator 13"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_14, "Indicator: Manufacturer Defined Indicator 14"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_15, "Indicator: Manufacturer Defined Indicator 15"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_16, "Indicator: Manufacturer Defined Indicator 16"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_17, "Indicator: Manufacturer Defined Indicator 17"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_18, "Indicator: Manufacturer Defined Indicator 18"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_19, "Indicator: Manufacturer Defined Indicator 19"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_20, "Indicator: Manufacturer Defined Indicator 20"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_21, "Indicator: Manufacturer Defined Indicator 21"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_22, "Indicator: Manufacturer Defined Indicator 22"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_23, "Indicator: Manufacturer Defined Indicator 23"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_24, "Indicator: Manufacturer Defined Indicator 24"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_25, "Indicator: Manufacturer Defined Indicator 25"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_26, "Indicator: Manufacturer Defined Indicator 26"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_27, "Indicator: Manufacturer Defined Indicator 27"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_28, "Indicator: Manufacturer Defined Indicator 28"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_29, "Indicator: Manufacturer Defined Indicator 29"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_30, "Indicator: Manufacturer Defined Indicator 30"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_31, "Indicator: Manufacturer Defined Indicator 31"},
+				{ValueID_Index_Indicator::Manufacturer_Defined_Indicator_32, "Indicator: Manufacturer Defined Indicator 32"},
+				{ValueID_Index_Indicator::Buzzer, "Indicator: Buzzer"}
+			};
+enum Indicator_Property_Bit { 
+	MultiLevel_Bit = 0x02,
+	Binary_Bit = 0x04,
+	OnOffPeriod_Bit = 0x08,
+	OnOffCycle_Bit = 0x10,
+	OnTimeWithPeriod_Bit = 0x20,
+	Timeout_Min_Bit = 0x40,
+	Timeout_Sec_Bit = 0x80,
+	Timeout_MS_Bit = 0x100,
+	SoundLevel_Bit = 0x200,
+	LowPower_Bit = 0x400
+};
+
+enum Indicator_Property_Group {
+	MultiLevel_Grp = 0x01,
+	Binary_Grp = 0x02,
+	Toogle_Grp = 0x03,
+	Timeout_Grp = 0x04,
+	Sound_Grp = 0x05,
+	Advertised_Grp = 0x06
+};
+enum Indicator_Property_offset {
+	Multilevel_Prop = 0x01,
+	Binary_Prop = 0x02,
+	OnOffPeriod_Prop = 0x03,
+	OnOffCycle_Prop = 0x04,
+	OnTimeWithPeriod_Prop = 0x05,
+	Timeout_Min_Prop = 0x06,
+	Timeout_Sec_Prop = 0x07,
+	Timeout_Ms_Prop = 0x08,
+	Sound_Prop = 0x09,
+	Adv_Low_Power_Prop = 0x10
+};
+
+
+//-----------------------------------------------------------------------------
+// <Indicator::Indicator>
+// Constructor
+//-----------------------------------------------------------------------------
+			Indicator::Indicator(uint32 const _homeId, uint8 const _nodeId) :
+					CommandClass(_homeId, _nodeId)
+			{ 
+				Timer::SetDriver(GetDriver());
+			}
 
 //-----------------------------------------------------------------------------
 // <Indicator::RequestState>
@@ -55,32 +219,74 @@ namespace OpenZWave
 //-----------------------------------------------------------------------------
 			bool Indicator::RequestState(uint32 const _requestFlags, uint8 const _instance, Driver::MsgQueue const _queue)
 			{
+				bool ret = false;
 				if (_requestFlags & RequestFlag_Dynamic)
 				{
-					return RequestValue(_requestFlags, 0, _instance, _queue);
-				}
 
-				return false;
+					if (GetVersion() == 1)
+						return RequestValue(_requestFlags, 0, _instance, _queue);
+					for (int i = 1; i <= ValueID_Index_Indicator::Buzzer; i++) {
+						if (Internal::VC::Value *value = GetValue(_instance, i))
+						{
+							ret |= RequestValue(_requestFlags, i, _instance, _queue);
+							value->Release();
+						}
+					}
+				}
+				if (GetVersion() > 1) 
+				{
+					if (_requestFlags & RequestFlag_Static)
+					{
+						Msg* msg = new Msg("IndicatorCmd_Supported_Get", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
+						msg->SetInstance(this, _instance);
+						msg->Append(GetNodeId());
+						msg->Append(3);
+						msg->Append(GetCommandClassId());
+						msg->Append(IndicatorCmd_Supported_Get);
+						/* get the first Supported Indicator */
+						msg->Append(0);
+						msg->Append(GetDriver()->GetTransmitOptions());
+						GetDriver()->SendMsg(msg, _queue);
+						ret = true;
+					}
+				}
+				return ret;
 			}
 
 //-----------------------------------------------------------------------------
 // <Indicator::RequestValue>
 // Request current value from the device
 //-----------------------------------------------------------------------------
-			bool Indicator::RequestValue(uint32 const _requestFlags, uint16 const _dummy1,	// = 0 (not used)
+			bool Indicator::RequestValue(uint32 const _requestFlags, uint16 const index,	// = 0 (not used)
 					uint8 const _instance, Driver::MsgQueue const _queue)
 			{
 				if (m_com.GetFlagBool(COMPAT_FLAG_GETSUPPORTED))
 				{
-					Msg* msg = new Msg("IndicatorCmd_Get", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
-					msg->SetInstance(this, _instance);
-					msg->Append(GetNodeId());
-					msg->Append(2);
-					msg->Append(GetCommandClassId());
-					msg->Append(IndicatorCmd_Get);
-					msg->Append(GetDriver()->GetTransmitOptions());
-					GetDriver()->SendMsg(msg, _queue);
-					return true;
+					if (index == ValueID_Index_Indicator::Indicator) 
+					{
+						Msg* msg = new Msg("IndicatorCmd_Get", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
+						msg->SetInstance(this, _instance);
+						msg->Append(GetNodeId());
+						msg->Append(2);
+						msg->Append(GetCommandClassId());
+						msg->Append(IndicatorCmd_Get);
+						msg->Append(GetDriver()->GetTransmitOptions());
+						GetDriver()->SendMsg(msg, _queue);
+						return true;
+					} 
+					else if (index > ValueID_Index_Indicator::Indicator && index <= ValueID_Index_Indicator::Buzzer)
+					{
+						Msg* msg = new Msg("IndicatorCmd_Get_v2", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
+						msg->SetInstance(this, _instance);
+						msg->Append(GetNodeId());
+						msg->Append(3);
+						msg->Append(GetCommandClassId());
+						msg->Append(IndicatorCmd_Get);
+						msg->Append(index);
+						msg->Append(GetDriver()->GetTransmitOptions());
+						GetDriver()->SendMsg(msg, _queue);
+						return true;
+					}
 				}
 				else
 				{
@@ -96,18 +302,148 @@ namespace OpenZWave
 			bool Indicator::HandleMsg(uint8 const* _data, uint32 const _length, uint32 const _instance	// = 1
 					)
 			{
-				if (IndicatorCmd_Report == (IndicatorCmd) _data[0])
+				if (IndicatorCmd_Supported_Report == (IndicatorCmd) _data[0]) 
 				{
-					Log::Write(LogLevel_Info, GetNodeId(), "Received an Indicator report: Indicator=%d", _data[1]);
+					uint8 id = _data[1];
+					uint8 nextid = _data[2];
+					uint8 propertiessupportedlength = (_data[3] & 0x1F);
+					uint32 propertiessupported = 0;
+					for (int i = 0; i < propertiessupportedlength; i++) 
+					{
+						propertiessupported = _data[4+i] << (8*i);
+					}
+					Log::Write(LogLevel_Info, GetNodeId(), "Indicator Supported Report for %d - Support %d - Next Indicator %d", id, propertiessupported, nextid);
+					std::shared_ptr<Properties> idprops = std::make_shared<Properties>();
+					idprops->id = id;
+					idprops->instance = _instance;
+					idprops->properties = propertiessupported;
+					this->m_indicatorLists.insert(std::pair<uint8, std::shared_ptr<Properties> >(id, idprops));
 
-					if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_Indicator::Indicator)))
+					if ((GetVersion() >= 4) && (id >= 0x80) && (id <= 0x9f))
 					{
-						value->OnValueRefreshed(_data[1]);
-						value->Release();
+						Msg* msg = new Msg("IndicatorCmd_Description_Get", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
+						msg->SetInstance(this, _instance);
+						msg->Append(GetNodeId());
+						msg->Append(3);
+						msg->Append(GetCommandClassId());
+						msg->Append(IndicatorCmd_Description_Get);
+						msg->Append(id);
+						msg->Append(GetDriver()->GetTransmitOptions());
+						GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
+					}
+					else 
+					{
+						this->createIndicatorConfigValues(id);
+					}
+
+					/* Get the Next Indicator */
+					if (nextid > 0)
+					{
+						Msg* msg = new Msg("IndicatorCmd_Supported_Get", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
+						msg->SetInstance(this, _instance);
+						msg->Append(GetNodeId());
+						msg->Append(3);
+						msg->Append(GetCommandClassId());
+						msg->Append(IndicatorCmd_Supported_Get);
+						msg->Append(nextid);
+						msg->Append(GetDriver()->GetTransmitOptions());
+						GetDriver()->SendMsg(msg, Driver::MsgQueue_Query);
+						return true;
 					}
 					return true;
 				}
+				if (IndicatorCmd_Report == (IndicatorCmd) _data[0])
+				{
+					if (GetVersion() == 1) { 
+						Log::Write(LogLevel_Info, GetNodeId(), "Received an Indicator report: Indicator=%d", _data[1]);
+						if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_Indicator::Indicator)))
+						{
+							value->OnValueRefreshed(_data[1]);
+							value->Release();
+						}
+						return true;
+					} else {
+						uint8 size = (_data[2] & 0x1F);
+						uint8 setid = 0;
+						uint8 setparam = 0;
+						for (int i = 0; i < size; i++) 
+						{
+							uint8 id = _data[3 + (i*3)];
+							uint8 property = _data[4 + (i*3)];
+							uint8 value = _data[5 + (i*3)];
+							Log::Write(LogLevel_Info, GetNodeId(), "Indicator Report for %d - Property %d - Value %d", id, property, value);
+							this->setIndicatorValue(id, _instance, property, value);
+							/* 4.24.5 - ID Field:
+							 * All indicator objects MUST carry the same Indicator ID.
+							 */
+							if (setid == 0)
+								setid = id;
+							if (value > 0)
+								setparam = property;
+						}
+						if (Internal::VC::ValueList* value = static_cast<Internal::VC::ValueList *>(GetValue(_instance, setid)))
+						{
+							bool setTimer = true;
+							if (setparam == Indicator_Property_offset::Multilevel_Prop)
+							{
+								value->OnValueRefreshed(Indicator_Property_Group::MultiLevel_Grp);
+								setTimer = false;
+							}
+							else if (setparam == Indicator_Property_offset::Binary_Prop)
+							{
+								value->OnValueRefreshed(Indicator_Property_Group::Binary_Grp);
+								setTimer = false;
+							}
+							else if (setparam >= Indicator_Property_offset::OnOffPeriod_Prop && setparam <= Indicator_Property_offset::OnTimeWithPeriod_Prop)
+								value->OnValueRefreshed(Indicator_Property_Group::Toogle_Grp);
+							else if (setparam >= Indicator_Property_offset::Timeout_Min_Prop && setparam <= Indicator_Property_offset::Timeout_Ms_Prop)
+								value->OnValueRefreshed(Indicator_Property_Group::Timeout_Grp);
+							else if (setparam == Indicator_Property_offset::Sound_Prop)
+								value->OnValueRefreshed(Indicator_Property_Group::Sound_Grp);
+							else 
+							{
+								value->OnValueRefreshed(0);
+								setTimer = false;
+							}
+							value->Release();
+							if (setTimer) 
+							{
+								int32 id = setid + (_instance << 16);
+								TimerThread::TimerCallback callback = bind(&Indicator::refreshIndicator, this, id);
+								TimerSetEvent(1000, callback, id);
+							}
+						}
+						else
+						{
+							Log::Write(LogLevel_Warning, GetNodeId(), "Can't Find ValueID for Indicator %d", setid);
+						}
 
+					}
+					return true;
+				}
+				if (IndicatorCmd_Description_Report == (IndicatorCmd) _data[0])
+				{
+					uint8 id = _data[1];
+					uint8 length = _data[2];
+					string label("Unknown Indicator");
+					if (m_indicatorLists.find(id) != m_indicatorLists.end())
+					{
+						if (length == 0) 
+						{
+							/* use the default label */
+							if (IndicatorTypes.find(id) != IndicatorTypes.end()) {
+								m_indicatorLists[id]->label = IndicatorTypes.at(id);
+							}
+						}
+						else 
+						{
+							string description((const char *) &_data[3], length);
+							if (!description.empty())
+								m_indicatorLists[id]->label = description;
+						}
+						this->createIndicatorConfigValues(id);
+					}
+				}
 				return false;
 			}
 
@@ -117,7 +453,8 @@ namespace OpenZWave
 //-----------------------------------------------------------------------------
 			bool Indicator::SetValue(Internal::VC::Value const& _value)
 			{
-				if (ValueID::ValueType_Byte == _value.GetID().GetType())
+				
+				if (ValueID_Index_Indicator::Indicator == _value.GetID().GetIndex())
 				{
 					Internal::VC::ValueByte const* value = static_cast<Internal::VC::ValueByte const*>(&_value);
 
@@ -133,7 +470,159 @@ namespace OpenZWave
 					GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
 					return true;
 				}
+				if (_value.GetID().GetIndex() > 1 && _value.GetID().GetIndex() <= ValueID_Index_Indicator::Buzzer) {
+					Internal::VC::ValueList const* value = static_cast<Internal::VC::ValueList const*>(&_value);
+					uint32 selected = value->GetItem()->m_value;
+					uint16 index = _value.GetID().GetIndex();
+					/* depending upon what is selected, we can get a Property Config ValueID's */
+					uint32 property = 1 << selected;
+					uint32 propertyindex = (256 + (32 * index));
+					Log::Write(LogLevel_Info, GetNodeId(), "Setting Index: %d Selected %d Property %d PropertyIndex %d", index, selected, property, propertyindex);
+					vector<uint8> payload;
+					switch (selected) {
+						case 0:
+							{ 
+								/* turn off any indicator */
+								Msg* msg = new Msg("IndicatorCmd_Set_v2", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
+								msg->SetInstance(this, _value.GetID().GetInstance());
+								msg->Append(GetNodeId());
+								msg->Append(3);
+								msg->Append(GetCommandClassId());
+								msg->Append(IndicatorCmd_Set);
+								msg->Append(0);
+								msg->Append(GetDriver()->GetTransmitOptions());
+								GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
+								return true;
+								break;
+							}
+						case Indicator_Property_Group::Binary_Grp:
+						{
+							if (Internal::VC::ValueBool* propertyValue = static_cast<Internal::VC::ValueBool *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::Binary_Prop)))
+							{
+								payload.push_back(1);
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::Binary_Prop);
+								payload.push_back(propertyValue->GetValue() == true ? 1 : 0);
+							}
+							break;
+						}
+						case Indicator_Property_Group::MultiLevel_Grp:
+						{
+							if (Internal::VC::ValueByte* propertyValue = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::Multilevel_Prop)))
+							{
+								payload.push_back(1);
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::Multilevel_Prop);
+								payload.push_back(propertyValue->GetValue());
+							}
+							break;
+						}
+						case Indicator_Property_Group::Toogle_Grp:
+						{
+							int params = 0;
+							if (Internal::VC::ValueByte* propertyValue = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::OnOffPeriod_Prop)))
+							{
+								params++;
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::OnOffPeriod_Prop);
+								payload.push_back(propertyValue->GetValue());
+							}
+							if (Internal::VC::ValueByte* propertyValue = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::OnOffCycle_Prop)))
+							{
+								params++;
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::OnOffCycle_Prop);
+								payload.push_back(propertyValue->GetValue());
+							}
+							if (Internal::VC::ValueByte* propertyValue = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::OnTimeWithPeriod_Prop)))
+							{
+								params++;
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::OnTimeWithPeriod_Prop);
+								payload.push_back(propertyValue->GetValue());
+							}
+							payload.insert(payload.begin(), params);
+							break;
+						}
+						case Indicator_Property_Group::Timeout_Grp:
+						{
+							int params = 0;
+							if (Internal::VC::ValueByte* propertyValue = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::Timeout_Min_Prop)))
+							{
+								params++;
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::Timeout_Min_Prop);
+								payload.push_back(propertyValue->GetValue());
+							}
+							if (Internal::VC::ValueByte* propertyValue = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::Timeout_Sec_Prop)))
+							{
+								params++;
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::Timeout_Sec_Prop);
+								payload.push_back(propertyValue->GetValue());
+							}
+							if (Internal::VC::ValueByte* propertyValue = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::Timeout_Ms_Prop)))
+							{
+								params++;
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::Timeout_Ms_Prop);
+								payload.push_back(propertyValue->GetValue());
+							}
+							payload.insert(payload.begin(), params);
+							break;
+						}
+						case Indicator_Property_Group::Sound_Grp:
+						{
+							if (Internal::VC::ValueByte* propertyValue = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), propertyindex + Indicator_Property_offset::Sound_Prop)))
+							{
+								payload.push_back(1);
+								payload.push_back(index);
+								payload.push_back(Indicator_Property_offset::Sound_Prop);
+								payload.push_back(propertyValue->GetValue());
+							}
+							break;
 
+						}
+						case Indicator_Property_Group::Advertised_Grp:
+						{
+								/* shouldn't ever be present */
+								break;
+						}
+					}
+					Msg* msg = new Msg("IndicatorCmd_Set_v2", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
+					msg->SetInstance(this, _value.GetID().GetInstance());
+					msg->Append(GetNodeId());
+					msg->Append(3 + payload.size());
+					msg->Append(GetCommandClassId());
+					msg->Append(IndicatorCmd_Set);
+					msg->Append(0);
+					for (unsigned int i = 0; i < payload.size(); i++) {
+						msg->Append(payload.at(i));
+					}
+					msg->Append(GetDriver()->GetTransmitOptions());
+					GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
+					return true;
+				}
+				if (_value.GetID().GetIndex() > ValueID_Index_Indicator::Buzzer)
+				{
+					if (_value.GetID().GetType() == ValueID::ValueType_Byte) 
+					{
+						if (Internal::VC::ValueByte * valueByte = static_cast<Internal::VC::ValueByte *>(GetValue(_value.GetID().GetInstance(), _value.GetID().GetIndex())))
+						{
+							valueByte->OnValueRefreshed(static_cast<Internal::VC::ValueByte const *>(&_value)->GetValue());
+							valueByte->Release();
+						}
+					}
+					if (_value.GetID().GetType() == ValueID::ValueType_Bool)
+					{
+						if (Internal::VC::ValueBool * valueBool = static_cast<Internal::VC::ValueBool *>(GetValue(_value.GetID().GetInstance(), _value.GetID().GetIndex())))
+						{
+							valueBool->OnValueRefreshed(static_cast<Internal::VC::ValueBool const *>(&_value)->GetValue());
+							valueBool->Release();
+						}
+					}
+					return true;
+				}
 				return false;
 			}
 
@@ -143,11 +632,241 @@ namespace OpenZWave
 //-----------------------------------------------------------------------------
 			void Indicator::CreateVars(uint8 const _instance)
 			{
+				if (GetVersion() == 1) { 
+					if (Node* node = GetNodeUnsafe())
+					{
+						node->CreateValueByte(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_Indicator::Indicator, "Indicator", "", false, false, false, 0);
+					}
+				}
+			}
+//-----------------------------------------------------------------------------
+// <Indicator::createIndicatorConfigValues>
+// Create the Config Values for each Indicator ID
+//-----------------------------------------------------------------------------
+
+			void Indicator::createIndicatorConfigValues(uint8 id) {
+				/* Value Indexes are as follows:
+				 * Assume that we can have 32 Properties per Index 
+				 * 0 - 256 - Actual Indicator ValueID
+				 * 257 - 288 - Indicator 1 Properties 
+				 * 289 - 320 - Indicator 2 Properties
+				 * 321 - 352 - Indicator 3 Properties 
+				 * and so on. */
+				if (m_indicatorLists.find(id) == m_indicatorLists.end()) 
+				{
+					Log::Write(LogLevel_Warning, GetNodeId(), "Cant find Indicator %d in List", id);
+					return;
+				}
+				Log::Write(LogLevel_Info, GetNodeId(), "Indicator Support:");
 				if (Node* node = GetNodeUnsafe())
 				{
-					node->CreateValueByte(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_Indicator::Indicator, "Indicator", "", false, false, false, 0);
+					string label("Unknown Indicator");
+					if (m_indicatorLists[id]->label.empty())
+					{
+						if (IndicatorTypes.find(id) != IndicatorTypes.end()) {
+							label = IndicatorTypes.at(id);
+						}
+					}
+					else
+					{
+						label = m_indicatorLists[id]->label;
+					}
+					
+					uint32 propertiesSet = 0;
+
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::MultiLevel_Bit) {
+						/* MultiLevel Property */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tMultiLevel Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::Multilevel_Prop));
+						node->CreateValueByte(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::Multilevel_Prop), label + ": Brightness/Level", "", false, false, 0, 0);
+						propertiesSet |= (1 << Indicator_Property_Group::MultiLevel_Grp);
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::Binary_Bit) 
+					{
+						/* Binary Property */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tBinary  Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::Binary_Prop));
+						node->CreateValueBool(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::Binary_Prop), label + ": On/Off", "", false, false, false, 0);
+						propertiesSet |= (1 << Indicator_Property_Group::Binary_Grp);
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::OnOffPeriod_Bit)
+					{
+						/* On/Off Period Property */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tOn/Off Period Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::OnOffPeriod_Prop));
+						node->CreateValueByte(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::OnOffPeriod_Prop), label + ": On/Off Period", "Seconds", false, false, 0, 0);
+						propertiesSet |= (1 << Indicator_Property_Group::Toogle_Grp);
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::OnOffCycle_Bit)
+					{
+						/* On/Off Cycles */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tOn/Off Cycles Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::OnOffCycle_Prop));
+						node->CreateValueByte(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::OnOffCycle_Prop), label + ": On/Off Cycles", "", false, false, 0, 0);
+						propertiesSet |= (1 << Indicator_Property_Group::Toogle_Grp);
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::OnTimeWithPeriod_Bit)
+					{
+						/* On Time with On/Off Period combination */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tOn Time with On/Off Period Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::OnTimeWithPeriod_Prop));
+						node->CreateValueByte(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::OnTimeWithPeriod_Prop), label + ": On time within an On/Off period", "Seconds", false, false, 0, 0); 
+						propertiesSet |= (1 << Indicator_Property_Group::Toogle_Grp);
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::Timeout_Min_Bit)
+					{
+						/* Timeout (Minutes) */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tTimeout (Minutes) Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::Timeout_Min_Prop));
+						node->CreateValueByte(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::Timeout_Min_Prop), label + ": Timeout (Minutes)", "Minutes", false, false, 0, 0);
+						propertiesSet |= (1 << Indicator_Property_Group::Timeout_Grp);
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::Timeout_Sec_Bit)
+					{
+						/* Timeout (Seconds) */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tTimeout (Seconds) Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::Timeout_Sec_Prop));
+						node->CreateValueByte(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::Timeout_Sec_Prop), label + ": Timeout (Seconds)", "Seconds", false, false, 0, 0);
+						propertiesSet |= (1 << Indicator_Property_Group::Timeout_Grp);
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::Timeout_MS_Bit)
+					{
+						/* Timeout (1/100 of seconds) */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tTimeout (1/100 of seconds) Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::Timeout_Ms_Prop));
+						node->CreateValueByte(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::Timeout_Ms_Prop), label + ": Timeout (1/100 of seconds)", "Miliseconds", false, false, 0, 0); 
+						propertiesSet |= (1 << Indicator_Property_Group::Timeout_Grp);
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::SoundLevel_Bit)
+					{
+						/* Multilevel Sound level */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tMultilevel Sound Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::Sound_Prop));
+						node->CreateValueByte(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::Sound_Prop), label + ": Multilevel Sound level", "", false, false, 0, 0);
+						propertiesSet |= Indicator_Property_Group::Sound_Grp;
+					}
+					if (m_indicatorLists[id]->properties & Indicator_Property_Bit::LowPower_Bit)
+					{
+						/* ADVERTISE: Low power */
+						Log::Write(LogLevel_Info, GetNodeId(), "\tADVERTISE: Low power Property - Index %d", (256 + (32 * id) + Indicator_Property_offset::Adv_Low_Power_Prop));
+						node->CreateValueBool(ValueID::ValueGenre_Config, GetCommandClassId(), m_indicatorLists[id]->instance, (256 + (32 * id) + Indicator_Property_offset::Adv_Low_Power_Prop), label + ": Low Power Capable", "", true, false, false, 0);
+						propertiesSet |= Indicator_Property_Group::Advertised_Grp;
+					}
+					/* Create the Actual Indicator */
+					vector<Internal::VC::ValueList::Item> items;
+					Internal::VC::ValueList::Item item;
+					item.m_label = "Off";
+					item.m_value = 0x00;
+					items.push_back(item);
+					if (propertiesSet & (1 << Indicator_Property_Group::Binary_Grp)) 
+					{
+						Internal::VC::ValueList::Item item;
+						item.m_label = "On";
+						item.m_value = Indicator_Property_Group::Binary_Grp;
+						items.push_back(item);
+					}					
+					if (propertiesSet & (1 << Indicator_Property_Group::MultiLevel_Grp)) 
+					{
+						Internal::VC::ValueList::Item item;
+						item.m_label = "Level";
+						item.m_value = Indicator_Property_Group::MultiLevel_Grp;
+						items.push_back(item);
+					}					
+					if (propertiesSet & (1 << Indicator_Property_Group::Toogle_Grp)) 
+					{
+						Internal::VC::ValueList::Item item;
+						item.m_label = "Toogle";
+						item.m_value = Indicator_Property_Group::Toogle_Grp;
+						items.push_back(item);
+					}					
+					if (propertiesSet & (1 << Indicator_Property_Group::Timeout_Grp)) 
+					{
+						Internal::VC::ValueList::Item item;
+						item.m_label = "Timeout";
+						item.m_value = Indicator_Property_Group::Timeout_Grp;
+						items.push_back(item);
+					}					
+					if (propertiesSet & (1 << Indicator_Property_Group::Sound_Grp)) 
+					{
+						Internal::VC::ValueList::Item item;
+						item.m_label = "Sound Level";
+						item.m_value = Indicator_Property_Group::Sound_Grp;
+						items.push_back(item);
+					}	
+					node->CreateValueList(ValueID::ValueGenre_User, GetCommandClassId(), m_indicatorLists[id]->instance, id, label, "", false, false, 0, items, 0, 0);					
 				}
 			}
+
+//-----------------------------------------------------------------------------
+// <Indicator::setIndicatorValue>
+// Sets the Properties Values for each Indicator ID
+//-----------------------------------------------------------------------------
+
+			void Indicator::setIndicatorValue(uint8 id, uint8 _instance, uint8 property, uint8 value) 
+			{
+				uint16 index = (256 + (32 * id) + property);
+				Internal::VC::Value* propertyValue = GetValue(_instance, index);
+				if (!propertyValue) {
+					Log::Write(LogLevel_Warning, GetNodeId(), "Got Indicator Property for a Unregistered Property - Id: %d Property: %d Index: %d", id, property, index);
+					return;
+				}
+				switch (propertyValue->GetID().GetType()) {
+					case ValueID::ValueType_Bool:
+					{
+						if (Internal::VC::ValueBool *propertyBool = static_cast<Internal::VC::ValueBool *>(propertyValue))
+						{ 
+							propertyBool->OnValueRefreshed(value > 0 ? true : false);
+						}
+						propertyValue->Release();
+						break;
+					}
+					case ValueID::ValueType_Byte:
+					{
+						if (Internal::VC::ValueByte *propertyByte = static_cast<Internal::VC::ValueByte *>(propertyValue))
+						{ 
+							propertyByte->OnValueRefreshed(value);
+						}
+						propertyValue->Release();
+						break;
+					}
+					default:
+					{
+						/* Not Handled */
+						Log::Write(LogLevel_Warning, GetNodeId(), "Got Indicator Property for a Unhandled Property Type %d", propertyValue->GetID().GetType());
+						break;
+					}
+				}
+			}
+
+//-----------------------------------------------------------------------------
+// <Indicator::Indicator>
+// Refresh The Indicator ID's Values. this is called from the timer when a indicator is active. 
+//-----------------------------------------------------------------------------
+			void Indicator::refreshIndicator(uint32 id)
+			{
+				uint16 index = (id & 0xFFFF);
+				uint8 instance = (id & 0xF0000) >> 16;
+				RequestValue(0, index, instance, Driver::MsgQueue_Query);		
+			}
+
+//-----------------------------------------------------------------------------
+// <SwitchBinary::SetValueBasic>
+// Update class values based in BASIC mapping
+//-----------------------------------------------------------------------------
+			void Indicator::SetValueBasic(uint8 const _instance, uint8 const _value)
+			{
+				// Send a request for new value to synchronize it with the BASIC set/report.
+				// In case the device is sleeping, we set the value anyway so the BASIC set/report
+				// stays in sync with it. We must be careful mapping the uint8 BASIC value
+				// into a class specific value.
+				// When the device wakes up, the real requested value will be retrieved.
+				if (GetVersion() == 1) 
+				{
+					RequestValue(0, 0, _instance, Driver::MsgQueue_Query);
+					return;
+				}
+				for (int i = 1; i <= ValueID_Index_Indicator::Buzzer; i++) {
+					if (Internal::VC::Value *value = GetValue(_instance, i))
+					{
+						RequestValue(0, i, _instance, Driver::MsgQueue_Query);
+						value->Release();
+					}
+				}
+				return;
+			}
+
+
 		} // namespace CC
 	} // namespace Internal
 } // namespace OpenZWave
diff --git a/cpp/src/command_classes/Indicator.h b/cpp/src/command_classes/Indicator.h
index 1dcb1d4b..81dff6fc 100644
--- a/cpp/src/command_classes/Indicator.h
+++ b/cpp/src/command_classes/Indicator.h
@@ -29,6 +29,8 @@
 #define _Indicator_H
 
 #include "command_classes/CommandClass.h"
+#include "TimerThread.h"
+
 
 namespace OpenZWave
 {
@@ -40,7 +42,7 @@ namespace OpenZWave
 			/** \brief Implements COMMAND_CLASS_INDICATOR (0x87), a Z-Wave device command class.
 			 * \ingroup CommandClass
 			 */
-			class Indicator: public CommandClass
+			class Indicator: public CommandClass, private Timer
 			{
 				public:
 					static CommandClass* Create(uint32 const _homeId, uint8 const _nodeId)
@@ -73,15 +75,26 @@ namespace OpenZWave
 					}
 					virtual bool HandleMsg(uint8 const* _data, uint32 const _length, uint32 const _instance = 1) override;
 					virtual bool SetValue(Internal::VC::Value const& _value) override;
-
+					virtual uint8 GetMaxVersion() override
+					{
+						return 4;
+					}
+					virtual void SetValueBasic(uint8 const _instance, uint8 const _value) override;
 				protected:
 					virtual void CreateVars(uint8 const _instance) override;
 
 				private:
-					Indicator(uint32 const _homeId, uint8 const _nodeId) :
-							CommandClass(_homeId, _nodeId)
-					{
-					}
+					struct Properties {
+						uint8 id;
+						uint8 instance;
+						uint8 properties;
+						string label;
+					};
+					void createIndicatorConfigValues(uint8 id);
+					void setIndicatorValue(uint8 id, uint8 _instance, uint8 property, uint8 value);
+					void refreshIndicator(uint32 id);
+					Indicator(uint32 const _homeId, uint8 const _nodeId);
+					std::map<uint8, std::shared_ptr<Properties> > m_indicatorLists;
 			};
 		} // namespace CC
 	} // namespace Internal
diff --git a/cpp/src/command_classes/ManufacturerSpecific.cpp b/cpp/src/command_classes/ManufacturerSpecific.cpp
index 7af32f80..5be7b933 100644
--- a/cpp/src/command_classes/ManufacturerSpecific.cpp
+++ b/cpp/src/command_classes/ManufacturerSpecific.cpp
@@ -93,7 +93,7 @@ namespace OpenZWave
 					if (_requestFlags & RequestFlag_Static)
 					{
 						{
-							Msg* msg = new Msg("ManufacturerSpecificCmd_DeviceGet_DeviceIDType_FactoryDefault", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
+							Msg* msg = new Msg("ManufacturerSpecificCmd_DeviceGet_DeviceIDType", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
 							msg->SetInstance(this, _instance);
 							msg->Append(GetNodeId());
 							msg->Append(3);
@@ -103,18 +103,6 @@ namespace OpenZWave
 							msg->Append(GetDriver()->GetTransmitOptions());
 							GetDriver()->SendMsg(msg, _queue);
 						}
-						{
-							Msg* msg = new Msg("ManufacturerSpecificCmd_DeviceGet_DeviceIDType_SerialNumber", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
-							msg->SetInstance(this, _instance);
-							msg->Append(GetNodeId());
-							msg->Append(3);
-							msg->Append(GetCommandClassId());
-							msg->Append(ManufacturerSpecificCmd_DeviceGet);
-							msg->Append(DeviceSpecificGet_DeviceIDType_SerialNumber);
-							msg->Append(GetDriver()->GetTransmitOptions());
-							GetDriver()->SendMsg(msg, _queue);
-						}
-
 						res = true;
 					}
 				}
@@ -239,6 +227,12 @@ namespace OpenZWave
 					}
 					if (deviceIDType == DeviceSpecificGet_DeviceIDType_FactoryDefault)
 					{
+						if (!GetValue(_instance, ValueID_Index_ManufacturerSpecific::DeviceID)) {
+							if (Node* node = GetNodeUnsafe())
+							{
+								node->CreateValueString(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_ManufacturerSpecific::DeviceID, "Device ID", "", true, false, "", 0);
+							}
+						}
 						Internal::VC::ValueString *default_value = static_cast<Internal::VC::ValueString*>(GetValue(_instance, ValueID_Index_ManufacturerSpecific::DeviceID));
 						default_value->OnValueRefreshed(deviceID);
 						default_value->Release();
@@ -246,6 +240,12 @@ namespace OpenZWave
 					}
 					else if (deviceIDType == DeviceSpecificGet_DeviceIDType_SerialNumber)
 					{
+						if (!GetValue(_instance, ValueID_Index_ManufacturerSpecific::SerialNumber)) {
+							if (Node* node = GetNodeUnsafe())
+							{
+								node->CreateValueString(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_ManufacturerSpecific::SerialNumber, "Serial Number", "", true, false, "", 0);
+							}
+						}
 						Internal::VC::ValueString *serial_value = static_cast<Internal::VC::ValueString*>(GetValue(_instance, ValueID_Index_ManufacturerSpecific::SerialNumber));
 						serial_value->OnValueRefreshed(deviceID);
 						serial_value->Release();
@@ -331,8 +331,6 @@ namespace OpenZWave
 						node->CreateValueInt(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_ManufacturerSpecific::LoadedConfig, "Loaded Config Revision", "", true, false, m_loadedConfigRevision, 0);
 						node->CreateValueInt(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_ManufacturerSpecific::LocalConfig, "Config File Revision", "", true, false, m_fileConfigRevision, 0);
 						node->CreateValueInt(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_ManufacturerSpecific::LatestConfig, "Latest Available Config File Revision", "", true, false, m_latestConfigRevision, 0);
-						node->CreateValueString(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_ManufacturerSpecific::DeviceID, "Device ID", "", true, false, "", 0);
-						node->CreateValueString(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_ManufacturerSpecific::SerialNumber, "Serial Number", "", true, false, "", 0);
 					}
 				}
 			}
diff --git a/cpp/src/command_classes/SensorMultilevel.cpp b/cpp/src/command_classes/SensorMultilevel.cpp
index c66e5cc9..634c3edf 100644
--- a/cpp/src/command_classes/SensorMultilevel.cpp
+++ b/cpp/src/command_classes/SensorMultilevel.cpp
@@ -149,7 +149,7 @@ namespace OpenZWave
 								if (requestedScale) {
 									const Internal::VC::ValueList::Item *item = requestedScale->GetItem();
 									if (item)
-										scale = item->m_value;
+										scale = ((item->m_value & 0x03) << 3);
 									requestedScale->Release();
 								}
 								value->Release();
@@ -177,7 +177,7 @@ namespace OpenZWave
 						if (requestedScale) {
 							const Internal::VC::ValueList::Item *item = requestedScale->GetItem();
 							if (item)
-								scale = item->m_value;
+								scale = ((item->m_value & 0x03) << 3);
 							requestedScale->Release();
 						}
 						value->Release();
diff --git a/cpp/src/command_classes/Supervision.cpp b/cpp/src/command_classes/Supervision.cpp
new file mode 100644
index 00000000..97908e08
--- /dev/null
+++ b/cpp/src/command_classes/Supervision.cpp
@@ -0,0 +1,174 @@
+//-----------------------------------------------------------------------------
+//
+//	Supervision.h
+//
+//	Implementation of the Z-Wave COMMAND_CLASS_SUPERVISION
+//
+//	Copyright (c) 2020 Mark Ruys <mark@paracas.nl>
+//
+//	SOFTWARE NOTICE AND LICENSE
+//
+//	This file is part of OpenZWave.
+//
+//	OpenZWave is free software: you can redistribute it and/or modify
+//	it under the terms of the GNU Lesser General Public License as published
+//	by the Free Software Foundation, either version 3 of the License,
+//	or (at your option) any later version.
+//
+//	OpenZWave is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU Lesser General Public License for more details.
+//
+//	You should have received a copy of the GNU Lesser General Public License
+//	along with OpenZWave.  If not, see <http://www.gnu.org/licenses/>.
+//
+//-----------------------------------------------------------------------------
+
+#include "command_classes/CommandClasses.h"
+#include "command_classes/Supervision.h"
+#include "Defs.h"
+#include "Msg.h"
+#include "Node.h"
+#include "Driver.h"
+#include "platform/Log.h"
+
+#include "value_classes/Value.h"
+
+namespace OpenZWave
+{
+	namespace Internal
+	{
+		namespace CC
+		{
+			uint8 Supervision::CreateSupervisionSession(uint8 _command_class_id, uint8 _index)
+			{
+				m_last_session_id++;
+				m_last_session_id &= 0x3f;
+
+				if (m_sessions.size() >= 6)
+				{
+					// Clean up oldest session, we support max 6 simultaneous sessions per node 
+					m_sessions.pop_front();
+				}
+
+				m_sessions.push_back({
+					.session_id = m_last_session_id, 
+					.command_class_id = _command_class_id,
+					.index = _index
+				});
+
+				return m_last_session_id;
+			}
+
+			uint32 Supervision::GetSupervisionIndex(uint8 _session_id)
+			{
+				for (auto it = m_sessions.cbegin(); it != m_sessions.cend(); ++it) 
+				{
+					if (it->session_id == _session_id) 
+					{
+						return it->index;
+					}
+				}
+			
+				return StaticNoIndex();
+			}
+
+//-----------------------------------------------------------------------------
+// <Supervision::HandleSupervisionReport>
+// Handle a supervision report message from the Z-Wave network
+//-----------------------------------------------------------------------------
+			void Supervision::HandleSupervisionReport(uint8 const* _data, uint32 const _length, uint32 const _instance)
+			{
+				if (Node* node = GetNodeUnsafe())
+				{
+					if (_length >= 4) 
+					{
+						uint8 more_status_updates = _data[1] >> 7;
+						uint8 session_id = _data[1] & 0x3f;
+						uint8 status = _data[2];
+						int duration = _data[3];
+
+						const char *status_identifier;
+						switch (status) {
+						case 0x00: status_identifier = "NO_SUPPORT"; break;
+						case 0x01: status_identifier = "WORKING"; break;
+						case 0x02: status_identifier = "FAIL"; break;
+						case 0xff: status_identifier = "SUCCESS"; break;
+						default: status_identifier = "UNKNOWN"; break;
+						}
+
+						for (auto it = m_sessions.cbegin(); it != m_sessions.cend(); ++it) 
+						{
+							if (it->session_id == session_id) 
+							{
+								if (CommandClass* pCommandClass = node->GetCommandClass(it->command_class_id))
+								{
+									Log::Write(LogLevel_Info, GetNodeId(), "Received SupervisionReport: session %d, %s index %d, status %s, duration %d sec, more status updates %d",
+										session_id, 
+										pCommandClass->GetCommandClassName().c_str(), it->index, 
+										status_identifier, decodeDuration(duration), more_status_updates);
+
+									if (status == SupervisionStatus::SupervisionStatus_Success)
+									{
+										pCommandClass->SupervisionSessionSuccess(session_id, _instance);
+									}
+								}
+								else
+								{
+									Log::Write(LogLevel_Warning, GetNodeId(), "Received SupervisionReport for unknown CC %d", it->command_class_id);
+								}
+
+								if (more_status_updates == 0)
+								{
+									m_sessions.erase(it);
+								}
+							
+								return;
+							}
+						}
+
+						Log::Write(LogLevel_Warning, GetNodeId(), "Received SupervisionReport: unknown session %d, status %s, duration %d sec, more status updates %d",
+							session_id, 
+							status_identifier, decodeDuration(duration), more_status_updates);
+					}
+				}
+			}
+
+			bool Supervision::HandleIncomingMsg(uint8 const* _data, uint32 const _length, uint32 const _instance)
+			{
+				return HandleMsg(_data, _length, _instance);
+			}
+
+//-----------------------------------------------------------------------------
+// <Supervision::HandleMsg>
+// Handle a message from the Z-Wave network
+//-----------------------------------------------------------------------------
+			bool Supervision::HandleMsg(uint8 const* _data, uint32 const _length, uint32 const _instance)	// = 1
+			{
+				bool handled = false;
+				Node* node = GetNodeUnsafe();
+				if (node != NULL)
+				{
+					handled = true;
+					switch ((SupervisionCmd) _data[0])
+					{
+						case SupervisionCmd_Report:
+						{
+							HandleSupervisionReport(_data, _length, _instance);
+							break;
+						}
+						default:
+						{
+							handled = false;
+							break;
+						}
+					}
+				}
+
+				return handled;
+			}
+		} // namespace CC
+	} // namespace Internal
+} // namespace OpenZWave
+
diff --git a/cpp/src/command_classes/Supervision.h b/cpp/src/command_classes/Supervision.h
new file mode 100644
index 00000000..24847170
--- /dev/null
+++ b/cpp/src/command_classes/Supervision.h
@@ -0,0 +1,127 @@
+//-----------------------------------------------------------------------------
+//
+//	Supervision.h
+//
+//	Implementation of the Z-Wave COMMAND_CLASS_SUPERVISION
+//
+//	Copyright (c) 2020 Mark Ruys <mark@paracas.nl>
+//
+//	SOFTWARE NOTICE AND LICENSE
+//
+//	This file is part of OpenZWave.
+//
+//	OpenZWave is free software: you can redistribute it and/or modify
+//	it under the terms of the GNU Lesser General Public License as published
+//	by the Free Software Foundation, either version 3 of the License,
+//	or (at your option) any later version.
+//
+//	OpenZWave is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU Lesser General Public License for more details.
+//
+//	You should have received a copy of the GNU Lesser General Public License
+//	along with OpenZWave.  If not, see <http://www.gnu.org/licenses/>.
+//
+//-----------------------------------------------------------------------------
+
+#ifndef _Supervision_H
+#define _Supervision_H
+
+#include <deque>
+
+#include "command_classes/CommandClass.h"
+
+namespace OpenZWave
+{
+	namespace Internal
+	{
+		namespace CC
+		{
+			/** \brief Implements COMMAND_CLASS_SUPERVISION (0x6c), a Z-Wave device command class.
+			 * \ingroup CommandClass
+			 */
+			class Supervision: public CommandClass
+			{
+				public:
+					enum SupervisionCmd
+					{
+						SupervisionCmd_Get = 0x01,
+						SupervisionCmd_Report = 0x02,
+					};
+					enum SupervisionMoreStatusUpdates
+					{
+						SupervisionMoreStatusUpdates_LastReport = 0x00,
+						SupervisionMoreStatusUpdates_MoreReports = 0x80,
+					};
+					enum SupervisionStatus
+					{
+						SupervisionStatus_NoSupport = 0x00,
+						SupervisionStatus_Working = 0x01,
+						SupervisionStatus_Fail = 0x02,
+						SupervisionStatus_Success = 0xff
+					};
+
+					static CommandClass* Create(uint32 const _homeId, uint8 const _nodeId)
+					{
+						return new Supervision(_homeId, _nodeId);
+					}
+					virtual ~Supervision()
+					{
+					}
+
+					static uint8 const StaticGetCommandClassId()
+					{
+						return 0x6c;
+					}
+					static string const StaticGetCommandClassName()
+					{
+						return "COMMAND_CLASS_SUPERVISION";
+					}
+
+					uint8 CreateSupervisionSession(uint8 _command_class_id, uint8 _index);
+					static uint8 const StaticNoSessionId()
+					{
+						return 0xff; // As sessions are only 5 bits, this value will never match
+					}
+					uint32 GetSupervisionIndex(uint8 _session_id);
+					static uint32 const StaticNoIndex()
+					{
+						return 0xffff; // As indices are max 16 bits, this value will never match
+					}
+
+					// From CommandClass
+					virtual uint8 const GetCommandClassId() const override
+					{
+						return StaticGetCommandClassId();
+					}
+					virtual string const GetCommandClassName() const override
+					{
+						return StaticGetCommandClassName();
+					}
+					virtual bool HandleIncomingMsg(uint8 const* _data, uint32 const _length, uint32 const _instance = 1) override;
+					virtual bool HandleMsg(uint8 const* _data, uint32 const _length, uint32 const _instance = 1) override;
+
+				private:
+					Supervision(uint32 const _homeId, uint8 const _nodeId) :
+						CommandClass(_homeId, _nodeId), 
+						m_last_session_id{StaticNoSessionId()}
+					{
+					}
+
+					struct s_Session {
+						uint8 session_id;
+						uint8 command_class_id;
+						uint8 index;
+					};
+					std::deque<s_Session> m_sessions;
+					uint8 m_last_session_id;
+
+					void HandleSupervisionReport(uint8 const* _data, uint32 const _length, uint32 const _instance);
+			};
+		} // namespace CC
+	} // namespace Internal
+} // namespace OpenZWave
+
+#endif
+
diff --git a/cpp/src/command_classes/SwitchBinary.cpp b/cpp/src/command_classes/SwitchBinary.cpp
index 23fed0f0..0fa9cc13 100644
--- a/cpp/src/command_classes/SwitchBinary.cpp
+++ b/cpp/src/command_classes/SwitchBinary.cpp
@@ -30,6 +30,7 @@
 #include "command_classes/CommandClasses.h"
 #include "command_classes/SwitchBinary.h"
 #include "command_classes/WakeUp.h"
+#include "command_classes/Supervision.h"
 #include "Defs.h"
 #include "Msg.h"
 #include "Driver.h"
@@ -37,7 +38,7 @@
 #include "platform/Log.h"
 
 #include "value_classes/ValueBool.h"
-#include "value_classes/ValueByte.h"
+#include "value_classes/ValueInt.h"
 
 namespace OpenZWave
 {
@@ -107,6 +108,8 @@ namespace OpenZWave
 					// data[1] => Switch state
 					if (Internal::VC::ValueBool* value = static_cast<Internal::VC::ValueBool*>(GetValue(_instance, ValueID_Index_SwitchBinary::Level)))
 					{
+						if (GetVersion() >= 2 && _length >= 4)
+							value->SetTargetValue(_data[2] != 0, _data[3]);
 						value->OnValueRefreshed(_data[1] != 0);
 						value->Release();
 					}
@@ -124,9 +127,9 @@ namespace OpenZWave
 						// data[3] might be duration
 						if (_length > 3)
 						{
-							if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchBinary::Duration)))
+							if (Internal::VC::ValueInt* value = static_cast<Internal::VC::ValueInt*>(GetValue(_instance, ValueID_Index_SwitchBinary::Duration)))
 							{
-								value->OnValueRefreshed(_data[3]);
+								value->OnValueRefreshed(decodeDuration(_data[3]));
 								value->Release();
 							}
 						}
@@ -137,6 +140,29 @@ namespace OpenZWave
 
 				return false;
 			}
+			
+			void SwitchBinary::SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance)
+			{
+				if (Node* node = GetNodeUnsafe())
+				{			
+					uint32 index = node->GetSupervisionIndex(_session_id);
+
+					if (index != Internal::CC::Supervision::StaticNoIndex())
+					{
+						if (Internal::VC::ValueBool* value = static_cast<Internal::VC::ValueBool*>(GetValue(_instance, index)))
+						{
+							value->ConfirmNewValue();
+
+							Log::Write(LogLevel_Info, GetNodeId(), "Confirmed switch binary index %d to value=%s",
+								index, value->GetValue() ? "On" : "Off");
+						}
+					}
+					else
+					{
+						Log::Write(LogLevel_Info, GetNodeId(), "Ignore unknown supervision session %d", _session_id);
+					}
+				}
+			}
 
 //-----------------------------------------------------------------------------
 // <SwitchBinary::SetValue>
@@ -160,9 +186,9 @@ namespace OpenZWave
 					}
 					case ValueID_Index_SwitchBinary::Duration:
 					{
-						if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(instance, ValueID_Index_SwitchBinary::Duration)))
+						if (Internal::VC::ValueInt* value = static_cast<Internal::VC::ValueInt*>(GetValue(instance, ValueID_Index_SwitchBinary::Duration)))
 						{
-							value->OnValueRefreshed((static_cast<Internal::VC::ValueByte const*>(&_value))->GetValue());
+							value->OnValueRefreshed((static_cast<Internal::VC::ValueInt const*>(&_value))->GetValue());
 							value->Release();
 						}
 						res = true;
@@ -210,47 +236,54 @@ namespace OpenZWave
 			{
 				uint8 const nodeId = GetNodeId();
 				uint8 const targetValue = _state ? 0xff : 0;
-
-				Log::Write(LogLevel_Info, nodeId, "SwitchBinary::Set - Setting to %s", _state ? "On" : "Off");
-				Msg* msg = new Msg("SwitchBinaryCmd_Set", nodeId, REQUEST, FUNC_ID_ZW_SEND_DATA, true);
-				msg->SetInstance(this, _instance);
-				msg->Append(nodeId);
-
-				if (GetVersion() >= 2)
+				
+				if (Node* node = GetNodeUnsafe())
 				{
-					Internal::VC::ValueByte* durationValue = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchBinary::Duration));
-					uint8 duration = durationValue->GetValue();
-					durationValue->Release();
-					if (duration == 0xff)
+					//add supervision encapsulation if supported
+					uint8 index = ValueID_Index_SwitchBinary::Level;
+					uint8 supervision_session_id = node->CreateSupervisionSession(StaticGetCommandClassId(), index);
+					if (supervision_session_id == Internal::CC::Supervision::StaticNoSessionId())
 					{
-						Log::Write(LogLevel_Info, GetNodeId(), "  Duration: Default");
+						Log::Write(LogLevel_Debug, GetNodeId(), "Supervision not supported, fall back to setpoint set/get");
 					}
-					else if (duration >= 0x80)
+
+					Log::Write(LogLevel_Info, nodeId, "SwitchBinary::Set - Setting to %s", _state ? "On" : "Off");
+					Msg* msg = new Msg("SwitchBinaryCmd_Set", nodeId, REQUEST, FUNC_ID_ZW_SEND_DATA, true);
+					msg->SetInstance(this, _instance);
+					msg->SetSupervision(supervision_session_id);
+					msg->Append(nodeId);
+
+					if (GetVersion() >= 2)
 					{
-						Log::Write(LogLevel_Info, GetNodeId(), "  Duration: %d minutes", duration - 0x7f);
+						Internal::VC::ValueInt* durationValue = static_cast<Internal::VC::ValueInt*>(GetValue(_instance, ValueID_Index_SwitchBinary::Duration));
+						uint32 duration = durationValue->GetValue();
+						durationValue->Release();
+						if (duration > 7620)
+							Log::Write(LogLevel_Info, GetNodeId(), "  Duration: Device Default");
+						else if (duration > 0x7F)
+							Log::Write(LogLevel_Info, GetNodeId(), "  Rouding to %d Minutes (over 127 seconds)", encodeDuration(duration)-0x79);
+						else 
+							Log::Write(LogLevel_Info, GetNodeId(), "  Duration: %d seconds", duration);
+
+						msg->Append(4);
+						msg->Append(GetCommandClassId());
+						msg->Append(SwitchBinaryCmd_Set);
+						msg->Append(targetValue);
+						msg->Append(encodeDuration(duration));
 					}
 					else
 					{
-						Log::Write(LogLevel_Info, GetNodeId(), "  Duration: %d seconds", duration);
+						msg->Append(3);
+						msg->Append(GetCommandClassId());
+						msg->Append(SwitchBinaryCmd_Set);
+						msg->Append(targetValue);
 					}
 
-					msg->Append(4);
-					msg->Append(GetCommandClassId());
-					msg->Append(SwitchBinaryCmd_Set);
-					msg->Append(targetValue);
-					msg->Append(duration);
-				}
-				else
-				{
-					msg->Append(3);
-					msg->Append(GetCommandClassId());
-					msg->Append(SwitchBinaryCmd_Set);
-					msg->Append(targetValue);
+					msg->Append(GetDriver()->GetTransmitOptions());
+					GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
+					return true;
 				}
-
-				msg->Append(GetDriver()->GetTransmitOptions());
-				GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
-				return true;
+				return false;
 			}
 
 //-----------------------------------------------------------------------------
@@ -263,7 +296,7 @@ namespace OpenZWave
 				{
 					if (GetVersion() >= 2)
 					{
-						node->CreateValueByte(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_SwitchBinary::Duration, "Transition Duration", "", false, false, 0xff, 0);
+						node->CreateValueInt(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_SwitchBinary::Duration, "Transition Duration", "Sec", false, false, -1, 0);
 						node->CreateValueBool(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_SwitchBinary::TargetState, "Target State", "", true, false, true, 0);
 					}
 					node->CreateValueBool(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_SwitchBinary::Level, "Switch", "", false, false, false, 0);
diff --git a/cpp/src/command_classes/SwitchBinary.h b/cpp/src/command_classes/SwitchBinary.h
index ff4fdb01..c301a73d 100644
--- a/cpp/src/command_classes/SwitchBinary.h
+++ b/cpp/src/command_classes/SwitchBinary.h
@@ -80,6 +80,7 @@ namespace OpenZWave
 					{
 						return 2;
 					}
+					virtual void SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance);
 
 				protected:
 					virtual void CreateVars(uint8 const _instance) override;
diff --git a/cpp/src/command_classes/SwitchMultilevel.cpp b/cpp/src/command_classes/SwitchMultilevel.cpp
index b02ef5c7..a20339e2 100644
--- a/cpp/src/command_classes/SwitchMultilevel.cpp
+++ b/cpp/src/command_classes/SwitchMultilevel.cpp
@@ -28,6 +28,7 @@
 #include "command_classes/CommandClasses.h"
 #include "command_classes/SwitchMultilevel.h"
 #include "command_classes/WakeUp.h"
+#include "command_classes/Supervision.h"
 #include "Defs.h"
 #include "Msg.h"
 #include "Driver.h"
@@ -37,6 +38,7 @@
 #include "value_classes/ValueBool.h"
 #include "value_classes/ValueButton.h"
 #include "value_classes/ValueByte.h"
+#include "value_classes/ValueInt.h"
 
 namespace OpenZWave
 {
@@ -138,6 +140,9 @@ namespace OpenZWave
 
 					if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Level)))
 					{
+						/* Target Value - 0 to 100 is valid values, 0xFF is also valid */
+						if ((GetVersion() >= 4) && ((_data[2] <= 100) || (_data[2] == 0xFF)))
+							value->SetTargetValue(_data[2], _data[3]);
 						value->OnValueRefreshed(_data[1]);
 						value->Release();
 					}
@@ -155,9 +160,9 @@ namespace OpenZWave
 						// data[3] might be duration
 						if (_length > 3)
 						{
-							if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Duration)))
+							if (Internal::VC::ValueInt* value = static_cast<Internal::VC::ValueInt*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Duration)))
 							{
-								value->OnValueRefreshed(_data[3]);
+								value->OnValueRefreshed(decodeDuration(_data[3]));
 								value->Release();
 							}
 						}
@@ -222,6 +227,29 @@ namespace OpenZWave
 				return false;
 			}
 
+			void SwitchMultilevel::SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance)
+			{
+				if (Node* node = GetNodeUnsafe())
+				{
+					uint32 index = node->GetSupervisionIndex(_session_id);
+
+					if (index != Internal::CC::Supervision::StaticNoIndex())
+					{
+						if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Level)))
+						{
+							value->ConfirmNewValue();
+
+							Log::Write(LogLevel_Info, GetNodeId(), "Confirmed switch multi level index %d to value=%d",
+								index, value->GetValue());
+						}
+					}
+					else
+					{
+						Log::Write(LogLevel_Info, GetNodeId(), "Ignore unknown supervision session %d", _session_id);
+					}
+				}
+			}
+
 //-----------------------------------------------------------------------------
 // <SwitchMultilevel::SetValue>
 // Set the level on a device
@@ -299,9 +327,9 @@ namespace OpenZWave
 					}
 					case ValueID_Index_SwitchMultiLevel::Duration:
 					{
-						if (Internal::VC::ValueByte* value = static_cast<Internal::VC::ValueByte*>(GetValue(instance, ValueID_Index_SwitchMultiLevel::Duration)))
+						if (Internal::VC::ValueInt* value = static_cast<Internal::VC::ValueInt*>(GetValue(instance, ValueID_Index_SwitchMultiLevel::Duration)))
 						{
-							value->OnValueRefreshed((static_cast<Internal::VC::ValueByte const*>(&_value))->GetValue());
+							value->OnValueRefreshed((static_cast<Internal::VC::ValueInt const*>(&_value))->GetValue());
 							value->Release();
 						}
 						res = true;
@@ -390,46 +418,54 @@ namespace OpenZWave
 //-----------------------------------------------------------------------------
 			bool SwitchMultilevel::SetLevel(uint8 const _instance, uint8 const _level)
 			{
-				Log::Write(LogLevel_Info, GetNodeId(), "SwitchMultilevel::Set - Setting to level %d", _level);
-				Msg* msg = new Msg("SwitchMultilevelCmd_Set", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
-				msg->SetInstance(this, _instance);
-				msg->Append(GetNodeId());
 
-				if (GetVersion() >= 2)
+				if (Node* node = GetNodeUnsafe())
 				{
-					Internal::VC::ValueByte* durationValue = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Duration));
-					uint8 duration = durationValue->GetValue();
-					durationValue->Release();
-					if (duration == 0xff)
+					//add supervision encapsulation if supported
+					uint8 index = ValueID_Index_SwitchMultiLevel::Level;
+					uint8 supervision_session_id = node->CreateSupervisionSession(StaticGetCommandClassId(), index);
+					if (supervision_session_id == Internal::CC::Supervision::StaticNoSessionId())
 					{
-						Log::Write(LogLevel_Info, GetNodeId(), "  Duration: Default");
+						Log::Write(LogLevel_Debug, GetNodeId(), "Supervision not supported, fall back to setpoint set/get");
 					}
-					else if (duration >= 0x80)
+
+					Log::Write(LogLevel_Info, GetNodeId(), "SwitchMultilevel::Set - Setting to level %d", _level);
+					Msg* msg = new Msg("SwitchMultilevelCmd_Set", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
+					msg->SetInstance(this, _instance);
+					msg->SetSupervision(supervision_session_id);
+					msg->Append(GetNodeId());
+
+					if (GetVersion() >= 2)
 					{
-						Log::Write(LogLevel_Info, GetNodeId(), "  Duration: %d minutes", duration - 0x7f);
+						Internal::VC::ValueInt* durationValue = static_cast<Internal::VC::ValueInt*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Duration));
+						uint32 duration = durationValue->GetValue();
+						durationValue->Release();
+						if (duration > 7620)
+							Log::Write(LogLevel_Info, GetNodeId(), "  Duration: Device Default");
+						else if (duration > 0x7F)
+							Log::Write(LogLevel_Info, GetNodeId(), "  Rouding to %d Minutes (over 127 seconds)", encodeDuration(duration)-0x79);
+						else 
+							Log::Write(LogLevel_Info, GetNodeId(), "  Duration: %d seconds", duration);
+
+						msg->Append(4);
+						msg->Append(GetCommandClassId());
+						msg->Append(SwitchMultilevelCmd_Set);
+						msg->Append(_level);
+						msg->Append(encodeDuration(duration));
 					}
 					else
 					{
-						Log::Write(LogLevel_Info, GetNodeId(), "  Duration: %d seconds", duration);
+						msg->Append(3);
+						msg->Append(GetCommandClassId());
+						msg->Append(SwitchMultilevelCmd_Set);
+						msg->Append(_level);
 					}
 
-					msg->Append(4);
-					msg->Append(GetCommandClassId());
-					msg->Append(SwitchMultilevelCmd_Set);
-					msg->Append(_level);
-					msg->Append(duration);
-				}
-				else
-				{
-					msg->Append(3);
-					msg->Append(GetCommandClassId());
-					msg->Append(SwitchMultilevelCmd_Set);
-					msg->Append(_level);
+					msg->Append(GetDriver()->GetTransmitOptions());
+					GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
+					return true;
 				}
-
-				msg->Append(GetDriver()->GetTransmitOptions());
-				GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
-				return true;
+				return false;
 			}
 
 //-----------------------------------------------------------------------------
@@ -468,8 +504,8 @@ namespace OpenZWave
 				}
 				Log::Write(LogLevel_Info, GetNodeId(), "  Start Level:        %d", startLevel);
 
-				uint8 duration = 0;
-				if (Internal::VC::ValueByte* durationValue = static_cast<Internal::VC::ValueByte*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Duration)))
+				uint32 duration = -1;
+				if (Internal::VC::ValueInt* durationValue = static_cast<Internal::VC::ValueInt*>(GetValue(_instance, ValueID_Index_SwitchMultiLevel::Duration)))
 				{
 					length = 5;
 					duration = durationValue->GetValue();
@@ -510,7 +546,7 @@ namespace OpenZWave
 
 				if (length >= 5)
 				{
-					msg->Append(duration);
+					msg->Append(encodeDuration(duration));
 				}
 
 				if (length == 6)
@@ -566,7 +602,7 @@ namespace OpenZWave
 					}
 					if (GetVersion() >= 2)
 					{
-						node->CreateValueByte(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_SwitchMultiLevel::Duration, "Dimming Duration", "", false, false, 0xff, 0);
+						node->CreateValueInt(ValueID::ValueGenre_System, GetCommandClassId(), _instance, ValueID_Index_SwitchMultiLevel::Duration, "Dimming Duration", "", false, false, -1, 0);
 					}
 					node->CreateValueByte(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_SwitchMultiLevel::Level, "Level", "", false, false, 0, 0);
 					node->CreateValueButton(ValueID::ValueGenre_User, GetCommandClassId(), _instance, ValueID_Index_SwitchMultiLevel::Bright, "Bright", 0);
diff --git a/cpp/src/command_classes/SwitchMultilevel.h b/cpp/src/command_classes/SwitchMultilevel.h
index 72de24dd..6c3aa756 100644
--- a/cpp/src/command_classes/SwitchMultilevel.h
+++ b/cpp/src/command_classes/SwitchMultilevel.h
@@ -79,6 +79,7 @@ namespace OpenZWave
 					{
 						return 4;
 					}
+					virtual void SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance);
 
 				protected:
 					virtual void CreateVars(uint8 const _instance) override;
diff --git a/cpp/src/command_classes/ThermostatMode.cpp b/cpp/src/command_classes/ThermostatMode.cpp
index 37c657f2..7f00a7e6 100644
--- a/cpp/src/command_classes/ThermostatMode.cpp
+++ b/cpp/src/command_classes/ThermostatMode.cpp
@@ -26,6 +26,7 @@
 //-----------------------------------------------------------------------------
 
 #include "command_classes/CommandClasses.h"
+#include "command_classes/Supervision.h"
 #include "command_classes/ThermostatMode.h"
 #include "Defs.h"
 #include "Msg.h"
@@ -92,7 +93,7 @@ namespace OpenZWave
 
 			static char const* c_modeName[] =
 			{ "Off", "Heat", "Cool", "Auto", "Aux Heat", "Resume", "Fan Only", "Furnace", "Dry Air", "Moist Air", "Auto Changeover", "Heat Econ", "Cool Econ", "Away", "Unknown", "Full Power", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Unknown", "Manufacturer Specific" };
-			
+
 
 			ThermostatMode::ThermostatMode(uint32 const _homeId, uint8 const _nodeId) :
 							CommandClass(_homeId, _nodeId),
@@ -323,6 +324,7 @@ namespace OpenZWave
 							}
 						}
 					}
+
 					/* at this stage, we don't know the Actual Mode of the Fan, so set it to the lowest 
 					 * value... If not, set to 0, which possibly could be invalid... 
 					 */
@@ -341,29 +343,70 @@ namespace OpenZWave
 				return false;
 			}
 
+			void ThermostatMode::SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance)
+			{
+				if (Node* node = GetNodeUnsafe())
+				{
+					uint32 index = node->GetSupervisionIndex(_session_id);
+
+					if (index != Internal::CC::Supervision::StaticNoIndex())
+					{
+						// We have received the confirmation for the thermostat mode from the Z-Wave device
+						if (Internal::VC::ValueList* valueList = static_cast<Internal::VC::ValueList*>(GetValue(_instance, ValueID_Index_ThermostatMode::Mode)))
+						{
+							valueList->ConfirmNewValue();
+							if (valueList->GetItem())
+							{
+								Log::Write(LogLevel_Info, GetNodeId(), "Confirmed thermostat mode: %s", valueList->GetItem()->m_label.c_str());
+								m_currentMode = valueList->GetItem()->m_value;
+							}
+							else
+								Log::Write(LogLevel_Warning, GetNodeId(), "Confirmed thermostat mode (No Item)");
+							valueList->Release();
+						}
+					}
+					else
+					{
+						Log::Write(LogLevel_Info, GetNodeId(), "Ignore unknown supervision session %d", _session_id);
+					}
+				}
+			}
+
 //-----------------------------------------------------------------------------
 // <ThermostatMode::SetValue>
 // Set the device's thermostat mode
 //-----------------------------------------------------------------------------
 			bool ThermostatMode::SetValue(Internal::VC::Value const& _value)
 			{
-				if (ValueID::ValueType_List == _value.GetID().GetType())
+
+				if (Node* node = GetNodeUnsafe())
 				{
-					Internal::VC::ValueList const* value = static_cast<Internal::VC::ValueList const*>(&_value);
-					if (value->GetItem() == NULL)
-						return false;
-					uint8 state = (uint8) value->GetItem()->m_value;
+					if (ValueID::ValueType_List == _value.GetID().GetType())
+					{
+						Internal::VC::ValueList const* value = static_cast<Internal::VC::ValueList const*>(&_value);
+						if (value->GetItem() == NULL)
+							return false;
+						uint8 state = (uint8)value->GetItem()->m_value;
+
+						uint8 index = value->GetID().GetIndex() & 0xFF;
+						uint8 supervision_session_id = node->CreateSupervisionSession(StaticGetCommandClassId(), index);
+						if (supervision_session_id == Internal::CC::Supervision::StaticNoSessionId())
+						{
+							Log::Write(LogLevel_Debug, GetNodeId(), "Supervision not supported, fall back to setpoint set/get");
+						}
 
-					Msg* msg = new Msg("ThermostatModeCmd_Set", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
-					msg->SetInstance(this, _value.GetID().GetInstance());
-					msg->Append(GetNodeId());
-					msg->Append(3);
-					msg->Append(GetCommandClassId());
-					msg->Append(ThermostatModeCmd_Set);
-					msg->Append(state);
-					msg->Append(GetDriver()->GetTransmitOptions());
-					GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
-					return true;
+						Msg* msg = new Msg("ThermostatModeCmd_Set", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
+						msg->SetInstance(this, _value.GetID().GetInstance());
+						msg->SetSupervision(supervision_session_id);
+						msg->Append(GetNodeId());
+						msg->Append(3);
+						msg->Append(GetCommandClassId());
+						msg->Append(ThermostatModeCmd_Set);
+						msg->Append(state);
+						msg->Append(GetDriver()->GetTransmitOptions());
+						GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
+						return true;
+					}
 				}
 
 				return false;
diff --git a/cpp/src/command_classes/ThermostatMode.h b/cpp/src/command_classes/ThermostatMode.h
index 0dc4d592..efa6fae7 100644
--- a/cpp/src/command_classes/ThermostatMode.h
+++ b/cpp/src/command_classes/ThermostatMode.h
@@ -82,6 +82,7 @@ namespace OpenZWave
 					{
 						return 3;
 					}
+					virtual void SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance);
 
 				protected:
 					virtual void CreateVars(uint8 const _instance) override;
diff --git a/cpp/src/command_classes/ThermostatSetpoint.cpp b/cpp/src/command_classes/ThermostatSetpoint.cpp
index 9dde0ca5..e8c3ece7 100644
--- a/cpp/src/command_classes/ThermostatSetpoint.cpp
+++ b/cpp/src/command_classes/ThermostatSetpoint.cpp
@@ -26,6 +26,7 @@
 //-----------------------------------------------------------------------------
 
 #include "command_classes/CommandClasses.h"
+#include "command_classes/Supervision.h"
 #include "command_classes/ThermostatSetpoint.h"
 #include "Defs.h"
 #include "Msg.h"
@@ -142,7 +143,7 @@ namespace OpenZWave
 // <ThermostatSetpoint::HandleMsg>
 // Handle a message from the Z-Wave network
 //-----------------------------------------------------------------------------
-			bool ThermostatSetpoint::HandleMsg(uint8 const* _data, uint32 const _length, uint32 const _instance	// = 1
+			bool ThermostatSetpoint::HandleMsg(uint8 const* _data, uint32 const _length, uint32 const _instance // = 1
 					)
 			{
 				if (ThermostatSetpointCmd_Report == (ThermostatSetpointCmd) _data[0])
@@ -260,28 +261,64 @@ namespace OpenZWave
 				return false;
 			}
 
+			void ThermostatSetpoint::SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance)
+			{
+				if (Node* node = GetNodeUnsafe())
+				{			
+					uint32 index = node->GetSupervisionIndex(_session_id);
+
+					if (index != Internal::CC::Supervision::StaticNoIndex())
+					{
+						if (Internal::VC::ValueDecimal* value = static_cast<Internal::VC::ValueDecimal*>(GetValue(_instance, index)))
+						{
+							value->ConfirmNewValue();
+
+							Log::Write(LogLevel_Info, GetNodeId(), "Confirmed thermostat setpoint index %d to %s%s",
+								index, value->GetValue().c_str(), value->GetUnits().c_str());
+						}
+					}
+					else
+					{
+						Log::Write(LogLevel_Info, GetNodeId(), "Ignore unknown supervision session %d", _session_id);
+					}
+				}
+			}
+
 //-----------------------------------------------------------------------------
 // <ThermostatSetpoint::SetValue>
 // Set a thermostat setpoint temperature
 //-----------------------------------------------------------------------------
 			bool ThermostatSetpoint::SetValue(Internal::VC::Value const& _value)
 			{
-				if (ValueID::ValueType_Decimal == _value.GetID().GetType())
+				if (Node* node = GetNodeUnsafe())
 				{
-					Internal::VC::ValueDecimal const* value = static_cast<Internal::VC::ValueDecimal const*>(&_value);
-					uint8 scale = strcmp("C", value->GetUnits().c_str()) ? 1 : 0;
+					if (ValueID::ValueType_Decimal == _value.GetID().GetType())
+					{
+						Internal::VC::ValueDecimal const* value = static_cast<Internal::VC::ValueDecimal const*>(&_value);
+						
+						uint8 index = value->GetID().GetIndex() & 0xFF;
+						uint8 supervision_session_id = node->CreateSupervisionSession(StaticGetCommandClassId(), index);
+						if (supervision_session_id == Internal::CC::Supervision::StaticNoSessionId())
+						{
+							Log::Write(LogLevel_Debug, GetNodeId(), "Supervision not supported, fall back to setpoint set/get");
+						}
 
-					Msg* msg = new Msg("ThermostatSetpointCmd_Set", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
-					msg->SetInstance(this, _value.GetID().GetInstance());
-					msg->Append(GetNodeId());
-					msg->Append(4 + GetAppendValueSize(value->GetValue()));
-					msg->Append(GetCommandClassId());
-					msg->Append(ThermostatSetpointCmd_Set);
-					msg->Append((uint8_t) (value->GetID().GetIndex() & 0xFF));
-					AppendValue(msg, value->GetValue(), scale);
-					msg->Append(GetDriver()->GetTransmitOptions());
-					GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
-					return true;
+						uint8 scale = strcmp("C", value->GetUnits().c_str()) ? 1 : 0;
+
+						Msg* msg = new Msg("ThermostatSetpointCmd_Set", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true);
+						msg->SetInstance(this, _value.GetID().GetInstance());
+						msg->SetSupervision(supervision_session_id);
+						msg->Append(GetNodeId());
+						msg->Append(4 + GetAppendValueSize(value->GetValue()));
+						msg->Append(GetCommandClassId());
+						msg->Append(ThermostatSetpointCmd_Set);
+						msg->Append(index);
+						AppendValue(msg, value->GetValue(), scale);
+
+						msg->Append(GetDriver()->GetTransmitOptions());
+						GetDriver()->SendMsg(msg, Driver::MsgQueue_Send);
+						return true;
+					}
 				}
 
 				return false;
diff --git a/cpp/src/command_classes/ThermostatSetpoint.h b/cpp/src/command_classes/ThermostatSetpoint.h
index fb12a54e..adaebc39 100644
--- a/cpp/src/command_classes/ThermostatSetpoint.h
+++ b/cpp/src/command_classes/ThermostatSetpoint.h
@@ -31,6 +31,7 @@
 #include <vector>
 #include <string>
 #include "command_classes/CommandClass.h"
+#include "value_classes/ValueDecimal.h"
 
 namespace OpenZWave
 {
@@ -79,6 +80,7 @@ namespace OpenZWave
 					{
 						return 3;
 					}
+					virtual void SupervisionSessionSuccess(uint8 _session_id, uint32 const _instance);
 
 				protected:
 					virtual void CreateVars(uint8 const _instance) override;
diff --git a/cpp/src/command_classes/Version.cpp b/cpp/src/command_classes/Version.cpp
index 7b0c4f6c..3aaef112 100644
--- a/cpp/src/command_classes/Version.cpp
+++ b/cpp/src/command_classes/Version.cpp
@@ -27,6 +27,7 @@
 
 #include "command_classes/CommandClasses.h"
 #include "command_classes/Version.h"
+#include "command_classes/Basic.h"
 #include "Defs.h"
 #include "Msg.h"
 #include "Driver.h"
@@ -155,13 +156,16 @@ namespace OpenZWave
 							Log::Write(LogLevel_Info, GetNodeId(), "Received CommandClass Version report from node %d: CommandClass=%s, Version=%d", GetNodeId(), pCommandClass->GetCommandClassName().c_str(), _data[2]);
 							pCommandClass->ClearStaticRequest(StaticRequest_Version);
 							/* some devices advertise CommandClasses, but return version as 0. In General this means
-							 * that the device doesn't actually support the CommandClass. So lets Remove it
+							 * that the device doesn't actually support the CommandClass. So lets Remove it.
 							 */
 
 							if (_data[2] > 0)
 							{
 								pCommandClass->SetVersion(_data[2]);
 							}
+							/* More often than not our Basic CC is needed. */
+							else if (_data[1] == Basic::StaticGetCommandClassId())
+								pCommandClass->SetVersion(pCommandClass->GetMaxVersion());
 							else
 							{
 								Log::Write(LogLevel_Warning, GetNodeId(), "CommandClass Version is 0, Removing CommandClass %s", pCommandClass->GetCommandClassName().c_str());
@@ -184,8 +188,9 @@ namespace OpenZWave
 			{
 				if (m_com.GetFlagBool(COMPAT_FLAG_VERSION_GETCLASSVERSION))
 				{
-//					if (_commandClass->HasStaticRequest(StaticRequest_Version))
-//					{
+					/* if its not a "Controlling" command Class */
+					if ((!_commandClass->IsAfterMark()) && (_commandClass->HasStaticRequest(StaticRequest_Version)))
+					{
 						Msg* msg = new Msg("VersionCmd_CommandClassGet", GetNodeId(), REQUEST, FUNC_ID_ZW_SEND_DATA, true, true, FUNC_ID_APPLICATION_COMMAND_HANDLER, GetCommandClassId());
 						msg->Append(GetNodeId());
 						msg->Append(3);
@@ -195,7 +200,7 @@ namespace OpenZWave
 						msg->Append(GetDriver()->GetTransmitOptions());
 						GetDriver()->SendMsg(msg, Driver::MsgQueue_Query);
 						return true;
-//					}
+					}
 				}
 
 				return false;
diff --git a/cpp/src/command_classes/WakeUp.cpp b/cpp/src/command_classes/WakeUp.cpp
index aa4e2509..74af7831 100644
--- a/cpp/src/command_classes/WakeUp.cpp
+++ b/cpp/src/command_classes/WakeUp.cpp
@@ -382,7 +382,7 @@ namespace OpenZWave
 						{
 							delete item.m_cci;
 						}
-						m_pendingQueue.erase(it++);
+						it = m_pendingQueue.erase(it);
 					}
 					else
 					{
diff --git a/cpp/src/platform/HttpClient.cpp b/cpp/src/platform/HttpClient.cpp
index 2fc3fff6..db03be7f 100644
--- a/cpp/src/platform/HttpClient.cpp
+++ b/cpp/src/platform/HttpClient.cpp
@@ -1368,7 +1368,7 @@ namespace OpenZWave
 					{
 						traceprint("Delete socket\n");
 						delete sock;
-						_store.erase(it++);
+						it = _store.erase(it);
 					}
 					else
 						++it;
diff --git a/cpp/src/value_classes/Value.cpp b/cpp/src/value_classes/Value.cpp
index a9a5e30b..cc5933a6 100644
--- a/cpp/src/value_classes/Value.cpp
+++ b/cpp/src/value_classes/Value.cpp
@@ -36,6 +36,7 @@
 #include "value_classes/Value.h"
 #include "platform/Log.h"
 #include "command_classes/CommandClass.h"
+#include "command_classes/Supervision.h"
 #include <ctime>
 #include "Options.h"
 
@@ -57,9 +58,13 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			Value::Value(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, ValueID::ValueType const _type, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, bool const _isSet, uint8 const _pollIntensity) :
-					m_min(0), m_max(0), m_refreshTime(0), m_verifyChanges(false), m_refreshAfterSet(true), m_id(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, _type), m_units(_units), m_readOnly(_readOnly), m_writeOnly(_writeOnly), m_isSet(_isSet), m_affectsLength(0), m_affects(), m_affectsAll(false), m_checkChange(false), m_pollIntensity(_pollIntensity)
+					m_min(0), m_max(0), m_refreshTime(0), m_verifyChanges(false), m_refreshAfterSet(true), m_id(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, _type), m_targetValueSet(false), m_duration(0), m_units(_units), m_readOnly(_readOnly), m_writeOnly(_writeOnly), m_isSet(_isSet), m_affectsLength(0), m_affects(), m_affectsAll(false), m_checkChange(false), m_pollIntensity(_pollIntensity)
 			{
 				SetLabel(_label);
+				if (Driver* driver = Manager::Get()->GetDriver(m_id.GetHomeId()))
+				{
+					Timer::SetDriver(driver);
+				}
 			}
 
 //-----------------------------------------------------------------------------
@@ -67,7 +72,7 @@ namespace OpenZWave
 // Constructor (from XML)
 //-----------------------------------------------------------------------------
 			Value::Value() :
-					m_min(0), m_max(0), m_refreshTime(0), m_verifyChanges(false), m_refreshAfterSet(true), m_readOnly(false), m_writeOnly(false), m_isSet(false), m_affectsLength(0), m_affects(), m_affectsAll(false), m_checkChange(false), m_pollIntensity(0)
+					m_min(0), m_max(0), m_refreshTime(0), m_verifyChanges(false), m_refreshAfterSet(true), m_targetValueSet(false), m_duration(0), m_readOnly(false), m_writeOnly(false), m_isSet(false), m_affectsLength(0), m_affects(), m_affectsAll(false), m_checkChange(false), m_pollIntensity(0)
 			{
 			}
 
@@ -103,12 +108,21 @@ namespace OpenZWave
 				uint16 index = 0;
 				if (TIXML_SUCCESS == _valueElement->QueryIntAttribute("index", &intVal))
 				{
-					/* index is only 10 bytes in the ValueID class */
-					index = (uint16) (intVal & 0x3FF);
+					/* index is only 16 bytes in the ValueID class */
+					index = (uint16) (intVal & 0xFFFF);
 				}
 
 				m_id = ValueID(_homeId, _nodeId, genre, _commandClassId, instance, index, type);
 
+				/* For Values Loaded from a XML File - We Need to load the Timer Driver here, as the default
+				 * constructor doens't have a m_id set, hence we can't get the HomeID
+				 */
+
+				if (Driver* driver = Manager::Get()->GetDriver(m_id.GetHomeId()))
+				{
+						Timer::SetDriver(driver);
+				}
+
 				char const* label = _valueElement->Attribute("label");
 				if (label)
 				{
@@ -229,7 +243,7 @@ namespace OpenZWave
 				snprintf(str, sizeof(str), "%d", m_id.GetInstance());
 				_valueElement->SetAttribute("instance", str);
 
-				snprintf(str, sizeof(str), "%d", (m_id.GetIndex() & 0x3FF));
+				snprintf(str, sizeof(str), "%d", (m_id.GetIndex() & 0xFFFF));
 				_valueElement->SetAttribute("index", str);
 
 				_valueElement->SetAttribute("label", GetLabel().c_str());
@@ -299,9 +313,13 @@ namespace OpenZWave
 							{
 								if (!IsWriteOnly())
 								{
-									// queue a "RequestValue" message to update the value
-									if (m_refreshAfterSet) {
-										cc->RequestValue( 0, m_id.GetIndex(), m_id.GetInstance(), Driver::MsgQueue_Send );
+									if (m_refreshAfterSet)
+									{
+										if (!node->GetCommandClass(Internal::CC::Supervision::StaticGetCommandClassId()))
+										{
+											// queue a "RequestValue" message to update the value
+											cc->RequestValue( 0, m_id.GetIndex(), m_id.GetInstance(), Driver::MsgQueue_Send );
+										}
 									}
 								}
 								else
@@ -469,9 +487,16 @@ namespace OpenZWave
 // <Value::VerifyRefreshedValue>
 // Check a refreshed value
 //-----------------------------------------------------------------------------
-			int Value::VerifyRefreshedValue(void* _originalValue, void* _checkValue, void* _newValue, ValueID::ValueType _type, int _originalValueLength, // = 0,
+			int Value::VerifyRefreshedValue(
+					void* _originalValue,
+					void* _checkValue,
+					void* _newValue,
+					void* _targetValue,
+					ValueID::ValueType _type,
+					int _originalValueLength, // = 0,
 					int _checkValueLength, // = 0,
-					int _newValueLength // = 0
+					int _newValueLength, // = 0,
+					int _targetValueLength // = 0,
 					)
 			{
 				// TODO: this is pretty rough code, but it's reused by each value type.  It would be
@@ -494,59 +519,76 @@ namespace OpenZWave
 						case ValueID::ValueType_Button:			// Button is stored as a bool
 						case ValueID::ValueType_Bool:			// bool
 						{
-							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Refreshed Value: old value=%s, new value=%s, type=%s", *((bool*) _originalValue) ? "true" : "false", *((uint8*) _newValue) ? "true" : "false", GetTypeNameFromEnum(_type));
+							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Value Updated: old value=%s, new value=%s, type=%s", *((bool*) _originalValue) ? "true" : "false", *((uint8*) _newValue) ? "true" : "false", GetTypeNameFromEnum(_type));
+							if (m_targetValueSet)
+								Log::Write(LogLevel_Detail, m_id.GetNodeId(), "\tTarget Value is Set to %s", *((bool*) _targetValue) ? "true" : "false" );
 							break;
 						}
 						case ValueID::ValueType_Byte:			// byte
 						{
-							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Refreshed Value: old value=%d, new value=%d, type=%s", *((uint8*) _originalValue), *((uint8*) _newValue), GetTypeNameFromEnum(_type));
+							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Value Updated: old value=%d, new value=%d, type=%s", *((uint8*) _originalValue), *((uint8*) _newValue), GetTypeNameFromEnum(_type));
+							if (m_targetValueSet)
+								Log::Write(LogLevel_Detail, m_id.GetNodeId(), "\tTarget Value is Set to %d", *((uint8*) _targetValue));
 							break;
 						}
 						case ValueID::ValueType_Decimal:		// decimal is stored as a string, so treat it as a string here
 						case ValueID::ValueType_String:			// string
 						{
-							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Refreshed Value: old value=%s, new value=%s, type=%s", ((string*) _originalValue)->c_str(), ((string*) _newValue)->c_str(), GetTypeNameFromEnum(_type));
+							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Value Updated: old value=%s, new value=%s, type=%s", ((string*) _originalValue)->c_str(), ((string*) _newValue)->c_str(), GetTypeNameFromEnum(_type));
+							if (m_targetValueSet)
+								Log::Write(LogLevel_Detail, m_id.GetNodeId(), "\tTarget Value is Set to %d", *((string*) _targetValue)->c_str());
 							break;
 						}
 						case ValueID::ValueType_Short:			// short
 						{
-							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Refreshed Value: old value=%d, new value=%d, type=%s", *((short*) _originalValue), *((short*) _newValue), GetTypeNameFromEnum(_type));
+							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Value Updated: old value=%d, new value=%d, type=%s", *((short*) _originalValue), *((short*) _newValue), GetTypeNameFromEnum(_type));
+							if (m_targetValueSet)
+								Log::Write(LogLevel_Detail, m_id.GetNodeId(), "\tTarget Value is Set to %d", *((short*) _targetValue));
 							break;
 						}
 						case ValueID::ValueType_List:			// List Type is treated as a int32
 						case ValueID::ValueType_Int:			// int32
 						case ValueID::ValueType_BitSet:			// BitSet
 						{
-							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Refreshed Value: old value=%d, new value=%d, type=%s", *((int32*) _originalValue), *((int32*) _newValue), GetTypeNameFromEnum(_type));
+							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Value Updated: old value=%d, new value=%d, type=%s", *((int32*) _originalValue), *((int32*) _newValue), GetTypeNameFromEnum(_type));
+							if (m_targetValueSet)
+								Log::Write(LogLevel_Detail, m_id.GetNodeId(), "\tTarget Value is Set to %d", *((int32*) _targetValue));
 							break;
 						}
 						case ValueID::ValueType_Raw:			// raw
 						{
-							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Refreshed Value: old value=%x, new value=%x, type=%s", _originalValue, _newValue, GetTypeNameFromEnum(_type));
+							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Value Updated: old value=%x, new value=%x, type=%s", _originalValue, _newValue, GetTypeNameFromEnum(_type));
+							if (m_targetValueSet)
+								Log::Write(LogLevel_Detail, m_id.GetNodeId(), "\tTarget Value is Set to %x", _targetValue);
 							break;
 						}
 						case ValueID::ValueType_Schedule:		// Schedule Type
 						{
-							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Refreshed Value: old value=%s, new value=%s, type=%s", _originalValue, _newValue, GetTypeNameFromEnum(_type));
+							Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Value Updated: old value=%s, new value=%s, type=%s", _originalValue, _newValue, GetTypeNameFromEnum(_type));
+							if (m_targetValueSet)
+								Log::Write(LogLevel_Detail, m_id.GetNodeId(), "\tTarget Value is Set to %x", _targetValue);
 							/* we cant support verifyChanges yet... so always unset this */
 							m_verifyChanges = false;
 							break;
 						}
 					}
+
 				}
 				m_refreshTime = time( NULL);	// update value refresh time
 
+				/* if this is a Value that has a Target Value Set, then lets compare the reported value against the Target Value
+				 * and Trigger a Refresh (based on the Duration, if necessary)
+				 */
+				if (m_targetValueSet)
+				{
+					return CheckTargetValue(_newValue, _targetValue, _type, _newValueLength, _targetValueLength);
+				}
+
+
 				// check whether changes in this value should be verified (since some devices will report values that always
 				// change, where confirming changes is difficult or impossible)
 				Log::Write(LogLevel_Detail, m_id.GetNodeId(), "Changes to this value are %sverified", m_verifyChanges ? "" : "not ");
 
-				if (!m_verifyChanges)
-				{
-					// since we're not checking changes in this value, notify ValueChanged (to be on the safe side)
-					Value::OnValueChanged();
-					return 2;				// confirmed change of value
-				}
-
 				// see if the value has changed (result is used whether checking change or not)
 				bool bOriginalEqual = false;
 				switch (_type)
@@ -570,9 +612,9 @@ namespace OpenZWave
 						bOriginalEqual = (*((bool*) _originalValue) == *((bool*) _newValue));
 						break;
 					case ValueID::ValueType_Raw:			// raw
-						bOriginalEqual = (_originalValueLength == _newValueLength);	// first check length of arrays
+						bOriginalEqual = (_originalValueLength == _newValueLength); // first check length of arrays
 						if (bOriginalEqual)
-							bOriginalEqual = (memcmp(_originalValue, _newValue, _newValueLength) == 0);	// if length is the same, then check content
+							bOriginalEqual = (memcmp(_originalValue, _newValue, _newValueLength) == 0); // if length is the same, then check content
 						break;
 					case ValueID::ValueType_Schedule:		// Schedule
 						/* Should not get here */
@@ -582,6 +624,16 @@ namespace OpenZWave
 						break;
 				}
 
+				if (!m_verifyChanges)
+				{
+					if (bOriginalEqual)
+						Value::OnValueRefreshed();
+					else
+						Value::OnValueChanged();
+					return 2;				// confirmed change of value
+				}
+
+
 				// if this is the first refresh of the value, test to see if the value has changed
 				if (!IsCheckingChange())
 				{
@@ -595,7 +647,8 @@ namespace OpenZWave
 					// values are different, so flag this as a verification refresh and queue it
 					Log::Write(LogLevel_Info, m_id.GetNodeId(), "Changed value (possible)--rechecking");
 					SetCheckingChange(true);
-					Manager::Get()->RefreshValue(GetID());
+					TimerThread::TimerCallback callback = bind(&Value::sendValueRefresh, this, 1);
+					TimerSetEvent(250, callback, 1);
 					return 1;				// value has changed (to be confirmed)
 				}
 				else		// IsCheckingChange is true if this is the second read of a potentially changed value
@@ -661,7 +714,9 @@ namespace OpenZWave
 					SetCheckingChange(true);
 
 					// save a temporary copy of value and re-read value from device
-					Manager::Get()->RefreshValue(GetID());
+					//Manager::Get()->RefreshValue(GetID());
+					TimerThread::TimerCallback callback = bind(&Value::sendValueRefresh, this, 1);
+					TimerSetEvent(250, callback, 1);
 					return 1;
 				}
 			}
@@ -683,6 +738,106 @@ namespace OpenZWave
 			{
 				Localization::Get()->SetValueLabel(m_id.GetNodeId(), m_id.GetCommandClassId(), m_id.GetIndex(), -1, _label, lang);
 			}
+
+//-----------------------------------------------------------------------------
+// <Value::CheckTargetValue>
+// Check the reported value against the Target Value
+//-----------------------------------------------------------------------------
+			int Value::CheckTargetValue(void* _newValue, void* _targetValue, ValueID::ValueType _type, int _newValueLength, int _targetValueLength)
+			{
+				// see if the value has changed (result is used whether checking change or not)
+				bool bOriginalEqual = false;
+				switch (_type)
+				{
+					case ValueID::ValueType_Decimal:		// Decimal is stored as a string
+					case ValueID::ValueType_String:			// string
+						bOriginalEqual = (strcmp(((string*) _targetValue)->c_str(), ((string*) _newValue)->c_str()) == 0);
+						break;
+					case ValueID::ValueType_Short:			// short
+						bOriginalEqual = (*((short*) _targetValue) == *((short*) _newValue));
+						break;
+					case ValueID::ValueType_List:			// List Type is treated as a int32
+					case ValueID::ValueType_Int:			// int
+						bOriginalEqual = (*((int32*) _targetValue) == *((int32*) _newValue));
+						break;
+					case ValueID::ValueType_Byte:			// uint8
+						bOriginalEqual = (*((uint8*) _targetValue) == *((uint8*) _newValue));
+						break;
+					case ValueID::ValueType_Button:			// Button is stored as a bool
+					case ValueID::ValueType_Bool:			// bool
+						bOriginalEqual = (*((bool*) _targetValue) == *((bool*) _newValue));
+						break;
+					case ValueID::ValueType_Raw:			// raw
+						bOriginalEqual = (_targetValueLength == _newValueLength);	// first check length of arrays
+						if (bOriginalEqual)
+							bOriginalEqual = (memcmp(_targetValue, _newValue, _newValueLength) == 0);	// if length is the same, then check content
+						break;
+					case ValueID::ValueType_Schedule:		// Schedule
+						/* Should not get here */
+						break;
+					case ValueID::ValueType_BitSet:			// BitSet
+						bOriginalEqual = (((Bitfield *) _targetValue)->GetValue() == ((Bitfield *) _newValue)->GetValue());
+						break;
+				}
+				if (bOriginalEqual)
+				{
+					/* reset the Bool around TargetValueSet so we
+					 * can handle situations where Target Value is not supplied in the future
+					 */
+					m_targetValueSet = false;
+
+					Value::OnValueChanged();
+					return 2;				// confirmed change of value
+				}
+				/* They are not equal - So we need to issue a Get, But lets pace the timing of the Get based on Duration
+				 * - Caveat here is that if the outgoing queue is large, then this will be additionally delayed
+				 */
+				int32 timeout;
+				if (m_duration <= 2)
+				{
+					timeout = 250;
+				}
+				else if (m_duration <= 5)
+				{
+					/* for Durations less than 5 seconds, lets refresh every 1/2 seconds
+					 */
+					timeout = 500;
+				}
+				else
+				{
+					/* Everything else is 1 second
+					 */
+					timeout = 1000;
+				}
+
+				TimerThread::TimerCallback callback = bind(&Value::sendValueRefresh, this, 1);
+				TimerSetEvent(timeout, callback, 1);
+				/* signal that the value hasn't changed */
+				return 0;
+			}
+
+//-----------------------------------------------------------------------------
+// <Value::sendValueRefresh>
+// Callback from the Timer to send a Get value to refresh a value from the
+// CheckTargetValue function
+//-----------------------------------------------------------------------------
+			void Value::sendValueRefresh(uint32 _unused)
+			{
+				Log::Write(LogLevel_Info, m_id.GetNodeId(), "Sending Get to Refresh Value after Target Check");
+				if (Driver* driver = Manager::Get()->GetDriver(m_id.GetHomeId()))
+				{
+					Node* node = driver->GetNodeUnsafe(m_id.GetNodeId());
+					if (node != NULL)
+					{
+						if (Internal::CC::CommandClass* cc = node->GetCommandClass(m_id.GetCommandClassId()))
+						{
+							cc->RequestValue( 0, m_id.GetIndex(), m_id.GetInstance(), Driver::MsgQueue_Send );
+						}
+					}
+				}
+			}
+
+
 		} // namespace VC
 	} // namespace Internal
 } // namespace OpenZWave
diff --git a/cpp/src/value_classes/Value.h b/cpp/src/value_classes/Value.h
index d85d0bf3..f8336c18 100644
--- a/cpp/src/value_classes/Value.h
+++ b/cpp/src/value_classes/Value.h
@@ -33,6 +33,7 @@
 #include <time.h>
 #endif
 #include "Defs.h"
+#include "TimerThread.h"
 #include "platform/Ref.h"
 #include "value_classes/ValueID.h"
 #include "platform/Log.h"
@@ -50,7 +51,7 @@ namespace OpenZWave
 			/** \brief Base class for values associated with a node.
 			 * \ingroup ValueID
 			 */
-			class Value: public Internal::Platform::Ref
+			class Value: public Internal::Platform::Ref, private Timer
 			{
 					friend class OpenZWave::Driver;
 					friend class ValueStore;
@@ -162,6 +163,8 @@ namespace OpenZWave
 						return Ref::Release();
 					}
 #endif
+					void sendValueRefresh(uint32 _unused);
+
 				protected:
 					virtual ~Value();
 
@@ -173,9 +176,15 @@ namespace OpenZWave
 					{
 						m_checkChange = _check;
 					}
+					bool IsTargetValueSet() const
+					{
+						return m_targetValueSet;
+					}
+
 					void OnValueRefreshed();			// A value in a device has been refreshed
 					void OnValueChanged();				// The refreshed value actually changed
-					int VerifyRefreshedValue(void* _originalValue, void* _checkValue, void* _newValue, ValueID::ValueType _type, int _originalValueLength = 0, int _checkValueLength = 0, int _newValueLength = 0);
+					int VerifyRefreshedValue(void* _originalValue, void* _checkValue, void* _newValue, void* _targetValue, ValueID::ValueType _type, int _originalValueLength = 0, int _checkValueLength = 0, int _newValueLength = 0, int _targetValueLength = 0);
+					int CheckTargetValue(void* _newValue, void* _targetValue, ValueID::ValueType _type, int _newValueLength, int _targetValueLength);
 
 					int32 m_min;
 					int32 m_max;
@@ -184,6 +193,8 @@ namespace OpenZWave
 					bool m_verifyChanges;		// if true, apparent changes are verified; otherwise, they're not
 					bool m_refreshAfterSet;		// if true, all value sets are followed by a get to refresh the value manually
 					ValueID m_id;
+					bool m_targetValueSet;		// If the Target Value is Set 
+					uint32 m_duration;			// The Duration, if the CC supports it
 
 				private:
 					string m_units;
diff --git a/cpp/src/value_classes/ValueBitSet.cpp b/cpp/src/value_classes/ValueBitSet.cpp
index 8a7089ce..df482c8d 100644
--- a/cpp/src/value_classes/ValueBitSet.cpp
+++ b/cpp/src/value_classes/ValueBitSet.cpp
@@ -46,7 +46,7 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			ValueBitSet::ValueBitSet(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, uint32 const _value, uint8 const _pollIntensity) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_BitSet, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(false), m_newValue(false), m_BitMask(0xFFFFFFFF), m_size(0)
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_BitSet, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(false), m_newValue(false), m_BitMask(0xFFFFFFFF), m_size(0), m_targetValue(0)
 			{
 			}
 
@@ -341,13 +341,24 @@ namespace OpenZWave
 				m_size = size;
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueByte::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueBitSet::SetTargetValue(uint32 const _target, uint32 _duration)
+			{
+				m_targetValueSet = true;
+				m_targetValue = _target;
+				m_duration = _duration;
+			}
+
 //-----------------------------------------------------------------------------
 // <ValueBitSet::OnValueRefreshed>
 // A value in a device has been refreshed
 //-----------------------------------------------------------------------------
 			void ValueBitSet::OnValueRefreshed(uint32 const _value)
 			{
-				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, ValueID::ValueType_BitSet))
+				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, (void*) &m_targetValue, ValueID::ValueType_BitSet))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueBitSet.h b/cpp/src/value_classes/ValueBitSet.h
index f4a9766d..bf2aec96 100644
--- a/cpp/src/value_classes/ValueBitSet.h
+++ b/cpp/src/value_classes/ValueBitSet.h
@@ -60,6 +60,8 @@ namespace OpenZWave
 					bool Set(uint32 const _value);
 					uint32 GetValue() const;
 
+					void SetTargetValue(uint32 const _target, uint32 _duration = 0);
+
 					bool SetBit(uint8 const _idx);
 					bool ClearBit(uint8 const _idx);
 					bool GetBit(uint8 _idx) const;
@@ -92,6 +94,7 @@ namespace OpenZWave
 					uint32 m_BitMask;				// Valid Bits
 					uint8 m_size;					// Number of bytes in size
 					vector<int32> m_bits;
+					uint32 m_targetValue; 		// Target Value, if Supported;
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/cpp/src/value_classes/ValueBool.cpp b/cpp/src/value_classes/ValueBool.cpp
index d7683d93..eea68b2b 100644
--- a/cpp/src/value_classes/ValueBool.cpp
+++ b/cpp/src/value_classes/ValueBool.cpp
@@ -45,7 +45,7 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			ValueBool::ValueBool(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, bool const _value, uint8 const _pollIntensity) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Bool, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(false)
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Bool, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(false), m_targetValue(false)
 			{
 			}
 
@@ -100,6 +100,9 @@ namespace OpenZWave
 				// create a temporary copy of this value to be submitted to the Set() call and set its value to the function param
 				ValueBool* tempValue = new ValueBool(*this);
 				tempValue->m_value = _value;
+				
+				// Save the new value to be stored when the device confirms the value was set successfully, 
+				m_newValue = _value;
 
 				// Set the value in the device.
 				bool ret = ((Value*) tempValue)->Set();
@@ -110,13 +113,24 @@ namespace OpenZWave
 				return ret;
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueBool::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueBool::SetTargetValue(bool const _target, uint32 _duration)
+			{
+				m_targetValueSet = true;
+				m_targetValue = _target;
+				m_duration = _duration;
+			}
+
 //-----------------------------------------------------------------------------
 // <ValueBool::OnValueRefreshed>
 // A value in a device has been refreshed
 //-----------------------------------------------------------------------------
 			void ValueBool::OnValueRefreshed(bool const _value)
 			{
-				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, ValueID::ValueType_Bool))
+				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, (void *) &m_targetValue, ValueID::ValueType_Bool))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueBool.h b/cpp/src/value_classes/ValueBool.h
index 7caf62ee..41fb23d8 100644
--- a/cpp/src/value_classes/ValueBool.h
+++ b/cpp/src/value_classes/ValueBool.h
@@ -57,6 +57,12 @@ namespace OpenZWave
 
 					bool Set(bool const _value);
 					void OnValueRefreshed(bool const _value);
+					void ConfirmNewValue()
+					{
+						OnValueRefreshed(m_newValue != 0);
+					};
+					void SetTargetValue(bool const _target, uint32 _duration = 0);
+
 
 					// From Value
 					virtual string const GetAsString() const
@@ -75,6 +81,8 @@ namespace OpenZWave
 				private:
 					bool m_value;				// the current index in the m_items vector
 					bool m_valueCheck;			// the previous value (used for double-checking spurious value reads)
+					bool m_targetValue;			// The Target Value
+					bool m_newValue;			// a new value to be set on the appropriate device (used by Supervision CC)
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/cpp/src/value_classes/ValueByte.cpp b/cpp/src/value_classes/ValueByte.cpp
index 68e30d72..a36b0642 100644
--- a/cpp/src/value_classes/ValueByte.cpp
+++ b/cpp/src/value_classes/ValueByte.cpp
@@ -45,7 +45,7 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			ValueByte::ValueByte(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, uint8 const _value, uint8 const _pollIntensity) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Byte, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(false)
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Byte, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(false), m_targetValue(0)
 			{
 				m_min = 0;
 				m_max = 255;
@@ -120,6 +120,9 @@ namespace OpenZWave
 				ValueByte* tempValue = new ValueByte(*this);
 				tempValue->m_value = _value;
 
+				// Save the new value to be stored when the device confirms the value was set successfully, 
+				m_newValue = _value;
+
 				// Set the value in the device.
 				bool ret = ((Value*) tempValue)->Set();
 
@@ -129,13 +132,24 @@ namespace OpenZWave
 				return ret;
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueByte::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueByte::SetTargetValue(uint8 const _target, uint32 _duration)
+			{
+				m_targetValueSet = true;
+				m_targetValue = _target;
+				m_duration = _duration;
+			}
+
 //-----------------------------------------------------------------------------
 // <ValueByte::OnValueRefreshed>
 // A value in a device has been refreshed
 //-----------------------------------------------------------------------------
 			void ValueByte::OnValueRefreshed(uint8 const _value)
 			{
-				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, ValueID::ValueType_Byte))
+				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, (void*) &m_targetValue, ValueID::ValueType_Byte))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueByte.h b/cpp/src/value_classes/ValueByte.h
index 517b04a2..bc658070 100644
--- a/cpp/src/value_classes/ValueByte.h
+++ b/cpp/src/value_classes/ValueByte.h
@@ -55,6 +55,11 @@ namespace OpenZWave
 
 					bool Set(uint8 const _value);
 					void OnValueRefreshed(uint8 const _value);
+					void ConfirmNewValue()
+					{
+						OnValueRefreshed(m_newValue);
+					};
+					void SetTargetValue(uint8 const _target, uint32 _duration = 0);
 
 					// From Value
 					virtual string const GetAsString() const;
@@ -70,6 +75,8 @@ namespace OpenZWave
 				private:
 					uint8 m_value;				// the current value
 					uint8 m_valueCheck;			// the previous value (used for double-checking spurious value reads)
+					uint8 m_targetValue; 		// the Target Value, if the CC support it
+					uint8 m_newValue;			// a new value to be set on the device (used by Supervision CC)
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/cpp/src/value_classes/ValueDecimal.cpp b/cpp/src/value_classes/ValueDecimal.cpp
index 9acef6ce..34920cc4 100644
--- a/cpp/src/value_classes/ValueDecimal.cpp
+++ b/cpp/src/value_classes/ValueDecimal.cpp
@@ -44,7 +44,7 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			ValueDecimal::ValueDecimal(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, string const& _value, uint8 const _pollIntensity) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Decimal, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(""), m_newValue(""), m_precision(0)
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Decimal, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(""), m_newValue(""), m_precision(0), m_targetValue("")
 			{
 			}
 
@@ -87,6 +87,9 @@ namespace OpenZWave
 				ValueDecimal* tempValue = new ValueDecimal(*this);
 				tempValue->m_value = _value;
 
+				// Save the new value to be stored when the device confirms the value was set successfully, 
+				m_newValue = _value;
+
 				// Set the value in the device.
 				bool ret = ((Value*) tempValue)->Set();
 
@@ -96,13 +99,25 @@ namespace OpenZWave
 				return ret;
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueDecimal::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueDecimal::SetTargetValue(string const _target, uint32 _duration)
+			{
+				m_targetValueSet = true;
+				m_targetValue = _target;
+				m_duration = _duration;
+			}
+
+
 //-----------------------------------------------------------------------------
 // <ValueDecimal::OnValueRefreshed>
 // A value in a device has been refreshed
 //-----------------------------------------------------------------------------
 			void ValueDecimal::OnValueRefreshed(string const& _value)
 			{
-				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, ValueID::ValueType_Decimal))
+				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, (void *) &m_targetValue, ValueID::ValueType_Decimal))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueDecimal.h b/cpp/src/value_classes/ValueDecimal.h
index 86849322..5b2d402b 100644
--- a/cpp/src/value_classes/ValueDecimal.h
+++ b/cpp/src/value_classes/ValueDecimal.h
@@ -59,6 +59,11 @@ namespace OpenZWave
 
 					bool Set(string const& _value);
 					void OnValueRefreshed(string const& _value);
+					void ConfirmNewValue()
+					{
+						OnValueRefreshed(m_newValue);
+					};
+					void SetTargetValue(string const _target, uint32 _duration = 0);
 
 					// From Value
 					virtual string const GetAsString() const
@@ -91,6 +96,7 @@ namespace OpenZWave
 					string m_valueCheck;			// the previous value (used for double-checking spurious value reads)
 					string m_newValue;				// a new value to be set on the appropriate device
 					uint8 m_precision;
+					string m_targetValue;			// Target Value if supported. 
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/cpp/src/value_classes/ValueInt.cpp b/cpp/src/value_classes/ValueInt.cpp
index 59e94e56..237404b7 100644
--- a/cpp/src/value_classes/ValueInt.cpp
+++ b/cpp/src/value_classes/ValueInt.cpp
@@ -46,7 +46,7 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			ValueInt::ValueInt(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, int32 const _value, uint8 const _pollIntensity) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Int, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(0)
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Int, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(0), m_targetValue(0)
 			{
 				m_min = INT_MIN;
 				m_max = INT_MAX;
@@ -128,13 +128,24 @@ namespace OpenZWave
 				return ret;
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueInt::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueInt::SetTargetValue(int32 const _target, uint32 _duration)
+			{
+				m_targetValueSet = true;
+				m_targetValue = _target;
+				m_duration = _duration;
+			}
+
 //-----------------------------------------------------------------------------
 // <ValueInt::OnValueRefreshed>
 // A value in a device has been refreshed
 //-----------------------------------------------------------------------------
 			void ValueInt::OnValueRefreshed(int32 const _value)
 			{
-				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, ValueID::ValueType_Int))
+				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, (void *) &m_targetValue, ValueID::ValueType_Int))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueInt.h b/cpp/src/value_classes/ValueInt.h
index 34f8c0f9..e272b93d 100644
--- a/cpp/src/value_classes/ValueInt.h
+++ b/cpp/src/value_classes/ValueInt.h
@@ -55,6 +55,8 @@ namespace OpenZWave
 
 					bool Set(int32 const _value);
 					void OnValueRefreshed(int32 const _value);
+					void SetTargetValue(int32 const _target, uint32 _duration = 0);
+
 
 					// From Value
 					virtual string const GetAsString() const;
@@ -70,6 +72,7 @@ namespace OpenZWave
 				private:
 					int32 m_value;				// the current value
 					int32 m_valueCheck;			// the previous value (used for double-checking spurious value reads)
+					int32 m_targetValue;		// Target Value 
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/cpp/src/value_classes/ValueList.cpp b/cpp/src/value_classes/ValueList.cpp
index 462db14c..a89629d1 100644
--- a/cpp/src/value_classes/ValueList.cpp
+++ b/cpp/src/value_classes/ValueList.cpp
@@ -46,7 +46,7 @@ namespace OpenZWave
 //-----------------------------------------------------------------------------
 			ValueList::ValueList(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, vector<Item> const& _items, int32 const _valueIdx, uint8 const _pollIntensity, uint8 const _size	// = 4
 					) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_List, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_items(_items), m_valueIdx(_valueIdx), m_valueIdxCheck(0), m_size(_size)
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_List, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_items(_items), m_valueIdx(_valueIdx), m_valueIdxCheck(0), m_size(_size), m_targetValue(0)
 			{
 				for (vector<Item>::iterator it = m_items.begin(); it != m_items.end(); ++it)
 				{
@@ -85,12 +85,12 @@ namespace OpenZWave
 					}
 					else
 					{
-						Log::Write(LogLevel_Warning, "Value size is invalid (%d). Only 1, 2 & 4 supported for node %d, class 0x%02x, instance %d, index %d", intSize, _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex());
+						Log::Write(LogLevel_Warning, "Value size is invalid (%d). Only 1, 2 & 4 supported for node %d, class 0x%02x, instance %d, index %d - %s", intSize, _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex(), GetID().GetAsString().c_str());
 					}
 				}
 				else
 				{
-					Log::Write(LogLevel_Warning, "Value list size is not set, assuming 4 bytes for node %d, class 0x%02x, instance %d, index %d", _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex());
+					Log::Write(LogLevel_Warning, "Value list size is not set, assuming 4 bytes for node %d, class 0x%02x, instance %d, index %d - %s", _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex(), GetID().GetAsString().c_str());
 				}
 
 				TiXmlElement const* itemElement = _valueElement->FirstChildElement();
@@ -125,11 +125,11 @@ namespace OpenZWave
 						int value = 0;
 						if (itemElement->QueryIntAttribute("value", &value) != TIXML_SUCCESS)
 						{
-							Log::Write(LogLevel_Warning, "Item value %s is wrong type or does not exist in xml configuration for node %d, class 0x%02x, instance %d, index %d", labelStr, _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex());
+							Log::Write(LogLevel_Warning, "Item value %s is wrong type or does not exist in xml configuration for node %d, class 0x%02x, instance %d, index %d - %s", labelStr, _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex(), GetID().GetAsString().c_str());
 						}
 						else if ((m_size == 1 && value > 255) || (m_size == 2 && value > 65535))
 						{
-							Log::Write(LogLevel_Warning, "Item value %s is incorrect size in xml configuration for node %d, class 0x%02x, instance %d, index %d", labelStr, _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex());
+							Log::Write(LogLevel_Warning, "Item value %s is incorrect size in xml configuration for node %d, class 0x%02x, instance %d, index %d - %s", labelStr, _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex(), GetID().GetAsString().c_str());
 						}
 						else
 						{
@@ -166,7 +166,7 @@ namespace OpenZWave
 					}
 					else
 					{
-						Log::Write(LogLevel_Warning, "Value is not found in xml configuration for node %d, class 0x%02x, instance %d, index %d", _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex());
+						Log::Write(LogLevel_Warning, "Value is not found in xml configuration for node %d, class 0x%02x, instance %d, index %d - %s", _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex(), GetID().GetAsString().c_str());
 					}
 				}
 
@@ -182,12 +182,12 @@ namespace OpenZWave
 					}
 					else
 					{
-						Log::Write(LogLevel_Warning, "Vindex is out of range for index in xml configuration for node %d, class 0x%02x, instance %d, index %d", _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex());
+						Log::Write(LogLevel_Warning, "Vindex is out of range for index in xml configuration for node %d, class 0x%02x, instance %d, index %d - %s", _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex(), GetID().GetAsString().c_str());
 					}
 				}
 				if (!valSet && !indSet)
 				{
-					Log::Write(LogLevel_Warning, "Missing default list value or vindex from xml configuration: node %d, class 0x%02x, instance %d, index %d", _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex());
+					Log::Write(LogLevel_Warning, "Missing default list value or vindex from xml configuration: node %d, class 0x%02x, instance %d, index %d - %s", _nodeId, _commandClassId, GetID().GetInstance(), GetID().GetIndex(), GetID().GetAsString().c_str());
 				}
 
 			}
@@ -229,6 +229,9 @@ namespace OpenZWave
 				ValueList* tempValue = new ValueList(*this);
 				tempValue->m_valueIdx = _value;
 
+				// Save the new value to be stored when the device confirms the value was set successfully, 
+				m_newValue = _value;
+
 				// Set the value in the device.
 				bool ret = ((Value*) tempValue)->Set();
 
@@ -249,13 +252,24 @@ namespace OpenZWave
 				if (index < 0)
 				{
 					// Item not found
-					Log::Write(LogLevel_Warning, "Attempt to Set a Invalid Label %s for ValueList in OnValueRefreshed", _label.c_str());
+					Log::Write(LogLevel_Warning, "Attempt to Set a Invalid Label %s for ValueList in OnValueRefreshed %s", _label.c_str(), GetID().GetAsString().c_str());
 					return false;
 				}
 
 				return SetByValue(index);
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueByte::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueList::SetTargetValue(int32 const _target, uint32 _duration)
+			{
+				m_targetValueSet = true;
+				m_targetValue = _target;
+				m_duration = _duration;
+			}
+
 //-----------------------------------------------------------------------------
 // <ValueList::OnValueRefreshed>
 // A value in a device has been refreshed
@@ -267,11 +281,11 @@ namespace OpenZWave
 				if (index < 0)
 				{
 					// Item not found
-					Log::Write(LogLevel_Warning, "Attempt to Set a Invalid Index %d for ValueList in OnValueRefreshed", _value);
+					Log::Write(LogLevel_Warning, "Attempt to Set a Invalid Index %d for ValueList in OnValueRefreshed %s", _value, GetID().GetAsString().c_str());
 					return;
 				}
 
-				switch (VerifyRefreshedValue((void*) &m_valueIdx, (void*) &m_valueIdxCheck, (void*) &index, ValueID::ValueType_List))
+				switch (VerifyRefreshedValue((void*) &m_valueIdx, (void*) &m_valueIdxCheck, (void*) &index, (void*) &m_targetValue, ValueID::ValueType_List))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
@@ -299,7 +313,7 @@ namespace OpenZWave
 						return i;
 					}
 				}
-				Log::Write(LogLevel_Warning, "Attempt to get a Invalid Label %s from ValueList", _label.c_str());
+				Log::Write(LogLevel_Warning, "Attempt to get a Invalid Label %s from ValueList %s", _label.c_str(), GetID().GetAsString().c_str());
 				return -1;
 			}
 
@@ -316,7 +330,7 @@ namespace OpenZWave
 						return i;
 					}
 				}
-				Log::Write(LogLevel_Warning, "Attempt to get a Invalid Index %d on ValueList", _value);
+				Log::Write(LogLevel_Warning, "Attempt to get a Invalid Index %d on ValueList %s", _value, GetID().GetAsString().c_str());
 				return -1;
 			}
 
@@ -335,7 +349,7 @@ namespace OpenZWave
 
 					return true;
 				}
-				Log::Write(LogLevel_Error, "o_items passed to ValueList::GetItemLabels is null");
+				Log::Write(LogLevel_Error, "o_items passed to ValueList::GetItemLabels is null: %s", GetID().GetAsString().c_str());
 				return false;
 			}
 
@@ -354,7 +368,7 @@ namespace OpenZWave
 
 					return true;
 				}
-				Log::Write(LogLevel_Error, "o_values passed to ValueList::GetItemLabels is null");
+				Log::Write(LogLevel_Error, "o_values passed to ValueList::GetItemLabels is null: %s", GetID().GetAsString().c_str());
 				return false;
 			}
 
@@ -366,11 +380,17 @@ namespace OpenZWave
 			{
 				try
 				{
+					/* very strange - We throw a exception if its out of range, but its not caught? */
+					if (m_items.size() < (uint32)m_valueIdx)
+					{
+						Log::Write(LogLevel_Warning, "Invalid Index Set on ValueList %s: %d", GetID().GetAsString().c_str(), m_valueIdx);
+						return NULL;
+					}
 					return &m_items.at(m_valueIdx);
 				}
-				catch (const std::out_of_range& oor)
+				catch (std::out_of_range const& oor)
 				{
-					Log::Write(LogLevel_Warning, "Invalid Index Set on ValueList: %s", oor.what());
+					Log::Write(LogLevel_Warning, "Invalid Index Set on ValueList %s: %s", GetID().GetAsString().c_str(), oor.what());
 					return NULL;
 				}
 			}
diff --git a/cpp/src/value_classes/ValueList.h b/cpp/src/value_classes/ValueList.h
index 614bf77d..6aa46b35 100644
--- a/cpp/src/value_classes/ValueList.h
+++ b/cpp/src/value_classes/ValueList.h
@@ -66,6 +66,10 @@ namespace OpenZWave
 					bool SetByValue(int32 const _value);
 
 					void OnValueRefreshed(int32 const _valueIdx);
+					void ConfirmNewValue()
+					{
+						OnValueRefreshed(m_items[m_newValue].m_value);
+					};
 
 					// From Value
 					virtual string const GetAsString() const
@@ -76,6 +80,8 @@ namespace OpenZWave
 					{
 						return SetByLabel(_value);
 					}
+					void SetTargetValue(int32 const _target, uint32 _duration = 0);
+
 					virtual void ReadXML(uint32 const _homeId, uint8 const _nodeId, uint8 const _commandClassId, TiXmlElement const* _valueElement);
 					virtual void WriteXML(TiXmlElement* _valueElement);
 
@@ -96,7 +102,10 @@ namespace OpenZWave
 					vector<Item> m_items;
 					int32 m_valueIdx;					// the current index in the m_items vector
 					int32 m_valueIdxCheck;			// the previous index in the m_items vector (used for double-checking spurious value reads)
+					int32 m_newValue;			// a new index to be set on the appropriate device (used by Supervision CC)
 					uint8 m_size;
+					int32 m_targetValue; 		// the Target Value, if the CC support it
+
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/cpp/src/value_classes/ValueRaw.cpp b/cpp/src/value_classes/ValueRaw.cpp
index 8c562a32..535b6c91 100644
--- a/cpp/src/value_classes/ValueRaw.cpp
+++ b/cpp/src/value_classes/ValueRaw.cpp
@@ -44,7 +44,7 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			ValueRaw::ValueRaw(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, uint8 const* _value, uint8 const _length, uint8 const _pollIntensity) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Raw, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value( NULL), m_valueLength(_length), m_valueCheck( NULL), m_valueCheckLength(0)
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Raw, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value( NULL), m_valueLength(_length), m_valueCheck( NULL), m_valueCheckLength(0), m_targetValue(NULL), m_targetValueLength(0)
 			{
 				m_value = new uint8[_length];
 				memcpy(m_value, _value, _length);
@@ -211,13 +211,25 @@ namespace OpenZWave
 				return ret;
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueRaw::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueRaw::SetTargetValue(uint8 const* _target, uint8 const _length, int32 _duration)
+			{
+				m_targetValueSet = true;
+				memcpy(m_targetValue, _target, _length);
+				m_targetValueLength = _length;
+				m_duration = _duration;
+			}
+
 //-----------------------------------------------------------------------------
 // <ValueRaw::OnValueRefreshed>
 // A value in a device has been refreshed
 //-----------------------------------------------------------------------------
 			void ValueRaw::OnValueRefreshed(uint8 const* _value, uint8 const _length)
 			{
-				switch (VerifyRefreshedValue((void*) m_value, (void*) m_valueCheck, (void*) _value, ValueID::ValueType_Raw, m_valueLength, m_valueCheckLength, _length))
+				switch (VerifyRefreshedValue((void*) m_value, (void*) m_valueCheck, (void*) _value, (void*) m_targetValue, ValueID::ValueType_Raw, m_valueLength, m_valueCheckLength, _length, m_targetValueLength))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueRaw.h b/cpp/src/value_classes/ValueRaw.h
index 38e3da44..180dc432 100644
--- a/cpp/src/value_classes/ValueRaw.h
+++ b/cpp/src/value_classes/ValueRaw.h
@@ -53,6 +53,7 @@ namespace OpenZWave
 
 					bool Set(uint8 const* _value, uint8 const _length);
 					void OnValueRefreshed(uint8 const* _value, uint8 const _length);
+					void SetTargetValue(uint8 const* _target, uint8 const _length, int32 _duration = 0);
 
 					// From Value
 					virtual string const GetAsString() const;
@@ -74,6 +75,8 @@ namespace OpenZWave
 					uint8 m_valueLength;				// fixed length for this instance
 					uint8* m_valueCheck;				// the previous value (used for double-checking spurious value reads)
 					uint8 m_valueCheckLength;			// m_valueCheck array length
+					uint8* m_targetValue;		// Target Value
+					uint8 m_targetValueLength;	// Target Value Array Length
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/cpp/src/value_classes/ValueSchedule.cpp b/cpp/src/value_classes/ValueSchedule.cpp
index fb5ed9a0..7624dfc5 100644
--- a/cpp/src/value_classes/ValueSchedule.cpp
+++ b/cpp/src/value_classes/ValueSchedule.cpp
@@ -155,7 +155,7 @@ namespace OpenZWave
 			{
 				/* Value::VerifyRefreshedValue doesn't handle Schedule Properly yet, but still do this so we can do it eventually */
 
-				switch (VerifyRefreshedValue((void*) "Schedule", (void*) "Schedule", (void*) "Schedule", ValueID::ValueType_Schedule))
+				switch (VerifyRefreshedValue((void*) "Schedule", (void*) "Schedule", (void*) "Schedule", (void *) "Schedule", ValueID::ValueType_Schedule))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueShort.cpp b/cpp/src/value_classes/ValueShort.cpp
index b0e0bd86..75815dfa 100644
--- a/cpp/src/value_classes/ValueShort.cpp
+++ b/cpp/src/value_classes/ValueShort.cpp
@@ -46,7 +46,7 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			ValueShort::ValueShort(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, int16 const _value, uint8 const _pollIntensity) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Short, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(0)
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_Short, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(0), m_targetValue(0)
 			{
 				m_min = SHRT_MIN;
 				m_max = SHRT_MAX;
@@ -131,13 +131,24 @@ namespace OpenZWave
 				return ret;
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueShort::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueShort::SetTargetValue(int16 const _target, uint32 _duration)
+			{
+				m_targetValueSet = true;
+				m_targetValue = _target;
+				m_duration = _duration;
+			}
+
 //-----------------------------------------------------------------------------
 // <ValueShort::OnValueRefreshed>
 // A value in a device has been refreshed
 //-----------------------------------------------------------------------------
 			void ValueShort::OnValueRefreshed(int16 const _value)
 			{
-				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, ValueID::ValueType_Short))
+				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, (void *) &m_targetValue, ValueID::ValueType_Short))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueShort.h b/cpp/src/value_classes/ValueShort.h
index db5c1334..abfd6645 100644
--- a/cpp/src/value_classes/ValueShort.h
+++ b/cpp/src/value_classes/ValueShort.h
@@ -55,6 +55,7 @@ namespace OpenZWave
 
 					bool Set(int16 const _value);
 					void OnValueRefreshed(int16 const _value);
+					void SetTargetValue(int16 const _target, uint32 _duration = 0);
 
 					// From Value
 					virtual string const GetAsString() const;
@@ -70,6 +71,7 @@ namespace OpenZWave
 				private:
 					int16 m_value;				// the current value
 					int16 m_valueCheck;			// the previous value (used for double-checking spurious value reads)
+					int16 m_targetValue;		// Target Value 
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/cpp/src/value_classes/ValueStore.cpp b/cpp/src/value_classes/ValueStore.cpp
index 20e21562..0851eefc 100644
--- a/cpp/src/value_classes/ValueStore.cpp
+++ b/cpp/src/value_classes/ValueStore.cpp
@@ -170,7 +170,7 @@ namespace OpenZWave
 
 						// Now release and remove the value from the store
 						value->Release();
-						m_values.erase(it++);
+						it = m_values.erase(it);
 					}
 					else
 					{
diff --git a/cpp/src/value_classes/ValueString.cpp b/cpp/src/value_classes/ValueString.cpp
index fad42a88..6e7a0f81 100644
--- a/cpp/src/value_classes/ValueString.cpp
+++ b/cpp/src/value_classes/ValueString.cpp
@@ -43,7 +43,7 @@ namespace OpenZWave
 // Constructor
 //-----------------------------------------------------------------------------
 			ValueString::ValueString(uint32 const _homeId, uint8 const _nodeId, ValueID::ValueGenre const _genre, uint8 const _commandClassId, uint8 const _instance, uint16 const _index, string const& _label, string const& _units, bool const _readOnly, bool const _writeOnly, string const& _value, uint8 const _pollIntensity) :
-					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_String, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(""), m_newValue("")
+					Value(_homeId, _nodeId, _genre, _commandClassId, _instance, _index, ValueID::ValueType_String, _label, _units, _readOnly, _writeOnly, false, _pollIntensity), m_value(_value), m_valueCheck(""), m_newValue(""), m_targetValue("")
 			{
 			}
 
@@ -95,13 +95,24 @@ namespace OpenZWave
 				return ret;
 			}
 
+//-----------------------------------------------------------------------------
+// <ValueString::SetTargetValue>
+// Set the Value Target (Used for Automatic Refresh)
+//-----------------------------------------------------------------------------
+			void ValueString::SetTargetValue(string const _target, uint32 _duration)
+			{
+				m_targetValueSet = true;
+				m_targetValue = _target;
+				m_duration = _duration;
+			}
+
 //-----------------------------------------------------------------------------
 // <ValueString::OnValueRefreshed>
 // A value in a device has been refreshed
 //-----------------------------------------------------------------------------
 			void ValueString::OnValueRefreshed(string const& _value)
 			{
-				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, ValueID::ValueType_String))
+				switch (VerifyRefreshedValue((void*) &m_value, (void*) &m_valueCheck, (void*) &_value, (void *) &m_targetValue, ValueID::ValueType_String))
 				{
 					case 0:		// value hasn't changed, nothing to do
 						break;
diff --git a/cpp/src/value_classes/ValueString.h b/cpp/src/value_classes/ValueString.h
index 0b3e7714..ad1bae4b 100644
--- a/cpp/src/value_classes/ValueString.h
+++ b/cpp/src/value_classes/ValueString.h
@@ -57,6 +57,7 @@ namespace OpenZWave
 
 					bool Set(string const& _value);
 					void OnValueRefreshed(string const& _value);
+					void SetTargetValue(string const _target, uint32 _duration = 0);
 
 					// From Value
 					virtual string const GetAsString() const
@@ -79,6 +80,7 @@ namespace OpenZWave
 					string m_value;				// the current value
 					string m_valueCheck;			// the previous value (used for double-checking spurious value reads)
 					string m_newValue;				// a new value to be set on the appropriate device
+					string m_targetValue;			// Target Value
 			};
 		} // namespace VC
 	} // namespace Internal
diff --git a/distfiles.mk b/distfiles.mk
index 61c207ae..a804229a 100644
--- a/distfiles.mk
+++ b/distfiles.mk
@@ -9,6 +9,7 @@ DISTFILES =	.gitignore \
 	README.md \
 	config/2gig/ct100.xml \
 	config/2gig/ct101.xml \
+	config/2gig/ct200.xml \
 	config/2gig/ct30.xml \
 	config/2gig/ct32.xml \
 	config/2gig/ct50e.xml \
@@ -36,6 +37,7 @@ DISTFILES =	.gitignore \
 	config/NotificationCCTypes.xsd \
 	config/SensorMultiLevelCCTypes.xml \
 	config/SensorMultiLevelCCTypes.xsd \
+	config/abus/SHRM10000.xml \
 	config/act/lfm20.xml \
 	config/act/zdm230.xml \
 	config/act/zdp100.xml \
@@ -112,27 +114,38 @@ DISTFILES =	.gitignore \
 	config/aeotec/zwa005.xml \
 	config/aeotec/zwa006.xml \
 	config/aeotec/zwa008.xml \
+	config/aeotec/zwa009.xml \
+	config/aeotec/zwa011.xml \
+	config/aeotec/zwa012.xml \
+	config/aeotec/zwa019.xml \
 	config/aeotec/zwa021.xml \
+	config/aeotec/zwa023.xml \
 	config/airlinemechanical/zds-ud10.xml \
 	config/alfred/DB2.xml \
 	config/assa_abloy/ConexisL1.xml \
 	config/assa_abloy/KeyfreeConnected-plus.xml \
 	config/assa_abloy/KeyfreeConnected.xml \
+	config/assa_abloy/ProSLKey-FreeDeadbolt.xml \
 	config/assa_abloy/PushButtonDeadbolt.xml \
 	config/assa_abloy/PushButtonLever.xml \
 	config/assa_abloy/TouchDeadbolt.xml \
 	config/assa_abloy/TouchLever.xml \
 	config/assa_abloy/nexTouch.xml \
+	config/assa_abloy/yrd1x0.xml \
+	config/assa_abloy/yrm276.xml \
 	config/august/asl-03.xml \
 	config/buffalo/hw-100v15a-zw.xml \
+	config/building36/b36-t10.xml \
 	config/comfort/ucm.xml \
 	config/config-template.xml \
+	config/connecthome/ch-201.xml \
 	config/cooper/RF9501.xml \
 	config/cooper/RF9505-T.xml \
 	config/cooper/RF9505-T.xml.zip \
 	config/cooper/RF9517.xml \
 	config/cooper/RF9540-N.xml \
 	config/cooper/RF9542-Z.xml \
+	config/cooper/RF9601.xml \
 	config/cooper/RFWC5.xml \
 	config/cooper/rf9534.xml \
 	config/danfoss/living.xml \
@@ -168,7 +181,9 @@ DISTFILES =	.gitignore \
 	config/dome/0087.xml \
 	config/dome/0088.xml \
 	config/dome/0101.xml \
+	config/dome/0104.xml \
 	config/dome/0201.xml \
+	config/dome/dmex1.xml \
 	config/domitech/zb22uk.xml \
 	config/domitech/ze27eu.xml \
 	config/domux/DX1CA-Z.xml \
@@ -180,6 +195,8 @@ DISTFILES =	.gitignore \
 	config/domux/DX1WL-Z.xml \
 	config/domux/DX2SK-Z.xml \
 	config/dragontech/wd-100.xml \
+	config/duco/DucoBox.xml \
+	config/duco/Ducotronic_CO-RH_sensor.xml \
 	config/duwi/05458.xml \
 	config/duwi/ZWES1000.xml \
 	config/duwi/ZWESJ300.xml \
@@ -187,12 +204,14 @@ DISTFILES =	.gitignore \
 	config/duwi/zw-zdan-300.xml \
 	config/duwi/zwfb.xml \
 	config/duwi/zwws.xml \
+	config/ecodim/0.7.xml \
 	config/ecolink/doorwindow.xml \
 	config/ecolink/firefighter.xml \
 	config/ecolink/floodfreeze.xml \
 	config/ecolink/motion.xml \
 	config/ecolink/sensor.xml \
 	config/ecolink/tiltsensor.xml \
+	config/econet/ezw1204.xml \
 	config/electronicsolutions/dbmz.xml \
 	config/enblink/ss201-us-w_1308.xml \
 	config/enerwave/zw15rmplus.xml \
@@ -239,7 +258,10 @@ DISTFILES =	.gitignore \
 	config/evolve/lrm-as.xml \
 	config/evolve/lsm-15.xml \
 	config/evolve/ltm-5.xml \
+	config/evolve/t-100.xml \
 	config/fakro/arz.xml \
+	config/fakro/arzsolar.xml \
+	config/fakro/zrh12.xml \
 	config/fakro/zwp10.xml \
 	config/fakro/zwrs.xml \
 	config/fakro/zws12.xml \
@@ -261,25 +283,33 @@ DISTFILES =	.gitignore \
 	config/fibaro/fgpb101.xml \
 	config/fibaro/fgr221.xml \
 	config/fibaro/fgr223.xml \
+	config/fibaro/fgrgbw442.xml \
 	config/fibaro/fgrgbwm441.xml \
 	config/fibaro/fgrm222.xml \
 	config/fibaro/fgs211.xml \
 	config/fibaro/fgs212.xml \
 	config/fibaro/fgs213.xml \
+	config/fibaro/fgs214.xml \
 	config/fibaro/fgs221.xml \
 	config/fibaro/fgs222.xml \
 	config/fibaro/fgs223.xml \
+	config/fibaro/fgs224.xml \
 	config/fibaro/fgsd002.xml \
 	config/fibaro/fgss101.xml \
 	config/fibaro/fgt001.xml \
+	config/fibaro/fgwceu201.xml \
 	config/fibaro/fgwd111.xml \
 	config/fibaro/fgwds221.xml \
+	config/fibaro/fgwds221ss.xml \
 	config/fibaro/fgwoe.xml \
+	config/fibaro/fgwpb121.xml \
 	config/fibaro/fgwpe.xml \
 	config/fibaro/fgwpfzw5.xml \
 	config/fibaro/fgwpg111.xml \
 	config/fibaro/fgwr111.xml \
+	config/firstalert/zcombo-g.xml \
 	config/firstalert/zcombo.xml \
+	config/firstalert/zsmoke.xml \
 	config/followgood/swz-1002.xml \
 	config/forest/fs2z5232000002.xml \
 	config/fortrezz/fmi.xml \
@@ -295,22 +325,30 @@ DISTFILES =	.gitignore \
 	config/frostdale/fdn2311.xml \
 	config/frostdale/fdn2nxx.xml \
 	config/ge/12719-plugin-switch.xml \
+	config/ge/12720.xml \
 	config/ge/12724-dimmer.xml \
 	config/ge/12727.xml \
+	config/ge/14280-plugin-dimmer.xml \
 	config/ge/14282-plugin-switch.xml \
 	config/ge/14284.xml \
+	config/ge/14285.xml \
 	config/ge/14288-outlet.xml \
 	config/ge/14291-switch.xml \
 	config/ge/14292-toggle-switch.xml \
 	config/ge/14294-dimmer.xml \
 	config/ge/14295-dimmer-toggle.xml \
+	config/ge/14298.xml \
+	config/ge/14322-dimmer-toggle.xml \
 	config/ge/26931-motion-switch.xml \
+	config/ge/26932-motion-dimmer.xml \
 	config/ge/26933-motion-dimmer.xml \
 	config/ge/28167-plugin-dimmer.xml \
 	config/ge/28169-plugin-switch.xml \
 	config/ge/45604.xml \
 	config/ge/46201-switch.xml \
+	config/ge/46202-switch.xml \
 	config/ge/46203-dimmer.xml \
+	config/ge/46204-dimmer-toggle.xml \
 	config/ge/dimmer.xml \
 	config/ge/dimmer_module.xml \
 	config/ge/hinge-pin.xml \
@@ -320,18 +358,22 @@ DISTFILES =	.gitignore \
 	config/ge/zw4001-switch.xml \
 	config/ge/zw6302.xml \
 	config/gocontrol/GC-TBZ48L.xml \
+	config/goodway/td14010.xml \
 	config/gr/gr-302n.xml \
 	config/gr/gr105.xml \
 	config/gr/gr105n.xml \
 	config/gr/grb3.xml \
 	config/graber/brz1.xml \
 	config/graber/csz1.xml \
+	config/graber/mcz1.xml \
 	config/graber/rsz1.xml \
 	config/graber/vcz1.xml \
 	config/greenwave/gs1110-1-gr-1.xml \
 	config/greenwave/powernode1.xml \
 	config/greenwave/powernode6.xml \
 	config/guardtec/gkw2000d.xml \
+	config/hab/iblindsV2.xml \
+	config/hab/iblindsV3.xml \
 	config/hank/hkzw-dws01.xml \
 	config/hank/hkzw-fld01.xml \
 	config/hank/hkzw-ms01.xml \
@@ -341,6 +383,7 @@ DISTFILES =	.gitignore \
 	config/hank/hkzw-so01-smartplug.xml \
 	config/hank/hkzw-so03.xml \
 	config/hank/hkzw-so05-smartplug.xml \
+	config/hank/hkzw-so08-smartplug.xml \
 	config/hank/scenecontroller1.xml \
 	config/hank/scenecontroller4.xml \
 	config/heiman/HS1CA-Z.xml \
@@ -371,8 +414,11 @@ DISTFILES =	.gitignore \
 	config/homeseer/hsm100.xml \
 	config/homeseer/hsm200.xml \
 	config/homeseer/ztroller.xml \
+	config/honeywell/2681-plugin-dimmer.xml \
+	config/honeywell/3830-zw3107.xml \
 	config/honeywell/39348-ZW4005.xml \
 	config/honeywell/39348-zw4008.xml \
+	config/honeywell/39349-ZW1002.xml \
 	config/honeywell/39351-ZW3005.xml \
 	config/honeywell/39351-ZW3010.xml \
 	config/honeywell/39357-ZW3004.xml \
@@ -396,14 +442,18 @@ DISTFILES =	.gitignore \
 	config/idlock/idlock101.xml \
 	config/idlock/idlock150.xml \
 	config/images/2gig/ct100.png \
+	config/images/2gig/ct200.png \
 	config/images/2gig/ct32.png \
 	config/images/BeNext/AlarmSound.png \
 	config/images/BeNext/DoorSensor.png \
 	config/images/BeNext/Molite.png \
+	config/images/BeNext/P1dongle.png \
 	config/images/BeNext/TagReader.png \
 	config/images/BeNext/TagReader500.png \
 	config/images/BeNext/mydisplay.png \
 	config/images/BeNext/mygate.png \
+	config/images/DefaultProductImage.png \
+	config/images/abus/SHRM10000.jpg \
 	config/images/act/lfm20.png \
 	config/images/act/zdm230.png \
 	config/images/act/zdp100.png \
@@ -470,24 +520,35 @@ DISTFILES =	.gitignore \
 	config/images/aeotec/zwa004.png \
 	config/images/aeotec/zwa005.png \
 	config/images/aeotec/zwa006.png \
+	config/images/aeotec/zwa009.png \
+	config/images/aeotec/zwa011.png \
+	config/images/aeotec/zwa012.png \
+	config/images/aeotec/zwa019.png \
 	config/images/aeotec/zwa021.png \
+	config/images/aeotec/zwa023.png \
 	config/images/airlinemechanical/zds-ud10.png \
 	config/images/alfred/DB2.png \
 	config/images/assa_abloy/ConexisL1.png \
 	config/images/assa_abloy/KeyfreeConnected-plus.png \
 	config/images/assa_abloy/KeyfreeConnected.png \
+	config/images/assa_abloy/ProSLKey-FreeDeadbolt.png \
 	config/images/assa_abloy/PushButtonDeadbolt.png \
 	config/images/assa_abloy/TouchDeadbolt.png \
 	config/images/assa_abloy/TouchLever.png \
 	config/images/assa_abloy/nexTouch.png \
+	config/images/assa_abloy/yrd1x0.png \
+	config/images/assa_abloy/yrm276.png \
 	config/images/august/asl-03.png \
 	config/images/buffalo/hw-100v15a-zw.png \
+	config/images/building36/b36-t10.png \
 	config/images/comfort/ucm.png \
+	config/images/connecthome/CH_201.png \
 	config/images/cooper/RF9501.png \
 	config/images/cooper/RF9505-T.png \
 	config/images/cooper/RF9517.png \
 	config/images/cooper/RF9540-N.png \
 	config/images/cooper/RF9542-Z.png \
+	config/images/cooper/RF9601.png \
 	config/images/cooper/rf9534.png \
 	config/images/danfoss/living.png \
 	config/images/danfoss/rsroom.png \
@@ -505,12 +566,14 @@ DISTFILES =	.gitignore \
 	config/images/diehlcontrols/766366.png \
 	config/images/dlink/dch-z110.png \
 	config/images/dlink/dch-z120.png \
+	config/images/dlink/dch-z210.png \
 	config/images/dlink/dch-z510.png \
 	config/images/dome/0002.png \
 	config/images/dome/0085.png \
 	config/images/dome/0086.png \
 	config/images/dome/0088.png \
 	config/images/dome/0201.png \
+	config/images/dome/dmex1.png \
 	config/images/domitech/zb22uk.png \
 	config/images/domitech/ze27eu.png \
 	config/images/dragontech/wd-100.png \
@@ -518,12 +581,14 @@ DISTFILES =	.gitignore \
 	config/images/duwi/zw-edan-300.png \
 	config/images/duwi/zw-zdan-300.png \
 	config/images/duwi/zwws.png \
+	config/images/ecodim/0.7.jpg \
 	config/images/ecolink/doorwindow.png \
 	config/images/ecolink/firefighter.png \
 	config/images/ecolink/floodfreeze.png \
 	config/images/ecolink/motion.png \
 	config/images/ecolink/sensor.png \
 	config/images/ecolink/tiltsensor.png \
+	config/images/econet/ezw1204.png \
 	config/images/electronicsolutions/dbmz.png \
 	config/images/enblink/ss201-us-w_1308.png \
 	config/images/enerwave/zw15rmplus.png \
@@ -531,6 +596,7 @@ DISTFILES =	.gitignore \
 	config/images/enerwave/zw20rm.png \
 	config/images/enerwave/zwn-bpc.png \
 	config/images/enerwave/zwnrsm1plus.png \
+	config/images/enerwave/zwnrsm2plus.png \
 	config/images/eurotronic/eur_airquality.png \
 	config/images/eurotronic/eur_cometz.png \
 	config/images/eurotronic/eur_spiritz.png \
@@ -563,12 +629,14 @@ DISTFILES =	.gitignore \
 	config/images/everspring/tse03.png \
 	config/images/evolve/lfm-20.png \
 	config/images/evolve/ltm-5.png \
+	config/images/evolve/t-100.png \
 	config/images/fakro/arz.png \
 	config/images/fakro/zws12.png \
 	config/images/fibaro/fgbs222.png \
 	config/images/fibaro/fgcd001.png \
 	config/images/fibaro/fgd212.png \
 	config/images/fibaro/fgdw2.png \
+	config/images/fibaro/fgfs101.png \
 	config/images/fibaro/fgfs101zw5.png \
 	config/images/fibaro/fggc001.png \
 	config/images/fibaro/fgk001.png \
@@ -578,18 +646,27 @@ DISTFILES =	.gitignore \
 	config/images/fibaro/fgmszw5.png \
 	config/images/fibaro/fgpb101.png \
 	config/images/fibaro/fgr223.png \
+	config/images/fibaro/fgrgbw442.png \
 	config/images/fibaro/fgrgbwm441.png \
+	config/images/fibaro/fgrm222.png \
 	config/images/fibaro/fgs213.png \
+	config/images/fibaro/fgs222.png \
 	config/images/fibaro/fgs223.png \
+	config/images/fibaro/fgs224.png \
 	config/images/fibaro/fgsd002.png \
 	config/images/fibaro/fgt001.png \
+	config/images/fibaro/fgwceu201.png \
 	config/images/fibaro/fgwd111.png \
+	config/images/fibaro/fgwds221.png \
 	config/images/fibaro/fgwoe.png \
+	config/images/fibaro/fgwpb121.png \
 	config/images/fibaro/fgwpe.png \
 	config/images/fibaro/fgwpfzw5.png \
 	config/images/fibaro/fgwpg111.png \
 	config/images/fibaro/fgwr111.png \
+	config/images/firstalert/zcombo-g.png \
 	config/images/firstalert/zcombo.png \
+	config/images/firstalert/zsmoke.png \
 	config/images/followgood/swz-1002.png \
 	config/images/forest/fs2z5232000002.png \
 	config/images/fortrezz/fmi.png \
@@ -606,20 +683,26 @@ DISTFILES =	.gitignore \
 	config/images/ge/12719-plugin-switch.png \
 	config/images/ge/12724-dimmer.png \
 	config/images/ge/12727.png \
+	config/images/ge/14280-plugin-dimmer.png \
 	config/images/ge/14282-plugin-switch.png \
 	config/images/ge/14284.png \
+	config/images/ge/14285.png \
 	config/images/ge/14288-outlet.png \
 	config/images/ge/14291-switch.png \
 	config/images/ge/14292-toggle-switch.png \
 	config/images/ge/14294-dimmer.png \
 	config/images/ge/14295-dimmer-toggle.png \
+	config/images/ge/14298.png \
+	config/images/ge/14322-dimmer-toggle.png \
 	config/images/ge/26931-motion-switch.png \
 	config/images/ge/26933-motion-dimmer.png \
 	config/images/ge/28167-plugin-dimmer.png \
 	config/images/ge/28169-plugin-switch.png \
 	config/images/ge/45604.png \
 	config/images/ge/46201-switch.png \
+	config/images/ge/46202-switch.png \
 	config/images/ge/46203-dimmer.png \
+	config/images/ge/46204-dimmer-toggle.png \
 	config/images/ge/dimmer.png \
 	config/images/ge/dimmer_module.png \
 	config/images/ge/hinge-pin.png \
@@ -627,17 +710,21 @@ DISTFILES =	.gitignore \
 	config/images/ge/relay.png \
 	config/images/ge/ze26i.png \
 	config/images/ge/zw6302.png \
+	config/images/goodway/td14010.png \
 	config/images/gr/gr-302n.png \
 	config/images/gr/gr105.png \
 	config/images/gr/gr105n.png \
 	config/images/graber/brz1.png \
 	config/images/graber/csz1.png \
+	config/images/graber/mcz1.png \
 	config/images/graber/rsz1.png \
 	config/images/graber/vcz1.png \
 	config/images/greenwave/gs1110-1-gr-1.png \
 	config/images/greenwave/powernode1.png \
 	config/images/greenwave/powernode6.png \
 	config/images/guardtec/gkw2000d.png \
+	config/images/hab/iblinds.png \
+	config/images/hab/iblindsV3.png \
 	config/images/hank/hkzw-dws01.png \
 	config/images/hank/hkzw-fld01.png \
 	config/images/hank/hkzw-ms01.png \
@@ -661,6 +748,7 @@ DISTFILES =	.gitignore \
 	config/images/homeseer/hs-ds100plus.png \
 	config/images/homeseer/hs-fc200plus.png \
 	config/images/homeseer/hs-fls100plus.png \
+	config/images/homeseer/hs-fs100plus.png \
 	config/images/homeseer/hs-ls100plus.png \
 	config/images/homeseer/hs-ms100plus.png \
 	config/images/homeseer/hs-wd100plus.png \
@@ -668,8 +756,11 @@ DISTFILES =	.gitignore \
 	config/images/homeseer/hs-ws100plus.png \
 	config/images/homeseer/hs-ws200plus.png \
 	config/images/homeseer/hsm200.png \
+	config/images/honeywell/2681-plugin-dimmer.png \
+	config/images/honeywell/3830-zw3107.png \
 	config/images/honeywell/39348-ZW4005.png \
-	config/images/honeywell/39348-zw4008.png \
+	config/images/honeywell/39348-ZW4008.png \
+	config/images/honeywell/39349-ZW1002.png \
 	config/images/honeywell/39351-ZW3005.png \
 	config/images/honeywell/39357-ZW3004.png \
 	config/images/honeywell/39358-ZW4002.png \
@@ -696,39 +787,60 @@ DISTFILES =	.gitignore \
 	config/images/inovelli/lzw30.png \
 	config/images/inovelli/lzw31-sn.png \
 	config/images/inovelli/lzw31.png \
+	config/images/inovelli/lzw36.png \
 	config/images/inovelli/lzw40.png \
 	config/images/inovelli/lzw41.png \
 	config/images/inovelli/lzw42.png \
 	config/images/inovelli/lzw60.png \
+	config/images/inovelli/nzw30.png \
 	config/images/inovelli/simple_module.png \
 	config/images/iwatsu/ne-4ct-2p.png \
 	config/images/iwatsu/ne-4ct.png \
 	config/images/jasco/45601.png \
 	config/images/kaipule/im20.png \
+	config/images/kwikset/888.png \
 	config/images/kwikset/914c.png \
+	config/images/kwikset/916.jpg \
 	config/images/kwikset/smartcode.png \
 	config/images/leviton/dz15s.png \
 	config/images/leviton/dz6hd.png \
+	config/images/leviton/dzpa1.png \
 	config/images/leviton/dzpd3.png \
 	config/images/leviton/vrcs2.png \
 	config/images/leviton/vrf01.png \
 	config/images/leviton/vri10.png \
+	config/images/leviton/vrpa1.png \
+	config/images/leviton/vrpd3.png \
 	config/images/leviton/vrs15.png \
+	config/images/leviton/zw15r.png \
+	config/images/leviton/zw4sf.png \
 	config/images/linear/LB60Z-1.png \
 	config/images/linear/WD500Z5-1.png \
+	config/images/linear/WT00Z5-1.png \
 	config/images/linear/gd00z-7.png \
 	config/images/linear/ngd00z.png \
 	config/images/logicsoft/ZDB5100.png \
 	config/images/logicsoft/ZHC5010.png \
+	config/images/mcohome/015f_5102_d411.png \
 	config/images/mcohome/mh7h.png \
+	config/images/mcohome/mh8fceu0803.png \
 	config/images/mcohome/mhp220.png \
 	config/images/mcohome/mhp511.png \
+	config/images/mcohome/mhs513.png \
 	config/images/merten/5044xx.png \
 	config/images/merten/5046xx.png \
 	config/images/merten/506004.png \
 	config/images/merten/508244.png \
 	config/images/miyakawaelectric/me-d101.png \
+	config/images/namron/1402756.png \
+	config/images/namron/4512710.png \
+	config/images/namron/4512712.jpg \
+	config/images/namron/4512714.jpg \
+	config/images/namron/4512715.png \
+	config/images/namron/4512720.jpg \
+	config/images/namron/4512724.png \
 	config/images/nexia/db100z.png \
+	config/images/nexia/th100nx.png \
 	config/images/nodon/asp3100SmartPlug.png \
 	config/images/nodon/crc3100OctanRemote.png \
 	config/images/nodon/crc360xSofremote.png \
@@ -737,6 +849,8 @@ DISTFILES =	.gitignore \
 	config/images/northq/nq92021.png \
 	config/images/oomi/ft100.png \
 	config/images/oomi/ft111.png \
+	config/images/oomi/ft112.png \
+	config/images/oomi/ft118.png \
 	config/images/permundo/psc132zw.png \
 	config/images/permundo/psc234zw.png \
 	config/images/philio/pad02.png \
@@ -773,21 +887,28 @@ DISTFILES =	.gitignore \
 	config/images/popp/solar-siren.png \
 	config/images/popp/zweather.png \
 	config/images/prowell/zw-702.png \
+	config/images/q-light/q-light_puck.png \
+	config/images/q-light/q-light_zerodim.png \
+	config/images/q-light/q-light_zerodim_2pol.png \
 	config/images/qees/reto-dimmer-plus.png \
 	config/images/qees/reto-plugin-switch.png \
+	config/images/qolsys/qz2140-840.png \
 	config/images/qubino/ZMNHADx.png \
 	config/images/qubino/ZMNHBDx.png \
 	config/images/qubino/ZMNHCDx.png \
 	config/images/qubino/ZMNHDA2.png \
 	config/images/qubino/ZMNHDDx.png \
+	config/images/qubino/ZMNHHDx.png \
 	config/images/qubino/ZMNHIDx.png \
 	config/images/qubino/ZMNHNDx.png \
 	config/images/qubino/ZMNHODx.png \
+	config/images/qubino/ZMNHQDx.png \
 	config/images/qubino/ZMNHSDx.png \
 	config/images/qubino/ZMNHTDx.png \
 	config/images/qubino/ZMNHVDx.png \
 	config/images/qubino/ZMNHWD1.png \
 	config/images/qubino/ZMNHYDx.png \
+	config/images/qubino/ZMNKADx.png \
 	config/images/qubino/zmnhxdx.png \
 	config/images/quby/qb2.png \
 	config/images/rcs/em52-zw.png \
@@ -803,6 +924,8 @@ DISTFILES =	.gitignore \
 	config/images/remotec/zxt-310.png \
 	config/images/remotec/zxt-600.png \
 	config/images/ring/PIR-SS.png \
+	config/images/ring/contact-sensor-v2.png \
+	config/images/ring/motion-detector-v2.png \
 	config/images/schlage/BE468ZP.png \
 	config/images/schlage/BE469.png \
 	config/images/schlage/BE469ZP.png \
@@ -811,12 +934,23 @@ DISTFILES =	.gitignore \
 	config/images/sensative/strips.png \
 	config/images/sensative/stripscomfort.png \
 	config/images/sercomm/sw-clp01-eu.png \
+	config/images/shenzen_neo/ls03ch.jpg \
 	config/images/shenzen_neo/nas-ab01z.png \
+	config/images/shenzen_neo/nas-cs01z.jpg \
 	config/images/shenzen_neo/nas-ds01z.png \
 	config/images/shenzen_neo/nas-pd01z.png \
+	config/images/shenzen_neo/nas-pd02z.png \
+	config/images/shenzen_neo/nas-sc03ze.jpg \
 	config/images/shenzen_neo/nas-wr01z.png \
+	config/images/shenzen_neo/nas-wr01ze.png \
 	config/images/shenzen_neo/nas-ws02z.png \
+	config/images/shenzen_saykey/SK-3007-05.png \
+	config/images/shenzhen-neo/eu-1.png \
+	config/images/shenzhen-neo/eu-2.png \
+	config/images/shenzhen-neo/eu-3.png \
+	config/images/simon/10002020-13X.png \
 	config/images/simon/10002034-13X.png \
+	config/images/simon/10002080-13X.png \
 	config/images/smartthings/pgc401m.png \
 	config/images/smartthings/sth-eth200.png \
 	config/images/steinel/is140-2.png \
@@ -824,22 +958,37 @@ DISTFILES =	.gitignore \
 	config/images/steinel/rs-led-d2.png \
 	config/images/steinel/xled-home-2.png \
 	config/images/stelpro/stzw402.png \
+	config/images/sunricher/srzv9001k12dimz4.png \
+	config/images/sunricher/srzv9001k12dimz5.png \
+	config/images/sunricher/srzv9001k2dim.png \
+	config/images/sunricher/srzv9001k4dim.png \
+	config/images/sunricher/srzv9001k4dimg2.png \
 	config/images/sunricher/srzv9001k8.png \
 	config/images/sunricher/srzv9001t4dimeu.png \
+	config/images/sunricher/srzv9001tccteu.png \
 	config/images/sunricher/srzv9003t4rgbweu.png \
+	config/images/sunricher/srzv9101facct.png \
 	config/images/sunricher/srzv9101sachpeu.png \
+	config/images/sunricher/srzv9101sachpswitch.png \
+	config/images/sunricher/zv2835rac.png \
+	config/images/sunricher/zv9100a.png \
 	config/images/sunricher/zv9101.png \
 	config/images/swiid/swiidinter.png \
 	config/images/technisat/03009496.png \
+	config/images/technisat/03009497.png \
 	config/images/technisat/03009499.png \
 	config/images/telldus/tzdw100.png \
 	config/images/telldus/tzwp100.png \
 	config/images/telldus/tzwp102.png \
 	config/images/there/800z.png \
 	config/images/thermofloor/Heatit-Z-Push-button-8-white.png \
+	config/images/thermofloor/heatit0204.png \
 	config/images/thermofloor/heatit021.png \
 	config/images/thermofloor/heatit056.png \
+	config/images/thermofloor/heatit058.png \
+	config/images/thermofloor/heatit20a.png \
 	config/images/thermofloor/heatit_zdim.png \
+	config/images/thermofloor/heatitzm.png \
 	config/images/trane/TZEMT400AB32MAA.png \
 	config/images/trane/TZEMT400BB32MAA.png \
 	config/images/trane/TZEMT524AA21MA.png \
@@ -857,6 +1006,7 @@ DISTFILES =	.gitignore \
 	config/images/vision/zm1601eu.png \
 	config/images/vision/zm1601eu5.png \
 	config/images/vision/zm1602eu5.png \
+	config/images/vision/zm1701.png \
 	config/images/vision/zp3102.png \
 	config/images/vision/zp3111.png \
 	config/images/vision/zr1202us.png \
@@ -875,8 +1025,10 @@ DISTFILES =	.gitignore \
 	config/images/wenzhou/tz67.png \
 	config/images/wenzhou/tz68.png \
 	config/images/wenzhou/tz69.png \
+	config/images/wenzhou/tz77.png \
 	config/images/wenzhou/tz78.png \
 	config/images/wenzhou/tz88.png \
+	config/images/wenzhou/tze96.png \
 	config/images/widom/DRY.png \
 	config/images/widom/UBS104.png \
 	config/images/widom/UME304C_S.png \
@@ -885,6 +1037,9 @@ DISTFILES =	.gitignore \
 	config/images/widom/WDS2.png \
 	config/images/widom/WSP.png \
 	config/images/widom/WTED.png \
+	config/images/wink/wnk-mot1.png \
+	config/images/wink/wnk-sir1p.png \
+	config/images/zen17.png \
 	config/images/zipato/HS1CA-Z.png \
 	config/images/zipato/HS1CG-Z.png \
 	config/images/zipato/HS1SA-Z.png \
@@ -901,16 +1056,24 @@ DISTFILES =	.gitignore \
 	config/images/zooz/zen06.png \
 	config/images/zooz/zen15.png \
 	config/images/zooz/zen16.png \
+	config/images/zooz/zen17.png \
 	config/images/zooz/zen20.png \
 	config/images/zooz/zen20v2.png \
 	config/images/zooz/zen21.png \
 	config/images/zooz/zen21v3.png \
 	config/images/zooz/zen22.png \
+	config/images/zooz/zen23v3.png \
 	config/images/zooz/zen24v2.png \
 	config/images/zooz/zen26.png \
 	config/images/zooz/zen27.png \
 	config/images/zooz/zen30.png \
 	config/images/zooz/zen31.png \
+	config/images/zooz/zen32.png \
+	config/images/zooz/zen34.png \
+	config/images/zooz/zen71.png \
+	config/images/zooz/zen72.png \
+	config/images/zooz/zen76.png \
+	config/images/zooz/zen77.png \
 	config/images/zooz/zse09.png \
 	config/images/zooz/zse19.png \
 	config/images/zooz/zse29.png \
@@ -924,17 +1087,22 @@ DISTFILES =	.gitignore \
 	config/images/zwave.me/ZUno.png \
 	config/images/zwave.me/kfob.png \
 	config/images/zwave.me/popp_kfob-c.png \
+	config/images/zwave.me/razberry.png \
 	config/images/zwave.me/zme_raz5.png \
+	config/images/zwave.me/zme_wallc_s.png \
 	config/images/zwave.me/zweather.png \
+	config/images/zwp/PA-100.png \
 	config/images/zwp/WD-100.png \
 	config/ingersoll/dwzwave1.xml \
 	config/inovelli/lzw30-sn.xml \
 	config/inovelli/lzw30.xml \
 	config/inovelli/lzw31-sn.xml \
 	config/inovelli/lzw31.xml \
+	config/inovelli/lzw36.xml \
 	config/inovelli/lzw40.xml \
 	config/inovelli/lzw41.xml \
 	config/inovelli/lzw42.xml \
+	config/inovelli/lzw45.xml \
 	config/inovelli/lzw60.xml \
 	config/inovelli/nzw1201.xml \
 	config/inovelli/nzw30.xml \
@@ -952,10 +1120,14 @@ DISTFILES =	.gitignore \
 	config/jasco/45601.xml \
 	config/kaipule/im20.xml \
 	config/kaipule/ix32.xml \
+	config/kwikset/888.xml \
+	config/kwikset/910.xml \
 	config/kwikset/914c.xml \
+	config/kwikset/916.xml \
 	config/kwikset/smartcode.xml \
 	config/leviton/dz15s.xml \
 	config/leviton/dz6hd.xml \
+	config/leviton/dzpa1.xml \
 	config/leviton/dzpd3.xml \
 	config/leviton/rzi10.xml \
 	config/leviton/vrcpg.xml \
@@ -965,7 +1137,11 @@ DISTFILES =	.gitignore \
 	config/leviton/vrf01.xml \
 	config/leviton/vri06.xml \
 	config/leviton/vri10.xml \
+	config/leviton/vrpa1.xml \
+	config/leviton/vrpd3.xml \
 	config/leviton/vrs15.xml \
+	config/leviton/zw15r.xml \
+	config/leviton/zw4sf.xml \
 	config/linear/GC-TBZ48.xml \
 	config/linear/LB60Z-1.xml \
 	config/linear/PD300Z-2.xml \
@@ -977,6 +1153,7 @@ DISTFILES =	.gitignore \
 	config/linear/WD500Z5-1.xml \
 	config/linear/WS15Z-1.xml \
 	config/linear/WT00Z-1.xml \
+	config/linear/WT00Z5-1.xml \
 	config/linear/gd00z-7.xml \
 	config/linear/ngd00z.xml \
 	config/logicsoft/ZDB5100.xml \
@@ -985,12 +1162,16 @@ DISTFILES =	.gitignore \
 	config/manufacturer_specific.xml \
 	config/manufacturer_specific.xsd \
 	config/mcohome/a8-9.xml \
+	config/mcohome/mh10pm25wd.xml \
 	config/mcohome/mh7h.xml \
 	config/mcohome/mh8fceu.xml \
+	config/mcohome/mh8fceu0803.xml \
 	config/mcohome/mh9co2.xml \
+	config/mcohome/mhdt411.xml \
 	config/mcohome/mhp210.xml \
 	config/mcohome/mhp220.xml \
 	config/mcohome/mhp511.xml \
+	config/mcohome/mhs220.xml \
 	config/mcohome/mhs311.xml \
 	config/mcohome/mhs312.xml \
 	config/mcohome/mhs314.xml \
@@ -1005,7 +1186,15 @@ DISTFILES =	.gitignore \
 	config/merten/50x5xx.xml \
 	config/miyakawaelectric/me-d101.xml \
 	config/namron/1402756.xml \
+	config/namron/4512710.xml \
+	config/namron/4512712.xml \
+	config/namron/4512714.xml \
+	config/namron/4512715.xml \
+	config/namron/4512720.xml \
+	config/namron/4512724.xml \
+	config/nei/ms11z.xml \
 	config/nexia/db100z.xml \
+	config/nexia/th100nx.xml \
 	config/nodon/asp3100SmartPlug.xml \
 	config/nodon/crc3100OctanRemote.xml \
 	config/nodon/crc360xSofremote.xml \
@@ -1067,8 +1256,12 @@ DISTFILES =	.gitignore \
 	config/popp/solar-siren.xml \
 	config/popp/zweather.xml \
 	config/prowell/zw-702.xml \
+	config/q-light/q-light_puck.xml \
+	config/q-light/q-light_zerodim.xml \
+	config/q-light/q-light_zerodim_2pol.xml \
 	config/qees/reto-dimmer-plus.xml \
 	config/qees/reto-plugin-switch.xml \
+	config/qolsys/qz2140-840.xml \
 	config/qubino/ZMNHAA2.xml \
 	config/qubino/ZMNHADx.xml \
 	config/qubino/ZMNHBA2.xml \
@@ -1086,6 +1279,7 @@ DISTFILES =	.gitignore \
 	config/qubino/ZMNHKDx.xml \
 	config/qubino/ZMNHLAx.xml \
 	config/qubino/ZMNHLDx.xml \
+	config/qubino/ZMNHMDx.xml \
 	config/qubino/ZMNHNDx.xml \
 	config/qubino/ZMNHODx.xml \
 	config/qubino/ZMNHQDx.xml \
@@ -1117,6 +1311,8 @@ DISTFILES =	.gitignore \
 	config/remotec/zxt-310.xml \
 	config/remotec/zxt-600.xml \
 	config/ring/PIR-SS.xml \
+	config/ring/contact-sensor-v2.xml \
+	config/ring/motion-detector-v2.xml \
 	config/schlage/BE468.xml \
 	config/schlage/BE468ZP.xml \
 	config/schlage/BE469.xml \
@@ -1125,21 +1321,30 @@ DISTFILES =	.gitignore \
 	config/schlagelink/41.xml \
 	config/schlagelink/itemp.xml \
 	config/schlagelink/minikeypad.xml \
+	config/sensative/kaipule/im20.xml \
+	config/sensative/kaipule/ix32.xml \
 	config/sensative/strips.xml \
 	config/sensative/stripscomfort.xml \
 	config/sercomm/sw-clp01-eu.xml \
 	config/shenzen_neo/ls01ch.xml \
 	config/shenzen_neo/ls02ch.xml \
+	config/shenzen_neo/ls03ch.xml \
 	config/shenzen_neo/nas-ab01z.xml \
+	config/shenzen_neo/nas-cs01z.xml \
 	config/shenzen_neo/nas-ds01z.xml \
 	config/shenzen_neo/nas-pd01z.xml \
 	config/shenzen_neo/nas-pd02z.xml \
+	config/shenzen_neo/nas-pd03z.xml \
 	config/shenzen_neo/nas-rc01z.xml \
+	config/shenzen_neo/nas-sc03ze.xml \
 	config/shenzen_neo/nas-wr01z.xml \
 	config/shenzen_neo/nas-wr01ze.xml \
 	config/shenzen_neo/nas-ws02z.xml \
+	config/shenzen_saykey/sk-3007-05.xml \
+	config/simon/10002020-13X.xml \
 	config/simon/10002034-13X.xml \
 	config/simon/10002041-13X.xml \
+	config/simon/10002080-13X.xml \
 	config/smartthings/pgc401m.xml \
 	config/smartthings/sth-eth200.xml \
 	config/somfy/1811265_ZRTSI.xml \
@@ -1148,23 +1353,40 @@ DISTFILES =	.gitignore \
 	config/steinel/rs-led-d2.xml \
 	config/steinel/xled-home-2.xml \
 	config/stelpro/stzw402.xml \
+	config/sunricher/srzv9001k12dimz4.xml \
+	config/sunricher/srzv9001k12dimz5.xml \
+	config/sunricher/srzv9001k2dim.xml \
+	config/sunricher/srzv9001k4dim.xml \
+	config/sunricher/srzv9001k4dimg2.xml \
 	config/sunricher/srzv9001k8.xml \
 	config/sunricher/srzv9001t4dimeu.xml \
+	config/sunricher/srzv9001tccteu.xml \
 	config/sunricher/srzv9003t4rgbweu.xml \
+	config/sunricher/srzv9100aa.xml \
 	config/sunricher/srzv9101sachpeu.xml \
+	config/sunricher/srzv9101sachpswitch.xml \
+	config/sunricher/zv2835rac.xml \
 	config/sunricher/zv9101.xml \
+	config/sunricher/zv9101fa.xml \
 	config/swiid/swiidinter.xml \
 	config/swiid/swiidplug.xml \
 	config/technisat/03009496.xml \
+	config/technisat/03009497.xml \
 	config/technisat/03009499.xml \
 	config/telldus/tzdw100.xml \
 	config/telldus/tzwp100.xml \
 	config/telldus/tzwp102.xml \
 	config/there/800z.xml \
 	config/thermofloor/heatit-zdim.xml \
+	config/thermofloor/heatit021-v1.92.xml \
 	config/thermofloor/heatit021.xml \
 	config/thermofloor/heatit056.xml \
+	config/thermofloor/heatit058.xml \
+	config/thermofloor/heatit204.xml \
+	config/thermofloor/heatit20a.xml \
+	config/thermofloor/heatitz4.xml \
 	config/thermofloor/heatitz8.xml \
+	config/thermofloor/heatitzm.xml \
 	config/trane/TZEMT400AB32MAA.xml \
 	config/trane/TZEMT400BB32MAA.xml \
 	config/trane/TZEMT524AA21MA.xml \
@@ -1214,9 +1436,11 @@ DISTFILES =	.gitignore \
 	config/wenzhou/tz68.xml \
 	config/wenzhou/tz69.xml \
 	config/wenzhou/tz74.xml \
+	config/wenzhou/tz77.xml \
 	config/wenzhou/tz78.xml \
 	config/wenzhou/tz79.xml \
 	config/wenzhou/tz88.xml \
+	config/wenzhou/tze96.xml \
 	config/widom/DRY.xml \
 	config/widom/UBS104.xml \
 	config/widom/UME304C_S.xml \
@@ -1225,6 +1449,8 @@ DISTFILES =	.gitignore \
 	config/widom/WDS2.xml \
 	config/widom/WSP.xml \
 	config/widom/WTED.xml \
+	config/wink/wnk-mot1.xml \
+	config/wink/wnk-sir1p.xml \
 	config/zipato/MiniKeypad.xml \
 	config/zipato/RGBBulb.xml \
 	config/zipato/RGBBulb2.xml \
@@ -1236,6 +1462,7 @@ DISTFILES =	.gitignore \
 	config/zooz/zen07.xml \
 	config/zooz/zen15.xml \
 	config/zooz/zen16.xml \
+	config/zooz/zen17.xml \
 	config/zooz/zen20.xml \
 	config/zooz/zen20v2.xml \
 	config/zooz/zen21.xml \
@@ -1243,6 +1470,7 @@ DISTFILES =	.gitignore \
 	config/zooz/zen22.xml \
 	config/zooz/zen22v2.xml \
 	config/zooz/zen23.xml \
+	config/zooz/zen23v3.xml \
 	config/zooz/zen24.xml \
 	config/zooz/zen24v2.xml \
 	config/zooz/zen25.xml \
@@ -1250,6 +1478,12 @@ DISTFILES =	.gitignore \
 	config/zooz/zen27.xml \
 	config/zooz/zen30.xml \
 	config/zooz/zen31.xml \
+	config/zooz/zen32.xml \
+	config/zooz/zen34.xml \
+	config/zooz/zen71.xml \
+	config/zooz/zen72.xml \
+	config/zooz/zen76.xml \
+	config/zooz/zen77.xml \
 	config/zooz/zse08.xml \
 	config/zooz/zse09.xml \
 	config/zooz/zse18.xml \
@@ -1273,6 +1507,7 @@ DISTFILES =	.gitignore \
 	config/zwave.me/iTemp.xml \
 	config/zwave.me/kfob.xml \
 	config/zwave.me/popp_kfob-c.xml \
+	config/zwave.me/razberry.xml \
 	config/zwave.me/zme_raz5.xml \
 	config/zwave.me/zweather.xml \
 	config/zwcfg.xsd \
@@ -1497,6 +1732,8 @@ DISTFILES =	.gitignore \
 	cpp/src/command_classes/SimpleAVCommandItem.h \
 	cpp/src/command_classes/SoundSwitch.cpp \
 	cpp/src/command_classes/SoundSwitch.h \
+	cpp/src/command_classes/Supervision.cpp \
+	cpp/src/command_classes/Supervision.h \
 	cpp/src/command_classes/SwitchAll.cpp \
 	cpp/src/command_classes/SwitchAll.h \
 	cpp/src/command_classes/SwitchBinary.cpp \
diff --git a/cpp/src/vers.cpp b/cpp/src/vers.cpp
index 5a0a5acf..3fff11d2 100644
--- a/cpp/src/vers.cpp
+++ b/cpp/src/vers.cpp
@@ -1,5 +1,5 @@
 #include "Defs.h"
 uint16_t ozw_vers_major = 1;
 uint16_t ozw_vers_minor = 6;
-uint16_t ozw_vers_revision = 1149;
-char ozw_version_string[] = "1.6-1149-ga35732f1";
+uint16_t ozw_vers_revision = 1965;
+char ozw_version_string[] = "1.6-1965-g3fff11d2";