diff --git a/assets/zone.js b/assets/zone.js
index a39edce..900f9cc 100644
--- a/assets/zone.js
+++ b/assets/zone.js
@@ -512,6 +512,15 @@ function patchClass(className) {
     return this._o.observe.apply(this._o, arguments);
   };
 
+  global[className].prototype.takeRecords = function () {
+    if (!this._active) {
+      this._creationZone.enqueueTask();
+      this._active = true;
+    }
+    return this._o.takeRecords.apply(this._o, arguments);
+  };
+
+
   var prop;
   for (prop in instance) {
     (function (prop) {
diff --git a/package.js b/package.js
index 73ad6f5..a742608 100644
--- a/package.js
+++ b/package.js
@@ -8,12 +8,12 @@ Package.describe({
   git: "https://github.com/meteorhacks/zones.git"
 });
 
-Package.on_use(function (api) {
+Package.onUse(function (api) {
   addPackageFiles(api);
   api.export('Zones', 'server');
 });
 
-Package.on_test(function (api) {
+Package.onTest(function (api) {
   addPackageFiles(api);
 
   api.use([
@@ -21,15 +21,15 @@ Package.on_test(function (api) {
     'test-helpers',
   ], 'client');
 
-  api.add_files([
+  api.addFiles([
     'tests/_both.js'
   ], ['client', 'server']);
 
-  api.add_files([
+  api.addFiles([
     'tests/_server.js'
   ], 'server');
 
-  api.add_files([
+  api.addFiles([
     'tests/loader.js',
     'tests/reporters.js',
     'tests/hijacks/methods.js',
@@ -46,18 +46,18 @@ function addPackageFiles(api) {
     api.use('inject-initial');
   }
 
-  api.add_files([
+  api.addAssets([
     'assets/utils.js',
     'assets/before.js',
     'assets/zone.js',
     'assets/after.js',
     'assets/reporters.js',
     'assets/tracer.js',
-  ], 'client', {isAsset: true});
+  ], 'client');
 
-  api.add_files(['server/inject.js'], 'server');
+  api.addFiles(['server/inject.js'], 'server');
 
-  api.add_files([
+  api.addFiles([
     'client/hijack.js'
   ], 'client');
 
diff --git a/server/inject.js b/server/inject.js
index dea8d91..1d1bcf9 100644
--- a/server/inject.js
+++ b/server/inject.js
@@ -24,9 +24,15 @@ var fileList = [
 
 var cacheAvoider = (new Date).getTime();
 var finalHtml = '';
+
+var prefixURL = "";
+if (process.env.CDN_URL) {
+  prefixURL = process.env.CDN_URL;
+}
+
 fileList.forEach(function(file) {
-  var template = '<script type="text/javascript" src="/packages/%s/assets/%s?%s"></script>\n';
-  finalHtml += format(template, packageName, file, cacheAvoider);
+  var template = '<script type="text/javascript" src="%s/packages/%s/assets/%s?%s"></script>\n';
+  finalHtml += format(template, prefixURL, packageName, file, cacheAvoider);
 });
 
 Zones = {