diff --git a/package.json b/package.json
index 4fad02e..d8ec6c2 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
   },
   "scripts": {
     "tsc": "tsc",
-    "tsd": "tsd",
-    "prepublish": "tsd install && tsc",
+    "typings": "typings",
+    "prepublish": "typings install && tsc",
     "test": "node index.js"
   },
   "author": "Juha Järvi",
@@ -22,13 +22,13 @@
   },
   "homepage": "https://github.com/charto/cxsd#readme",
   "dependencies": {
-    "bluebird": "~3.1.1",
+    "bluebird": "~3.2.2",
     "cget": "~0.0.3",
     "cxml": "~0.0.4",
-    "node-expat": "~2.3.12"
+    "node-expat": "~2.3.13"
   },
   "devDependencies": {
-    "tsd": "~0.6.5",
-    "typescript": "~1.8.0-dev.20160114"
+    "typescript": "~1.9.0-dev.20160205",
+    "typings": "~0.6.6"
   }
 }
diff --git a/src/schema/exporter/Exporter.ts b/src/schema/exporter/Exporter.ts
index 783b3f9..14c4d2c 100644
--- a/src/schema/exporter/Exporter.ts
+++ b/src/schema/exporter/Exporter.ts
@@ -1,6 +1,7 @@
 // This file is part of cxsd, copyright (c) 2015-2016 BusFaster Ltd.
 // Released under the MIT license, see LICENSE.
 
+import * as Promise from 'bluebird';
 import * as path from 'path';
 
 import {Transform} from '../transform/Transform';
diff --git a/src/xsd/Loader.ts b/src/xsd/Loader.ts
index adcaa50..d3c62fc 100644
--- a/src/xsd/Loader.ts
+++ b/src/xsd/Loader.ts
@@ -1,6 +1,8 @@
 // This file is part of cxsd, copyright (c) 2015-2016 BusFaster Ltd.
 // Released under the MIT license, see LICENSE.
 
+import * as Promise from 'bluebird';
+
 import {Address, FetchOptions, Cache, CacheResult, util} from 'cget'
 import {Namespace} from './Namespace'
 import {Source} from './Source'
diff --git a/src/xsd/Source.ts b/src/xsd/Source.ts
index 8b29126..cdc0a3f 100644
--- a/src/xsd/Source.ts
+++ b/src/xsd/Source.ts
@@ -1,6 +1,7 @@
 // This file is part of cxsd, copyright (c) 2015-2016 BusFaster Ltd.
 // Released under the MIT license, see LICENSE.
 
+import * as Promise from 'bluebird';
 import * as url from 'url';
 
 import {Namespace} from './Namespace'
diff --git a/src/xsd/types/MissingReferenceError.ts b/src/xsd/types/MissingReferenceError.ts
index 9dd4456..3f8e5d3 100644
--- a/src/xsd/types/MissingReferenceError.ts
+++ b/src/xsd/types/MissingReferenceError.ts
@@ -7,6 +7,8 @@ import {Base} from './Base';
 
 export class MissingReferenceError extends Error {
 	constructor(tag: Base, state: State, type: string, ref: QName) {
+		super();
+
 		this.name = 'MissingReferenceError';
 		this.message = 'Missing ' + type + ': ' + ref.format() + ' on line ' + tag.lineNumber + ' of ' + state.source.url;
 
diff --git a/tsconfig.json b/tsconfig.json
index 5e9224b..698e1eb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
 		"target": "es5"
 	},
 	"files": [
-		"typings/tsd.d.ts",
+		"typings/main.d.ts",
 		"typings-custom/node-expat.d.ts",
 
 		"src/cli.ts"
diff --git a/tsd.json b/tsd.json
deleted file mode 100644
index 3b75421..0000000
--- a/tsd.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "version": "v4",
-  "repo": "borisyankov/DefinitelyTyped",
-  "ref": "master",
-  "path": "typings",
-  "bundle": "typings/tsd.d.ts",
-  "installed": {
-    "node/node.d.ts": {
-      "commit": "98a9440752f3f2ad7786aba1bf9bdefec818919e"
-    },
-    "request/request.d.ts": {
-      "commit": "98a9440752f3f2ad7786aba1bf9bdefec818919e"
-    },
-    "form-data/form-data.d.ts": {
-      "commit": "98a9440752f3f2ad7786aba1bf9bdefec818919e"
-    },
-    "bluebird/bluebird.d.ts": {
-      "commit": "ac5cd185d007f6aacd6eeaaecfb75dae3ff59553"
-    }
-  }
-}
diff --git a/typings.json b/typings.json
new file mode 100644
index 0000000..3fcd94e
--- /dev/null
+++ b/typings.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "bluebird": "github:unional/typed-bluebird#ce35f299e5313994c0b8e9f0f31e94e115ec791f"
+  },
+  "devDependencies": {},
+  "ambientDependencies": {
+    "form-data": "github:DefinitelyTyped/DefinitelyTyped/form-data/form-data.d.ts#bb1b99052bf1d697f0368fbff56898bc1f5a525c",
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#1c56e368e17bb28ca57577250624ca5bd561aa81",
+    "request": "github:DefinitelyTyped/DefinitelyTyped/request/request.d.ts#e252a088123eb595d9d772eb373f41c084360278"
+  }
+}