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 8d487e97b2..b91ce885e6 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoAuthenticationService.service.ts
@@ -94,6 +94,10 @@ export class AlfrescoAuthenticationService extends AlfrescoAuthenticationBase {
         return this.alfrescoApi;
     }
 
+    getToken(): any {
+        return this.alfrescoApi.getToeken();
+    }
+
     /**
      * The method return tru if the user is logged in
      * @returns {boolean}
diff --git a/ng2-components/ng2-alfresco-documentlist/karma.conf.js b/ng2-components/ng2-alfresco-documentlist/karma.conf.js
index 9de1c785c7..2edcd2e495 100644
--- a/ng2-components/ng2-alfresco-documentlist/karma.conf.js
+++ b/ng2-components/ng2-alfresco-documentlist/karma.conf.js
@@ -18,6 +18,7 @@ module.exports = function (config) {
       {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false},
       {pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.js', included: false, served: true, watched: false},
       {pattern: 'node_modules/ng2-translate/**/*.js', included: false, served: true, watched: false},
+      {pattern: 'node_modules/alfresco-js-api/dist/alfresco-js-api.js', included: true, watched: false},
 
       {pattern: 'karma-test-shim.js', included: true, watched: true},
 
diff --git a/ng2-components/ng2-alfresco-search/demo/index.html b/ng2-components/ng2-alfresco-search/demo/index.html
index d068f03ee7..3cc4956d35 100644
--- a/ng2-components/ng2-alfresco-search/demo/index.html
+++ b/ng2-components/ng2-alfresco-search/demo/index.html
@@ -18,7 +18,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-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index b1b37d4569..fcf6039779 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -69,7 +69,7 @@
 
     "alfresco-js-api": "^0.1.0",
     "ng2-alfresco-core": "^0.1.36",
-    "ng2-alfresco-search": "^0.1.21"
+    "ng2-alfresco-search": "file:../"
   },
   "devDependencies": {
     "concurrently": "2.0.0",
diff --git a/ng2-components/ng2-alfresco-search/karma.conf.js b/ng2-components/ng2-alfresco-search/karma.conf.js
index d7241fa9fb..879e251aa3 100644
--- a/ng2-components/ng2-alfresco-search/karma.conf.js
+++ b/ng2-components/ng2-alfresco-search/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function (config) {
       {pattern: 'node_modules/@angular/**/*.map', included: false, watched: false},
 
       {pattern: 'node_modules/material-design-lite/material.min.js', included: true, watched: false},
-      {pattern: 'node_modules/alfresco-js-api/bundle.js', included: true, watched: false},
+      {pattern: 'node_modules/alfresco-js-api/dist/alfresco-js-api.js', included: true, watched: false},
 
       {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false},
       {pattern: 'node_modules/ng2-translate/**/*.js', included: false, served: true, watched: false},
@@ -74,7 +74,7 @@ module.exports = function (config) {
 
     // Coverage reporter generates the coverage
     reporters: ['mocha', 'coverage', 'coveralls', 'kjhtml'],
-    
+
     // Source files that you wanna generate coverage for.
     // Do not include tests or libraries (these files will be instrumented by Istanbul)
     preprocessors: {
diff --git a/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts b/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts
index 68be078741..cba51e6585 100644
--- a/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts
+++ b/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts
@@ -18,7 +18,6 @@
 import {Observable} from 'rxjs/Rx';
 
 import {
-    AlfrescoSettingsService,
     AlfrescoAuthenticationService
 } from 'ng2-alfresco-core';
 import {AlfrescoSearchService} from './../../src/services/alfresco-search.service';
@@ -28,10 +27,9 @@ export class AlfrescoServiceMock extends AlfrescoSearchService {
     _folderToReturn: any = {};
 
     constructor(
-        settings: AlfrescoSettingsService = null,
         authService: AlfrescoAuthenticationService = null
     ) {
-        super(settings, authService);
+        super(authService);
     }
 
     getFolder(folder: string) {
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts
index f08564120f..3877bf2b86 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts
@@ -26,6 +26,6 @@ describe('AlfrescoSearchService', () => {
     let service: AlfrescoSearchService;
 
     beforeEach(() => {
-        service = new AlfrescoSearchService(null, null);
+        service = new AlfrescoSearchService(null);
     });
 });
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
index 2e09bd5b6f..3913feb255 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
@@ -19,7 +19,6 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Rx';
 
 import {
-    AlfrescoSettingsService,
     AlfrescoAuthenticationService
 } from 'ng2-alfresco-core';
 
@@ -31,23 +30,17 @@ declare let AlfrescoApi: any;
 @Injectable()
 export class AlfrescoSearchService {
 
-    constructor(private settings: AlfrescoSettingsService,
-                private authService: AlfrescoAuthenticationService) {
-    }
-
-    private getAlfrescoClient() {
-        return AlfrescoApi.getClientWithTicket(this.settings.getApiBaseUrl(), this.authService.getToken());
+    constructor(private authService: AlfrescoAuthenticationService) {
     }
 
     private getSearchNodesPromise(term: string) {
-        let apiInstance = new AlfrescoApi.Core.SearchApi(this.getAlfrescoClient());
         let nodeId = '-root-';
         let opts = {
             include: ['path'],
             rootNodeId: nodeId,
             nodeType: 'cm:content'
         };
-        return apiInstance.liveSearchNodes(term, opts);
+        return this.authService.alfrescoApi.search.liveSearchNodes(term, opts);
     }
 
     /**
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts
index 83025140ab..d05c0d1c3a 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts
@@ -20,8 +20,6 @@ import {
     AlfrescoContentService
 } from 'ng2-alfresco-core';
 
-declare let AlfrescoApi: any;
-
 @Injectable()
 export class AlfrescoThumbnailService {
 
diff --git a/ng2-components/ng2-alfresco-viewer/demo/localImg.jpg b/ng2-components/ng2-alfresco-viewer/demo/localImg.jpg
new file mode 100644
index 0000000000..7020b91d86
Binary files /dev/null and b/ng2-components/ng2-alfresco-viewer/demo/localImg.jpg differ