diff --git a/angular-agility/angular-agility.d.ts b/angular-agility/angular-agility.d.ts
index c11aff0b07..872971aedd 100644
--- a/angular-agility/angular-agility.d.ts
+++ b/angular-agility/angular-agility.d.ts
@@ -41,7 +41,7 @@ declare module aa {
 		[settingName: string]: any;
 	}
 
-	export interface IFormExtensionsProvider extends ng.auto.IProvider {
+	export interface IFormExtensionsProvider extends ng.IServiceProvider {
 		defaultLabelStrategy:string;
 		defaultFieldGroupStrategy:string;
 		defaultValMsgPlacementStrategy:string;
@@ -88,7 +88,7 @@ declare module aa {
 		message:string;
 	}
 	
-	export interface INotifyConfigProvider extends ng.auto.IProvider {
+	export interface INotifyConfigProvider extends ng.IServiceProvider {
 		notifyConfigs:any;
 		defaultTargetContainerName:string;
 		defaultNotifyConfig:string;
diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index 7885451561..8d86949d24 100644
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -7,27 +7,27 @@
  * (c) 2012 Witold Szczerba
  * License: MIT
  */
-angular.module('http-auth-interceptor', [])
 
-    .provider('authService', function () {
-        /**
-         * Holds all the requests which failed due to 401 response,
-         * so they can be re-requested in future, once login is completed.
-         */
-        var buffer: { config: ng.IRequestConfig; deferred: ng.IDeferred<any>; }[] = [];
+class AuthService {
+    /**
+      * Holds all the requests which failed due to 401 response,
+      * so they can be re-requested in future, once login is completed.
+      */
+    buffer: { config: ng.IRequestConfig; deferred: ng.IDeferred<any>; }[] = [];
 
-        /**
-         * Required by HTTP interceptor.
-         * Function is attached to provider to be invisible for regular users of this service.
-         */
-        this.pushToBuffer = function (config: ng.IRequestConfig, deferred: ng.IDeferred<any>) {
-            buffer.push({
-                config: config,
-                deferred: deferred
-            });
-        }
+    /**
+     * Required by HTTP interceptor.
+     * Function is attached to provider to be invisible for regular users of this service.
+     */
+    pushToBuffer = function(config: ng.IRequestConfig, deferred: ng.IDeferred<any>) {
+        this.buffer.push({
+            config: config,
+            deferred: deferred
+        });
+    }
 
-      this.$get = ['$rootScope', '$injector', <any>function ($rootScope: ng.IScope, $injector: ng.auto.IInjectorService) {
+    $get = [
+        '$rootScope', '$injector', <any>function($rootScope: ng.IScope, $injector: ng.auto.IInjectorService) {
             var $http: ng.IHttpService; //initialized later because of circular dependency problem
             function retry(config: ng.IRequestConfig, deferred: ng.IDeferred<any>) {
                 $http = $http || $injector.get('$http');
@@ -36,20 +36,25 @@ angular.module('http-auth-interceptor', [])
                 });
             }
             function retryAll() {
-                for (var i = 0; i < buffer.length; ++i) {
-                    retry(buffer[i].config, buffer[i].deferred);
+                for (var i = 0; i < this.buffer.length; ++i) {
+                    retry(this.buffer[i].config, this.buffer[i].deferred);
                 }
-                buffer = [];
+                this.buffer = [];
             }
 
-          return {
+            return {
                 loginConfirmed: function () {
                     $rootScope.$broadcast('event:auth-loginConfirmed');
                     retryAll();
                 }
             }
-      }]
-  })
+        }
+    ];
+}
+
+angular.module('http-auth-interceptor', [])
+
+    .provider('authService', AuthService)
 
 /**
  * $http interceptor.
@@ -183,7 +188,8 @@ mod.factory(My.Namespace);
 mod.filter('name', function ($scope: ng.IScope) { })
 mod.filter('name', ['$scope', <any>function ($scope: ng.IScope) { }])
 mod.filter(My.Namespace);
-mod.provider('name', function ($scope: ng.IScope) { })
+mod.provider('name', function ($scope: ng.IScope) { return { $get: () => { } } })
+mod.provider('name', TestProvider);
 mod.provider('name', ['$scope', <any>function ($scope: ng.IScope) { }])
 mod.provider(My.Namespace);
 mod.service('name', function ($scope: ng.IScope) { })
@@ -196,6 +202,13 @@ mod.value('name', 23);
 mod.value('name', "23");
 mod.value(My.Namespace);
 
+class TestProvider implements ng.IServiceProvider {
+    constructor(private $scope: ng.IScope) {
+    }
+
+    $get() {
+    }
+}
 
 // Promise signature tests
 var foo: ng.IPromise<number>;
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 3880a8c05f..ca8751b8e6 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -18,6 +18,15 @@ interface Function {
 ///////////////////////////////////////////////////////////////////////////////
 declare module ng {
 
+    // not directly implemented, but ensures that constructed class implements $get
+    interface IServiceProviderClass {
+        new(...args: any[]): IServiceProvider;
+    }
+    
+    interface IServiceProviderFactory {
+        (...args: any[]): IServiceProvider;
+    }
+
     // All service providers extend this interface
     interface IServiceProvider {
         $get: any;
@@ -125,7 +134,7 @@ declare module ng {
          */
         controller(name: string, inlineAnnotatedConstructor: any[]): IModule;
         controller(object : Object): IModule;
-        directive(name: string, directiveFactory: Function): IModule;
+        directive(name: string, directiveFactory: IDirectiveFactory): IModule;
         directive(name: string, inlineAnnotatedFunction: any[]): IModule;
         directive(object: Object): IModule;
         /**
@@ -146,9 +155,10 @@ declare module ng {
         filter(name: string, filterFactoryFunction: Function): IModule;
         filter(name: string, inlineAnnotatedFunction: any[]): IModule;
         filter(object: Object): IModule;
-        provider(name: string, serviceProviderConstructor: Function): IModule;
+        provider(name: string, serviceProviderFactory: IServiceProviderFactory): IModule;
+        provider(name: string, serviceProviderConstructor: IServiceProviderClass): IModule;
         provider(name: string, inlineAnnotatedConstructor: any[]): IModule;
-        provider(name: string, providerObject: auto.IProvider): IModule;
+        provider(name: string, providerObject: IServiceProvider): IModule;
         provider(object: Object): IModule;
         /**
          * Run blocks are the closest thing in Angular to the main method. A run block is the code which needs to run to kickstart the application. It is executed after all of the service have been configured and the injector has been created. Run blocks typically contain code which is hard to unit-test, and for this reason should be declared in isolated modules, so that they can be ignored in the unit-tests.
@@ -975,6 +985,11 @@ declare module ng {
     // and http://docs.angularjs.org/guide/directive
     ///////////////////////////////////////////////////////////////////////////
 
+    interface IDirectiveFactory {
+        (...args: any[]): IDirective;
+    }
+
+
     interface IDirective{
         compile?:
             (templateElement: IAugmentedJQuery,
@@ -1053,9 +1068,6 @@ declare module ng {
     // AUTO module (angular.js)
     ///////////////////////////////////////////////////////////////////////////
     export module auto {
-        interface IProvider {
-            $get: any;
-        }
 
         ///////////////////////////////////////////////////////////////////////
         // InjectorService