diff --git a/bundles/binding/org.openhab.binding.zwave/database/greenwave/np210.xml b/bundles/binding/org.openhab.binding.zwave/database/greenwave/np210.xml
index 845e668fa46..63752059b37 100644
--- a/bundles/binding/org.openhab.binding.zwave/database/greenwave/np210.xml
+++ b/bundles/binding/org.openhab.binding.zwave/database/greenwave/np210.xml
@@ -3,26 +3,39 @@
 	<Model>NP210</Model>
 	<Label lang="en">Smart PowerNode</Label>
 	<CommandClasses>
-		<Class><id>0x20</id></Class>
-		<Class><id>0x25</id></Class>
-		<Class><id>0x27</id></Class>
-		<Class><id>0x32</id></Class>
-		<Class><id>0x56</id></Class>
-		<Class><id>0x60</id></Class>
-		<Class><id>0x70</id></Class>
-		<Class><id>0x71</id></Class>
-		<Class><id>0x72</id></Class>
-		<Class><id>0x75</id></Class>
-		<Class><id>0x85</id></Class>
-		<Class><id>0x86</id></Class>
-		<Class><id>0x87</id></Class>
+		<Class><id>0x20</id></Class><!-- COMMAND_CLASS_BASIC -->
+		<Class><id>0x25</id></Class><!-- COMMAND_CLASS_SWITCH_BINARY -->
+		<Class><id>0x27</id></Class><!-- COMMAND_CLASS_SWITCH_ALL -->
+		<Class><id>0x32</id></Class><!-- COMMAND_CLASS_METER_V2 -->
+		<Class><id>0x56</id></Class><!-- COMMAND_CLASS_CRC_16_ENCAP -->
+		<Class><id>0x60</id></Class><!-- COMMAND_CLASS_MULTI_CHANNEL_V3 -->
+		<Class><id>0x70</id></Class><!-- COMMAND_CLASS_CONFIGURATION -->
+		<Class><id>0x71</id></Class><!-- COMMAND_CLASS_ALARM -->
+		<Class><id>0x72</id></Class><!-- COMMAND_CLASS_MANUFACTURER_SPECIFIC_V2 -->
+		<Class><id>0x75</id></Class><!-- COMMAND_CLASS_PROTECTION_V2 -->
+		<Class><id>0x85</id></Class><!-- COMMAND_CLASS_ASSOCIATION -->
+		<Class><id>0x86</id></Class><!-- COMMAND_CLASS_VERSION -->
+		<Class><id>0x87</id></Class><!-- COMMAND_CLASS_INDICATOR -->
 	</CommandClasses>
 	
 	
 	<Configuration>
+		<Parameter>
+			<Index>0</Index>
+			<Type>byte</Type>
+			<Minimum>1</Minimum>
+			<Maximum>100</Maximum>
+			<Default>10</Default>
+			<Size>1</Size>
+			<Label lang="en">Min. variation of load current</Label>
+			<Help lang="en">Minimum variation in load current before a message is sent. Value in percent (30 => 30%)</Help>
+		</Parameter>
+
 		<Parameter>
 			<Index>1</Index>
 			<Type>byte</Type>
+			<Minimum>1</Minimum>
+			<Maximum>255</Maximum>
 			<Default>2</Default>
 			<Size>1</Size>
 			<Label lang="en">No communication light</Label>
@@ -34,6 +47,7 @@
 			<Type>list</Type>
 			<Default>0</Default>
 			<Size>1</Size>
+			<ReadOnly>true</ReadOnly>
 			<Item>
 				<Value>128</Value>
 				<Label lang="en">Black</Label>
@@ -78,6 +92,69 @@
 			<Label lang="en">Room color</Label>
 			<Help lang="en">The room color (Corner wheel color) on the GreenWave device</Help>
 		</Parameter>
+		
+		<Parameter>
+			<Index>3</Index>
+			<Type>list</Type>
+			<Default>2</Default>
+			<Item>
+				<Value>0</Value>
+				<Label lang="en">Off</Label>
+			</Item>
+			<Item>
+				<Value>1</Value>
+				<Label lang="en">Last state</Label>
+			</Item>
+			<Item>
+				<Value>2</Value>
+				<Label lang="en">On</Label>
+			</Item>
+			<Size>1</Size>
+			<Label lang="en">Power-on state</Label>
+			<Help lang="en">Default state after power loss</Help>
+		</Parameter>
+		
+		<Parameter>
+			<Index>4</Index>
+			<Type>list</Type>
+			<Default>0</Default>
+			<Size>1</Size>
+			<Item>
+				<Value>0</Value>
+				<Label lang="en">LED flash off</Label>
+			</Item>
+			<Item>
+				<Value>1</Value>
+				<Label lang="en">LED flash on</Label>
+			</Item>
+			<Label lang="en">Network error</Label>
+			<Help lang="en">If the LED should indicate a network error by flashing or not</Help>
+		</Parameter>
 	</Configuration>
