diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html
index 3294099a58..93ac0bfd52 100644
--- a/demo-shell-ng2/index.html
+++ b/demo-shell-ng2/index.html
@@ -32,7 +32,6 @@
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
     <script src="/app/js/xml2json.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-activiti-analytics/demo/index.html b/ng2-components/ng2-activiti-analytics/demo/index.html
index 40958146d8..833362c08e 100644
--- a/ng2-components/ng2-activiti-analytics/demo/index.html
+++ b/ng2-components/ng2-activiti-analytics/demo/index.html
@@ -18,7 +18,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
     <script src="node_modules/chart.js/dist/Chart.bundle.min.js"></script>
 
     <script src="systemjs.config.js"></script>
diff --git a/ng2-components/ng2-activiti-processlist/demo/index.html b/ng2-components/ng2-activiti-processlist/demo/index.html
index 63fd1b2b57..1fe571c84c 100644
--- a/ng2-components/ng2-activiti-processlist/demo/index.html
+++ b/ng2-components/ng2-activiti-processlist/demo/index.html
@@ -17,9 +17,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <!-- Additional Alfresco libraries -->
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
     <script src="systemjs.config.js"></script>
     <script>
       System.import('app').catch(function(err){ console.error(err); });
diff --git a/ng2-components/ng2-activiti-tasklist/demo/index.html b/ng2-components/ng2-activiti-tasklist/demo/index.html
index 5b926def7a..19590ff9e8 100644
--- a/ng2-components/ng2-activiti-tasklist/demo/index.html
+++ b/ng2-components/ng2-activiti-tasklist/demo/index.html
@@ -18,8 +18,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
     <script src="systemjs.config.js"></script>
     <script>
         System.import('app').catch(function(err){ console.error(err); });
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoApi.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoApi.service.ts
index f71d5f5df5..dad5f6d8e9 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoApi.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoApi.service.ts
@@ -16,18 +16,18 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoJsApi } from 'alfresco-js-api';
+import { AlfrescoApi } from  'alfresco-js-api';
 
 @Injectable()
 export class AlfrescoApiService {
 
-    private _instance: AlfrescoJsApi;
+    private _instance: AlfrescoApi;
 
-    public getInstance(): AlfrescoJsApi {
+    public getInstance(): AlfrescoApi {
         return this._instance;
     }
 
-    public setInstance(value: AlfrescoJsApi) {
+    public setInstance(value: AlfrescoApi) {
         this._instance = value;
     }
 
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.spec.ts
index 1071d838ad..e610ad7c9d 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.spec.ts
@@ -20,7 +20,6 @@ import { AlfrescoSettingsService } from './AlfrescoSettings.service';
 import { AlfrescoAuthenticationService } from './AlfrescoAuthentication.service';
 import { AlfrescoApiService } from './AlfrescoApi.service';
 
-declare var AlfrescoApi: any;
 declare let jasmine: any;
 
 describe('AlfrescoAuthentication', () => {
diff --git a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts
index 26a031c2e9..90064f06ef 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthentication.service.ts
@@ -19,17 +19,15 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 import { AlfrescoSettingsService } from './AlfrescoSettings.service';
 import { AlfrescoApiService } from './AlfrescoApi.service';
-import { AlfrescoJsApi } from 'alfresco-js-api';
-
-declare var AlfrescoApi: AlfrescoJsApi;
-
+import * as alfrescoApi from  'alfresco-js-api';
+import { AlfrescoApi } from  'alfresco-js-api';
 /**
  * The AlfrescoAuthenticationService provide the login service and store the ticket in the localStorage
  */
 @Injectable()
 export class AlfrescoAuthenticationService {
 
-    alfrescoApi: AlfrescoJsApi;
+    alfrescoApi: AlfrescoApi;
 
     /**
      * Constructor
@@ -38,7 +36,7 @@ export class AlfrescoAuthenticationService {
      */
     constructor(private settingsService: AlfrescoSettingsService,
                 private apiService: AlfrescoApiService) {
-        this.alfrescoApi = new AlfrescoApi({
+        this.alfrescoApi = <AlfrescoApi>new alfrescoApi({
             provider: this.settingsService.getProviders(),
             ticketEcm: this.getTicketEcm(),
             ticketBpm: this.getTicketBpm(),
@@ -216,7 +214,7 @@ export class AlfrescoAuthenticationService {
         return Observable.throw(error || 'Server error');
     }
 
-    getAlfrescoApi(): AlfrescoJsApi {
+    getAlfrescoApi(): any {
         return this.alfrescoApi;
     }
 }
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/index.html b/ng2-components/ng2-alfresco-documentlist/demo/index.html
index f1c18c3ceb..8d2c80e4b8 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/index.html
+++ b/ng2-components/ng2-alfresco-documentlist/demo/index.html
@@ -15,7 +15,7 @@
     <!-- Polyfill(s) for Safari (pre-10.x) -->
     <script src="node_modules/intl/dist/Intl.min.js"></script>
     <script src="node_modules/intl/locale-data/jsonp/en.js"></script>
-    
+
     <!-- Polyfill(s) for older browsers -->
     <script src="node_modules/core-js/client/shim.min.js"></script>
 
@@ -23,9 +23,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <!-- Additional Alfresco libraries -->
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
     <script src="systemjs.config.js"></script>
     <script>
         System.import('app').catch(function(err){ console.error(err); });
diff --git a/ng2-components/ng2-alfresco-login/demo/index.html b/ng2-components/ng2-alfresco-login/demo/index.html
index 382d4ab7b2..574e0f1ca0 100644
--- a/ng2-components/ng2-alfresco-login/demo/index.html
+++ b/ng2-components/ng2-alfresco-login/demo/index.html
@@ -19,9 +19,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <!-- Additional Alfresco libraries -->
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
     <script src="systemjs.config.js"></script>
     <script>
         System.import('app').catch(function(err){ console.error(err); });
diff --git a/ng2-components/ng2-alfresco-search/demo/index.html b/ng2-components/ng2-alfresco-search/demo/index.html
index 3cc4956d35..f6b743299f 100644
--- a/ng2-components/ng2-alfresco-search/demo/index.html
+++ b/ng2-components/ng2-alfresco-search/demo/index.html
@@ -17,9 +17,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <!-- Additional Alfresco libraries -->
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
     <script src="systemjs.config.js"></script>
     <script>
         System.import('app').catch(function(err){ console.error(err); });
diff --git a/ng2-components/ng2-alfresco-tag/demo/index.html b/ng2-components/ng2-alfresco-tag/demo/index.html
index ee97252ec1..309e792adc 100644
--- a/ng2-components/ng2-alfresco-tag/demo/index.html
+++ b/ng2-components/ng2-alfresco-tag/demo/index.html
@@ -19,9 +19,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <!-- Additional Alfresco libraries -->
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
     <script src="systemjs.config.js"></script>
     <script>
         System.import('app').catch(
diff --git a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts
index aa79f291f8..ef7278418c 100644
--- a/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts
+++ b/ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts
@@ -24,7 +24,6 @@ import {
 import { TagService } from '../services/tag.service';
 
 declare let jasmine: any;
-declare var AlfrescoApi: any;
 
 describe('Tag service', () => {
 
diff --git a/ng2-components/ng2-alfresco-upload/demo/index.html b/ng2-components/ng2-alfresco-upload/demo/index.html
index fec1e9dbeb..0de5abaeda 100644
--- a/ng2-components/ng2-alfresco-upload/demo/index.html
+++ b/ng2-components/ng2-alfresco-upload/demo/index.html
@@ -20,9 +20,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <!-- Additional Alfresco libraries -->
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
     <script src="systemjs.config.js"></script>
     <script>
         System.import('app').catch(function(err){ console.error(err); });
diff --git a/ng2-components/ng2-alfresco-userinfo/demo/index.html b/ng2-components/ng2-alfresco-userinfo/demo/index.html
index b82fe16e83..21b9bde5ee 100644
--- a/ng2-components/ng2-alfresco-userinfo/demo/index.html
+++ b/ng2-components/ng2-alfresco-userinfo/demo/index.html
@@ -18,8 +18,6 @@
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
     <script src="systemjs.config.js"></script>
     <script>
         System.import('app').catch(function(err){ console.error(err); });
diff --git a/ng2-components/ng2-alfresco-viewer/demo/index.html b/ng2-components/ng2-alfresco-viewer/demo/index.html
index 5e571042d4..6c6cb39409 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/index.html
+++ b/ng2-components/ng2-alfresco-viewer/demo/index.html
@@ -22,10 +22,6 @@
     <script src="node_modules/pdfjs-dist/build/pdf.worker.js"></script>
     <script src="node_modules/pdfjs-dist/web/pdf_viewer.js"></script>
 
-    <!-- Additional Alfresco libraries -->
-    <script src="node_modules/alfresco-js-api/dist/alfresco-js-api.js"></script>
-
-
     <script src="systemjs.config.js"></script>
     <script>
         System.import('app').catch(function(err){ console.error(err); });