diff --git a/gulpfile.js b/gulpfile.js
index 032bf34..306b047 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -35,12 +35,18 @@ var PATHS = {
 	],
 	rx: 'node_modules/\@reactivex/rxjs/dist/**/*.js',
 	typings: [
-		'node_modules/angular2/bundles/typings/angular2/angular2.d.ts',
-		'node_modules/angular2/typings/**/*.d.ts'
+		'node_modules/angular2/*.d.ts',
+		'node_modules/angular2/src/**/*.d.ts',
+		'node_modules/angular2/manual_typings/*.d.ts',
+		'node_modules/angular2/typings/**/*.d.ts',
+		'node_modules/\@reactivex/rxjs/dist/cjs/**/*.d.ts'
 	],
 	testTypings: [
-		'node_modules/angular2/bundles/typings/angular2/angular2.d.ts',
+		'node_modules/angular2/*.d.ts',
+		'node_modules/angular2/src/**/*.d.ts',
+		'node_modules/angular2/manual_typings/*.d.ts',
 		'node_modules/angular2/typings/**/*.d.ts',
+		'node_modules/\@reactivex/rxjs/dist/cjs/**/*.d.ts',
 		'dist/*.d.ts'
 		// 'typings/jasmine/jasmine.d.ts'
 	],
diff --git a/package.json b/package.json
index 9e4ba05..8bd723b 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "karma-phantomjs-launcher": "^0.2.1",
     "merge2": "^0.3.6",
     "phantomjs": "^1.9.18",
+    "reflect-metadata": "^0.1.2",
     "typescript": "^1.6.2"
   },
   "dependencies": {}
diff --git a/src/NgGrid.d.ts b/src/NgGrid.d.ts
index 5dff1f4..9cb9bd8 100644
--- a/src/NgGrid.d.ts
+++ b/src/NgGrid.d.ts
@@ -4,12 +4,12 @@ export declare class NgGrid implements OnInit, DoCheck {
     private _ngEl;
     private _renderer;
     private _loader;
-    dragStart: EventEmitter;
-    drag: EventEmitter;
-    dragStop: EventEmitter;
-    resizeStart: EventEmitter;
-    resize: EventEmitter;
-    resizeStop: EventEmitter;
+    dragStart: EventEmitter<any>;
+    drag: EventEmitter<any>;
+    dragStop: EventEmitter<any>;
+    resizeStart: EventEmitter<any>;
+    resize: EventEmitter<any>;
+    resizeStop: EventEmitter<any>;
     colWidth: number;
     rowHeight: number;
     minCols: number;
@@ -99,13 +99,13 @@ export declare class NgGridItem implements OnInit {
     private _ngEl;
     private _renderer;
     private _ngGrid;
-    itemChange: EventEmitter;
-    dragStart: EventEmitter;
-    drag: EventEmitter;
-    dragStop: EventEmitter;
-    resizeStart: EventEmitter;
-    resize: EventEmitter;
-    resizeStop: EventEmitter;
+    itemChange: EventEmitter<any>;
+    dragStart: EventEmitter<any>;
+    drag: EventEmitter<any>;
+    dragStop: EventEmitter<any>;
+    resizeStart: EventEmitter<any>;
+    resize: EventEmitter<any>;
+    resizeStop: EventEmitter<any>;
     private static CONST_DEFAULT_CONFIG;
     gridPosition: {
         'col': number;