+
+	<Associations>
+		<Group>
+			<Index>1</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Wheel position change</Label>
+		</Group>
+		<Group>
+			<Index>2</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Current leakage on relay</Label>
+		</Group>
+		<Group>
+			<Index>3</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Power level change</Label>
+			<Help lang="en">The new power reading is sent if the delta of the change is greater than the defined minimum variation</Help>
+		</Group>
+		<Group>
+			<Index>4</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Over-current detection</Label>
+		</Group>
+	</Associations>
+
 </Product>
 
diff --git a/bundles/binding/org.openhab.binding.zwave/database/greenwave/np310.xml b/bundles/binding/org.openhab.binding.zwave/database/greenwave/np310.xml
new file mode 100644
index 00000000000..94866b401bc
--- /dev/null
+++ b/bundles/binding/org.openhab.binding.zwave/database/greenwave/np310.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product>
+	<Model>NP310</Model>
+	<Label lang="en">Smart PowerNode</Label>
+	<CommandClasses>
+		<Class><id>0x20</id></Class><!-- COMMAND_CLASS_BASIC -->
+		<Class><id>0x25</id></Class><!-- COMMAND_CLASS_SWITCH_BINARY -->
+		<Class><id>0x27</id></Class><!-- COMMAND_CLASS_SWITCH_ALL -->
+		<Class><id>0x32</id></Class><!-- COMMAND_CLASS_METER_V2 -->
+		<Class><id>0x56</id></Class><!-- COMMAND_CLASS_CRC_16_ENCAP -->
+		<Class><id>0x60</id></Class><!-- COMMAND_CLASS_MULTI_CHANNEL_V3 -->
+		<Class><id>0x70</id></Class><!-- COMMAND_CLASS_CONFIGURATION -->
+		<Class><id>0x71</id></Class><!-- COMMAND_CLASS_ALARM -->
+		<Class><id>0x72</id></Class><!-- COMMAND_CLASS_MANUFACTURER_SPECIFIC_V2 -->
+		<Class><id>0x75</id></Class><!-- COMMAND_CLASS_PROTECTION_V2 -->
+		<Class><id>0x85</id></Class><!-- COMMAND_CLASS_ASSOCIATION -->
+		<Class><id>0x86</id></Class><!-- COMMAND_CLASS_VERSION -->
+		<Class><id>0x87</id></Class><!-- COMMAND_CLASS_INDICATOR -->
+	</CommandClasses>
+	
+	
+	<Configuration>
+		<Parameter>
+			<Index>0</Index>
+			<Type>byte</Type>
+			<Minimum>1</Minimum>
+			<Maximum>100</Maximum>
+			<Default>10</Default>
+			<Size>1</Size>
+			<Label lang="en">Min. variation of load current</Label>
+			<Help lang="en">Minimum variation in load current before a message is sent. Value in percent (30 => 30%)</Help>
+		</Parameter>
+
+		<Parameter>
+			<Index>1</Index>
+			<Type>byte</Type>
+			<Minimum>1</Minimum>
+			<Maximum>255</Maximum>
+			<Default>2</Default>
+			<Size>1</Size>
+			<Label lang="en">No communication light</Label>
+			<Help lang="en">After how many minutes the GreenWave device should start flashing if the controller didn't communicate with this device</Help>
+		</Parameter>
+
+		<Parameter>
+			<Index>2</Index>
+			<Type>list</Type>
+			<Default>0</Default>
+			<Size>1</Size>
+			<ReadOnly>true</ReadOnly>
+			<Item>
+				<Value>-128</Value>
+				<Label lang="en">Black</Label>
+			</Item>
+			<Item>
+				<Value>-127</Value>
+				<Label lang="en">Green (1)</Label>
+			</Item>
+			<Item>
+				<Value>-126</Value>
+				<Label lang="en">Dark Blue (2)</Label>
+			</Item>
+			<Item>
+				<Value>-125</Value>
+				<Label lang="en">Red (3)</Label>
+			</Item>
+			<Item>
+				<Value>-124</Value>
+				<Label lang="en">Yellow (4)</Label>
+			</Item>
+			<Item>
+				<Value>-123</Value>
+				<Label lang="en">Purple (5)</Label>
+			</Item>
+			<Item>
+				<Value>-122</Value>
+				<Label lang="en">Orange (6)</Label>
+			</Item>
+			<Item>
+				<Value>-121</Value>
+				<Label lang="en">Light Blue (7)</Label>
+			</Item>
+			<Item>
+				<Value>-120</Value>
+				<Label lang="en">Pink (8)</Label>
+			</Item>
+			<Item>
+				<Value>-119</Value>
+				<Label lang="en">Locked</Label>
+			</Item>
+
+			<Label lang="en">Wheel position</Label>
+			<Help lang="en">Wheel position on the GreenWave device (read-only)</Help>
+		</Parameter>
+
+		<Parameter>
+			<Index>3</Index>
+			<Type>list</Type>
+			<Default>2</Default>
+			<Item>
+				<Value>0</Value>
+				<Label lang="en">Off</Label>
+			</Item>
+			<Item>
+				<Value>1</Value>
+				<Label lang="en">Last state</Label>
+			</Item>
+			<Item>
+				<Value>2</Value>
+				<Label lang="en">On</Label>
+			</Item>
+			<Size>1</Size>
+			<Label lang="en">Power-on state</Label>
+			<Help lang="en">Default state after power loss</Help>
+		</Parameter>
+
+		<Parameter>
+			<Index>4</Index>
+			<Type>list</Type>
+			<Default>0</Default>
+			<Size>1</Size>
+			<Item>
+				<Value>0</Value>
+				<Label lang="en">LED flash off</Label>
+			</Item>
+			<Item>
+				<Value>1</Value>
+				<Label lang="en">LED flash on</Label>
+			</Item>
+			<Label lang="en">Network error</Label>
+			<Help lang="en">If the LED should indicate a network error by flashing or not</Help>
+		</Parameter>
+	</Configuration>
+
+	<Associations>
+		<Group>
+			<Index>1</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Wheel position change</Label>
+		</Group>
+		<Group>
+			<Index>2</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Current leakage on relay</Label>
+		</Group>
+		<Group>
+			<Index>3</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Power level change</Label>
+			<Help lang="en">The new power reading is sent if the delta of the change is greater than the defined minimum variation</Help>
+		</Group>
+		<Group>
+			<Index>4</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Over-current detection</Label>
+		</Group>
+	</Associations>
+
+</Product>
+
diff --git a/bundles/binding/org.openhab.binding.zwave/database/greenwave/ns210.xml b/bundles/binding/org.openhab.binding.zwave/database/greenwave/ns210.xml
index 76d9fb756e7..da42f1be64e 100644
--- a/bundles/binding/org.openhab.binding.zwave/database/greenwave/ns210.xml
+++ b/bundles/binding/org.openhab.binding.zwave/database/greenwave/ns210.xml
@@ -3,24 +3,37 @@
 	<Model>NS210</Model>
 	<Label lang="en">Smart PowerNode</Label>
 	<CommandClasses>
