diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
index 31de410d17..7e817d440f 100644
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2016 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 import {Component} from 'angular2/core';
 import {Router, RouteConfig, ROUTER_DIRECTIVES} from 'angular2/router';
 import {Authentication} from 'ng2-alfresco-login/ng2-alfresco-login';
-import {AlfrescoService} from 'ng2-alfresco-documentlist/ng2-alfresco-documentlist';
 import {MDL} from 'ng2-alfresco-core/material';
 import {FilesComponent} from './components/files/files.component';
 import {Login} from 'ng2-alfresco-login/ng2-alfresco-login';
 import {AuthRouterOutlet} from './components/router/AuthRouterOutlet';
 import {UploaderComponent} from './components/uploader/uploader.component';
+import {AlfrescoSettingsService} from 'ng2-alfresco-core/services';
 
 declare var document: any;
 
@@ -41,8 +41,8 @@ export class AppComponent {
 
     constructor(public auth:Authentication,
                 public router:Router,
-                alfrescoService:AlfrescoService) {
-        alfrescoService.host = 'http://192.168.99.100:8080';
+                alfrescoSettingsService:AlfrescoSettingsService) {
+        alfrescoSettingsService.host = 'http://192.168.99.100:8080';
     }
 
     isActive(instruction:any[]):boolean {
diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts
index 864bb4cc9c..54475cad5a 100644
--- a/demo-shell-ng2/app/components/files/files.component.ts
+++ b/demo-shell-ng2/app/components/files/files.component.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2016 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/demo-shell-ng2/app/components/router/AuthRouterOutlet.ts b/demo-shell-ng2/app/components/router/AuthRouterOutlet.ts
index 76cc2387e3..8a7d8aa446 100644
--- a/demo-shell-ng2/app/components/router/AuthRouterOutlet.ts
+++ b/demo-shell-ng2/app/components/router/AuthRouterOutlet.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2016 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/demo-shell-ng2/app/components/uploader/uploader.component.ts b/demo-shell-ng2/app/components/uploader/uploader.component.ts
index 5cdb55dfdc..78b1b57c8c 100644
--- a/demo-shell-ng2/app/components/uploader/uploader.component.ts
+++ b/demo-shell-ng2/app/components/uploader/uploader.component.ts
@@ -1,3 +1,19 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
 import {Component, NgZone} from 'angular2/core';
 import {UPLOAD_DIRECTIVES} from 'ng2-uploader/ng2-uploader';
 
diff --git a/demo-shell-ng2/app/license_header.txt b/demo-shell-ng2/app/license_header.txt
index 6119ea0f8e..3868d3f0c3 100644
--- a/demo-shell-ng2/app/license_header.txt
+++ b/demo-shell-ng2/app/license_header.txt
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2016 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,4 +13,4 @@
  * 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.
- */
\ No newline at end of file
+ */
diff --git a/demo-shell-ng2/app/main.ts b/demo-shell-ng2/app/main.ts
index 30f9e4f5a6..16791cf2f9 100644
--- a/demo-shell-ng2/app/main.ts
+++ b/demo-shell-ng2/app/main.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2005-2017 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@ import {AppComponent} from './app.component';
 import {ROUTER_PROVIDERS} from 'angular2/router';
 import {HTTP_PROVIDERS}    from 'angular2/http';
 import {ALFRESCO_AUTHENTICATION} from 'ng2-alfresco-login/ng2-alfresco-login';
-import {ALFRESCO_PROVIDERS} from 'ng2-alfresco-documentlist/ng2-alfresco-documentlist';
+import {ALFRESCO_CORE_PROVIDERS} from 'ng2-alfresco-core/services';
 
 bootstrap(AppComponent, [
     ROUTER_PROVIDERS,
     HTTP_PROVIDERS,
     ALFRESCO_AUTHENTICATION,
-    ALFRESCO_PROVIDERS
+    ALFRESCO_CORE_PROVIDERS
 ]);
diff --git a/ng2-components/ng2-alfresco-core/material.d.ts b/ng2-components/ng2-alfresco-core/material.d.ts
index 7a4040a671..9cdceddc7f 100644
--- a/ng2-components/ng2-alfresco-core/material.d.ts
+++ b/ng2-components/ng2-alfresco-core/material.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2016 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ng2-components/ng2-alfresco-core/material.ts b/ng2-components/ng2-alfresco-core/material.ts
index 7a4040a671..9cdceddc7f 100644
--- a/ng2-components/ng2-alfresco-core/material.ts
+++ b/ng2-components/ng2-alfresco-core/material.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2016 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ng2-components/ng2-alfresco-core/services.d.ts b/ng2-components/ng2-alfresco-core/services.d.ts
new file mode 100644
index 0000000000..c836811c0d
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/services.d.ts
@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
+import { AlfrescoSettingsService } from './services/AlfrescoSettingsService';
+export * from './services/AlfrescoSettingsService';
+declare var _default: {
+    directives: undefined[];
+    providers: typeof AlfrescoSettingsService[];
+};
+export default _default;
+export declare const ALFRESCO_CORE_PROVIDERS: [any];
diff --git a/ng2-components/ng2-alfresco-core/services.js b/ng2-components/ng2-alfresco-core/services.js
new file mode 100644
index 0000000000..643b604cd9
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/services.js
@@ -0,0 +1,33 @@
+System.register(['./services/AlfrescoSettingsService'], function(exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var AlfrescoSettingsService_1;
+    var ALFRESCO_CORE_PROVIDERS;
+    var exportedNames_1 = {
+        'ALFRESCO_CORE_PROVIDERS': true
+    };
+    function exportStar_1(m) {
+        var exports = {};
+        for(var n in m) {
+            if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n];
+        }
+        exports_1(exports);
+    }
+    return {
+        setters:[
+            function (AlfrescoSettingsService_1_1) {
+                AlfrescoSettingsService_1 = AlfrescoSettingsService_1_1;
+                exportStar_1(AlfrescoSettingsService_1_1);
+            }],
+        execute: function() {
+            exports_1("default",{
+                directives: [],
+                providers: [AlfrescoSettingsService_1.AlfrescoSettingsService]
+            });
+            exports_1("ALFRESCO_CORE_PROVIDERS", ALFRESCO_CORE_PROVIDERS = [
+                AlfrescoSettingsService_1.AlfrescoSettingsService
+            ]);
+        }
+    }
+});
+//# sourceMappingURL=services.js.map
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-core/services.js.map b/ng2-components/ng2-alfresco-core/services.js.map
new file mode 100644
index 0000000000..c769577080
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/services.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"services.js","sourceRoot":"","sources":["services.ts"],"names":[],"mappings":";;;;QAwBa,uBAAuB;;;;;;;;;;;;;;;;;;YALpC,oBAAe;gBACX,UAAU,EAAE,EAAE;gBACd,SAAS,EAAE,CAAC,iDAAuB,CAAC;aACvC,EAAA;YAEY,qCAAA,uBAAuB,GAAU;gBAC1C,iDAAuB;aAC1B,CAAA,CAAC"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-core/services.ts b/ng2-components/ng2-alfresco-core/services.ts
new file mode 100644
index 0000000000..ab4a13de39
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/services.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
+import {AlfrescoSettingsService} from './services/AlfrescoSettingsService';
+export * from './services/AlfrescoSettingsService';
+
+export default {
+    directives: [],
+    providers: [AlfrescoSettingsService]
+}
+
+export const ALFRESCO_CORE_PROVIDERS: [any] = [
+    AlfrescoSettingsService
+];
diff --git a/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.d.ts b/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.d.ts
new file mode 100644
index 0000000000..c544b82b40
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.d.ts
@@ -0,0 +1,4 @@
+export declare class AlfrescoSettingsService {
+    private _host;
+    host: string;
+}
diff --git a/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.js b/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.js
new file mode 100644
index 0000000000..1dd8c06a1d
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.js
@@ -0,0 +1,45 @@
+System.register(['angular2/core'], function(exports_1, context_1) {
+    "use strict";
+    var __moduleName = context_1 && context_1.id;
+    var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+    };
+    var __metadata = (this && this.__metadata) || function (k, v) {
+        if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+    };
+    var core_1;
+    var AlfrescoSettingsService;
+    return {
+        setters:[
+            function (core_1_1) {
+                core_1 = core_1_1;
+            }],
+        execute: function() {
+            AlfrescoSettingsService = (function () {
+                function AlfrescoSettingsService() {
+                    this._host = 'http://127.0.0.1:8080';
+                }
+                Object.defineProperty(AlfrescoSettingsService.prototype, "host", {
+                    get: function () {
+                        return this._host;
+                    },
+                    set: function (value) {
+                        this._host = value;
+                    },
+                    enumerable: true,
+                    configurable: true
+                });
+                AlfrescoSettingsService = __decorate([
+                    core_1.Injectable(), 
+                    __metadata('design:paramtypes', [])
+                ], AlfrescoSettingsService);
+                return AlfrescoSettingsService;
+            }());
+            exports_1("AlfrescoSettingsService", AlfrescoSettingsService);
+        }
+    }
+});
+//# sourceMappingURL=AlfrescoSettingsService.js.map
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.js.map b/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.js.map
new file mode 100644
index 0000000000..ef574b7b6e
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"AlfrescoSettingsService.js","sourceRoot":"","sources":["AlfrescoSettingsService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;YAmBA;gBAAA;oBACY,UAAK,GAAW,uBAAuB,CAAC;gBASpD,CAAC;gBAPG,sBAAW,yCAAI;yBAAf;wBACI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;oBACtB,CAAC;yBAED,UAAgB,KAAY;wBACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;oBACvB,CAAC;;;mBAJA;gBANL;oBAAC,iBAAU,EAAE;;2CAAA;gBAWb,8BAAC;YAAD,CAAC,AAVD,IAUC;YAVD,6DAUC,CAAA"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.ts b/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.ts
new file mode 100644
index 0000000000..4375e48a32
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/services/AlfrescoSettingsService.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
+import {Injectable} from 'angular2/core';
+
+@Injectable()
+export class AlfrescoSettingsService {
+    private _host: string = 'http://127.0.0.1:8080';
+
+    public get host():string {
+        return this._host;
+    }
+
+    public set host(value:string) {
+        this._host = value;
+    }
+}
diff --git a/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.d.ts b/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.d.ts
index 081f2c7813..6b1da55294 100644
--- a/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.d.ts
+++ b/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.d.ts
@@ -1,11 +1 @@
-import { DocumentList } from './src/document-list.component';
-import { AlfrescoService } from './src/alfresco.service';
 export * from './src/document-list.component';
-export * from './src/alfresco.service';
-declare var _default: {
-    directives: typeof DocumentList[];
-    providers: typeof AlfrescoService[];
-};
-export default _default;
-export declare const ALFRESCO_DIRECTIVES: [any];
-export declare const ALFRESCO_PROVIDERS: [any];
diff --git a/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.js b/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.js
index ae6f2c956a..9d5a620d4b 100644
--- a/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.js
+++ b/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.js
@@ -1,36 +1,19 @@
-System.register(['./src/document-list.component', './src/alfresco.service'], function(exports_1, context_1) {
+System.register(['./src/document-list.component'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
-    var document_list_component_1, alfresco_service_1;
-    var ALFRESCO_DIRECTIVES, ALFRESCO_PROVIDERS;
-    var exportedNames_1 = {
-        'ALFRESCO_DIRECTIVES': true,
-        'ALFRESCO_PROVIDERS': true
-    };
     function exportStar_1(m) {
         var exports = {};
         for(var n in m) {
-            if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n];
+            if (n !== "default") exports[n] = m[n];
         }
         exports_1(exports);
     }
     return {
         setters:[
             function (document_list_component_1_1) {
-                document_list_component_1 = document_list_component_1_1;
                 exportStar_1(document_list_component_1_1);
-            },
-            function (alfresco_service_1_1) {
-                alfresco_service_1 = alfresco_service_1_1;
-                exportStar_1(alfresco_service_1_1);
             }],
         execute: function() {
-            exports_1("default",{
-                directives: [document_list_component_1.DocumentList],
-                providers: [alfresco_service_1.AlfrescoService]
-            });
-            exports_1("ALFRESCO_DIRECTIVES", ALFRESCO_DIRECTIVES = [document_list_component_1.DocumentList]);
-            exports_1("ALFRESCO_PROVIDERS", ALFRESCO_PROVIDERS = [alfresco_service_1.AlfrescoService]);
         }
     }
 });
diff --git a/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.js.map b/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.js.map
index 9f138a95a5..774ba174f6 100644
--- a/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.js.map
+++ b/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.js.map
@@ -1 +1 @@
-{"version":3,"file":"ng2-alfresco-documentlist.js","sourceRoot":"","sources":["ng2-alfresco-documentlist.ts"],"names":[],"mappings":";;;;QAWa,mBAAmB,EACnB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;YAN/B,oBAAe;gBACX,UAAU,EAAE,CAAC,sCAAY,CAAC;gBAC1B,SAAS,EAAE,CAAC,kCAAe,CAAC;aAC/B,EAAA;YAEY,iCAAA,mBAAmB,GAAU,CAAC,sCAAY,CAAC,CAAA,CAAC;YAC5C,gCAAA,kBAAkB,GAAU,CAAC,kCAAe,CAAC,CAAA,CAAC"}
\ No newline at end of file
+{"version":3,"file":"ng2-alfresco-documentlist.js","sourceRoot":"","sources":["ng2-alfresco-documentlist.ts"],"names":[],"mappings":""}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.ts b/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.ts
index 24059de9cd..6b1da55294 100644
--- a/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.ts
+++ b/ng2-components/ng2-alfresco-documentlist/ng2-alfresco-documentlist.ts
@@ -1,13 +1 @@
-import {DocumentList} from './src/document-list.component';
-import {AlfrescoService} from './src/alfresco.service';
-
 export * from './src/document-list.component';
-export * from './src/alfresco.service';
-
-export default {
-    directives: [DocumentList],
-    providers: [AlfrescoService]
-}
-
-export const ALFRESCO_DIRECTIVES: [any] = [DocumentList];
-export const ALFRESCO_PROVIDERS: [any] = [AlfrescoService];
diff --git a/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.d.ts b/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.d.ts
index a8fd80ff63..c4514e82af 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.d.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.d.ts
@@ -2,9 +2,11 @@ import { Http } from 'angular2/http';
 import { Observable } from 'rxjs/Observable';
 import { FolderEntity } from "./core/entities/folder.entity";
 import { DocumentEntity } from "./core/entities/document.entity";
+import { AlfrescoSettingsService } from '../../ng2-alfresco-core/services';
 export declare class AlfrescoService {
     private http;
-    constructor(http: Http);
+    private settings;
+    constructor(http: Http, settings: AlfrescoSettingsService);
     private _host;
     private _baseUrlPath;
     host: string;
diff --git a/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.js b/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.js
index 9536f3f793..478479eb6b 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.js
+++ b/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.js
@@ -1,4 +1,4 @@
-System.register(['angular2/core', 'angular2/http', 'rxjs/Observable'], function(exports_1, context_1) {
+System.register(['angular2/core', 'angular2/http', 'rxjs/Observable', '../../ng2-alfresco-core/services'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -10,7 +10,7 @@ System.register(['angular2/core', 'angular2/http', 'rxjs/Observable'], function(
     var __metadata = (this && this.__metadata) || function (k, v) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
     };
-    var core_1, http_1, Observable_1;
+    var core_1, http_1, Observable_1, services_1;
     var AlfrescoService;
     return {
         setters:[
@@ -22,13 +22,18 @@ System.register(['angular2/core', 'angular2/http', 'rxjs/Observable'], function(
             },
             function (Observable_1_1) {
                 Observable_1 = Observable_1_1;
+            },
+            function (services_1_1) {
+                services_1 = services_1_1;
             }],
         execute: function() {
             AlfrescoService = (function () {
-                function AlfrescoService(http) {
+                function AlfrescoService(http, settings) {
                     this.http = http;
+                    this.settings = settings;
                     this._host = 'http://127.0.0.1:8080';
                     this._baseUrlPath = '/alfresco/service/slingshot/doclib/doclist/all/site/';
+                    this._host = settings.host;
                 }
                 Object.defineProperty(AlfrescoService.prototype, "host", {
                     get: function () {
@@ -69,7 +74,7 @@ System.register(['angular2/core', 'angular2/http', 'rxjs/Observable'], function(
                 };
                 AlfrescoService = __decorate([
                     core_1.Injectable(), 
-                    __metadata('design:paramtypes', [http_1.Http])
+                    __metadata('design:paramtypes', [http_1.Http, services_1.AlfrescoSettingsService])
                 ], AlfrescoService);
                 return AlfrescoService;
             }());
diff --git a/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.js.map b/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.js.map
index ced3933184..34514230fe 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.js.map
+++ b/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.js.map
@@ -1 +1 @@
-{"version":3,"file":"alfresco.service.js","sourceRoot":"","sources":["alfresco.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;YAOA;gBACI,yBAAoB,IAAU;oBAAV,SAAI,GAAJ,IAAI,CAAM;oBAEtB,UAAK,GAAW,uBAAuB,CAAC;oBACxC,iBAAY,GAAW,sDAAsD,CAAC;gBAHrD,CAAC;gBAKlC,sBAAW,iCAAI;yBAAf;wBACI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;oBACtB,CAAC;yBAED,UAAgB,KAAY;wBACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;oBACvB,CAAC;;;mBAJA;gBAMO,oCAAU,GAAlB;oBACI,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC;gBACzC,CAAC;gBAED,mCAAS,GAAT,UAAU,MAAc;oBACpB,IAAI,OAAO,GAAG,IAAI,cAAO,CAAC;wBACtB,cAAc,EAAE,kBAAkB;wBAClC,eAAe,EAAE,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC;qBAClD,CAAC,CAAC;oBACH,IAAI,OAAO,GAAG,IAAI,qBAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,IAAI;yBACX,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,EAAE,OAAO,CAAC;yBACxC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAe,GAAG,CAAC,IAAI,EAAE,EAAzB,CAAyB,CAAC;yBACrC,EAAE,CAAC,UAAA,IAAI,IAAI,OAAA,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAjB,CAAiB,CAAC,CAAC,iCAAiC;yBAC/D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACjC,CAAC;gBAED,iDAAuB,GAAvB,UAAwB,QAAwB;oBAC5C,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,6BAA6B,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,mEAAmE,CAAC;gBACnK,CAAC;gBAED,uCAAa,GAAb,UAAc,QAAwB;oBAClC,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,oBAAoB,GAAG,QAAQ,CAAC,UAAU,CAAC;gBACnE,CAAC;gBAEO,qCAAW,GAAnB,UAAqB,KAAe;oBAChC,mFAAmF;oBACnF,4CAA4C;oBAC5C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrB,MAAM,CAAC,uBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,cAAc,CAAC,CAAC;gBAClE,CAAC;gBA7CL;oBAAC,iBAAU,EAAE;;mCAAA;gBA8Cb,sBAAC;YAAD,CAAC,AA7CD,IA6CC;YA7CD,6CA6CC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"alfresco.service.js","sourceRoot":"","sources":["alfresco.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAwBA;gBACI,yBACY,IAAU,EACV,QAAiC;oBADjC,SAAI,GAAJ,IAAI,CAAM;oBACV,aAAQ,GAAR,QAAQ,CAAyB;oBAKrC,UAAK,GAAW,uBAAuB,CAAC;oBACxC,iBAAY,GAAW,sDAAsD,CAAC;oBAJlF,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC;gBAC/B,CAAC;gBAKD,sBAAW,iCAAI;yBAAf;wBACI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;oBACtB,CAAC;yBAED,UAAgB,KAAY;wBACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;oBACvB,CAAC;;;mBAJA;gBAMO,oCAAU,GAAlB;oBACI,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC;gBACzC,CAAC;gBAED,mCAAS,GAAT,UAAU,MAAc;oBACpB,IAAI,OAAO,GAAG,IAAI,cAAO,CAAC;wBACtB,cAAc,EAAE,kBAAkB;wBAClC,eAAe,EAAE,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC;qBAClD,CAAC,CAAC;oBACH,IAAI,OAAO,GAAG,IAAI,qBAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,IAAI;yBACX,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,MAAM,EAAE,OAAO,CAAC;yBACxC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAe,GAAG,CAAC,IAAI,EAAE,EAAzB,CAAyB,CAAC;yBACrC,EAAE,CAAC,UAAA,IAAI,IAAI,OAAA,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAjB,CAAiB,CAAC,CAAC,iCAAiC;yBAC/D,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACjC,CAAC;gBAED,iDAAuB,GAAvB,UAAwB,QAAwB;oBAC5C,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,6BAA6B,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,mEAAmE,CAAC;gBACnK,CAAC;gBAED,uCAAa,GAAb,UAAc,QAAwB;oBAClC,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,oBAAoB,GAAG,QAAQ,CAAC,UAAU,CAAC;gBACnE,CAAC;gBAEO,qCAAW,GAAnB,UAAqB,KAAe;oBAChC,mFAAmF;oBACnF,4CAA4C;oBAC5C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrB,MAAM,CAAC,uBAAU,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,cAAc,CAAC,CAAC;gBAClE,CAAC;gBAlDL;oBAAC,iBAAU,EAAE;;mCAAA;gBAmDb,sBAAC;YAAD,CAAC,AAlDD,IAkDC;YAlDD,6CAkDC,CAAA"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.ts b/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.ts
index b8b2238a07..f35e2f98b3 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/alfresco.service.ts
@@ -1,12 +1,34 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
 import {Injectable} from 'angular2/core';
 import {Http, Response, RequestOptions, Headers} from 'angular2/http';
 import {Observable} from 'rxjs/Observable';
 import {FolderEntity} from "./core/entities/folder.entity";
 import {DocumentEntity} from "./core/entities/document.entity";
+import {AlfrescoSettingsService} from '../../ng2-alfresco-core/services';
 
 @Injectable()
 export class AlfrescoService {
-    constructor(private http: Http) {}
+    constructor(
+        private http: Http,
+        private settings: AlfrescoSettingsService
+    ) {
+        this._host = settings.host;
+    }
 
     private _host: string = 'http://127.0.0.1:8080';
     private _baseUrlPath: string = '/alfresco/service/slingshot/doclib/doclist/all/site/';
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.d.ts b/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.d.ts
index c78176c687..9ddefcdf84 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.d.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.d.ts
@@ -1,3 +1,19 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
 import { LocationEntity } from "./location.entity";
 export declare class DocumentEntity {
     nodeRef: string;
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.js.map b/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.js.map
index 2f40decf8f..3281207326 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.js.map
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.js.map
@@ -1 +1 @@
-{"version":3,"file":"document.entity.js","sourceRoot":"","sources":["document.entity.ts"],"names":[],"mappings":";;;;;;;YAGA;gBAAA;gBA6BA,CAAC;gBAAD,qBAAC;YAAD,CAAC,AA7BD,IA6BC;YA7BD,2CA6BC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"document.entity.js","sourceRoot":"","sources":["document.entity.ts"],"names":[],"mappings":";;;;;;;YAmBA;gBAAA;gBA6BA,CAAC;gBAAD,qBAAC;YAAD,CAAC,AA7BD,IA6BC;YA7BD,2CA6BC,CAAA"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.ts b/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.ts
index a825559fb5..a592463767 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/document.entity.ts
@@ -1,3 +1,19 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
 // contains only limited subset of available fields
 import {LocationEntity} from "./location.entity";
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.d.ts b/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.d.ts
index 2ccbd8bceb..5359b4d259 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.d.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.d.ts
@@ -1,3 +1,19 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
 import { DocumentEntity } from "./document.entity";
 export declare class FolderEntity {
     items: DocumentEntity[];
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.js.map b/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.js.map
index 4cb6b3b62d..8d0186f8cd 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.js.map
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.js.map
@@ -1 +1 @@
-{"version":3,"file":"folder.entity.js","sourceRoot":"","sources":["folder.entity.ts"],"names":[],"mappings":";;;;;;;YAEA,mDAAmD;YACnD;gBAAA;gBAEA,CAAC;gBAAD,mBAAC;YAAD,CAAC,AAFD,IAEC;YAFD,uCAEC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"folder.entity.js","sourceRoot":"","sources":["folder.entity.ts"],"names":[],"mappings":";;;;;;;YAkBA,mDAAmD;YACnD;gBAAA;gBAEA,CAAC;gBAAD,mBAAC;YAAD,CAAC,AAFD,IAEC;YAFD,uCAEC,CAAA"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.ts b/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.ts
index 0715ea2b66..cc13afd617 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/folder.entity.ts
@@ -1,3 +1,19 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
 import {DocumentEntity} from "./document.entity";
 
 // contains only limited subset of available fields
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.d.ts b/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.d.ts
index bbcb7d5229..ec49e11020 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.d.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.d.ts
@@ -1,3 +1,19 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
 export declare class LocationEntity {
     repositoryId: string;
     site: string;
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.js b/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.js
index 8786fbd7fd..3d7d60700e 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.js
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.js
@@ -5,6 +5,22 @@ System.register([], function(exports_1, context_1) {
     return {
         setters:[],
         execute: function() {
+            /**
+             * @license
+             * Copyright 2016 Alfresco Software, Ltd.
+             *
+             * 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.
+             */
             // contains only limited subset of available fields
             LocationEntity = (function () {
                 function LocationEntity() {
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.js.map b/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.js.map
index 8140bc9ae3..bb6574e274 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.js.map
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.js.map
@@ -1 +1 @@
-{"version":3,"file":"location.entity.js","sourceRoot":"","sources":["location.entity.ts"],"names":[],"mappings":";;;;;;;YAAA,mDAAmD;YACnD;gBAAA;gBAQA,CAAC;gBAAD,qBAAC;YAAD,CAAC,AARD,IAQC;YARD,2CAQC,CAAA;YAED;gBAAA;gBAEA,CAAC;gBAAD,2BAAC;YAAD,CAAC,AAFD,IAEC;YAFD,uDAEC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"location.entity.js","sourceRoot":"","sources":["location.entity.ts"],"names":[],"mappings":";;;;;;;YAAA;;;;;;;;;;;;;;;eAeG;YACH,mDAAmD;YACnD;gBAAA;gBAQA,CAAC;gBAAD,qBAAC;YAAD,CAAC,AARD,IAQC;YARD,2CAQC,CAAA;YAED;gBAAA;gBAEA,CAAC;gBAAD,2BAAC;YAAD,CAAC,AAFD,IAEC;YAFD,uDAEC,CAAA"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.ts b/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.ts
index 3dcb7f0804..6671a990a2 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/core/entities/location.entity.ts
@@ -1,3 +1,19 @@
+/**
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * 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.
+ */
 // contains only limited subset of available fields
 export class LocationEntity {
     repositoryId: string;
diff --git a/ng2-components/ng2-alfresco-documentlist/src/document-list.component.d.ts b/ng2-components/ng2-alfresco-documentlist/src/document-list.component.d.ts
index 13cc3e151a..14434416d1 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/document-list.component.d.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/document-list.component.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2016 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ng2-components/ng2-alfresco-documentlist/src/document-list.component.js b/ng2-components/ng2-alfresco-documentlist/src/document-list.component.js
index 7fb3ad1d7d..64babec3fe 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/document-list.component.js
+++ b/ng2-components/ng2-alfresco-documentlist/src/document-list.component.js
@@ -145,7 +145,8 @@ System.register(["angular2/core", "./alfresco.service"], function(exports_1, con
                         styles: [
                             "\n            :host .breadcrumb {\n                margin-bottom: 4px;\n            }\n\n            :host .folder-icon {\n                float: left;\n                margin-right: 10px;\n            }\n\n            :host .file-icon {\n                width: 52px;\n                height: 52px;\n                float: left;\n                margin-right: 10px;\n            }\n\n            :host .document-header:hover {\n                text-decoration: underline;\n            }\n\n            :host .download-button {\n                color: #777;\n                text-decoration: none;\n            }\n\n            :host .download-button:hover {\n                color: #555;\n            }\n        "
                         ],
-                        template: "\n        <ol *ngIf=\"breadcrumb\" class=\"breadcrumb\">\n            <li *ngFor=\"#r of route; #last = last\" [class.active]=\"last\" [ngSwitch]=\"last\">\n                <span *ngSwitchWhen=\"true\">{{r.name}}</span>\n                <a *ngSwitchDefault href=\"#\" (click)=\"goToRoute(r, $event)\">{{r.name}}</a>\n            </li>\n        </ol>\n        <div *ngIf=\"folder\" class=\"list-group\">\n            <a href=\"#\" *ngIf=\"canNavigateParent()\" (click)=\"onNavigateParentClick($event)\" class=\"list-group-item\">\n                <i class=\"fa fa-level-up\"></i> ...\n            </a>\n            <a href=\"#\" *ngFor=\"#document of folder.items\" (click)=\"onItemClick(document, $event)\" class=\"list-group-item clearfix\">\n                <a *ngIf=\"downloads && !document.isFolder\" href=\"{{getContentUrl(document)}}\" (click)=\"onDownloadClick($event)\" class=\"download-button pull-right\" download target=\"_blank\">\n                    <i class=\"fa fa-download fa-2x\"></i>\n                </a>\n                <i *ngIf=\"thumbnails && document.isFolder\" class=\"folder-icon {{folderIconClass}}\"></i>\n                <img *ngIf=\"thumbnails && !document.isFolder\" class=\"file-icon\" src=\"{{getDocumentThumbnailUrl(document)}}\">\n                <h4 class=\"list-group-item-heading document-header\">\n                    {{document.displayName}}\n                </h4>\n                <p class=\"list-group-item-text\">{{document.description}}</p>\n                <small>\n                    Modified {{document.modifiedOn}} by {{document.modifiedBy}}\n                </small>\n            </a>\n        </div>\n    "
+                        template: "\n        <ol *ngIf=\"breadcrumb\" class=\"breadcrumb\">\n            <li *ngFor=\"#r of route; #last = last\" [class.active]=\"last\" [ngSwitch]=\"last\">\n                <span *ngSwitchWhen=\"true\">{{r.name}}</span>\n                <a *ngSwitchDefault href=\"#\" (click)=\"goToRoute(r, $event)\">{{r.name}}</a>\n            </li>\n        </ol>\n        <div *ngIf=\"folder\" class=\"list-group\">\n            <a href=\"#\" *ngIf=\"canNavigateParent()\" (click)=\"onNavigateParentClick($event)\" class=\"list-group-item\">\n                <i class=\"fa fa-level-up\"></i> ...\n            </a>\n            <a href=\"#\" *ngFor=\"#document of folder.items\" (click)=\"onItemClick(document, $event)\" class=\"list-group-item clearfix\">\n                <a *ngIf=\"downloads && !document.isFolder\" href=\"{{getContentUrl(document)}}\" (click)=\"onDownloadClick($event)\" class=\"download-button pull-right\" download target=\"_blank\">\n                    <i class=\"fa fa-download fa-2x\"></i>\n                </a>\n                <i *ngIf=\"thumbnails && document.isFolder\" class=\"folder-icon {{folderIconClass}}\"></i>\n                <img *ngIf=\"thumbnails && !document.isFolder\" class=\"file-icon\" src=\"{{getDocumentThumbnailUrl(document)}}\">\n                <h4 class=\"list-group-item-heading document-header\">\n                    {{document.displayName}}\n                </h4>\n                <p class=\"list-group-item-text\">{{document.description}}</p>\n                <small>\n                    Modified {{document.modifiedOn}} by {{document.modifiedBy}}\n                </small>\n            </a>\n        </div>\n    ",
+                        providers: [alfresco_service_1.AlfrescoService]
                     }), 
                     __metadata('design:paramtypes', [alfresco_service_1.AlfrescoService])
                 ], DocumentList);
diff --git a/ng2-components/ng2-alfresco-documentlist/src/document-list.component.js.map b/ng2-components/ng2-alfresco-documentlist/src/document-list.component.js.map
index d40f5fa365..bf8853052f 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/document-list.component.js.map
+++ b/ng2-components/ng2-alfresco-documentlist/src/document-list.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"document-list.component.js","sourceRoot":"","sources":["document-list.component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;YAmFA;gBA+BI,sBACY,gBAAiC;oBAAjC,qBAAgB,GAAhB,gBAAgB,CAAiB;oBA9B7C,gFAAgF;oBACvE,aAAQ,GAAY,IAAI,CAAC;oBAClC,iFAAiF;oBACxE,eAAU,GAAY,KAAK,CAAC;oBACrC,oGAAoG;oBACxE,oBAAe,GAAW,sBAAsB,CAAC;oBAC7E,wFAAwF;oBAC/E,eAAU,GAAY,IAAI,CAAC;oBACpC,uFAAuF;oBAC9E,cAAS,GAAY,IAAI,CAAC;oBAEzB,cAAS,GAAsB,IAAI,mBAAY,EAAE,CAAC;oBAE5D,eAAU,GAAG;wBACT,IAAI,EAAE,kBAAkB;wBACxB,IAAI,EAAE,uBAAuB;qBAChC,CAAC;oBACF,sBAAiB,GAAW,uBAAuB,CAAC;oBAIpD,UAAK,GAAU,EAAE,CAAC;gBAUf,CAAC;gBARJ,wCAAiB,GAAjB;oBACI,MAAM,CAAC,IAAI,CAAC,QAAQ;wBAChB,CAAC,IAAI,CAAC,UAAU;wBAChB,IAAI,CAAC,iBAAiB,KAAK,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACxD,CAAC;gBAMD,+BAAQ,GAAR;oBACI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACjC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACpD,CAAC;gBAEO,2CAAoB,GAA5B,UAA6B,IAAI;oBAAjC,iBAQC;oBAPG,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;oBAC9B,IAAI,CAAC,gBAAgB;yBAChB,SAAS,CAAC,IAAI,CAAC;yBACf,SAAS,CACN,UAAA,MAAM,IAAI,OAAA,KAAI,CAAC,MAAM,GAAG,MAAM,EAApB,CAAoB,EAC9B,UAAA,KAAK,IAAI,OAAA,KAAI,CAAC,YAAY,GAAQ,KAAK,EAA9B,CAA8B,CAC1C,CAAC;gBACV,CAAC;gBAED,4CAAqB,GAArB,UAAsB,MAAM;oBACxB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;wBACT,MAAM,CAAC,cAAc,EAAE,CAAC;oBAC5B,CAAC;oBAED,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;wBAChB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;wBACjB,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;wBACzF,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;4BACT,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBAC3C,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,sCAAe,GAAf,UAAgB,KAAK;oBACjB,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC5B,CAAC;gBAED,kCAAW,GAAX,UAAY,IAAoB,EAAE,MAAM;oBACpC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;wBACT,MAAM,CAAC,cAAc,EAAE,CAAC;oBAC5B,CAAC;oBAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;wBAChB,KAAK,EAAE,IAAI;qBACd,CAAC,CAAC;oBAEH,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC;wBACxB,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;4BAChB,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;4BAClC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gCACZ,IAAI,EAAE,IAAI,CAAC,WAAW;gCACtB,IAAI,EAAE,IAAI;6BACb,CAAC,CAAC;4BACH,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;wBACpC,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,gCAAS,GAAT,UAAU,CAAC,EAAE,MAAM;oBACf,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;wBACT,MAAM,CAAC,cAAc,EAAE,CAAC;oBAC5B,CAAC;oBAED,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;wBAChB,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBAChC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;4BACX,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;4BAC3B,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;wBACtC,CAAC;oBACL,CAAC;gBACL,CAAC;gBAEO,kCAAW,GAAnB,UAAoB,IAAoB;oBACpC,IAAI,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;oBACxC,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAE,GAAG,GAAG,CAAC;oBAC1E,IAAI,YAAY,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;oBACpD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,GAAG,YAAY,CAAC;gBACnD,CAAC;gBAED,oCAAa,GAAb,UAAc,QAAwB;oBAClC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACzD,CAAC;gBAED,8CAAuB,GAAvB,UAAwB,QAAyB;oBAC7C,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;gBACnE,CAAC;gBAjHD;oBAAC,YAAK,EAAE;;8DAAA;gBAER;oBAAC,YAAK,EAAE;;gEAAA;gBAER;oBAAC,YAAK,CAAC,mBAAmB,CAAC;;qEAAA;gBAE3B;oBAAC,YAAK,EAAE;;gEAAA;gBAER;oBAAC,YAAK,EAAE;;+DAAA;gBAER;oBAAC,aAAM,EAAE;;+DAAA;gBA3Eb;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,wBAAwB;wBAClC,MAAM,EAAE;4BACJ,0sBA6BC;yBACJ;wBACD,QAAQ,EAAE,4nDA0BT;qBACJ,CAAC;;gCAAA;gBAsHF,mBAAC;YAAD,CAAC,AArHD,IAqHC;YArHD,uCAqHC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"document-list.component.js","sourceRoot":"","sources":["document-list.component.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-documentlist/src/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/document-list.component.ts
index 338acae665..5db086b9fd 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/document-list.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/document-list.component.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (C) 2016 Alfresco Software Limited.
+ * Copyright 2016 Alfresco Software, Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,8 @@ import {DocumentEntity} from "./core/entities/document.entity";
                 </small>
             </a>
         </div>
-    `
+    `,
+    providers: [AlfrescoService]
 })
 export class DocumentList implements OnInit {