1 files changed, 5 insertions, 11 deletions
diff --git a/lib/output/createTemplateEngine.js b/lib/output/createTemplateEngine.js
index 9b29b2a..523c850 100644
--- a/lib/output/createTemplateEngine.js
+++ b/lib/output/createTemplateEngine.js
@@ -3,6 +3,8 @@ var Immutable = require('immutable');
 var Templating = require('../templating');
 var TemplateEngine = require('../models/templateEngine');
 
+var Plugins = require('../plugins');
+
 var defaultBlocks = require('../constants/defaultBlocks');
 var defaultFilters = require('../constants/defaultFilters');
 
@@ -19,19 +21,11 @@ function createTemplateEngine(output) {
     var rootFolder = book.getContentRoot();
     var logger = book.getLogger();
 
-    var filters = plugins
-        .reduce(function(result, plugin) {
-            return result.merge(plugin.getFilters());
-        }, Immutable.Map());
-
-    var blocks = plugins
-        .map(function(plugin) {
-            return plugin.getBlocks();
-        })
-        .flatten(1);
+    var filters = Plugins.listFilters(plugins);
+    var blocks = Plugins.listBlocks(plugins);
 
     // Extend with default
-    blocks = defaultBlocks.concat(blocks);
+    blocks = defaultBlocks.merge(blocks);
     filters = defaultFilters.merge(filters);
 
     // Create loader