diff --git a/ng2-components/ng2-alfresco-upload/demo/index.html b/ng2-components/ng2-alfresco-upload/demo/index.html
index cbb462b986..ddb356f0fe 100644
--- a/ng2-components/ng2-alfresco-upload/demo/index.html
+++ b/ng2-components/ng2-alfresco-upload/demo/index.html
@@ -21,6 +21,7 @@
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script src="node_modules/angular2/bundles/router.dev.js"></script>
     <script src="node_modules/angular2/bundles/http.dev.js"></script>
+    <script src="node_modules/alfresco-core-rest-api/bundle.js"></script>
 
     <script>
         System.config({
diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index 9b5edd92e2..c209d3b239 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -12,6 +12,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "alfresco-core-rest-api": "^0.1.0",
     "angular2": "2.0.0-beta.13",
     "es6-promise": "3.0.2",
     "es6-shim": "0.35.0",
diff --git a/ng2-components/ng2-alfresco-upload/demo/src/components/my-demo.component.ts b/ng2-components/ng2-alfresco-upload/demo/src/components/my-demo.component.ts
deleted file mode 100644
index 845837b4d0..0000000000
--- a/ng2-components/ng2-alfresco-upload/demo/src/components/my-demo.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-///<reference path="../../node_modules/angular2/typings/browser.d.ts"/>
-
-/**
- * @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 } from 'angular2/core';
-import { ALFRESCO_ULPOAD_COMPONENT } from 'ng2-alfresco-upload/ng2-alfresco-upload';
-
-@Component({
-    selector: 'my-demo',
-    template: `<alfresco-upload-button [showDialogUpload]="true"
-                                       [showUdoNotificationBar]="true"
-                                       [uploadFolders]="false"
-                                       [multipleFiles]="false">
-               </alfresco-upload-button>`,
-    directives: [ALFRESCO_ULPOAD_COMPONENT]
-})
-export class MyDemoComponent {
-
-}
diff --git a/ng2-components/ng2-alfresco-upload/demo/src/my-app.ts b/ng2-components/ng2-alfresco-upload/demo/src/my-app.ts
index edbc66c570..29796de18f 100644
--- a/ng2-components/ng2-alfresco-upload/demo/src/my-app.ts
+++ b/ng2-components/ng2-alfresco-upload/demo/src/my-app.ts
@@ -15,26 +15,54 @@
  * limitations under the License.
  */
 
-import { Component, provide } from 'angular2/core';
+import { Component } from 'angular2/core';
 import { bootstrap } from 'angular2/platform/browser';
 import { HTTP_PROVIDERS } from 'angular2/http';
-import { MyDemoComponent } from "./components/my-demo.component";
-import { TranslateLoader, TranslateService } from 'ng2-translate/ng2-translate';
-import { AlfrescoTranslationLoader } from 'ng2-alfresco-core/services/AlfrescoTranslationService';
+import { AlfrescoTranslationService, AlfrescoTranslationLoader } from 'ng2-alfresco-core/services';
+import { ALFRESCO_ULPOAD_COMPONENT } from 'ng2-alfresco-upload/ng2-alfresco-upload';
+
 
 @Component({
     selector: 'my-app',
-    template: '<my-demo></my-demo>',
-    directives: [MyDemoComponent]
+    template: `<alfresco-upload-button [showDialogUpload]="true"
+                                       [showUdoNotificationBar]="true"
+                                       [uploadFolders]="false"
+                                       [multipleFiles]="false">
+               </alfresco-upload-button>
+
+               <br><br>
+
+               <alfresco-upload-button [showDialogUpload]="true"
+                                       [showUdoNotificationBar]="true"
+                                       [uploadFolders]="true"
+                                       [multipleFiles]="false">
+               </alfresco-upload-button>
+
+               <br><br>
+
+               <alfresco-upload-button [showDialogUpload]="true"
+                                       [showUdoNotificationBar]="true"
+                                       [uploadFolders]="false"
+                                       [multipleFiles]="true">
+               </alfresco-upload-button>
+
+               <br><br>
+
+               <alfresco-upload-drag-area [showDialogUpload]="true" >
+                     <div style="width: 200px; height: 100px; border: 1px solid #888888">
+                         DRAG HERE
+                     </div>
+               </alfresco-upload-drag-area>`,
+    directives: [ALFRESCO_ULPOAD_COMPONENT]
 })
-class VgDemo {
+export class MyDemoApp {
     constructor() {
 
     }
 }
 
-bootstrap(VgDemo, [
+bootstrap(MyDemoApp, [
     HTTP_PROVIDERS,
-    provide(TranslateLoader, {useClass: AlfrescoTranslationLoader}),
-    TranslateService
+    AlfrescoTranslationService,
+    AlfrescoTranslationLoader
 ]);
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index b6814deb95..33ee1a058b 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -47,6 +47,7 @@
     "alfresco"
   ],
   "dependencies": {
+    "alfresco-core-rest-api": "^0.1.0",
     "angular2": "2.0.0-beta.15",
     "es6-module-loader": "^0.17.8",
     "es6-shim": "^0.35.0",