diff --git a/demo-shell-ng2/config/loaders/system.js b/demo-shell-ng2/config/loaders/system.js
new file mode 100644
index 0000000000..2775093851
--- /dev/null
+++ b/demo-shell-ng2/config/loaders/system.js
@@ -0,0 +1,15 @@
+const moduleIdRegex = /moduleId: module.id,/g;
+
+module.exports = function(source) {
+    this.cacheable();
+
+    let result = source;
+    let modified = false;
+    if (moduleIdRegex.test(source)) {
+        result = source.replace(moduleIdRegex, (match) => {
+            return `// ${match}`;
+        });
+        // console.log(result);
+    }
+    return result;
+}
diff --git a/demo-shell-ng2/config/webpack.common.js b/demo-shell-ng2/config/webpack.common.js
index 39611e09b1..3bba170398 100644
--- a/demo-shell-ng2/config/webpack.common.js
+++ b/demo-shell-ng2/config/webpack.common.js
@@ -2,6 +2,7 @@ var webpack = require('webpack');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
 var helpers = require('./helpers');
+var path = require('path');
 
 var alfrescoLibs = [
     helpers.root('node_modules', 'alfresco-js-api'),
@@ -40,6 +41,12 @@ module.exports = {
     }
   },
 
+  resolveLoader: {
+      alias: {
+          'systemjs-loader': helpers.root('config', 'loaders', 'system.js')
+      }
+  },
+
   module: {
     loaders: [
       {
@@ -52,7 +59,7 @@ module.exports = {
         include: [
           ...alfrescoLibs
         ],
-        loader: 'angular2-template-loader',
+        loaders: ['angular2-template-loader', 'systemjs-loader']
       },
       {
         test: /\.html$/,
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
index eb00788f07..89f9a4e14f 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
@@ -40,7 +40,10 @@ import {
     ImageResolver
 } from './../data/share-datatable-adapter';
 
+declare var module: any;
+
 @Component({
+    moduleId: module.id,
     selector: 'alfresco-document-list',
     styleUrls: ['./document-list.css'],
     templateUrl: './document-list.html'