diff --git a/modules/angular2/change_detection.ts b/modules/angular2/change_detection.ts
index 82a8a3ecac..da822bc62b 100644
--- a/modules/angular2/change_detection.ts
+++ b/modules/angular2/change_detection.ts
@@ -53,6 +53,8 @@ export {
   defaultPipes,
   DynamicChangeDetection,
   JitChangeDetection,
+  PreGeneratedChangeDetection,
+  preGeneratedProtoDetectors,
   defaultPipeRegistry
 } from './src/change_detection/change_detection';
 
diff --git a/modules/angular2/src/change_detection/change_detection.ts b/modules/angular2/src/change_detection/change_detection.ts
index e3b032ba45..1f87c62518 100644
--- a/modules/angular2/src/change_detection/change_detection.ts
+++ b/modules/angular2/src/change_detection/change_detection.ts
@@ -6,12 +6,10 @@ import {KeyValueChangesFactory} from './pipes/keyvalue_changes';
 import {ObservablePipeFactory} from './pipes/observable_pipe';
 import {PromisePipeFactory} from './pipes/promise_pipe';
 import {NullPipeFactory} from './pipes/null_pipe';
-import {BindingRecord} from './binding_record';
-import {DirectiveRecord} from './directive_record';
-import {DEFAULT} from './constants';
 import {ChangeDetection, ProtoChangeDetector, ChangeDetectorDefinition} from './interfaces';
 import {Injectable} from 'angular2/src/di/decorators';
-import {List} from 'angular2/src/facade/collection';
+import {List, StringMapWrapper} from 'angular2/src/facade/collection';
+import {isPresent, BaseException} from 'angular2/src/facade/lang';
 
 // HACK: workaround for Traceur behavior.
 // It expects all transpiled modules to contain this marker.
@@ -47,6 +45,34 @@ export var defaultPipes = {
   "async": async
 };
 
+export var preGeneratedProtoDetectors = {};
+
+
+/**
+ * Implements change detection using a map of pregenerated proto detectors.
+ *
+ * @exportedAs angular2/change_detection
+ */
+export class PreGeneratedChangeDetection extends ChangeDetection {
+  _dynamicChangeDetection: ChangeDetection;
+  _protoChangeDetectors: any;
+
+  constructor(private registry: PipeRegistry, protoChangeDetectors?) {
+    super();
+    this._dynamicChangeDetection = new DynamicChangeDetection(registry);
+    this._protoChangeDetectors =
+        isPresent(protoChangeDetectors) ? protoChangeDetectors : preGeneratedProtoDetectors;
+  }
+
+  createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector {
+    var id = definition.id;
+    if (StringMapWrapper.contains(this._protoChangeDetectors, id)) {
+      return StringMapWrapper.get(this._protoChangeDetectors, id)(this.registry);
+    }
+    return this._dynamicChangeDetection.createProtoChangeDetector(definition);
+  }
+}
+
 
 /**
  * Implements change detection that does not require `eval()`.
@@ -57,9 +83,9 @@ export var defaultPipes = {
  */
 @Injectable()
 export class DynamicChangeDetection extends ChangeDetection {
-  constructor(public registry: PipeRegistry) { super(); }
+  constructor(private registry: PipeRegistry) { super(); }
 
-  createProtoChangeDetector(definition:ChangeDetectorDefinition): ProtoChangeDetector {
+  createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector {
     return new DynamicProtoChangeDetector(this.registry, definition);
   }
 }
@@ -76,7 +102,7 @@ export class DynamicChangeDetection extends ChangeDetection {
 export class JitChangeDetection extends ChangeDetection {
   constructor(public registry: PipeRegistry) { super(); }
 
-  createProtoChangeDetector(definition:ChangeDetectorDefinition): ProtoChangeDetector {
+  createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector {
     return new JitProtoChangeDetector(this.registry, definition);
   }
 }
diff --git a/modules/angular2/test/change_detection/change_detection_spec.js b/modules/angular2/test/change_detection/change_detection_spec.js
index a52e59f359..45df478068 100644
--- a/modules/angular2/test/change_detection/change_detection_spec.js
+++ b/modules/angular2/test/change_detection/change_detection_spec.js
@@ -1,22 +1,29 @@
 import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
 
-import {PreGeneratedChangeDetection} from 'angular2/change_detection';
+import {PreGeneratedChangeDetection, ChangeDetectorDefinition, ProtoChangeDetector, DynamicProtoChangeDetector} from 'angular2/change_detection';
+
+class DummyChangeDetector extends ProtoChangeDetector {}
 
 export function main() {
   describe("PreGeneratedChangeDetection", () => {
-    it("sfs", () => {
+    var proto;
+    var def;
 
-      var rs = coalesce([
-        r("user",  [],  0, 1, true),
-        r("user",  [],  0, 2, true)
-      ]);
+    beforeEach(() => {
+      proto = new DummyChangeDetector();
+      def = new ChangeDetectorDefinition('id', null, [], [], []);
+    });
 
-      expect(rs[1]).toEqual(new ProtoRecord(
-        RECORD_TYPE_SELF, "self", null,
-        [], null, 1, null, 2,
-        null, null,
-        true, false)
-      );
+    it("should return a proto change detector when one is available", () => {
+      var map = {'id' : (registry) => proto};
+      var cd = new PreGeneratedChangeDetection(null, map);
+
+      expect(cd.createProtoChangeDetector(def)).toBe(proto)
+    });
+
+    it("should delegate to dynamic change detection otherwise", () => {
+      var cd = new PreGeneratedChangeDetection(null, {});
+      expect(cd.createProtoChangeDetector(def)).toBeAnInstanceOf(DynamicProtoChangeDetector);
     });
   });
 }