diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..fd7522287
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - enhancement
+  - bug
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
\ No newline at end of file
diff --git a/lib/homeassistant.js b/lib/homeassistant.js
index 83e7144e1..f0374ab65 100644
--- a/lib/homeassistant.js
+++ b/lib/homeassistant.js
@@ -115,7 +115,7 @@ const configurations = {
             unit_of_measurement: 'Watt',
             icon: 'mdi:flash',
             value_template: '{{ value_json.power }}',
-            json_attributes: ['voltage', 'temperature', 'consumption'],
+            json_attributes: ['voltage', 'temperature', 'consumption', 'current', 'power_factor'],
         },
     },
     'sensor_action': {
@@ -284,6 +284,7 @@ const mapping = {
     'K2RGBW01': [configurations.light_brightness_colortemp_xy],
     '9290011370': [configurations.light_brightness],
     'DNCKATSW001': [configurations.switch],
+    'Z809A': [configurations.switch, configurations.sensor_power],
     'NL08-0800': [configurations.light_brightness],
 };
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index af1f8de8b..bd36f6bf3 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -295,9 +295,9 @@
       "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs="
     },
     "commander": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+      "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew=="
     },
     "commist": {
       "version": "1.0.0",
@@ -1171,9 +1171,9 @@
       }
     },
     "mqtt": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-2.18.1.tgz",
-      "integrity": "sha512-p+RIMFsNb5z65/dy5beKgTnycd3+N8gQ+E2Jnx+0g0OoRza/LCXtUp/vEb3mgWJdljTU+5n4Lc3h0ya994zmVg==",
+      "version": "2.18.2",
+      "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-2.18.2.tgz",
+      "integrity": "sha512-egP6gbLES2aELu6LNtwOtpC779Hu7LVTYm6HKE5wJdTuX2jZ4JOOtK7HS2JWyW6IfKN5U99u/VU155tLwFAKbQ==",
       "requires": {
         "commist": "1.0.0",
         "concat-stream": "1.6.2",
@@ -1561,7 +1561,7 @@
       "integrity": "sha1-QhxhiophK9QM+kYbSkYVTa8iKaU=",
       "requires": {
         "bindings": "1.2.1",
-        "commander": "2.15.1",
+        "commander": "2.16.0",
         "debug": "2.6.9",
         "lie": "3.3.0",
         "nan": "2.10.0",
@@ -1879,7 +1879,7 @@
                   "bundled": true,
                   "requires": {
                     "chalk": "1.1.3",
-                    "commander": "2.15.1",
+                    "commander": "2.16.0",
                     "is-my-json-valid": "2.15.0",
                     "pinkie-promise": "2.0.1"
                   },
@@ -2861,9 +2861,9 @@
       }
     },
     "zigbee-shepherd-converters": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-2.0.18.tgz",
-      "integrity": "sha512-E9Uq6q2jAZOt7oTi4uBa6yzNOD45K/wJs8RUnIAYXPXF4gx3PWKXUqHzJLgkUIsy1XQpIiwtSSu49et9hpC1nQ==",
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-2.0.19.tgz",
+      "integrity": "sha512-h+TdTaMEnq9lMc82g3tYxVRASL8P75gKJxoVm2noK1zzLdvfWy5y1gnR9lOdimY9X1aTx8dCKVGNJ8nj2U2fqQ==",
       "requires": {
         "debounce": "1.1.0"
       },