diff --git a/app/models/entity.js b/app/models/entity.js
index 29b0c4a..1b6bebe 100644
--- a/app/models/entity.js
+++ b/app/models/entity.js
@@ -1,6 +1,17 @@
+import Ember from 'ember';
 import DS from 'ember-data';
 
 export default DS.Model.extend({
   type: DS.attr('string'),
-  properties: DS.attr()
+  properties: DS.attr(),
+
+  poll: function() {
+    Ember.debug("Poll");
+
+    var _this = this;
+    Ember.run.later(function() {
+      _this.reload();
+      _this.poll();
+    }, 500);
+  }.observes('didLoad')
 });
diff --git a/app/serializers/application.js b/app/serializers/application.js
index 871d3a8..c71ef80 100644
--- a/app/serializers/application.js
+++ b/app/serializers/application.js
@@ -43,7 +43,8 @@ export default DS.RESTSerializer.extend({
             var property = {
               name: attribute.name,
               value: attribute.value,
-              type: attribute.type
+              type: attribute.type,
+              timestamp: attribute.metadatas[0].value
             }
 
             entity.attributes.properties.push(property);
diff --git a/app/styles/app.css b/app/styles/app.css
index 58b25b0..f5a1e36 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -89,8 +89,8 @@ body {
 #last-update-info {
 	padding: 0px 0 20px 0;
 
-	font-size: 16px;
-	text-align: center;
+	font-size: 15px;
+	text-align: left;
 }
 
 .data-table {
diff --git a/app/templates/components/properties-table.hbs b/app/templates/components/properties-table.hbs
index 3609f4f..16a83ea 100644
--- a/app/templates/components/properties-table.hbs
+++ b/app/templates/components/properties-table.hbs
@@ -1,10 +1,12 @@
 <tr>
   <th>Name</th>
   <th>Value</th>
+  <th>Date</th>
 </tr>
 {{#each entity.properties as |property|}}
   <tr>
     <td>{{property.name}}</td>
     <td>{{property.value}} {{property.type}}</td>
+    <td>{{property.timestamp}}</td>
   </tr>
 {{/each}}
diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs
index 5f86ee1..b31228d 100644
--- a/app/templates/lab-mashup.hbs
+++ b/app/templates/lab-mashup.hbs
@@ -9,7 +9,3 @@
 		{{outlet}}
 	</section>
 </section>
-
-<section id="last-update-info">
-	<p>Last updated: </p>
-</section>
diff --git a/app/transforms/property.js b/app/transforms/property.js
index 2acb7a3..9481c91 100644
--- a/app/transforms/property.js
+++ b/app/transforms/property.js
@@ -3,10 +3,10 @@ import DS from 'ember-data';
 
 export default DS.Transform.extend({
   deserialize: function(value) {
-    return Ember.create({ name: value[0], value: value[1], type: value[2]});
+    return Ember.create({ name: value[0], value: value[1], type: value[2], timestamp: value[3]});
   },
 
   serialize: function(value) {
-    return [value.get('name'), value.get('value'), value.get('type')];
+    return [value.get('name'), value.get('value'), value.get('type'), value.get('timestamp')];
   }
 });