-		<Class><id>0x20</id></Class>
-		<Class><id>0x25</id></Class>
-		<Class><id>0x27</id></Class>
-		<Class><id>0x32</id></Class>
-		<Class><id>0x56</id></Class>
-		<Class><id>0x70</id></Class>
-		<Class><id>0x71</id></Class>
-		<Class><id>0x72</id></Class>
-		<Class><id>0x75</id></Class>
-		<Class><id>0x85</id></Class>
-		<Class><id>0x86</id></Class>
-		<Class><id>0x87</id></Class>
+		<Class><id>0x20</id></Class><!-- COMMAND_CLASS_BASIC -->
+		<Class><id>0x25</id></Class><!-- COMMAND_CLASS_SWITCH_BINARY -->
+		<Class><id>0x27</id></Class><!-- COMMAND_CLASS_SWITCH_ALL -->
+		<Class><id>0x32</id></Class><!-- COMMAND_CLASS_METER_V2 -->
+		<Class><id>0x56</id></Class><!-- COMMAND_CLASS_CRC_16_ENCAP -->
+		<Class><id>0x70</id></Class><!-- COMMAND_CLASS_CONFIGURATION -->
+		<Class><id>0x71</id></Class><!-- COMMAND_CLASS_ALARM -->
+		<Class><id>0x72</id></Class><!-- COMMAND_CLASS_MANUFACTURER_SPECIFIC_V2 -->
+		<Class><id>0x75</id></Class><!-- COMMAND_CLASS_PROTECTION_V2 -->
+		<Class><id>0x85</id></Class><!-- COMMAND_CLASS_ASSOCIATION -->
+		<Class><id>0x86</id></Class><!-- COMMAND_CLASS_VERSION -->
+		<Class><id>0x87</id></Class><!-- COMMAND_CLASS_INDICATOR -->
 	</CommandClasses>
 	
 	<Configuration>
