diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 92cbd1283..a8e634da7 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1060,7 +1060,7 @@ const mapping = {
     'TERNCY-PP01': [cfg.sensor_temperature, cfg.binary_sensor_occupancy, cfg.sensor_illuminance, cfg.sensor_click],
     'CR11S8UZ': [cfg.sensor_action],
     'RB 148 T': [cfg.light_brightness_colortemp],
-    'STS-OUT-US-2': [cfg.switch],
+    'STS-OUT-US-2': [cfg.switch, cfg.sensor_power],
     'UK7004240': [cfg.thermostat(), cfg.sensor_battery],
     'S31ZB': [cfg.switch],
     'SA-003-Zigbee': [cfg.switch],
@@ -1135,7 +1135,7 @@ const mapping = {
     '067773': [cfg.sensor_action, cfg.sensor_battery],
     '067771': [cfg.switch],
     '064873': [cfg.sensor_action],
-    'K3004C': [cfg.switch],
+    'K4003C': [cfg.switch],
     'STZB402': [
         cfg.thermostat(5, 30, 'occupied_heating_setpoint', 0.5),
         cfg.sensor_local_temperature,
@@ -1158,6 +1158,12 @@ const mapping = {
     '100.110.51': [cfg.light_brightness_colortemp],
     'HGZB-DLC4-N12B': [cfg.light_brightness_colortemp_colorxy],
     'U86KCJ-ZP': [cfg.sensor_action],
+    'HS1HT': [cfg.sensor_temperature, cfg.sensor_humidity, cfg.sensor_battery],
+    'HS2ESK-E': [cfg.switch, cfg.sensor_power],
+    'B01M7Y8BP9': [cfg.sensor_action],
+    'GP-WOU019BBDWG': [cfg.switch, cfg.sensor_power],
+    'AV2010/21A': [cfg.binary_sensor_battery_low, cfg.binary_sensor_contact, cfg.binary_sensor_tamper],
+    'AL-PIR02': [cfg.binary_sensor_occupancy, cfg.binary_sensor_tamper, cfg.sensor_battery],
 };
 
 Object.keys(mapping).forEach((key) => {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1d5262490..2d8cf5b64 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -686,20 +686,20 @@
       "dev": true
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.16.0.tgz",
-      "integrity": "sha512-bXTmAztXpqxliDKZgvWkl+5dHeRN+jqXVZ16peKKFzSXVzT6mz8kgBpHiVzEKO2NZ8OCU7dG61K9sRS/SkUUFQ==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.17.0.tgz",
+      "integrity": "sha512-2bNf+mZ/3mj5/3CP56v+ldRK3vFy9jOvmCPs/Gr2DeSJh+asPZrhFniv4QmQsHWQFPJFWhFHgkGgJeRmK4m8iQ==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.16.0",
+        "@typescript-eslint/typescript-estree": "2.17.0",
         "eslint-scope": "^5.0.0"
       }
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.16.0.tgz",
-      "integrity": "sha512-hyrCYjFHISos68Bk5KjUAXw0pP/455qq9nxqB1KkT67Pxjcfw+r6Yhcmqnp8etFL45UexCHUMrADHH7dI/m2WQ==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.17.0.tgz",
+      "integrity": "sha512-g0eVRULGnEEUakxRfJO0s0Hr1LLQqsI6OrkiCLpdHtdJJek+wyd8mb00vedqAoWldeDcOcP8plqw8/jx9Gr3Lw==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -1764,9 +1764,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.17.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.2.tgz",
-      "integrity": "sha512-YoKuru3Lyoy7yVTBSH2j7UxTqe/je3dWAruC0sHvZX1GNd5zX8SSLvQqEgO9b3Ex8IW+goFI9arEEsFIbulhOw==",
+      "version": "1.17.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.3.tgz",
+      "integrity": "sha512-AwiVPKf3sKGMoWtFw0J7Y4MTZ4Iek67k4COWOwHqS8B9TOZ71DCfcoBmdamy8Y6mj4MDz0+VNUpC2HKHFHA3pg==",
       "dev": true,
       "requires": {
         "es-to-primitive": "^1.2.1",
@@ -13526,9 +13526,9 @@
       }
     },
     "zigbee-herdsman-converters": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.0.tgz",
-      "integrity": "sha512-BtW0xQEIq3g9ExGYjLmU5Nxz4LMphSwOaTTaZK/ZKnzs/gWsWEGYIkSMBZ3Lt0ijUCFV6Vl4V3lu+7bciyw6xA==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.1.tgz",
+      "integrity": "sha512-8zYkePs9B+MV1ITPTnGWIkWdIGKOk1bE6T9al6VbKuHGxejotDBEgs8PRV6m9Ueg0Aop+LB+8TCR9Rxk2UvxTQ==",
       "dependencies": {
         "@babel/code-frame": {
           "version": "7.5.5",
diff --git a/package.json b/package.json
index 8ec37799c..60df7d7df 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "semver": "*",
     "winston": "*",
     "zigbee-herdsman": "0.12.34",
-    "zigbee-herdsman-converters": "12.0.0"
+    "zigbee-herdsman-converters": "12.0.1"
   },
   "devDependencies": {
     "eslint": "*",