2 files changed, 21 insertions, 1 deletions
diff --git a/lib/output/createTemplateEngine.js b/lib/output/createTemplateEngine.js
index 810c41e..27dbeba 100644
--- a/lib/output/createTemplateEngine.js
+++ b/lib/output/createTemplateEngine.js
@@ -1,5 +1,10 @@
 var Immutable = require('immutable');
+
 var TemplateEngine = require('../models/templateEngine');
+var ConrefsLoader = require('./loaders/conrefs');
+
+var defaultBlocks = require('../constants/defaultBlocks');
+var defaultFilters = require('../constants/defaultFilters');
 
 /**
     Create template engine for an output.
@@ -22,9 +27,16 @@ function createTemplateEngine(output) {
         })
         .flatten();
 
+    // Extend with default
+    blocks = defaultBlocks.concat(blocks);
+    filters = defaultFilters.merge(filters);
+
+    var loader = new ConrefsLoader();
+
     return new TemplateEngine({
         filters: filters,
-        blocks: blocks
+        blocks: blocks,
+        loader: loader
     });
 }
 
diff --git a/lib/output/loaders/conrefs.js b/lib/output/loaders/conrefs.js
new file mode 100644
index 0000000..7580826
--- /dev/null
+++ b/lib/output/loaders/conrefs.js
@@ -0,0 +1,8 @@
+var nunjucks = require('nunjucks');
+
+var Loader = nunjucks.Loader.extend({
+    async: true,
+
+});
+
+module.exports = Loader;