+		<Parameter>
+			<Index>0</Index>
+			<Type>byte</Type>
+			<Minimum>1</Minimum>
+			<Maximum>100</Maximum>
+			<Default>10</Default>
+			<Size>1</Size>
+			<Label lang="en">Min. variation of load current</Label>
+			<Help lang="en">Minimum variation in load current before a message is sent. Value in percent (30 => 30%)</Help>
+		</Parameter>
+
 		<Parameter>
 			<Index>1</Index>
 			<Type>byte</Type>
+			<Minimum>1</Minimum>
+			<Maximum>255</Maximum>
 			<Default>2</Default>
 			<Size>1</Size>
 			<Label lang="en">No communication light</Label>
@@ -32,6 +45,7 @@
 			<Type>list</Type>
 			<Default>0</Default>
 			<Size>1</Size>
+			<ReadOnly>true</ReadOnly>
 			<Item>
 				<Value>128</Value>
 				<Label lang="en">Black</Label>
@@ -76,7 +90,69 @@
 			<Label lang="en">Room color</Label>
 			<Help lang="en">The room color (Corner wheel color) on the GreenWave device</Help>
 		</Parameter>
+
+		<Parameter>
+			<Index>3</Index>
+			<Type>list</Type>
+			<Default>2</Default>
+			<Item>
+				<Value>0</Value>
+				<Label lang="en">Off</Label>
+			</Item>
+			<Item>
+				<Value>1</Value>
+				<Label lang="en">Last state</Label>
+			</Item>
+			<Item>
+				<Value>2</Value>
+				<Label lang="en">On</Label>
+			</Item>
+			<Size>1</Size>
+			<Label lang="en">Power-on state</Label>
+			<Help lang="en">Default state after power loss</Help>
+		</Parameter>
+		
+		<Parameter>
+			<Index>4</Index>
+			<Type>list</Type>
+			<Default>0</Default>
+			<Size>1</Size>
+			<Item>
+				<Value>0</Value>
+				<Label lang="en">LED flash off</Label>
+			</Item>
+			<Item>
+				<Value>1</Value>
+				<Label lang="en">LED flash on</Label>
+			</Item>
+			<Label lang="en">Network error</Label>
+			<Help lang="en">If the LED should indicate a network error by flashing or not</Help>
+		</Parameter>
 	</Configuration>
 
+	<Associations>
+		<Group>
+			<Index>1</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Wheel position change</Label>
+		</Group>
+		<Group>
+			<Index>2</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Current leakage on relay</Label>
+		</Group>
+		<Group>
+			<Index>3</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Power level change</Label>
+			<Help lang="en">The new power reading is sent if the delta of the change is greater than the defined minimum variation</Help>
+		</Group>
+		<Group>
+			<Index>4</Index>
+			<Maximum>1</Maximum>
+			<Label lang="en">Over-current detection</Label>
+		</Group>
+	</Associations>
+
 </Product>
 
diff --git a/bundles/binding/org.openhab.binding.zwave/database/greenwave/ns310.xml b/bundles/binding/org.openhab.binding.zwave/database/greenwave/ns310.xml
index f667a08c50b..c5a989f896b 100644
--- a/bundles/binding/org.openhab.binding.zwave/database/greenwave/ns310.xml
+++ b/bundles/binding/org.openhab.binding.zwave/database/greenwave/ns310.xml
@@ -3,26 +3,27 @@
 	<Model>NS310</Model>
 	<Label lang="en">Smart PowerNode</Label>
 	<CommandClasses>
