diff --git a/package.json b/package.json
index 20af4b1..a2fe44b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vvzvlad/node-red-contrib-rn-combined-nodes",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "",
   "main": "index.js",
   "keywords": [
diff --git a/thermostat.html b/thermostat.html
index 47a4a19..1383ea3 100644
--- a/thermostat.html
+++ b/thermostat.html
@@ -4,8 +4,9 @@
         color: '#F3B567',
         paletteLabel: 'C-Thermostat',
         defaults: {
-            name: {value:"", required:true},
-            tag: {value:""}
+            name: {value:""},
+            room: {value:"", required:true},
+            zone: {value:"", required:true}
         },
         inputs: 1,
         outputs: 2,
@@ -23,8 +24,12 @@
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row">
-        <label for="node-input-tag"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-tag" placeholder="Tag">
+        <label for="node-input-room"><i class="fa fa-tag"></i> Room name</label>
+        <input type="text" id="node-input-room" placeholder="Room name: gid_1">
+    </div>
+    <div class="form-row">
+        <label for="node-input-zone"><i class="fa fa-tag"></i> Zone name</label>
+        <input type="text" id="node-input-zone" placeholder="Zone name: gid">
     </div>
 </script>
 
diff --git a/thermostat.js b/thermostat.js
index cceb269..e3ec668 100644
--- a/thermostat.js
+++ b/thermostat.js
@@ -1,7 +1,8 @@
 module.exports = function(RED) {
     function thermostat(config) {
         RED.nodes.createNode(this,config);
-        this.tag = config.tag;
+        this.room = config.room;
+        this.zone = config.zone;
         var node = this;
         var context = node.context();
 
@@ -179,7 +180,7 @@ module.exports = function(RED) {
             node.status({ text: debug_text("return_debug") })
 
             let msg_heater_status = { payload: heater_status }
-            let msg_extended_stats = { payload: extended_stats, topic: node.tag }
+            let msg_extended_stats = { payload: extended_stats, room: node.room, zone: node.zone }
 
             if (heater_status === null || typeof heater_status === "undefined") {
                 msg_heater_status = null