diff --git a/nodes/core/core/80-template.html b/nodes/core/core/80-template.html
index 33e7505de..dc014d37e 100644
--- a/nodes/core/core/80-template.html
+++ b/nodes/core/core/80-template.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 IBM Corp.
+  Copyright 2013,2014 IBM Corp.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,31 +16,33 @@
 
 <script type="text/x-red" data-template-name="template">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-
     <div class="form-row">
-        <label for="node-input-template"><i class="icon-wrench"></i> Template</label>
+        <label for="node-input-template"><i class="fa fa-file-code-o"></i> Template</label>
         <input type="hidden" id="node-input-template" autofocus="autofocus">
         <div style="height: 250px;" class="node-text-editor" id="node-input-template-editor" ></div>
     </div>
-
+    <div class="form-row">
+        <label for="node-input-field"><i class="fa fa-edit"></i> Property</label>
+        msg.<input type="text" id="node-input-field" placeholder="payload" style="width: 64%;">
+    </div>
 </script>
 
 <script type="text/x-red" data-help-name="template">
-	<p>Creates a new payload based on the provided template.</p>
-	<p>This uses the <i><a href="http://mustache.github.io/mustache.5.html" target="_new">mustache</a></i> format.</p>
-	<p>For example, when a template of:
-	<pre>Hello {{name}}. Today is {{date}}</pre>
-	<p>receives a message containing:
-	<pre>{ 
+    <p>Creates a new message based on the provided template.</p>
+    <p>This uses the <i><a href="http://mustache.github.io/mustache.5.html" target="_new">mustache</a></i> format.</p>
+    <p>For example, when a template of:
+    <pre>Hello {{name}}. Today is {{date}}</pre>
+    <p>receives a message containing:
+    <pre>{
   name: "Fred",
   date: "Monday"
   payload: ...
 }</pre>
-	<p>The resulting payload will be:
-	<pre>Hello Fred. Today is Monday</pre>
+    <p>The resulting payload will be:
+    <pre>Hello Fred. Today is Monday</pre>
 </script>
 
 <script type="text/javascript">
@@ -49,6 +51,7 @@
         category: 'function',
         defaults: {
             name: {value:""},
+            field: {value:"payload"},
             template: {value:"This is the payload: {{payload}}!"},
         },
         inputs:1,
@@ -86,7 +89,7 @@
                     url:"templates", // where to get the data from
                     type:"template", // the type of object the library is for
                     editor:that.editor, // the field name the main text body goes to
-                    fields:['name']
+                    fields:['name','field']
                 });
                 $("#node-input-name").focus();
             });
@@ -96,5 +99,4 @@
             delete this.editor;
         }
     });
-
 </script>
diff --git a/nodes/core/core/80-template.js b/nodes/core/core/80-template.js
index 82348326e..0059f5d51 100644
--- a/nodes/core/core/80-template.js
+++ b/nodes/core/core/80-template.js
@@ -17,20 +17,43 @@
 module.exports = function(RED) {
     "use strict";
     var mustache = require("mustache");
-    var util = require("util");
     var fs = require('fs');
 
     function TemplateNode(n) {
         RED.nodes.createNode(this,n);
         this.name = n.name;
+        this.field = n.field || "payload";
         this.template = n.template;
-        this.on("input", function(msg) {
+        var node = this;
+
+        var b = node.field.split(".");
+        var i = 0;
+        var m = null;
+        var rec = function(obj) {
+            i += 1;
+            if ((i < b.length) && (typeof obj[b[i-1]] === "object")) {
+                rec(obj[b[i-1]]); // not there yet - carry on digging
+            }
+            else {
+                 if (i === b.length) { // we've finished so assign the value
+                     obj[b[i-1]] = mustache.render(node.template,m);
+                     node.send(m);
+                 }
+                 else {
+                     obj[b[i-1]] = {}; // needs to be a new object so create it
+                     rec(obj[b[i-1]]); // and carry on digging
+                 }
+            }
+        }
+
+        node.on("input", function(msg) {
             if (msg != null) {
                 try {
-                    msg.payload = mustache.render(this.template,msg)
-                    this.send(msg);
+                    m = msg;
+                    i = 0;
+                    rec(msg);
                 } catch(err) {
-                    this.error(err.message);
+                    node.error(err.message);
                 }
             }
         });