-		<Class><id>0x20</id></Class>
-		<Class><id>0x25</id></Class>
-		<Class><id>0x27</id></Class>
-		<Class><id>0x32</id></Class>
-		<Class><id>0x56</id></Class>
-		<Class><id>0x70</id></Class>
-		<Class><id>0x71</id></Class>
-		<Class><id>0x72</id></Class>
-		<Class><id>0x75</id></Class>
-		<Class><id>0x85</id></Class>
-		<Class><id>0x86</id></Class>
-		<Class><id>0x87</id></Class>
+		<Class><id>0x20</id></Class><!-- COMMAND_CLASS_BASIC -->
+		<Class><id>0x25</id></Class><!-- COMMAND_CLASS_SWITCH_BINARY -->
+		<Class><id>0x27</id></Class><!-- COMMAND_CLASS_SWITCH_ALL -->
+		<Class><id>0x32</id></Class><!-- COMMAND_CLASS_METER_V2 -->
+		<Class><id>0x56</id></Class><!-- COMMAND_CLASS_CRC_16_ENCAP -->
+		<Class><id>0x70</id></Class><!-- COMMAND_CLASS_CONFIGURATION -->
+		<Class><id>0x71</id></Class><!-- COMMAND_CLASS_ALARM -->
+		<Class><id>0x72</id></Class><!-- COMMAND_CLASS_MANUFACTURER_SPECIFIC_V2 -->
+		<Class><id>0x75</id></Class><!-- COMMAND_CLASS_PROTECTION_V2 -->
+		<Class><id>0x85</id></Class><!-- COMMAND_CLASS_ASSOCIATION -->
+		<Class><id>0x86</id></Class><!-- COMMAND_CLASS_VERSION -->
+		<Class><id>0x87</id></Class><!-- COMMAND_CLASS_INDICATOR -->
 	</CommandClasses>
 	
 	<Configuration>
 		<Parameter>
 			<Index>0</Index>
-			<Type>int</Type>
-			<Minimum>0</Minimum>
+			<Type>byte</Type>
+			<Minimum>1</Minimum>
 			<Maximum>100</Maximum>
+			<Default>10</Default>
 			<Size>1</Size>
 			<Label lang="en">Min. variation of load current</Label>
 			<Help lang="en">Minimum variation in load current before a message is sent. Value in percent (30 => 30%)</Help>
@@ -30,10 +31,10 @@
 	
 		<Parameter>
 			<Index>1</Index>
-			<Type>int</Type>
+			<Type>byte</Type>
+			<Minimum>1</Minimum>
+			<Maximum>255</Maximum>
 			<Default>2</Default>
-			<Minimum>-1</Minimum>
-			<Maximum>127</Maximum>
 			<Size>1</Size>
 			<Label lang="en">No communication light</Label>
 			<Help lang="en">After how many minutes the GreenWave device should start flashing if the controller didn't communicate with this device</Help>
@@ -118,11 +119,11 @@
 			<Size>1</Size>
 			<Item>
 				<Value>0</Value>
-				<Label lang="en">LED flash on</Label>
+				<Label lang="en">LED flash off</Label>
 			</Item>
 			<Item>
 				<Value>1</Value>
-				<Label lang="en">LED flash off</Label>
+				<Label lang="en">LED flash on</Label>
 			</Item>
 			<Label lang="en">Network error</Label>
 			<Help lang="en">If the LED should indicate a network error by flashing or not</Help>
diff --git a/bundles/binding/org.openhab.binding.zwave/database/products.xml b/bundles/binding/org.openhab.binding.zwave/database/products.xml
index a2966f638e6..fc0b4486849 100644
--- a/bundles/binding/org.openhab.binding.zwave/database/products.xml
+++ b/bundles/binding/org.openhab.binding.zwave/database/products.xml
@@ -1270,17 +1270,18 @@
 				<Type>0003</Type>
 				<Id>0003</Id>
 			</Reference>
-			<Model>NP210</Model>
-			<Label lang="en">Smart PowerNode</Label>
-			<ConfigFile>greenwave/np210.xml</ConfigFile>
+			<Model>NP210/NP310</Model>
+			<Label lang="en">Smart PowerNode (6x)</Label>
+			<ConfigFile VersionMax="3">greenwave/np210.xml</ConfigFile>
+			<ConfigFile VersionMin="4">greenwave/np310.xml</ConfigFile>
 		</Product>
 		<Product>
 			<Reference>
 				<Type>0002</Type>
 				<Id>0002</Id>
 			</Reference>
-			<Model>NS210</Model>
-			<Label lang="en">Smart PowerNode</Label>
+			<Model>NS210/NS310</Model>
+			<Label lang="en">Smart PowerNode (single)</Label>
 			<ConfigFile VersionMax="3">greenwave/ns210.xml</ConfigFile>
 			<ConfigFile VersionMin="4">greenwave/ns310.xml</ConfigFile>
 		</Product>