diff --git a/app/controllers/data.py b/app/controllers/data.py
index 22f695b812a12df0df0de9d29d3f50cc740ed53e..92eb723544040d855a30ea6b461d3f08be8457f2 100644
--- a/app/controllers/data.py
+++ b/app/controllers/data.py
@@ -37,7 +37,7 @@ class DataController(RestController):
             where_statement += 'AND unit_id=%s'
             where_tuple = where_tuple + (filter_data['unit_id'],)
 
-        sql = "SELECT ts, value, unit, unit_id, name, sn, mod FROM data {} ORDER BY ts".format(where_statement)
+        sql = "SELECT ts, value, unit, unit_id, name, sn, mod, channel_id FROM data {} ORDER BY ts".format(where_statement)
         db = get_redshift_db(current_app)
         cur = db.cursor(cursor_factory=psycopg2.extras.DictCursor)
         cur.execute(sql, where_tuple)
diff --git a/app/forms/senseware_node.py b/app/forms/senseware_node.py
index 98b278e67566aeb5b52685c4fd0d0ced2c406110..b015258960f6271f5caa5faf47a37f62c8340467 100644
--- a/app/forms/senseware_node.py
+++ b/app/forms/senseware_node.py
@@ -54,3 +54,15 @@ class SensewareNodeForm(Form, UserForm):
     notes = wtf.StringField(
         validators=[wtf.validators.Optional()]
     )
+    temperature_probe_1_cid = NullableIntegerField(
+        validators=[wtf.validators.Optional()]
+    )
+    temperature_probe_2_cid = NullableIntegerField(
+        validators=[wtf.validators.Optional()]
+    )
+    temperature_probe_3_cid = NullableIntegerField(
+        validators=[wtf.validators.Optional()]
+    )
+    temperature_probe_4_cid = NullableIntegerField(
+        validators=[wtf.validators.Optional()]
+    )
diff --git a/app/models/senseware_node.py b/app/models/senseware_node.py
index 95e7f48189e6a7e1e389c0b52405c8d8d0bbf5bf..d1c946cbb819cc86731144c77e1df0dbd28a8669 100644
--- a/app/models/senseware_node.py
+++ b/app/models/senseware_node.py
@@ -21,3 +21,7 @@ class SensewareNode(Model, User, Tracked, db.Model):
     temperature_probe_3 = db.Column(db.Integer)
     temperature_probe_4 = db.Column(db.Integer)
     notes = db.Column(db.Unicode(500))
+    temperature_probe_1_cid = db.Column(db.Integer)
+    temperature_probe_2_cid = db.Column(db.Integer)
+    temperature_probe_3_cid = db.Column(db.Integer)
+    temperature_probe_4_cid = db.Column(db.Integer)