diff --git a/ng2-components/ng2-alfresco-core/karma-test-shim.js b/ng2-components/ng2-alfresco-core/karma-test-shim.js
index d58df28667..3a95ee82c7 100644
--- a/ng2-components/ng2-alfresco-core/karma-test-shim.js
+++ b/ng2-components/ng2-alfresco-core/karma-test-shim.js
@@ -14,7 +14,8 @@ var map = {
 
 var packages = {
     'app': { main: 'main.js',  defaultExtension: 'js' },
-    'rxjs': { defaultExtension: 'js' },
+    'rxjs': {  defaultExtension: 'js' },
+    'alfresco-js-api' : {  main: 'alfresco-js-api.js', defaultExtension: 'js' },
     'ng2-translate': { defaultExtension: 'js' }
 };
 
diff --git a/ng2-components/ng2-alfresco-core/karma.conf.js b/ng2-components/ng2-alfresco-core/karma.conf.js
index f03e383ede..328986c938 100644
--- a/ng2-components/ng2-alfresco-core/karma.conf.js
+++ b/ng2-components/ng2-alfresco-core/karma.conf.js
@@ -15,6 +15,7 @@ module.exports = function (config) {
       {pattern: 'node_modules/rxjs/**/*.map', included: false, watched: false},
       {pattern: 'node_modules/@angular/**/*.js', included: false, watched: false},
       {pattern: 'node_modules/@angular/**/*.map', included: false, 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-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index 0d43a8e029..d34b5864ad 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -6,19 +6,15 @@
   "scripts": {
     "clean": "rimraf dist node_modules typings",
     "typings": "typings install",
-    "build": "npm run tslint && typings install && rimraf dist && tsc && npm run copytemplates && license-check",
+    "build": "npm run tslint && typings install && rimraf dist && tsc && license-check",
+    "build:w": "npm run tslint && typings install && rimraf dist && npm run watch-task",
+    "watch-task": "concurrently \"npm run tsc:w\" \"license-check\"",
     "tslint": "npm run tslint-src && npm run tslint-root",
     "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
     "tslint-root": "tslint -c tslint.json *.ts",
-    "copytemplates": "npm run copy-html-css && npm run copy-i18n",
-    "copy-html-css": "cpx \"./src/**/*.{html,css}\" ./dist/src",
-    "copy-html-css:w": "cpx \"./src/**/*.{html,css}\" ./dist/src -w",
-    "copy-i18n": "cpx \"./i18n/**/*.json\" ./dist/i18n",
-    "copy-i18n:w": "cpx \"./i18n/**/*.json\" ./dist/i18n -w",
-    "copy-images": "cpx \"./src/**/*.{png,jpg,gif,svg}\" ./dist/src",
-    "copy-images:w": "cpx \"./src/**/*.{png,jpg,gif,svg}\" ./dist/src -w",
     "licensecheck": "license-check",
     "tsc": "tsc",
+    "tsc:w": "tsc -w",
     "pretest": "npm run build",
     "test": "karma start karma.conf.js --reporters mocha,coverage --single-run",
     "test-browser": "karma start karma.conf.js --reporters kjhtml ",
@@ -54,6 +50,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "alfresco-js-api": "0.1.0",
     "@angular/common": "2.0.0-rc.3",
     "@angular/compiler": "2.0.0-rc.3",
     "@angular/core": "2.0.0-rc.3",
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 4054068e80..e4a101a164 100644
--- a/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/AlfrescoContentService.service.ts
@@ -18,15 +18,11 @@
 import { Injectable } from '@angular/core';
 
 import { AlfrescoAuthenticationService } from './AlfrescoAuthenticationService.service';
-import { AlfrescoSettingsService } from './AlfrescoSettingsService.service';
 
 @Injectable()
 export class AlfrescoContentService {
 
-    constructor(
-        private settings: AlfrescoSettingsService,
-        private authService: AlfrescoAuthenticationService
-    ) {
+    constructor(private authService: AlfrescoAuthenticationService) {
     }
 
     /**
@@ -35,8 +31,7 @@ export class AlfrescoContentService {
      * @returns {string} URL address.
      */
     getDocumentThumbnailUrl(document: any) {
-        return this.settings.getApiBaseUrl() + '/nodes/' + document.entry.id +
-            '/renditions/doclib/content' + '?attachment=false&alf_ticket=' + this.authService.getToken();
+        this.authService.alfrescoApi.getDocumentThumbnailUrl(document.entry.id);
     }
 
     /**
@@ -45,7 +40,6 @@ export class AlfrescoContentService {
      * @returns {string} URL address.
      */
     getContentUrl(document: any) {
-        return this.settings.getApiBaseUrl() + '/nodes/' + document.entry.id +
-            '/content' + '?attachment=false&alf_ticket=' + this.authService.getToken();
+        this.authService.alfrescoApi.getContentUrl(document.entry.id);
     }
 }
diff --git a/ng2-components/ng2-alfresco-login/demo/index.html b/ng2-components/ng2-alfresco-login/demo/index.html
index c277d15eef..382d4ab7b2 100644
--- a/ng2-components/ng2-alfresco-login/demo/index.html
+++ b/ng2-components/ng2-alfresco-login/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-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
index cfe9488a78..d578292197 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
@@ -92,7 +92,6 @@ export class AlfrescoLoginComponent {
 
         this.form.valueChanges.subscribe(data => this.onValueChanged(data));
 
-        // this.onValueChanged(null);
     }
 
     /**