diff --git a/compiler/ast/HtmlAttribute/html/generateCode.js b/compiler/ast/HtmlAttribute/html/generateCode.js
index e65ea7a44..66a018bd5 100644
--- a/compiler/ast/HtmlAttribute/html/generateCode.js
+++ b/compiler/ast/HtmlAttribute/html/generateCode.js
@@ -1,7 +1,8 @@
 'use strict';
 
-var attr = require('../../../../runtime/html/attr');
-var escapeXmlAttr = require('../../../../runtime/html/escapeXml').attr;
+var runtimeHtmlHelpers = require('../../../../runtime/html/helpers');
+var attr = runtimeHtmlHelpers.a;
+var escapeXmlAttr = runtimeHtmlHelpers.xa;
 
 function isStringLiteral(node) {
     return node.type === 'Literal' && typeof node.value === 'string';
@@ -76,12 +77,11 @@ function generateCodeForExpressionAttr(name, value, escape, codegen) {
             if (isStringLiteral(part)) {
                 part.value = escapeXmlAttr(part.value);
             } else if (part.type === 'Literal') {
-
             } else if (isNoEscapeXml(part)) {
                 part = codegen.builder.functionCall(context.helper('str'), [part]);
             } else {
                 if (escape !== false) {
-                    part = codegen.builder.functionCall(context.helper('escapeXmlAttr'), [part]);
+                    part = builder.functionCall(context.helper('escapeXmlAttr'), [part]);
                 }
             }
             addHtml(part);
diff --git a/compiler/ast/Text/html/generateCode.js b/compiler/ast/Text/html/generateCode.js
index c179f70e3..9feb57a5e 100644
--- a/compiler/ast/Text/html/generateCode.js
+++ b/compiler/ast/Text/html/generateCode.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var escapeXml = require('../../../../runtime/html/escapeXml');
+var escapeXml = require('../../../../runtime/html/helpers').x;
 var Literal = require('../..//Literal');
 
 module.exports = function(node, codegen) {
diff --git a/compiler/ast/Text/vdom/TextVDOM.js b/compiler/ast/Text/vdom/TextVDOM.js
index 9d63715f0..781fa2945 100644
--- a/compiler/ast/Text/vdom/TextVDOM.js
+++ b/compiler/ast/Text/vdom/TextVDOM.js
@@ -21,16 +21,6 @@ class TextVDOM extends Node {
 
         vdomUtil.registerOptimizer(context);
 
-        var args = this.arguments;
-
-        for (var i=0, len=args.length; i<len; i++) {
-            var arg = args[i];
-            if (arg.type !== 'Literal') {
-                this.strFuncId = context.helper('str');
-                break;
-            }
-        }
-
         return this;
     }
 
@@ -70,7 +60,6 @@ class TextVDOM extends Node {
         let escape = this.escape;
 
         var funcName = escape ? 't' : 'h';
-        var strFuncId = this.strFuncId;
 
         function writeTextArgs() {
             writer.write('(');
@@ -84,15 +73,7 @@ class TextVDOM extends Node {
                     writer.writeIndent();
                 }
 
-                if (arg.type === 'Literal') {
-                    writer.write(arg);
-                } else {
-                    writer.write(strFuncId);
-                    writer.write('(');
-                    writer.write(arg);
-                    writer.write(')');
-                }
-
+                writer.write(arg);
             }
 
             writer.write(')');
diff --git a/compiler/util/vdom/VDOMOptimizer.js b/compiler/util/vdom/VDOMOptimizer.js
index 31e08b02c..ab237a6bb 100644
--- a/compiler/util/vdom/VDOMOptimizer.js
+++ b/compiler/util/vdom/VDOMOptimizer.js
@@ -57,7 +57,6 @@ function generateNodesForArray(nodes, context, options) {
     let nextNodeId = 0;
     let nextAttrsId = 0;
 
-    var optimizeTextNodes = options.optimizeTextNodes !== false;
     var optimizeStaticNodes = options.optimizeStaticNodes !== false;
 
     function generateStaticNode(node) {
@@ -112,31 +111,6 @@ function generateNodesForArray(nodes, context, options) {
                 finalNodes.push(node);
             }
 
-        } else if (node.type === 'TextVDOM') {
-            if (optimizeTextNodes) {
-                let firstTextNode = node;
-
-                // We will need to merge the text nodes into a single node
-                while(++i<nodes.length) {
-                    let currentTextNode = nodes[i];
-                    if (currentTextNode.type === 'TextVDOM') {
-                        if (!firstTextNode.append(currentTextNode)) {
-                            // If the current text node was not appendable then
-                            // we will stop. We can only merge text nodes that are compatible
-                            break;
-                        }
-                    } else {
-                        break;
-                    }
-                }
-
-                // firstTextNode.isStatic = false;
-                finalNodes.push(firstTextNode);
-                continue;
-            } else {
-                finalNodes.push(node);
-            }
-
         } else {
             finalNodes.push(node);
         }
diff --git a/package.json b/package.json
index 684cf7ce2..c3d9cc99f 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "jsdom": "^9.6.0",
     "jshint": "^2.5.0",
     "lasso": "^2.4.1",
-    "lasso-marko": "^2.0.4",
+    "lasso-marko": "^2.1.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.3.3",
     "mocha-phantomjs": "^4.1.0",
diff --git a/runtime/document-provider.js b/runtime/document-provider.js
new file mode 100644
index 000000000..2581bf288
--- /dev/null
+++ b/runtime/document-provider.js
@@ -0,0 +1 @@
+exports.document = typeof document != 'undefined' && document;
\ No newline at end of file
diff --git a/runtime/helpers.js b/runtime/helpers.js
index e0213208c..a463b5a50 100644
--- a/runtime/helpers.js
+++ b/runtime/helpers.js
@@ -1,6 +1,5 @@
 'use strict';
 var isArray = Array.isArray;
-var load = require('./loader');
 
 function classListHelper(arg, classNames) {
     var len;
@@ -93,141 +92,138 @@ LoopStatus.prototype = {
     }
 };
 
-module.exports = {
-    /**
-     * Internal helper method to prevent null/undefined from being written out
-     * when writing text that resolves to null/undefined
-     * @private
-     */
-    s: function(str) {
-        return (str == null) ? '' : str.toString();
-    },
+/**
+ * Internal helper method to prevent null/undefined from being written out
+ * when writing text that resolves to null/undefined
+ * @private
+ */
+exports.s = function strHelper(str) {
+    return (str == null) ? '' : str.toString();
+};
 
-    /**
-     * Internal helper method to handle loops with a status variable
-     * @private
-     */
-    fv: function (array, callback) {
-        if (!array) {
-            return;
-        }
-        if (!array.forEach) {
-            array = [array];
-        }
+/**
+ * Internal helper method to handle loops with a status variable
+ * @private
+ */
+exports.fv = function forEachStatusVariableHelper(array, callback) {
+    if (!array) {
+        return;
+    }
+    if (!array.forEach) {
+        array = [array];
+    }
 
-        var len = array.length;
-        var loopStatus = new LoopStatus(len);
+    var len = array.length;
+    var loopStatus = new LoopStatus(len);
 
-        for (; loopStatus.i < len; loopStatus.i++) {
-            var o = array[loopStatus.i];
-            callback(o, loopStatus);
-        }
-    },
+    for (; loopStatus.i < len; loopStatus.i++) {
+        var o = array[loopStatus.i];
+        callback(o, loopStatus);
+    }
+};
 
-    /**
-     * Internal helper method to handle loops without a status variable
-     * @private
-     */
-    f: function forEach(array, callback) {
-        if (isArray(array)) {
-            for (var i=0; i<array.length; i++) {
-                callback(array[i]);
-            }
-        } else if (typeof array === 'function') {
-            // Also allow the first argument to be a custom iterator function
-            array(callback);
-        }
-    },
-    /**
-     * Internal helper method for looping over the properties of any object
-     * @private
-     */
-    fp: function (o, func) {
-        if (!o) {
-            return;
+/**
+ * Internal helper method to handle loops without a status variable
+ * @private
+ */
+exports.f = function forEachHelper(array, callback) {
+    if (isArray(array)) {
+        for (var i=0; i<array.length; i++) {
+            callback(array[i]);
         }
+    } else if (typeof array === 'function') {
+        // Also allow the first argument to be a custom iterator function
+        array(callback);
+    }
+};
+/**
+ * Internal helper method for looping over the properties of any object
+ * @private
+ */
+exports.fp = function forEachPropertyHelper(o, func) {
+    if (!o) {
+        return;
+    }
 
-        if (Array.isArray(o)) {
-            for (var i=0; i<o.length; i++) {
-                func(i, o[i]);
-            }
-        } else {
-            for (var k in o) {
-                if (o.hasOwnProperty(k)) {
-                    func(k, o[k]);
-                }
+    if (Array.isArray(o)) {
+        for (var i=0; i<o.length; i++) {
+            func(i, o[i]);
+        }
+    } else {
+        for (var k in o) {
+            if (o.hasOwnProperty(k)) {
+                func(k, o[k]);
             }
         }
-    },
+    }
+};
 
-    /**
-     * Helper to load a custom tag
-     */
-    t: function (renderer, targetProperty, isRepeated, hasNestedTags) {
-        if (renderer) {
-            renderer = resolveRenderer(renderer);
-        }
+/**
+ * Helper to load a custom tag
+ */
+exports.t = function loadTagHelper(renderer, targetProperty, isRepeated, hasNestedTags) {
+    if (renderer) {
+        renderer = resolveRenderer(renderer);
+    }
 
-        if (targetProperty || hasNestedTags) {
-            return function(input, out, parent, renderBody) {
-                // Handle nested tags
-                if (renderBody) {
-                    renderBody(out, input);
-                }
+    if (targetProperty || hasNestedTags) {
+        return function(input, out, parent, renderBody) {
+            // Handle nested tags
+            if (renderBody) {
+                renderBody(out, input);
+            }
 
-                if (targetProperty) {
-                    // If we are nested tag then we do not have a renderer
-                    if (isRepeated) {
-                        var existingArray = parent[targetProperty];
-                        if (existingArray) {
-                            existingArray.push(input);
-                        } else {
-                            parent[targetProperty] = [input];
-                        }
+            if (targetProperty) {
+                // If we are nested tag then we do not have a renderer
+                if (isRepeated) {
+                    var existingArray = parent[targetProperty];
+                    if (existingArray) {
+                        existingArray.push(input);
                     } else {
-                        parent[targetProperty] = input;
+                        parent[targetProperty] = [input];
                     }
                 } else {
-                    // We are a tag with nested tags, but we have already found
-                    // our nested tags by rendering the body
-                    renderer(input, out);
+                    parent[targetProperty] = input;
                 }
-            };
-        } else {
-            return renderer;
-        }
-    },
-
-    /**
-     * Merges object properties
-     * @param  {[type]} object [description]
-     * @param  {[type]} source [description]
-     * @return {[type]}        [description]
-     */
-    m: function(into, source) {
-        for (var k in source) {
-            if (source.hasOwnProperty(k) && !into.hasOwnProperty(k)) {
-                into[k] = source[k];
+            } else {
+                // We are a tag with nested tags, but we have already found
+                // our nested tags by rendering the body
+                renderer(input, out);
             }
-        }
-        return into;
-    },
-
-    /**
-     * classList(a, b, c, ...)
-     * Joines a list of class names with spaces. Empty class names are omitted.
-     *
-     * classList('a', undefined, 'b') --> 'a b'
-     *
-     */
-    cl: function() {
-        return classList(arguments);
-    },
-
-    /**
-     * Loads a template (__helpers.l --> marko_loadTemplate(path))
-     */
-    l: load,
-
-    i: require('./include')
+        };
+    } else {
+        return renderer;
+    }
 };
+
+/**
+ * Merges object properties
+ * @param  {[type]} object [description]
+ * @param  {[type]} source [description]
+ * @return {[type]}        [description]
+ */
+exports.m = function mergeHelper(into, source) {
+    for (var k in source) {
+        if (source.hasOwnProperty(k) && !into.hasOwnProperty(k)) {
+            into[k] = source[k];
+        }
+    }
+    return into;
+};
+
+/**
+ * classList(a, b, c, ...)
+ * Joines a list of class names with spaces. Empty class names are omitted.
+ *
+ * classList('a', undefined, 'b') --> 'a b'
+ *
+ */
+exports.cl = function classListHelper() {
+    return classList(arguments);
+};
+
+/**
+ * Loads a template (__helpers.l --> marko_loadTemplate(path))
+ */
+exports.l = require('./loader');
+exports.i = require('./include');
\ No newline at end of file
diff --git a/runtime/html/AsyncStream.js b/runtime/html/AsyncStream.js
index 0c89296d4..7a3f58d67 100644
--- a/runtime/html/AsyncStream.js
+++ b/runtime/html/AsyncStream.js
@@ -2,11 +2,9 @@
 var EventEmitter = require('events').EventEmitter;
 var StringWriter = require('./StringWriter');
 var BufferedWriter = require('./BufferedWriter');
-var attr = require('./attr');
-var escapeXml = require('./escapeXml');
 var extend = require('raptor-util/extend');
-
-var defaultDocument = typeof document != 'undefined' && document;
+var documentProvider = require('../document-provider');
+var helpers;
 
 var voidWriter = { write:function(){} };
 
@@ -412,12 +410,10 @@ var proto = AsyncStream.prototype = {
         return new AsyncStream(this.global);
     },
 
-    beginElement: function(name, attrs) {
+    beginElement: function(name, elementAttrs) {
 
         var str = '<' + name;
-        for (var attrName in attrs) {
-            str += attr(attrName, attrs[attrName]);
-        }
+        helpers.as(elementAttrs);
 
         str += '>';
 
@@ -436,7 +432,7 @@ var proto = AsyncStream.prototype = {
     },
 
     text: function(str) {
-        this.write(escapeXml(str));
+        this.write(helpers.x(str));
     },
 
     getNode: function(doc) {
@@ -446,7 +442,7 @@ var proto = AsyncStream.prototype = {
         var html = this.getOutput();
 
         if (!doc) {
-            doc = this.document || defaultDocument;
+            doc = documentProvider.document;
         }
 
         if (!node) {
@@ -504,4 +500,6 @@ proto.w = proto.write;
 
 extend(proto, require('../OutMixins'));
 
-module.exports = AsyncStream;
\ No newline at end of file
+module.exports = AsyncStream;
+
+helpers = require('./helpers');
\ No newline at end of file
diff --git a/runtime/html/attr.js b/runtime/html/attr.js
deleted file mode 100644
index d038d1ce9..000000000
--- a/runtime/html/attr.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var escapeXmlAttr = require('./escapeXml').attr;
-
-module.exports = function(name, value, shouldEscape) {
-    if (typeof value === 'string') {
-        return ' ' + name + '="' + (shouldEscape !== false ? escapeXmlAttr(value) : value) + '"';
-    } else if (value === true) {
-        return ' ' + name;
-    } else if (value == null || value === false) {
-        return '';
-    } else {
-        return ' ' + name + '="' + value.toString() + '"';
-    }
-};
diff --git a/runtime/html/escapeXml.js b/runtime/html/escapeXml.js
deleted file mode 100644
index 8a43dec41..000000000
--- a/runtime/html/escapeXml.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var elTest = /[&<]/;
-var elTestReplace = /[&<]/g;
-var attrTest = /[&<\"\n]/;
-var attrReplace = /[&<\"\n]/g;
-var replacements = {
-    '<': '&lt;',
-    '&': '&amp;',
-    '"': '&quot;',
-    '\n': '&#10;' //Preserve new lines so that they don't get normalized as space
-};
-
-function replaceChar(match) {
-    return replacements[match];
-}
-
-function escapeXml(str) {
-    // check for most common case first
-    if (typeof str === 'string') {
-        return elTest.test(str) ? str.replace(elTestReplace, replaceChar) : str;
-    }
-
-    return (str == null) ? '' : str.toString();
-}
-
-function escapeXmlAttr(str) {
-    if (typeof str === 'string') {
-        return attrTest.test(str) ? str.replace(attrReplace, replaceChar) : str;
-    }
-
-    return (str == null) ? '' : str.toString();
-}
-
-
-module.exports = escapeXml;
-escapeXml.attr = escapeXmlAttr;
\ No newline at end of file
diff --git a/runtime/html/helpers.js b/runtime/html/helpers.js
index 6a920a618..4443bc139 100644
--- a/runtime/html/helpers.js
+++ b/runtime/html/helpers.js
@@ -1,120 +1,193 @@
 'use strict';
-var escapeXml = require('./escapeXml');
-var escapeXmlAttr = escapeXml.attr;
-var attr = require('./attr');
+require('raptor-polyfill/string/startsWith');
+
+var warp10 = require('warp10');
 var extend = require('raptor-util/extend');
 
 var STYLE_ATTR = 'style';
 var CLASS_ATTR = 'class';
 var escapeEndingScriptTagRegExp = /<\//g;
 
-var commonHelpers = require('../helpers');
+var elTest = /[&<]/;
+var elTestReplace = /[&<]/g;
+var attrTest = /[&<\"\n]/;
+var attrReplace = /[&<\"\n]/g;
+var stringifiedAttrTest = /[&\'\n]/;
+var stringifiedAttrReplace = /[&\'\n]/g;
 
-var classList = commonHelpers.cl;
+var classList;
 
-module.exports = extend({
-    /**
-     * Internal method to escape special XML characters
-     * @private
-     */
-    x: escapeXml,
-    /**
-     * Internal method to escape special XML characters within an attribute
-     * @private
-     */
-    xa: escapeXmlAttr,
+var replacements = {
+    '<': '&lt;',
+    '&': '&amp;',
+    '"': '&quot;',
+    '\'': '&#39;',
+    '\n': '&#10;' //Preserve new lines so that they don't get normalized as space
+};
 
-    /**
-     * Escapes the '</' sequence in the body of a <script> body to avoid the `<script>` being
-     * ended prematurely.
-     *
-     * For example:
-     * var evil = {
-     * 	name:  '</script><script>alert(1)</script>'
-     * };
-     *
-     * <script>var foo = ${JSON.stringify(evil)}</script>
-     *
-     * Without escaping the ending '</script>' sequence the opening <script> tag would be
-     * prematurely ended and a new script tag could then be started that could then execute
-     * arbitrary code.
-     */
-    xs: function(val) {
-        return (typeof val === 'string') ? val.replace(escapeEndingScriptTagRegExp, '\\u003C/') : val;
-    },
+function replaceChar(match) {
+    return replacements[match];
+}
 
-    /**
-     * Internal method to render a single HTML attribute
-     * @private
-     */
-    a: attr,
+function escapeStr(str, regexpTest, regexpReplace) {
+    return regexpTest.test(str) ? str.replace(regexpReplace, replaceChar) : str;
+}
 
-    /**
-     * Internal method to render multiple HTML attributes based on the properties of an object
-     * @private
-     */
-    as: function(arg) {
-        if (typeof arg === 'object') {
-            var out = '';
-            for (var attrName in arg) {
-                out += attr(attrName, arg[attrName]);
-            }
-            return out;
-        } else if (typeof arg === 'string') {
-            return arg;
-        }
+function escapeXmlHelper(value, regexpTest, regexpReplace) {
+    // check for most common case first
+    if (typeof value === 'string') {
+        return escapeStr(value, regexpTest, regexpReplace);
+    } else if (value == null) {
         return '';
-    },
-
-    /**
-     * Internal helper method to handle the "style" attribute. The value can either
-     * be a string or an object with style propertes. For example:
-     *
-     * sa('color: red; font-weight: bold') ==> ' style="color: red; font-weight: bold"'
-     * sa({color: 'red', 'font-weight': 'bold'}) ==> ' style="color: red; font-weight: bold"'
-     */
-    sa: function(style) {
-        if (!style) {
+    } else if (typeof value === 'object') {
+        var safeHTML = value.safeHTML;
+        if (safeHTML != null) {
+            return value.safeHTML;
+        } else {
             return '';
         }
+    } else if (value === true || value === false || typeof value === 'number') {
+        return value.toString();
+    }
 
-        if (typeof style === 'string') {
-            return attr(STYLE_ATTR, style, false);
-        } else if (typeof style === 'object') {
-            var parts = [];
-            for (var name in style) {
-                if (style.hasOwnProperty(name)) {
-                    var value = style[name];
-                    if (value) {
-                        parts.push(name + ':' + value);
-                    }
+    return escapeStr(value.toString(), regexpTest, regexpReplace);
+}
+
+function escapeXml(value) {
+    return escapeXmlHelper(value, elTest, elTestReplace);
+}
+
+function escapeXmlAttr(value) {
+    return escapeXmlHelper(value, attrTest, attrReplace);
+}
+
+function attr(name, value, shouldEscape) {
+    if (typeof value === 'string') {
+        return ' ' + name + '="' + (shouldEscape !== false ? escapeStr(value, attrTest, attrReplace) : value) + '"';
+    } else if (value === true) {
+        return ' ' + name;
+    } else if (value == null || value === false) {
+        return '';
+    } else if (typeof value === 'object') {
+        if (name.startsWith('data-_')) {
+            value = warp10.stringify(value);
+        } else {
+            value = JSON.stringify(value);
+        }
+        return ' ' + name + "='" + escapeStr(value, stringifiedAttrTest, stringifiedAttrReplace) + "'";
+    } else {
+        return ' ' + name + '=' + value; // number (doesn't need quotes)
+    }
+}
+
+
+/**
+ * Internal method to escape special XML characters
+ * @private
+ */
+exports.x = escapeXml;
+/**
+ * Internal method to escape special XML characters within an attribute
+ * @private
+ */
+exports.xa = escapeXmlAttr;
+
+/**
+ * Escapes the '</' sequence in the body of a <script> body to avoid the `<script>` being
+ * ended prematurely.
+ *
+ * For example:
+ * var evil = {
+ * 	name:  '</script><script>alert(1)</script>'
+ * };
+ *
+ * <script>var foo = ${JSON.stringify(evil)}</script>
+ *
+ * Without escaping the ending '</script>' sequence the opening <script> tag would be
+ * prematurely ended and a new script tag could then be started that could then execute
+ * arbitrary code.
+ */
+exports.xs = function(val) {
+    return (typeof val === 'string') ? val.replace(escapeEndingScriptTagRegExp, '\\u003C/') : val;
+};
+
+/**
+ * Internal method to render a single HTML attribute
+ * @private
+ */
+exports.a = attr;
+
+/**
+ * Internal method to render multiple HTML attributes based on the properties of an object
+ * @private
+ */
+exports.as = function(arg) {
+    if (typeof arg === 'object') {
+        var out = '';
+        for (var attrName in arg) {
+            out += attr(attrName, arg[attrName]);
+        }
+        return out;
+    } else if (typeof arg === 'string') {
+        return arg;
+    }
+    return '';
+};
+
+/**
+ * Internal helper method to handle the "style" attribute. The value can either
+ * be a string or an object with style propertes. For example:
+ *
+ * sa('color: red; font-weight: bold') ==> ' style="color: red; font-weight: bold"'
+ * sa({color: 'red', 'font-weight': 'bold'}) ==> ' style="color: red; font-weight: bold"'
+ */
+exports.sa = function(style) {
+    if (!style) {
+        return '';
+    }
+
+    if (typeof style === 'string') {
+        return attr(STYLE_ATTR, style, false);
+    } else if (typeof style === 'object') {
+        var parts = [];
+        for (var name in style) {
+            if (style.hasOwnProperty(name)) {
+                var value = style[name];
+                if (value) {
+                    parts.push(name + ':' + value);
                 }
             }
-            return parts ? attr(STYLE_ATTR, parts.join(';'), false) : '';
-        } else {
-            return '';
         }
-    },
+        return parts ? attr(STYLE_ATTR, parts.join(';'), false) : '';
+    } else {
+        return '';
+    }
+};
 
-    /**
-     * Internal helper method to handle the "class" attribute. The value can either
-     * be a string, an array or an object. For example:
-     *
-     * ca('foo bar') ==> ' class="foo bar"'
-     * ca({foo: true, bar: false, baz: true}) ==> ' class="foo baz"'
-     * ca(['foo', 'bar']) ==> ' class="foo bar"'
-     */
-    ca: function(classNames) {
-        if (!classNames) {
-            return '';
-        }
+/**
+ * Internal helper method to handle the "class" attribute. The value can either
+ * be a string, an array or an object. For example:
+ *
+ * ca('foo bar') ==> ' class="foo bar"'
+ * ca({foo: true, bar: false, baz: true}) ==> ' class="foo baz"'
+ * ca(['foo', 'bar']) ==> ' class="foo bar"'
+ */
+exports.ca = function(classNames) {
+    if (!classNames) {
+        return '';
+    }
 
-        if (typeof classNames === 'string') {
-            return attr(CLASS_ATTR, classNames, false);
-        } else {
-            return attr(CLASS_ATTR, classList(classNames), false);
-        }
-    },
+    if (typeof classNames === 'string') {
+        return attr(CLASS_ATTR, classNames, false);
+    } else {
+        return attr(CLASS_ATTR, classList(classNames), false);
+    }
+};
 
-    inline: require('./')._inline
-}, commonHelpers);
+
+
+var commonHelpers = require('../helpers');
+classList = commonHelpers.cl;
+extend(exports, commonHelpers);
+
+exports.inline = require('./')._inline;
\ No newline at end of file
diff --git a/runtime/html/index.js b/runtime/html/index.js
index 1793a9295..9cd29d166 100644
--- a/runtime/html/index.js
+++ b/runtime/html/index.js
@@ -12,7 +12,7 @@ exports.c = function createTemplate(path) {
      return new Template(path);
 };
 
-var AsyncStream = require('./AsyncStream');
+var AsyncStream;
 
 function createOut(globalData) {
     return new AsyncStream(globalData);
@@ -161,6 +161,10 @@ exports.Template = Template;
 helpers = require('./helpers');
 exports.helpers = helpers;
 
+
+
+AsyncStream = require('./AsyncStream');
+
 exports.enableAsyncStackTrace = AsyncStream.enableAsyncStackTrace;
 
 require('../')._setRuntime(exports);
\ No newline at end of file
diff --git a/runtime/index.js b/runtime/index.js
index ca17ee0a5..751e48023 100644
--- a/runtime/index.js
+++ b/runtime/index.js
@@ -1,4 +1,6 @@
 'use strict';
+var documentProvider = require('./document-provider');
+
 var runtime;
 
 function setRuntime(_runtime) {
@@ -6,13 +8,18 @@ function setRuntime(_runtime) {
 }
 exports._setRuntime = setRuntime;
 
-var load = require('./loader');
-
-
 function createOut(globalData) {
     return runtime.createOut(globalData);
 }
 
+/**
+ * Used to associate a DOM Document with marko. This is needed
+ * to parse HTML fragments to insert into the VDOM tree.
+ */
+exports.setDocument = function(newDoc) {
+    documentProvider.document = newDoc;
+};
+
 exports.createOut = createOut;
-exports.load = load;
+exports.load = require('./loader');
 exports.events = require('./events');
\ No newline at end of file
diff --git a/runtime/vdom/AsyncVDOMBuilder.js b/runtime/vdom/AsyncVDOMBuilder.js
index d74e2a511..dff8d45f0 100644
--- a/runtime/vdom/AsyncVDOMBuilder.js
+++ b/runtime/vdom/AsyncVDOMBuilder.js
@@ -4,11 +4,8 @@ var DocumentFragment = require('./DocumentFragment');
 var Comment = require('./Comment');
 var Text = require('./Text');
 var extend = require('raptor-util/extend');
-
-var virtualize = require('./virtualize');
-var specialHtmlRegexp = /[&<]/;
-var defaultDocument = typeof document != 'undefined' && document;
-
+var virtualizeHTML = require('./virtualizeHTML');
+var documentProvider = require('../document-provider');
 
 function State(tree) {
     this.remaining = 1;
@@ -39,8 +36,6 @@ function AsyncVDOMBuilder(globalData, parentNode, state) {
     this._sync = false;
 }
 
-var range;
-
 var proto = AsyncVDOMBuilder.prototype = {
     isAsyncVDOMBuilder: true,
 
@@ -71,6 +66,22 @@ var proto = AsyncVDOMBuilder.prototype = {
     },
 
     text: function(text) {
+        var type = typeof text;
+
+        if (type !== 'string') {
+            if (text == null) {
+                return;
+            } else if (type === 'object') {
+                var safeHTML = text.safeHTML;
+                if (safeHTML) {
+                    var html = typeof safeHTML === 'function' ? text.safeHTML() : safeHTML;
+                    return this.html(html);
+                }
+            } else {
+                text = text.toString();
+            }
+        }
+
         var parent = this._parent;
         if (parent) {
             var lastChild = parent.lastChild;
@@ -88,39 +99,9 @@ var proto = AsyncVDOMBuilder.prototype = {
     },
 
     html: function(html) {
-        if (!specialHtmlRegexp.test(html)) {
-            return this.text(html);
-        }
-
-        var document = this.document;
-
-        if (!range && document.createRange) {
-            range = document.createRange();
-            range.selectNode(document.body);
-        }
-
-        var vdomFragment;
-
-        var fragment;
-        if (range && range.createContextualFragment) {
-            fragment = range.createContextualFragment(html);
-            vdomFragment = virtualize(fragment);
-        } else {
-            var container = document.createElement('body');
-            container.innerHTML = html;
-
-            var curChild = container.firstChild;
-            if (curChild) {
-                vdomFragment = new DocumentFragment();
-                while(curChild) {
-                    vdomFragment.appendChild(virtualize(curChild));
-                    curChild = curChild.nextSibling;
-                }
-            }
-        }
-
-        if (vdomFragment) {
-            this.node(vdomFragment);
+        if (html != null) {
+            var vdomNode = virtualizeHTML(html, documentProvider.document);
+            this.node(vdomNode);
         }
 
         return this;
@@ -291,7 +272,7 @@ var proto = AsyncVDOMBuilder.prototype = {
             var vdomTree = this.getOutput();
 
             if (!doc) {
-                doc = this.document || defaultDocument;
+                doc = documentProvider.document;
             }
 
             node = vdomTree.actualize(doc);
diff --git a/runtime/vdom/HTMLElement.js b/runtime/vdom/HTMLElement.js
index 198304ed2..f20ed153a 100644
--- a/runtime/vdom/HTMLElement.js
+++ b/runtime/vdom/HTMLElement.js
@@ -1,8 +1,11 @@
+require('raptor-polyfill/string/startsWith');
 var inherit = require('raptor-util/inherit');
 var extend = require('raptor-util/extend');
 var Text = require('./Text');
 var Comment = require('./Comment');
 var Node = require('./Node');
+var documentProvider = require('../document-provider');
+var virtualizeHTML;
 
 var NS_XLINK = 'http://www.w3.org/1999/xlink';
 var ATTR_HREF = 'href';
@@ -20,6 +23,16 @@ function removePreservedAttributes(attrs) {
     return attrs;
 }
 
+function convertAttrValue(type, value) {
+    if (value === true) {
+        return '';
+    } else if (type === 'object') {
+        return JSON.stringify(value);
+    } else {
+        return value.toString();
+    }
+}
+
 function HTMLElementClone(other) {
     extend(this, other);
     this.parentNode = undefined;
@@ -136,6 +149,19 @@ HTMLElement.prototype = {
                 if (attrValue == null || attrValue === false) {
                     targetNode.removeAttribute(attrName);
                 } else if (oldAttrs[attrName] !== attrValue) {
+
+                    if (attrName.startsWith('data-_')) {
+                        // Special attributes aren't copied to the real DOM. They are only
+                        // kept in the virtual attributes map
+                        continue;
+                    }
+
+                    var type = typeof attrValue;
+
+                    if (type !== 'string') {
+                        attrValue = convertAttrValue(type, attrValue);
+                    }
+
                     targetNode.setAttribute(attrName, attrValue);
                 }
             }
@@ -182,6 +208,20 @@ HTMLElement.prototype = {
      * @param  {String} value The text value for the new Text node
      */
     t: function(value) {
+        var type = typeof value;
+
+        if (type !== 'string') {
+            if (value == null) {
+                value = '';
+            } else if (type === 'object') {
+                var safeHTML = value.safeHTML;
+                var vdomNode = virtualizeHTML(safeHTML || '', documentProvider.document);
+                this.appendChild(vdomNode);
+                return this._finishChild();
+            } else {
+                value = value.toString();
+            }
+        }
         this.appendChild(new Text(value));
         return this._finishChild();
     },
@@ -221,9 +261,17 @@ HTMLElement.prototype = {
         for (var attrName in attributes) {
             var attrValue = attributes[attrName];
 
+            if (attrName.startsWith('data-_')) {
+                continue;
+            }
+
             if (attrValue !== false && attrValue != null) {
-                if (attrValue === true) {
-                    attrValue = '';
+                var type = typeof attrValue;
+
+                if (type !== 'string') {
+                    // Special attributes aren't copied to the real DOM. They are only
+                    // kept in the virtual attributes map
+                    attrValue = convertAttrValue(type, attrValue);
                 }
 
                 if (attrName === 'xlink:href') {
@@ -313,4 +361,6 @@ Object.defineProperty(proto, 'disabled', {
     }
 });
 
-module.exports = HTMLElement;
\ No newline at end of file
+module.exports = HTMLElement;
+
+virtualizeHTML = require('./virtualizeHTML');
\ No newline at end of file
diff --git a/runtime/vdom/helpers.js b/runtime/vdom/helpers.js
index 4231dbe0e..93446bdcd 100644
--- a/runtime/vdom/helpers.js
+++ b/runtime/vdom/helpers.js
@@ -1,19 +1,3 @@
-/*
-* Copyright 2011 eBay Software Foundation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
 'use strict';
 
 var HTMLElement = require('./HTMLElement');
@@ -23,67 +7,69 @@ var extend = require('raptor-util/extend');
 
 var classList = commonHelpers.cl;
 
-module.exports = extend({
-    e: function(tagName, attrs, childCount, constId) {
-        return new HTMLElement(tagName, attrs, childCount, constId);
-    },
-    t: function(value) {
-        return new Text(value);
-    },
-    const: function(id) {
-        var i=0;
-        return function() {
-            return id + (i++);
-        };
-    },
+exports.e = function(tagName, attrs, childCount, constId) {
+    return new HTMLElement(tagName, attrs, childCount, constId);
+};
 
-    /**
-     * Helper for generating the string for a style attribute
-     * @param  {[type]} style [description]
-     * @return {[type]}       [description]
-     */
-    sa: function(style) {
-        if (!style) {
-            return null;
-        }
+exports.t = function(value) {
+    return new Text(value);
+};
 
-        if (typeof style === 'string') {
-            return style;
-        } else if (typeof style === 'object') {
-            var parts = [];
-            for (var name in style) {
-                if (style.hasOwnProperty(name)) {
-                    var value = style[name];
-                    if (value) {
-                        parts.push(name + ':' + value);
-                    }
+exports.const = function(id) {
+    var i=0;
+    return function() {
+        return id + (i++);
+    };
+};
+
+/**
+ * Helper for generating the string for a style attribute
+ * @param  {[type]} style [description]
+ * @return {[type]}       [description]
+ */
+exports.sa = function(style) {
+    if (!style) {
+        return null;
+    }
+
+    if (typeof style === 'string') {
+        return style;
+    } else if (typeof style === 'object') {
+        var parts = [];
+        for (var name in style) {
+            if (style.hasOwnProperty(name)) {
+                var value = style[name];
+                if (value) {
+                    parts.push(name + ':' + value);
                 }
             }
-            return parts ? parts.join(';') : null;
-        } else {
-            return null;
         }
-    },
+        return parts ? parts.join(';') : null;
+    } else {
+        return null;
+    }
+};
 
-    /**
-     * Internal helper method to handle the "class" attribute. The value can either
-     * be a string, an array or an object. For example:
-     *
-     * ca('foo bar') ==> ' class="foo bar"'
-     * ca({foo: true, bar: false, baz: true}) ==> ' class="foo baz"'
-     * ca(['foo', 'bar']) ==> ' class="foo bar"'
-     */
-    ca: function(classNames) {
-        if (!classNames) {
-            return null;
-        }
+/**
+ * Internal helper method to handle the "class" attribute. The value can either
+ * be a string, an array or an object. For example:
+ *
+ * ca('foo bar') ==> ' class="foo bar"'
+ * ca({foo: true, bar: false, baz: true}) ==> ' class="foo baz"'
+ * ca(['foo', 'bar']) ==> ' class="foo bar"'
+ */
+exports.ca = function(classNames) {
+    if (!classNames) {
+        return null;
+    }
 
-        if (typeof classNames === 'string') {
-            return classNames;
-        } else {
-            return classList(classNames);
-        }
-    },
+    if (typeof classNames === 'string') {
+        return classNames;
+    } else {
+        return classList(classNames);
+    }
+};
 
-    inline: require('./')._inline
-}, commonHelpers);
\ No newline at end of file
+exports.inline = require('./')._inline;
+
+extend(exports, commonHelpers);
\ No newline at end of file
diff --git a/runtime/vdom/index.js b/runtime/vdom/index.js
index 8da6697aa..5dff28868 100644
--- a/runtime/vdom/index.js
+++ b/runtime/vdom/index.js
@@ -136,14 +136,6 @@ exports.Template = Template;
 
 exports._inline = createInlineMarkoTemplate;
 
-/**
- * Used to associate a DOM Document with marko. This is needed
- * to parse HTML fragments to insert into the VDOM tree.
- */
-exports.setDocument = function(newDoc) {
-    AsyncVDOMBuilder.prototype.document = newDoc;
-};
-
 
 helpers = require('./helpers');
 exports.helpers = helpers;
diff --git a/runtime/vdom/virtualizeHTML.js b/runtime/vdom/virtualizeHTML.js
new file mode 100644
index 000000000..f9cdeeee4
--- /dev/null
+++ b/runtime/vdom/virtualizeHTML.js
@@ -0,0 +1,37 @@
+var Text = require('./Text');
+var DocumentFragment = require('./DocumentFragment');
+var virtualize = require('./virtualize');
+var specialHtmlRegexp = /[&<]/;
+
+var range;
+
+module.exports = function virtualizeHTML(html, doc) {
+    if (!specialHtmlRegexp.test(html)) {
+        return new Text(html);
+    }
+
+    if (!range && doc.createRange) {
+        range = doc.createRange();
+        range.selectNode(doc.body);
+    }
+
+    var vdomFragment;
+
+    var fragment;
+    if (range && range.createContextualFragment) {
+        fragment = range.createContextualFragment(html);
+        vdomFragment = virtualize(fragment);
+    } else {
+        var container = doc.createElement('body');
+        container.innerHTML = html;
+        vdomFragment = new DocumentFragment();
+
+        var curChild = container.firstChild;
+        while(curChild) {
+            vdomFragment.appendChild(virtualize(curChild));
+            curChild = curChild.nextSibling;
+        }
+    }
+
+    return vdomFragment;
+};
\ No newline at end of file
diff --git a/test/autotests/render/attr-number/expected.html b/test/autotests/render/attr-number/expected.html
new file mode 100644
index 000000000..c7cd125a8
--- /dev/null
+++ b/test/autotests/render/attr-number/expected.html
@@ -0,0 +1 @@
+<div data-foo=1></div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-number/template.marko b/test/autotests/render/attr-number/template.marko
new file mode 100644
index 000000000..75d2333da
--- /dev/null
+++ b/test/autotests/render/attr-number/template.marko
@@ -0,0 +1,2 @@
+<div data-foo=1>
+</div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-number/test.js b/test/autotests/render/attr-number/test.js
new file mode 100644
index 000000000..a3998af96
--- /dev/null
+++ b/test/autotests/render/attr-number/test.js
@@ -0,0 +1,5 @@
+exports.templateData = {
+    message: {
+        safeHTML: '<span>Hello World</span>'
+    }
+};
\ No newline at end of file
diff --git a/test/autotests/render/attr-object-dynamic/expected.html b/test/autotests/render/attr-object-dynamic/expected.html
new file mode 100644
index 000000000..cb372d884
--- /dev/null
+++ b/test/autotests/render/attr-object-dynamic/expected.html
@@ -0,0 +1 @@
+<div value='{"hello":"world&#39;s"}'></div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-object-dynamic/template.marko b/test/autotests/render/attr-object-dynamic/template.marko
new file mode 100644
index 000000000..ad44b1901
--- /dev/null
+++ b/test/autotests/render/attr-object-dynamic/template.marko
@@ -0,0 +1 @@
+<div value=data.myObject/>
\ No newline at end of file
diff --git a/test/autotests/render/attr-object-dynamic/test.js b/test/autotests/render/attr-object-dynamic/test.js
new file mode 100644
index 000000000..b9b95ee13
--- /dev/null
+++ b/test/autotests/render/attr-object-dynamic/test.js
@@ -0,0 +1,3 @@
+exports.templateData = {
+    myObject: {hello: 'world\'s'}
+};
\ No newline at end of file
diff --git a/test/autotests/render/attr-object/expected.html b/test/autotests/render/attr-object/expected.html
new file mode 100644
index 000000000..2cd5dd405
--- /dev/null
+++ b/test/autotests/render/attr-object/expected.html
@@ -0,0 +1 @@
+<div data-hello='{"foo":"bar"}'></div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-object/template.marko b/test/autotests/render/attr-object/template.marko
new file mode 100644
index 000000000..f6237285d
--- /dev/null
+++ b/test/autotests/render/attr-object/template.marko
@@ -0,0 +1 @@
+<div data-hello={foo: 'bar'}/>
\ No newline at end of file
diff --git a/test/autotests/render/attr-object/test.js b/test/autotests/render/attr-object/test.js
new file mode 100644
index 000000000..015cec295
--- /dev/null
+++ b/test/autotests/render/attr-object/test.js
@@ -0,0 +1,2 @@
+exports.templateData = {};
+exports.vdomSkip = false;
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-expression-circular/expected.html b/test/autotests/render/attr-special-object-expression-circular/expected.html
new file mode 100644
index 000000000..e3db04dfc
--- /dev/null
+++ b/test/autotests/render/attr-special-object-expression-circular/expected.html
@@ -0,0 +1 @@
+<div data-_onclick='{"o":{"name":"parent","child":{}},"$$":[{"l":["child","parent"],"r":[]}]}'></div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-expression-circular/template.marko b/test/autotests/render/attr-special-object-expression-circular/template.marko
new file mode 100644
index 000000000..d2ca0117a
--- /dev/null
+++ b/test/autotests/render/attr-special-object-expression-circular/template.marko
@@ -0,0 +1 @@
+<div data-_onclick=data.parent/>
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-expression-circular/test.js b/test/autotests/render/attr-special-object-expression-circular/test.js
new file mode 100644
index 000000000..0e04efcee
--- /dev/null
+++ b/test/autotests/render/attr-special-object-expression-circular/test.js
@@ -0,0 +1,14 @@
+var parent = {
+    name: 'parent'
+};
+
+var child = {
+    parent: parent
+};
+
+parent.child = child;
+
+exports.templateData = {
+    parent: parent
+};
+exports.vdomSkip = true;
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-expression/expected.html b/test/autotests/render/attr-special-object-expression/expected.html
new file mode 100644
index 000000000..edeb88f49
--- /dev/null
+++ b/test/autotests/render/attr-special-object-expression/expected.html
@@ -0,0 +1 @@
+<div data-_onclick='{"foo":"bar"}'></div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-expression/template.marko b/test/autotests/render/attr-special-object-expression/template.marko
new file mode 100644
index 000000000..b37cc2f26
--- /dev/null
+++ b/test/autotests/render/attr-special-object-expression/template.marko
@@ -0,0 +1 @@
+<div data-_onclick=data.specialData/>
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-expression/test.js b/test/autotests/render/attr-special-object-expression/test.js
new file mode 100644
index 000000000..e60c209de
--- /dev/null
+++ b/test/autotests/render/attr-special-object-expression/test.js
@@ -0,0 +1,6 @@
+exports.templateData = {
+    specialData: {
+        foo: 'bar'
+    }
+};
+exports.vdomSkip = true;
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-literal/expected.html b/test/autotests/render/attr-special-object-literal/expected.html
new file mode 100644
index 000000000..edeb88f49
--- /dev/null
+++ b/test/autotests/render/attr-special-object-literal/expected.html
@@ -0,0 +1 @@
+<div data-_onclick='{"foo":"bar"}'></div>
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-literal/template.marko b/test/autotests/render/attr-special-object-literal/template.marko
new file mode 100644
index 000000000..8da0c7003
--- /dev/null
+++ b/test/autotests/render/attr-special-object-literal/template.marko
@@ -0,0 +1 @@
+<div data-_onclick={ foo: 'bar' }/>
\ No newline at end of file
diff --git a/test/autotests/render/attr-special-object-literal/test.js b/test/autotests/render/attr-special-object-literal/test.js
new file mode 100644
index 000000000..e60c209de
--- /dev/null
+++ b/test/autotests/render/attr-special-object-literal/test.js
@@ -0,0 +1,6 @@
+exports.templateData = {
+    specialData: {
+        foo: 'bar'
+    }
+};
+exports.vdomSkip = true;
\ No newline at end of file
diff --git a/test/autotests/render/safeHTML-value/expected.html b/test/autotests/render/safeHTML-value/expected.html
new file mode 100644
index 000000000..f28d2cbdf
--- /dev/null
+++ b/test/autotests/render/safeHTML-value/expected.html
@@ -0,0 +1 @@
+<div><span>Hello World</span></div>
\ No newline at end of file
diff --git a/test/autotests/render/safeHTML-value/template.marko b/test/autotests/render/safeHTML-value/template.marko
new file mode 100644
index 000000000..016b8f3a5
--- /dev/null
+++ b/test/autotests/render/safeHTML-value/template.marko
@@ -0,0 +1,3 @@
+<div>
+    ${data.message}
+</div>
\ No newline at end of file
diff --git a/test/autotests/render/safeHTML-value/test.js b/test/autotests/render/safeHTML-value/test.js
new file mode 100644
index 000000000..a3998af96
--- /dev/null
+++ b/test/autotests/render/safeHTML-value/test.js
@@ -0,0 +1,5 @@
+exports.templateData = {
+    message: {
+        safeHTML: '<span>Hello World</span>'
+    }
+};
\ No newline at end of file
diff --git a/test/autotests/vdom-compiler/attr-class-expression/expected.js b/test/autotests/vdom-compiler/attr-class-expression/expected.js
index 3ad2461c0..25b2f687c 100644
--- a/test/autotests/vdom-compiler/attr-class-expression/expected.js
+++ b/test/autotests/vdom-compiler/attr-class-expression/expected.js
@@ -4,7 +4,6 @@ module.exports = template;
 
 var marko_helpers = require("marko/runtime/vdom/helpers"),
     marko_classList = marko_helpers.cl,
-    marko_str = marko_helpers.s,
     marko_classAttr = marko_helpers.ca;
 
 function render(data, out) {
@@ -13,10 +12,10 @@ function render(data, out) {
           bar: true,
           baz: false
         }))
-    }, 1)
-    .t("Hello " +
-      marko_str(name) +
-      "!");
+    }, 3)
+    .t("Hello ")
+    .t(name)
+    .t("!");
 }
 
 template._ = render;
diff --git a/test/autotests/vdom-compiler/attrs-dynamic-object-literal/expected.js b/test/autotests/vdom-compiler/attrs-dynamic-object-literal/expected.js
index 5b9ad9d99..c56964c16 100644
--- a/test/autotests/vdom-compiler/attrs-dynamic-object-literal/expected.js
+++ b/test/autotests/vdom-compiler/attrs-dynamic-object-literal/expected.js
@@ -2,17 +2,14 @@ var template = require("marko/vdom").c(__filename);
 
 module.exports = template;
 
-var marko_helpers = require("marko/runtime/vdom/helpers"),
-    marko_str = marko_helpers.s;
-
 function render(data, out) {
   out.e("div", {
       foo: "bar",
       hello: "world"
-    }, 1)
-    .t("Hello " +
-      marko_str(name) +
-      "!");
+    }, 3)
+    .t("Hello ")
+    .t(name)
+    .t("!");
 }
 
 template._ = render;
diff --git a/test/autotests/vdom-compiler/attrs-dynamic/expected.js b/test/autotests/vdom-compiler/attrs-dynamic/expected.js
index 541054db7..00f9a7e5b 100644
--- a/test/autotests/vdom-compiler/attrs-dynamic/expected.js
+++ b/test/autotests/vdom-compiler/attrs-dynamic/expected.js
@@ -2,19 +2,16 @@ var template = require("marko/vdom").c(__filename);
 
 module.exports = template;
 
-var marko_helpers = require("marko/runtime/vdom/helpers"),
-    marko_str = marko_helpers.s;
-
 function render(data, out) {
   var attrs = {
           foo: "bar",
           hello: "world"
         };
 
-  out.e("div", attrs, 1)
-    .t("Hello " +
-      marko_str(name) +
-      "!");
+  out.e("div", attrs, 3)
+    .t("Hello ")
+    .t(name)
+    .t("!");
 }
 
 template._ = render;
diff --git a/test/autotests/vdom-compiler/dynamic-body-text/expected.js b/test/autotests/vdom-compiler/dynamic-body-text/expected.js
index e2659de6d..70ee42565 100644
--- a/test/autotests/vdom-compiler/dynamic-body-text/expected.js
+++ b/test/autotests/vdom-compiler/dynamic-body-text/expected.js
@@ -2,17 +2,15 @@ var template = require("marko/vdom").c(__filename);
 
 module.exports = template;
 
-var marko_helpers = require("marko/runtime/vdom/helpers"),
-    marko_str = marko_helpers.s,
-    marko_attrs0 = {
+var marko_attrs0 = {
         "class": "foo"
       };
 
 function render(data, out) {
-  out.e("div", marko_attrs0, 1)
-    .t("Hello " +
-      marko_str(name) +
-      "!");
+  out.e("div", marko_attrs0, 3)
+    .t("Hello ")
+    .t(name)
+    .t("!");
 }
 
 template._ = render;
diff --git a/test/autotests/vdom-compiler/no-escape/expected.js b/test/autotests/vdom-compiler/no-escape/expected.js
index db82d5da2..abb54f3dd 100644
--- a/test/autotests/vdom-compiler/no-escape/expected.js
+++ b/test/autotests/vdom-compiler/no-escape/expected.js
@@ -2,15 +2,14 @@ var template = require("marko/vdom").c(__filename);
 
 module.exports = template;
 
-var marko_helpers = require("marko/runtime/vdom/helpers"),
-    marko_str = marko_helpers.s;
-
 function render(data, out) {
-  out.t("Hello " +
-    marko_str(name) +
-    "! ");
+  out.t("Hello ");
 
-  out.h(marko_str(message));
+  out.t(name);
+
+  out.t("! ");
+
+  out.h(message);
 }
 
 template._ = render;
diff --git a/test/autotests/vdom-compiler/simple/expected.js b/test/autotests/vdom-compiler/simple/expected.js
index 2f13f3375..1fa02f3b8 100644
--- a/test/autotests/vdom-compiler/simple/expected.js
+++ b/test/autotests/vdom-compiler/simple/expected.js
@@ -3,7 +3,6 @@ var template = require("marko/vdom").c(__filename);
 module.exports = template;
 
 var marko_helpers = require("marko/runtime/vdom/helpers"),
-    marko_str = marko_helpers.s,
     marko_forEach = marko_helpers.f,
     marko_createElement = marko_helpers.e,
     marko_const = marko_helpers.const,
@@ -12,17 +11,17 @@ var marko_helpers = require("marko/runtime/vdom/helpers"),
       .t("No colors!");
 
 function render(data, out) {
-  out.e("h1", null, 1)
-    .t("Hello " +
-      marko_str(data.name) +
-      "!");
+  out.e("h1", null, 3)
+    .t("Hello ")
+    .t(data.name)
+    .t("!");
 
   if (data.colors.length) {
     out.be("ul");
 
     marko_forEach(data.colors, function(color) {
       out.e("li", null, 1)
-        .t(marko_str(color));
+        .t(color);
     });
 
     out.ee();
diff --git a/test/autotests/vdom-compiler/static-element-nested/expected.js b/test/autotests/vdom-compiler/static-element-nested/expected.js
index fc0fd8888..71ba18cd3 100644
--- a/test/autotests/vdom-compiler/static-element-nested/expected.js
+++ b/test/autotests/vdom-compiler/static-element-nested/expected.js
@@ -3,7 +3,6 @@ var template = require("marko/vdom").c(__filename);
 module.exports = template;
 
 var marko_helpers = require("marko/runtime/vdom/helpers"),
-    marko_str = marko_helpers.s,
     marko_createElement = marko_helpers.e,
     marko_const = marko_helpers.const,
     marko_const_nextId = marko_const("69a896"),
@@ -15,10 +14,10 @@ var marko_helpers = require("marko/runtime/vdom/helpers"),
 
 function render(data, out) {
   out.e("span", null, 2)
-    .e("h1", null, 1)
-      .t("Hello " +
-        marko_str(data.name) +
-        "!")
+    .e("h1", null, 3)
+      .t("Hello ")
+      .t(data.name)
+      .t("!")
     .n(marko_node0);
 }
 
diff --git a/test/autotests/widgets-browser-deprecated/widget-renderer-only/index.js b/test/autotests/widgets-browser-deprecated/widget-renderer-only/index.js
index 3190ca9b4..1195c4dd8 100644
--- a/test/autotests/widgets-browser-deprecated/widget-renderer-only/index.js
+++ b/test/autotests/widgets-browser-deprecated/widget-renderer-only/index.js
@@ -1,7 +1,5 @@
 module.exports = require('marko/widgets').defineComponent({
-    createOut: require('marko/html').createOut,
-    
     renderer: function(input, out) {
-        out.write('Hello ' + input.name + '!');
+        out.text('Hello ' + input.name + '!');
     }
 });
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-label-for/test.js b/test/autotests/widgets-browser/widget-label-for/test.js
index 2c4f61859..3c8360c7f 100644
--- a/test/autotests/widgets-browser/widget-label-for/test.js
+++ b/test/autotests/widgets-browser/widget-label-for/test.js
@@ -6,7 +6,7 @@ module.exports = function(helpers) {
     var forElId = label.getAttribute('for');
     var inputEl = document.getElementById(forElId);
 
-    expect(forElId).to.exist;
+    expect(!!forElId).to.equal(true);
     expect(inputEl.value).to.equal('test');
     expect(label.getAttribute('for-ref')).to.equal(null);
 };
diff --git a/test/autotests/widgets-browser/widget-render-to-iframe/test.js b/test/autotests/widgets-browser/widget-render-to-iframe/test.js
index 77f2a1715..051532190 100644
--- a/test/autotests/widgets-browser/widget-render-to-iframe/test.js
+++ b/test/autotests/widgets-browser/widget-render-to-iframe/test.js
@@ -3,7 +3,7 @@ var expect = require('chai').expect;
 module.exports = function(helpers) {
     var widget = helpers.mount(require('./index'), {});
 
-    expect(widget.__document).to.exist;
+    expect(widget.__document != null).to.equal(true);
     expect(widget.__document).to.equal(document);
 
     var contentWidget = widget.renderIntoIframe();
diff --git a/test/autotests/widgets-browser/widget-renderer-only/index.js b/test/autotests/widgets-browser/widget-renderer-only/index.js
index 3190ca9b4..1195c4dd8 100644
--- a/test/autotests/widgets-browser/widget-renderer-only/index.js
+++ b/test/autotests/widgets-browser/widget-renderer-only/index.js
@@ -1,7 +1,5 @@
 module.exports = require('marko/widgets').defineComponent({
-    createOut: require('marko/html').createOut,
-    
     renderer: function(input, out) {
-        out.write('Hello ' + input.name + '!');
+        out.text('Hello ' + input.name + '!');
     }
 });
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/test.js b/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/test.js
index 975dcc5f5..454eefaf0 100644
--- a/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/test.js
+++ b/test/autotests/widgets-browser/widget-stateful-no-rerender-if-destroyed/test.js
@@ -10,5 +10,5 @@ module.exports = function(helpers) {
 
     widget.destroy();
 
-    expect(widget.update()).to.be.undefined;
+    expect(widget.update() === undefined).to.equal(true);
 };
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/async-boundaries/browser.json b/test/autotests/widgets-pages/async-boundaries/browser.json
index 63a44d4cb..dc1e86e5b 100644
--- a/test/autotests/widgets-pages/async-boundaries/browser.json
+++ b/test/autotests/widgets-pages/async-boundaries/browser.json
@@ -1,5 +1,7 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-async/widget",
+        "require: ./components/app-hello/widget",
+        "require: ./components/app-init-async/widget"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/async-boundaries/components/app-async/renderer.js b/test/autotests/widgets-pages/async-boundaries/components/app-async/renderer.js
index 21facce81..36f97381e 100644
--- a/test/autotests/widgets-pages/async-boundaries/components/app-async/renderer.js
+++ b/test/autotests/widgets-pages/async-boundaries/components/app-async/renderer.js
@@ -1,4 +1,4 @@
-var template = require('marko').load(require.resolve('./template.marko'));
+var template = require('./template.marko');
 
 module.exports = function(input, out) {
     var asyncOut = out.beginAsync();
diff --git a/test/autotests/widgets-pages/dom-events/browser.json b/test/autotests/widgets-pages/dom-events/browser.json
index 63a44d4cb..36bd7c876 100644
--- a/test/autotests/widgets-pages/dom-events/browser.json
+++ b/test/autotests/widgets-pages/dom-events/browser.json
@@ -1,5 +1,5 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/getRenderedWidgets/browser.json b/test/autotests/widgets-pages/getRenderedWidgets/browser.json
index 63a44d4cb..0733c440c 100644
--- a/test/autotests/widgets-pages/getRenderedWidgets/browser.json
+++ b/test/autotests/widgets-pages/getRenderedWidgets/browser.json
@@ -1,5 +1,5 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-simple"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/browser.json b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/browser.json
index 63a44d4cb..c08375151 100644
--- a/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/browser.json
+++ b/test/autotests/widgets-pages/init-widgets-immediate-await-client-reorder/browser.json
@@ -1,5 +1,6 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo",
+        "require: ./components/app-bar"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/init-widgets-immediate/browser.json b/test/autotests/widgets-pages/init-widgets-immediate/browser.json
index 63a44d4cb..8220c1210 100644
--- a/test/autotests/widgets-pages/init-widgets-immediate/browser.json
+++ b/test/autotests/widgets-pages/init-widgets-immediate/browser.json
@@ -1,5 +1,7 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo",
+        "require: ./components/app-bar",
+        "require: ./components/app-baz"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/init-widgets-tag-none/browser.json b/test/autotests/widgets-pages/init-widgets-tag-none/browser.json
index 63a44d4cb..8220c1210 100644
--- a/test/autotests/widgets-pages/init-widgets-tag-none/browser.json
+++ b/test/autotests/widgets-pages/init-widgets-tag-none/browser.json
@@ -1,5 +1,7 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo",
+        "require: ./components/app-bar",
+        "require: ./components/app-baz"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/init-widgets-tag/browser.json b/test/autotests/widgets-pages/init-widgets-tag/browser.json
index 63a44d4cb..8220c1210 100644
--- a/test/autotests/widgets-pages/init-widgets-tag/browser.json
+++ b/test/autotests/widgets-pages/init-widgets-tag/browser.json
@@ -1,5 +1,7 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo",
+        "require: ./components/app-bar",
+        "require: ./components/app-baz"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/server-browser-unique-ids/browser.json b/test/autotests/widgets-pages/server-browser-unique-ids/browser.json
index 63a44d4cb..36bd7c876 100644
--- a/test/autotests/widgets-pages/server-browser-unique-ids/browser.json
+++ b/test/autotests/widgets-pages/server-browser-unique-ids/browser.json
@@ -1,5 +1,5 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/split-widget-renderer/browser.json b/test/autotests/widgets-pages/split-widget-renderer/browser.json
index 73d1595d7..141f17271 100644
--- a/test/autotests/widgets-pages/split-widget-renderer/browser.json
+++ b/test/autotests/widgets-pages/split-widget-renderer/browser.json
@@ -1,5 +1,5 @@
 {
     "dependencies": [
-        "require: ./components/**/widget.js"
+        "require: ./components/app-button-split/widget"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/widget-config/browser.json b/test/autotests/widgets-pages/widget-config/browser.json
index 63a44d4cb..36bd7c876 100644
--- a/test/autotests/widgets-pages/widget-config/browser.json
+++ b/test/autotests/widgets-pages/widget-config/browser.json
@@ -1,5 +1,5 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/widget-fixed-id/browser.json b/test/autotests/widgets-pages/widget-fixed-id/browser.json
index 63a44d4cb..22dc158c8 100644
--- a/test/autotests/widgets-pages/widget-fixed-id/browser.json
+++ b/test/autotests/widgets-pages/widget-fixed-id/browser.json
@@ -1,5 +1,6 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-fixed-id",
+        "require: ./components/app-hello/widget"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/widget-state/browser.json b/test/autotests/widgets-pages/widget-state/browser.json
index 63a44d4cb..36bd7c876 100644
--- a/test/autotests/widgets-pages/widget-state/browser.json
+++ b/test/autotests/widgets-pages/widget-state/browser.json
@@ -1,5 +1,5 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo"
     ]
 }
\ No newline at end of file
diff --git a/test/autotests/widgets-pages/xss/browser.json b/test/autotests/widgets-pages/xss/browser.json
index 63a44d4cb..36bd7c876 100644
--- a/test/autotests/widgets-pages/xss/browser.json
+++ b/test/autotests/widgets-pages/xss/browser.json
@@ -1,5 +1,5 @@
 {
     "dependencies": [
-        "require: ./components/**/*.js"
+        "require: ./components/app-foo"
     ]
 }
\ No newline at end of file
diff --git a/test/util/domToHTML.js b/test/util/domToHTML.js
index bf820f954..3c8a3e895 100644
--- a/test/util/domToHTML.js
+++ b/test/util/domToHTML.js
@@ -1,7 +1,8 @@
 'use strict';
 
-var escapeXml = require('../../runtime/html/escapeXml');
-var escapeXmlAttr = escapeXml.attr;
+var runtimeHtmlHelpers = require('../../runtime/html/helpers');
+var escapeXml = runtimeHtmlHelpers.x;
+var escapeXmlAttr = runtimeHtmlHelpers.xa;
 
 var openTagOnly = {};
 
diff --git a/test/util/runRenderTest.js b/test/util/runRenderTest.js
index 3384074c9..5b58ee830 100644
--- a/test/util/runRenderTest.js
+++ b/test/util/runRenderTest.js
@@ -9,7 +9,7 @@ const jsdom = require("jsdom").jsdom;
 const expect = require('chai').expect;
 
 const defaultDocument = jsdom('<html><body></body></html>');
-require('../../runtime/vdom').setDocument(defaultDocument); // We need this to parse HTML fragments on the server
+require('../../').setDocument(defaultDocument); // We need this to parse HTML fragments on the server
 
 
 function createAsyncVerifier(main, helpers, out) {
@@ -179,10 +179,11 @@ module.exports = function runRenderTest(dir, helpers, done, options) {
                     getExpectedHtml(function(err, expectedHtml) {
                         fs.writeFileSync(path.join(dir, 'vdom-expected.generated.html'), expectedHtml, { encoding: 'utf8' });
 
+                        let actualizedDom = vdomTree.actualize(defaultDocument);
 
                         // NOTE: We serialie the virtual DOM tree into an HTML string and reparse so that we can
                         //       normalize the text
-                        let vdomHtml = domToHTML(vdomTree);
+                        let vdomHtml = domToHTML(actualizedDom);
                         let vdomRealDocument = jsdom('<html><body>' + vdomHtml + '</body></html>');
                         let vdomString = domToString(vdomRealDocument.body, { childrenOnly: true });
                         helpers.compare(vdomString, 'vdom-', '.generated.html');
diff --git a/widgets/event-delegation.js b/widgets/event-delegation.js
index feff9b9cb..3b25fdd17 100644
--- a/widgets/event-delegation.js
+++ b/widgets/event-delegation.js
@@ -1,5 +1,19 @@
 var _addEventListener = require('./addEventListener');
 var updateManager = require('./update-manager');
+var warp10Parse = require('warp10/parse');
+
+function getEventAttribute(el, attrName) {
+    var virtualAttrs = el._vattrs;
+
+    if (virtualAttrs) {
+        return el._vattrs[attrName];
+    } else {
+        var attrValue = el.getAttribute(attrName);
+        if (attrValue) {
+            return warp10Parse(attrValue);
+        }
+    }
+}
 
 var attachBubbleEventListeners = function() {
     var body = document.body;
@@ -30,17 +44,22 @@ var attachBubbleEventListeners = function() {
 
                 // Search up the tree looking DOM events mapped to target
                 // widget methods
-                var attrName = 'data-w-on' + eventType;
-                var targetMethod;
-                var targetWidget;
+                var attrName = 'data-_on' + eventType;
+                var target;
 
                 // Attributes will have the following form:
                 // w-on<event_type>="<target_method>|<widget_id>"
 
                 do {
-                    if ((targetMethod = curNode.getAttribute(attrName))) {
-                        var separator = targetMethod.lastIndexOf('|');
-                        var targetWidgetId = targetMethod.substring(separator+1);
+                    if ((target = getEventAttribute(curNode, attrName))) {
+                        var targetMethod = target[0];
+                        var targetWidgetId = target[1];
+                        var targetArgs;
+
+                        if (target.length > 2) {
+                            targetArgs = target.slice(2);
+                        }
+
                         var targetWidgetEl = document.getElementById(targetWidgetId);
                         if (!targetWidgetEl) {
                             // The target widget is not in the DOM anymore
@@ -50,12 +69,11 @@ var attachBubbleEventListeners = function() {
                             continue;
                         }
 
-                        targetWidget = targetWidgetEl.__widget;
+                        var targetWidget = targetWidgetEl.__widget;
 
                         if (!targetWidget) {
                             throw new Error('Widget not found: ' + targetWidgetId);
                         }
-                        targetMethod = targetMethod.substring(0, separator);
 
                         var targetFunc = targetWidget[targetMethod];
                         if (!targetFunc) {
diff --git a/widgets/taglib/TransformHelper/handleWidgetEvents.js b/widgets/taglib/TransformHelper/handleWidgetEvents.js
index 4ea36f38e..74eb7a1fb 100644
--- a/widgets/taglib/TransformHelper/handleWidgetEvents.js
+++ b/widgets/taglib/TransformHelper/handleWidgetEvents.js
@@ -42,26 +42,17 @@ function addBubblingEventListener(transformHelper, eventType, targetMethod) {
         builder.identifier('widget'),
         builder.identifier('id'));
 
-    if (targetMethod.type === 'Literal') {
-        // We know the event handler is method is no conditional so we set the attribute correctly at compile time
-        attrValue = builder.concat(
-           targetMethod,
-           builder.literal('|'),
-           widgetIdExpression);
-    } else {
+    // The event handler method is conditional and it may resolve to a null method name. Therefore,
+    // we need to use a runtime helper to set the value correctly.
+    var markoWidgetsEventFuncId = transformHelper.context.importModule('markoWidgets_event',
+        transformHelper.getMarkoWidgetsRequirePath('marko/widgets/taglib/helpers/event'));
 
-        // The event handler method is conditional and it may resolve to a null method name. Therefore,
-        // we need to use a runtime helper to set the value correctly.
-        var markoWidgetsEventFuncId = transformHelper.context.importModule('markoWidgets_event',
-            transformHelper.getMarkoWidgetsRequirePath('marko/widgets/taglib/helpers/event'));
+    attrValue = builder.functionCall(markoWidgetsEventFuncId, [
+            targetMethod,
+            widgetIdExpression
+        ]);
 
-        attrValue = builder.functionCall(markoWidgetsEventFuncId, [
-                targetMethod,
-                widgetIdExpression
-            ]);
-    }
-
-    el.setAttributeValue('data-w-on' + eventType.value, attrValue);
+    el.setAttributeValue('data-_on' + eventType.value, attrValue);
 }
 
 function addDirectEventListener(transformHelper, eventType, targetMethod) {
diff --git a/widgets/taglib/helpers/event.js b/widgets/taglib/helpers/event.js
index 76607b137..abc3f76fe 100644
--- a/widgets/taglib/helpers/event.js
+++ b/widgets/taglib/helpers/event.js
@@ -1,3 +1,3 @@
 module.exports = function(handlerMethodName, widgetId) {
-    return handlerMethodName && (handlerMethodName + '|' + widgetId);
+    return handlerMethodName && [handlerMethodName, widgetId];
 };
\ No newline at end of file