diff --git a/karma-test-shim.js b/karma-test-shim.js
index d3d6406..9a699fe 100644
--- a/karma-test-shim.js
+++ b/karma-test-shim.js
@@ -20,8 +20,8 @@ System.config({
   }
 });
 
-System.import('angular2/core').then(function (testing) {
-  return System.import('angular2/platform/testing/browser').then(function (providers) {
+System.import('@angular/core').then(function (testing) {
+  return System.import('@angular/platform/testing/browser').then(function (providers) {
     testing.setBaseTestProviders(providers.TEST_BROWSER_PLATFORM_PROVIDERS,
       providers.TEST_BROWSER_APPLICATION_PROVIDERS);
   });
diff --git a/karma.conf.js b/karma.conf.js
index f1a264f..42d4fbe 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -27,7 +27,7 @@ module.exports = function (config) {
         included: true,
         watched: true
       }, {
-        pattern: 'node_modules/angular2/bundles/angular2-polyfills.js',
+        pattern: 'node_modules/@angular/bundles/@angular-polyfills.js',
         included: true,
         watched: true
       }, {
@@ -35,19 +35,19 @@ module.exports = function (config) {
         included: true,
         watched: true
       }, {
-        pattern: 'node_modules/angular2/bundles/angular2.js',
+        pattern: 'node_modules/@angular/bundles/@angular.js',
         included: true,
         watched: true
       }, {
-        pattern: 'node_modules/angular2/bundles/http.dev.js',
+        pattern: 'node_modules/@angular/bundles/http.dev.js',
         included: true,
         watched: true
       }, {
-        pattern: 'node_modules/angular2/bundles/router.dev.js',
+        pattern: 'node_modules/@angular/bundles/router.dev.js',
         included: true,
         watched: true
       }, {
-        pattern: 'node_modules/angular2/bundles/testing.dev.js',
+        pattern: 'node_modules/@angular/bundles/testing.dev.js',
         included: true,
         watched: true
       }, {
diff --git a/package.json b/package.json
index b992458..10c2821 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng2-data",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Convential HTTP client for Model Data in Angular 2",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
   },
   "keywords": [
     "angular",
-    "angular2",
+    "@angular",
     "data",
     "orm",
     "http"
@@ -31,12 +31,14 @@
   "typings": "./ng2-data.d.ts",
   "homepage": "https://github.com/raghunat/ng2-data#readme",
   "dependencies": {
-    "angular2": "2.0.0-beta.9",
+    "@angular/common": "^2.0.0-rc.1",
+    "@angular/core": "2.0.0-rc.1",
+    "@angular/http": "^2.0.0-rc.1",
     "es6-promise": "^3.0.2",
     "es6-shim": "^0.33.3",
     "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.5.15"
+    "rxjs": "5.0.0-beta.6",
+    "zone.js": "0.6.6"
   },
   "devDependencies": {
     "body-parser": "^1.15.0",
diff --git a/src/base.model.spec.js b/src/base.model.spec.js
index 2b2c1ee..9d87574 100644
--- a/src/base.model.spec.js
+++ b/src/base.model.spec.js
@@ -1,4 +1,4 @@
-System.register(['angular2/testing', 'angular2/core', 'angular2/http', 'angular2/http/testing', './store.service', './base.model'], function(exports_1, context_1) {
+System.register(['@angular/core/testing', '@angular/core', '@angular/http', '@angular/http/testing', './store.service', './base.model'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var testing_1, core_1, http_1, testing_2, store_service_1, base_model_1;
diff --git a/src/base.model.spec.ts b/src/base.model.spec.ts
index 98aed7d..79ff04e 100644
--- a/src/base.model.spec.ts
+++ b/src/base.model.spec.ts
@@ -8,11 +8,11 @@ inject,
 injectAsync,
 
 beforeEachProviders
-} from 'angular2/testing';
-import {provide} from 'angular2/core';
-import {HTTP_PROVIDERS, XHRBackend} from 'angular2/http';
-import {MockBackend} from 'angular2/http/testing';
-import {MockConnection} from 'angular2/http/testing';
+} from '@angular/core/testing';
+import {provide} from '@angular/core';
+import {HTTP_PROVIDERS, XHRBackend} from '@angular/http';
+import {MockBackend} from '@angular/http/testing';
+import {MockConnection} from '@angular/http/testing';
 
 import {StoreService} from './store.service';
 import {BaseModel} from './base.model';
diff --git a/src/store.config.spec.js b/src/store.config.spec.js
index 7f2f03d..1c31e76 100644
--- a/src/store.config.spec.js
+++ b/src/store.config.spec.js
@@ -1,4 +1,4 @@
-System.register(['angular2/testing', './store.config'], function(exports_1, context_1) {
+System.register(['@angular/core/testing', './store.config'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var testing_1, store_config_1;
diff --git a/src/store.config.spec.ts b/src/store.config.spec.ts
index 9ad7adc..6fd583c 100644
--- a/src/store.config.spec.ts
+++ b/src/store.config.spec.ts
@@ -6,7 +6,7 @@ import {
   it,
   inject,
    injectAsync
-} from 'angular2/testing';
+} from '@angular/core/testing';
 
 import {StoreConfig} from './store.config';
 
diff --git a/src/store.service.js b/src/store.service.js
index 9077c9b..493767d 100644
--- a/src/store.service.js
+++ b/src/store.service.js
@@ -1,4 +1,4 @@
-System.register(['angular2/core', 'angular2/http', 'rxjs/Rx', './base.model'], function(exports_1, context_1) {
+System.register(['@angular/core', '@angular/http', 'rxjs/Rx', './base.model'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
diff --git a/src/store.service.spec.js b/src/store.service.spec.js
index ccfbf25..cad4372 100644
--- a/src/store.service.spec.js
+++ b/src/store.service.spec.js
@@ -1,4 +1,4 @@
-System.register(['angular2/testing', 'angular2/core', './store.service', './store.config', 'angular2/http', 'angular2/http/testing'], function(exports_1, context_1) {
+System.register(['@angular/core/testing', '@angular/core', './store.service', './store.config', '@angular/http', '@angular/http/testing'], function(exports_1, context_1) {
     "use strict";
     var __moduleName = context_1 && context_1.id;
     var testing_1, core_1, store_service_1, store_config_1, http_1, testing_2, http_2;
diff --git a/src/store.service.spec.ts b/src/store.service.spec.ts
index 07a7071..0221136 100644
--- a/src/store.service.spec.ts
+++ b/src/store.service.spec.ts
@@ -8,14 +8,14 @@ inject,
 injectAsync,
 
 beforeEachProviders
-} from 'angular2/testing';
-import {provide} from 'angular2/core';
+} from '@angular/core/testing';
+import {provide} from '@angular/core';
 import {StoreService} from './store.service';
 import {StoreConfig} from './store.config';
-import {Headers, HTTP_PROVIDERS, BaseRequestOptions, XHRBackend, Response} from 'angular2/http';
-import {MockBackend} from 'angular2/http/testing';
-import {MockConnection} from 'angular2/http/testing';
-import {ResponseOptions} from 'angular2/http';
+import {Headers, HTTP_PROVIDERS, BaseRequestOptions, XHRBackend, Response} from '@angular/http';
+import {MockBackend} from '@angular/http/testing';
+import {MockConnection} from '@angular/http/testing';
+import {ResponseOptions} from '@angular/http';
 
 describe('StoreService Service', () => {
 
diff --git a/src/store.service.ts b/src/store.service.ts
index d094fda..815979f 100644
--- a/src/store.service.ts
+++ b/src/store.service.ts
@@ -1,5 +1,5 @@
-import {Injectable} from 'angular2/core';
-import {Http, URLSearchParams, RequestOptions, Headers} from 'angular2/http';
+import {Injectable} from '@angular/core';
+import {Http, URLSearchParams, RequestOptions, Headers} from '@angular/http';
 import 'rxjs/Rx';
 
 import {StoreConfig} from './store.config';