diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html
index ba765707be..3fbdbbf291 100644
--- a/demo-shell-ng2/index.html
+++ b/demo-shell-ng2/index.html
@@ -24,7 +24,7 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="/app/js/xml2json.js"></script>
-    <script src="node_modules/alfresco-js-api/bundle.js"></script>
+    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
 
     <script src="node_modules/pdfjs-dist/build/pdf.js"></script>
     <script src="node_modules/pdfjs-dist/build/pdf.worker.js"></script>
diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index d34b5864ad..f770962232 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -41,6 +41,10 @@
     {
       "name": "Mario Romano",
       "email": "mario.romano83@gmail.com"
+    },
+    {
+      "name": "Eugenio Romano",
+      "email": "eugenio.romano@alfresco.com"
     }
   ],
   "keywords": [
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts
index 939f07cd2f..8d487e97b2 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts
@@ -90,6 +90,10 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
         });
     }
 
+    getAlfrescoApi(): any {
+        return this.alfrescoApi;
+    }
+
     /**
      * The method return tru if the user is logged in
      * @returns {boolean}
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts
index e4a101a164..07ec940087 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts
@@ -30,8 +30,8 @@ export class AlfrescoContentService {
      * @param document Node to get URL for.
      * @returns {string} URL address.
      */
-    getDocumentThumbnailUrl(document: any) {
-        this.authService.alfrescoApi.getDocumentThumbnailUrl(document.entry.id);
+    getDocumentThumbnailUrl(document: any): string {
+        return this.authService.alfrescoApi.getDocumentThumbnailUrl(document.entry.id);
     }
 
     /**
@@ -39,7 +39,7 @@ export class AlfrescoContentService {
      * @param document Node to get URL for.
      * @returns {string} URL address.
      */
-    getContentUrl(document: any) {
-        this.authService.alfrescoApi.getContentUrl(document.entry.id);
+    getContentUrl(document: any): string {
+        return this.authService.alfrescoApi.getContentUrl(document.entry.id);
     }
 }
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/index.html b/ng2-components/ng2-alfresco-documentlist/demo/index.html
index 0e4f578378..83e36b9f9c 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/index.html
+++ b/ng2-components/ng2-alfresco-documentlist/demo/index.html
@@ -20,7 +20,7 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <!-- Additional Alfresco libraries -->
-    <script src="node_modules/alfresco-js-api/bundle.js"></script>
+    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
 
     <script src="systemjs.config.js"></script>
     <script>
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index 3c1407e2a7..16770e03fc 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -39,10 +39,10 @@
       "material-design-lite": "1.1.3",
       "ng2-translate": "2.2.2",
 
-      "alfresco-js-api": "^0.1.0",
-      "ng2-alfresco-core": "^0.1.36",
-      "ng2-alfresco-documentlist": "^0.1.34",
-      "ng2-alfresco-datatable": "^0.1.17"
+      "alfresco-js-api": "0.1.0",
+      "ng2-alfresco-core": "0.1.36",
+      "ng2-alfresco-documentlist": "0.1.34",
+      "ng2-alfresco-datatable": "0.1.17"
     },
     "devDependencies": {
       "concurrently": "2.0.0",
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index 7791d27c1d..10ca4f881d 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -48,6 +48,10 @@
     {
       "name": "Mario Romano",
       "email": "mario.romano83@gmail.com"
+    },
+    {
+      "name": "Eugenio Romano",
+      "email": "eugenio.romano@alfresco.com"
     }
   ],
   "keywords": [
diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
index 6a78992fd7..5cfdbaefcd 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-list.service.ts
@@ -68,26 +68,21 @@ export class DocumentListService {
     ) {
     }
 
-    private getAlfrescoClient() {
-        return AlfrescoApi.getClientWithTicket(this.settings.getApiBaseUrl(), this.authService.getToken());
+    private getAlfrescoApi() {
+        return this.authService.getAlfrescoApi();
     }
 
     private getNodesPromise(folder: string) {
-        let alfrescoClient = this.getAlfrescoClient();
-        let apiInstance = new AlfrescoApi.Core.NodesApi(alfrescoClient);
         let nodeId = '-root-';
         let opts = {
             relativePath: folder,
             include: ['path']
         };
-        return apiInstance.getNodeChildren(nodeId, opts);
+        return this.getAlfrescoApi().getNodeChildren(nodeId, opts);
     }
 
     deleteNode(nodeId: string) {
-        let client = this.getAlfrescoClient();
-        let nodesApi = new AlfrescoApi.Core.NodesApi(client);
-        let opts = {};
-        return Observable.fromPromise(nodesApi.deleteNode(nodeId, opts));
+        return Observable.fromPromise(this.getAlfrescoApi().deleteNode(nodeId));
     }
 
     /**
diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts
index f8d8c92ab3..ac01431395 100644
--- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts
+++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts
@@ -45,7 +45,7 @@ import { EventMock } from './assets/event.mock';
                      let element = fixture.nativeElement;
                      let component = fixture.componentInstance;
                      component.urlFile = 'http://localhost:9876/fake-url-file.pdf';
-                     
+
                      component.ngOnChanges().then(() => {
                          fixture.detectChanges();
                          expect(element.querySelector('#viewer-name-file').innerHTML).toEqual('fake-url-file.pdf');