diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4217471f9d..79793c16c1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,6 +2,7 @@ Please fill in this template.
 
 - [ ] Use a meaningful title for the pull request. Include the name of the package modified.
 - [ ] Test the change in your own code. (Compile and run.)
+- [ ] Add or edit tests to reflect the change. (Run with `npm test`.)
 - [ ] Follow the advice from the [readme](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/README.md#make-a-pull-request).
 - [ ] Avoid [common mistakes](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/README.md#common-mistakes).
 - [ ] Run `npm run lint package-name` (or `tsc` if no `tslint.json` is present).
diff --git a/notNeededPackages.json b/notNeededPackages.json
index a3423d479c..8c587f7c43 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -173,6 +173,12 @@
             "typingsPackageName": "bignumber.js",
             "sourceRepoURL": "https://github.com/MikeMcl/bignumber.js/",
             "asOfVersion": "5.0.0"
+        },
+		{
+            "libraryName": "bingmaps",
+            "typingsPackageName": "bingmaps",
+            "sourceRepoURL": "https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions",
+            "asOfVersion": "2.0.15"
         },
         {
             "libraryName": "botvs",
diff --git a/types/ace/index.d.ts b/types/ace/index.d.ts
index 822c394a32..1f7dd9752b 100644
--- a/types/ace/index.d.ts
+++ b/types/ace/index.d.ts
@@ -52,6 +52,10 @@ declare namespace AceAjax {
     export interface TokenInfo {
 
         value: string;
+
+        index?: number;
+
+        start?: number;
     }
 
     export interface Position {
@@ -575,7 +579,7 @@ declare namespace AceAjax {
          * @param row The row number to retrieve from
          * @param column The column number to retrieve from
         **/
-        getTokenAt(row: number, column: number): TokenInfo;
+        getTokenAt(row: number, column: number): TokenInfo|null;
 
         /**
          * Sets the undo manager.
diff --git a/types/aframe/index.d.ts b/types/aframe/index.d.ts
index 803318a754..0da1ed0ef5 100644
--- a/types/aframe/index.d.ts
+++ b/types/aframe/index.d.ts
@@ -16,16 +16,13 @@
 declare var AFRAME: AFrame.AFrameGlobal;
 declare var hasNativeWebVRImplementation: boolean;
 
-interface NodeSelector {
-	querySelector(selectors: 'a-scene'): AFrame.Scene;
+interface Document {
+    createElement(tagName: string): AFrame.Entity;
+    querySelector(selectors: 'a-scene'): AFrame.Scene;
 	querySelector<T extends AFrame.Entity<any>>(selectors: string): T;
 	querySelectorAll(selectors: string): NodeListOf<AFrame.Entity<any> | Element>;
 }
 
-interface Document {
-	createElement(tagName: string): AFrame.Entity;
-}
-
 // Interfaces
 declare namespace AFrame {
 	interface ObjectMap<T = any> {
diff --git a/types/amqplib/index.d.ts b/types/amqplib/index.d.ts
index 25b0ef04e9..269ed0112e 100644
--- a/types/amqplib/index.d.ts
+++ b/types/amqplib/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for amqplib 0.5
 // Project: https://github.com/squaremo/amqp.node
-// Definitions by: Michael Nahkies <https://github.com/mnahkies>, Ab Reitsma <https://github.com/abreits>, Nicolás Fantone <https://github.com/nfantone>
+// Definitions by: Michael Nahkies <https://github.com/mnahkies>, Ab Reitsma <https://github.com/abreits>, Nicolás Fantone <https://github.com/nfantone>, Nick Zelei <https://github.com/zelein>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/amqplib/properties.d.ts b/types/amqplib/properties.d.ts
index af90909d8c..9f96b14f5c 100644
--- a/types/amqplib/properties.d.ts
+++ b/types/amqplib/properties.d.ts
@@ -141,6 +141,52 @@ export namespace Options {
 
 export interface Message {
     content: Buffer;
-    fields: any;
-    properties: any;
+    fields: MessageFields;
+    properties: MessageProperties;
+}
+
+export interface MessageFields {
+    deliveryTag: number;
+    redelivered: boolean;
+    exchange: string;
+    routingKey: string;
+    messageCount: string;
+}
+
+export interface MessageProperties {
+    contentType: any | undefined;
+    contentEncoding: any | undefined;
+    headers: MessagePropertyHeaders;
+    deliveryMode: any | undefined;
+    priority: any | undefined;
+    correlationId: any | undefined;
+    replyTo: any | undefined;
+    expiration: any | undefined;
+    messageId: any | undefined;
+    timestamp: any | undefined;
+    type: any | undefined;
+    userId: any | undefined;
+    appId: any | undefined;
+    clusterId: any | undefined;
+}
+
+export interface MessagePropertyHeaders {
+    "x-first-death-exchange"?: string;
+    "x-first-death-queue"?: string;
+    "x-first-death-reason"?: string;
+    "x-death"?: XDeath[];
+    [key: string]: any;
+}
+
+export interface XDeath {
+    count: number;
+    reason: "rejected" | "expired" | "maxlen";
+    queue: string;
+    time: {
+        "!": "timestamp";
+        value: number;
+    };
+    exchange: string;
+    "original-expiration"?: any;
+    "routing-keys": string[];
 }
diff --git a/types/angular-route/angular-route-tests.ts b/types/angular-route/angular-route-tests.ts
index 4d596cdfdf..677c1589ed 100644
--- a/types/angular-route/angular-route-tests.ts
+++ b/types/angular-route/angular-route-tests.ts
@@ -40,7 +40,8 @@ $routeProvider
         }
     })
     .otherwise({ redirectTo: '/' })
-    .otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" });
+    .otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" })
+    .otherwise("/");
 
 
 var current: ng.route.ICurrentRoute;
diff --git a/types/angular-route/index.d.ts b/types/angular-route/index.d.ts
index 29c59f955c..56bd3f2263 100644
--- a/types/angular-route/index.d.ts
+++ b/types/angular-route/index.d.ts
@@ -138,7 +138,7 @@ declare module 'angular' {
              *
              * @params Mapping information to be assigned to $route.current.
              */
-            otherwise(params: IRoute): IRouteProvider;
+            otherwise(params: IRoute | string): IRouteProvider;
             /**
              * Adds a new route definition to the $route service.
              *
diff --git a/types/array-unique/array-unique-tests.ts b/types/array-unique/array-unique-tests.ts
new file mode 100644
index 0000000000..a854cab3bf
--- /dev/null
+++ b/types/array-unique/array-unique-tests.ts
@@ -0,0 +1,9 @@
+import arrayUnique = require("array-unique");
+
+arrayUnique([1, 1, 2, 3, 3]);
+
+arrayUnique(["foo", "foo", "bar", "foo"]);
+
+arrayUnique.immutable([1, 1, 2, 3, 3]);
+
+arrayUnique.immutable(["foo", "foo", "bar", "foo"]);
diff --git a/types/array-unique/index.d.ts b/types/array-unique/index.d.ts
new file mode 100644
index 0000000000..40d73a53de
--- /dev/null
+++ b/types/array-unique/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for array-unique 0.3
+// Project: https://github.com/jonschlinkert/array-unique
+// Definitions by: Michaël St-Georges <https://github.com/CSLTech>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function arrayUnique<T>(arr: T[]): T[];
+
+declare namespace arrayUnique {
+    function immutable<T>(arr: ReadonlyArray<T>): T[];
+}
+
+export = arrayUnique;
diff --git a/types/array-unique/tsconfig.json b/types/array-unique/tsconfig.json
new file mode 100644
index 0000000000..9829c01906
--- /dev/null
+++ b/types/array-unique/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "array-unique-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/array-unique/tslint.json b/types/array-unique/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/array-unique/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/assets-webpack-plugin/index.d.ts b/types/assets-webpack-plugin/index.d.ts
index 660fbc6052..7644d8f9ad 100644
--- a/types/assets-webpack-plugin/index.d.ts
+++ b/types/assets-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sporto/assets-webpack-plugin
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 
diff --git a/types/async/index.d.ts b/types/async/index.d.ts
index 17fecb467b..e2ecb522bc 100644
--- a/types/async/index.d.ts
+++ b/types/async/index.d.ts
@@ -7,6 +7,7 @@
 export as namespace async;
 
 export interface Dictionary<T> { [key: string]: T; }
+export type IterableCollection<T> = T[] | IterableIterator<T> | Dictionary<T>
 
 export interface ErrorCallback<T> { (err?: T): void; }
 export interface AsyncBooleanResultCallback<E> { (err?: E, truthValue?: boolean): void; }
@@ -36,11 +37,9 @@ export interface AsyncQueue<T> {
     running(): number;
     idle(): boolean;
     concurrency: number;
-    push<E>(task: T, callback?: ErrorCallback<E>): void;
+    push<E>(task: T | T[], callback?: ErrorCallback<E>): void;
     push<R,E>(task: T, callback?: AsyncResultCallback<R, E>): void;
-    push<E>(task: T[], callback?: ErrorCallback<E>): void;
-    unshift<E>(task: T, callback?: ErrorCallback<E>): void;
-    unshift<E>(task: T[], callback?: ErrorCallback<E>): void;
+    unshift<E>(task: T | T[], callback?: ErrorCallback<E>): void;
     saturated: () => any;
     empty: () => any;
     drain: () => any;
@@ -62,8 +61,7 @@ export interface AsyncPriorityQueue<T> {
     concurrency: number;
     started: boolean;
     paused: boolean;
-    push<R,E>(task: T, priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
-    push<R,E>(task: T[], priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
+    push<R,E>(task: T | T[], priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
     saturated: () => any;
     empty: () => any;
     drain: () => any;
@@ -86,7 +84,6 @@ export interface AsyncCargo {
     length(): number;
     payload?: number;
     push(task: any, callback? : Function): void;
-    push(task: any[], callback? : Function): void;
     saturated(): void;
     empty(): void;
     drain(): void;
@@ -97,39 +94,28 @@ export interface AsyncCargo {
 }
 
 // Collections
-export function each<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function each<T, E>(arr: Dictionary<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function each<T, E>(arr: IterableCollection<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const eachSeries: typeof each;
-export function eachLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function eachLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function eachLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const forEach: typeof each;
 export const forEachSeries: typeof each;
 export const forEachLimit: typeof eachLimit;
-export function forEachOf<T, E>(obj: T[] | IterableIterator<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function forEachOf<T, E>(obj: Dictionary<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function forEachOf<T, E>(obj: IterableCollection<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const forEachOfSeries: typeof forEachOf;
-export function forEachOfLimit<T, E>(obj: T[] | IterableIterator<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function forEachOfLimit<T, E>(obj: Dictionary<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function forEachOfLimit<T, E>(obj: IterableCollection<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const eachOf: typeof forEachOf;
 export const eachOfSeries: typeof forEachOf;
 export const eachOfLimit: typeof forEachOfLimit;
 export function map<T, R, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export function map<T, R, E>(arr: Dictionary<T>, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export const mapSeries: typeof map;
-export function mapLimit<T, R, E>(
-    arr: T[] | Dictionary<T> | IterableIterator<T>,
-    limit: number,
-    iterator: AsyncResultIterator<T, R, E>,
-    callback?: AsyncResultArrayCallback<R, E>
-): void;
+export function mapLimit<T, R, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export function mapValuesLimit<T, R, E>(obj: Dictionary<T>, limit: number, iteratee: (value: T, key: string, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultObjectCallback<R, E>): void;
 export function mapValues<T, R, E>(obj: Dictionary<T>, iteratee: (value: T, key: string, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultObjectCallback<R, E>): void;
 export const mapValuesSeries: typeof mapValues;
-export function filter<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function filter<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
+export function filter<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
 export const filterSeries: typeof filter;
-export function filterLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function filterLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
+export function filterLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
 export const select: typeof filter;
 export const selectSeries: typeof filter;
 export const selectLimit: typeof filterLimit;
@@ -141,36 +127,28 @@ export const inject: typeof reduce;
 export const foldl: typeof reduce;
 export const reduceRight: typeof reduce;
 export const foldr: typeof reduce;
-export function detect<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
-export function detect<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
+export function detect<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
 export const detectSeries: typeof detect;
-export function detectLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
-export function detectLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
+export function detectLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
 export const find: typeof detect;
 export const findSeries: typeof detect;
 export const findLimit: typeof detectLimit;
 export function sortBy<T, V, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, V, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function some<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function some<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function some<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const someSeries: typeof some;
-export function someLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function someLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function someLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const any: typeof some;
 export const anySeries: typeof someSeries;
 export const anyLimit: typeof someLimit;
-export function every<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function every<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function every<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const everySeries: typeof every;
-export function everyLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function everyLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function everyLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const all: typeof every;
 export const allSeries: typeof every;
 export const allLimit: typeof everyLimit;
 
-export function concat<T, R, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concat<T, R, E>(arr: Dictionary<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concatLimit<T, R, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concatLimit<T, R, E>(arr: Dictionary<T>, limit: number,iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function concat<T, R, E>(arr: IterableCollection<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function concatLimit<T, R, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export const concatSeries: typeof concat;
 
 // Control Flow
diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index b295259d79..cefa92ef5c 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -719,6 +719,9 @@ function testDisplayMarker() {
 
 // DisplayMarkerLayer =========================================================
 function testDisplayMarkerLayer() {
+    // Properties
+    str = displayMarkerLayer.id;
+
     // Lifecycle
     displayMarkerLayer.destroy();
     displayMarkerLayer.clear();
@@ -1275,6 +1278,9 @@ function testMarker() {
 
 // MarkerLayer ================================================================
 function testMarkerLayer() {
+    // Properties
+    str = markerLayer.id;
+
     // Lifecycle
     markerLayer = markerLayer.copy();
     bool = markerLayer.destroy();
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 5cc136f7a6..5db8f55ce5 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -9,7 +9,6 @@
 // NOTE: only those classes exported within this file should be retain that status below.
 // https://github.com/atom/atom/blob/v1.24.0/exports/atom.js
 
-/// <reference types="jquery" />
 /// <reference types="node" />
 
 import { ReadStream, WriteStream } from "fs";
@@ -40,58 +39,58 @@ export function watchPath(rootPath: string, options: {}, eventCallback: (events:
 export interface AtomEnvironment {
     // Properties
     /** A CommandRegistry instance. */
-    commands: CommandRegistry;
+    readonly commands: CommandRegistry;
 
     /** A Config instance. */
-    config: Config;
+    readonly config: Config;
 
     /** A Clipboard instance. */
-    clipboard: Clipboard;
+    readonly clipboard: Clipboard;
 
     /** A ContextMenuManager instance. */
-    contextMenu: ContextMenuManager;
+    readonly contextMenu: ContextMenuManager;
 
     /** A MenuManager instance. */
-    menu: MenuManager;
+    readonly menu: MenuManager;
 
     /** A KeymapManager instance. */
-    keymaps: KeymapManager;
+    readonly keymaps: KeymapManager;
 
     /** A TooltipManager instance. */
-    tooltips: TooltipManager;
+    readonly tooltips: TooltipManager;
 
     /** A NotificationManager instance. */
-    notifications: NotificationManager;
+    readonly notifications: NotificationManager;
 
     /** A Project instance. */
-    project: Project;
+    readonly project: Project;
 
     /** A GrammarRegistry instance. */
-    grammars: GrammarRegistry;
+    readonly grammars: GrammarRegistry;
 
     /** A HistoryManager instance. */
-    history: HistoryManager;
+    readonly history: HistoryManager;
 
     /** A PackageManager instance. */
-    packages: PackageManager;
+    readonly packages: PackageManager;
 
     /** A ThemeManager instance. */
-    themes: ThemeManager;
+    readonly themes: ThemeManager;
 
     /** A StyleManager instance. */
-    styles: StyleManager;
+    readonly styles: StyleManager;
 
     /** A DeserializerManager instance. */
-    deserializers: DeserializerManager;
+    readonly deserializers: DeserializerManager;
 
     /** A ViewRegistry instance. */
-    views: ViewRegistry;
+    readonly views: ViewRegistry;
 
     /** A Workspace instance. */
-    workspace: Workspace;
+    readonly workspace: Workspace;
 
     /** A TextEditorRegistry instance. */
-    textEditors: TextEditorRegistry;
+    readonly textEditors: TextEditorRegistry;
 
     // Event Subscription
     /** Invoke the given callback whenever ::beep is called. */
@@ -447,7 +446,7 @@ export interface Config {
  */
 export interface Decoration {
     /** The identifier for this Decoration. */
-    id: number;
+    readonly id: number;
 
     // Construction and Destruction
     /**
@@ -654,6 +653,9 @@ export interface DisplayMarker {
  *  This API is experimental and subject to change on any release.
  */
 export interface DisplayMarkerLayer {
+    /** The identifier for the underlying MarkerLayer. */
+    readonly id: string;
+
     // Lifecycle
     /** Destroy this layer. */
     destroy(): void;
@@ -837,7 +839,7 @@ export interface LayerDecoration {
  */
 export interface Marker {
     /** The identifier for this Marker. */
-    id: number;
+    readonly id: number;
 
     // Lifecycle
     /**
@@ -949,6 +951,9 @@ export interface Marker {
 
 /** Experimental: A container for a related set of markers. */
 export interface MarkerLayer {
+    /** The identifier for this MarkerLayer. */
+    readonly id: string;
+
     // Lifecycle
     /** Create a copy of this layer with markers in the same state and locations. */
     copy(): MarkerLayer;
@@ -1031,7 +1036,7 @@ export class Notification {
 /** A notification manager used to create Notifications to be shown to the user. */
 export interface NotificationManager {
     // Properties
-    notifications: Notification[];
+    readonly notifications: Notification[];
 
     // Events
     /** Invoke the given callback after a notification has been added. */
@@ -1267,8 +1272,8 @@ export class Range {
  *  including cursor and selection positions, folds, and soft wraps.
  */
 export class TextEditor {
-    id: number;
-    buffer: TextBuffer;
+    readonly id: number;
+    readonly buffer: TextBuffer;
 
     // NOTE: undocumented within the public API. Don't go down the rabbit hole.
     constructor(options?: object);
@@ -2519,6 +2524,10 @@ export interface TextEditorRegistry {
     observe(callback: (editor: TextEditor) => void): Disposable;
 }
 
+export interface JQueryCompatible<Element extends Node = HTMLElement> extends Iterable<Element> {
+    jquery: string;
+}
+
 export type TooltipPlacement =
     |"top"|"bottom"|"left"|"right"
     |"auto"|"auto top"|"auto bottom"|"auto left"|"auto right";
@@ -2526,7 +2535,7 @@ export type TooltipPlacement =
 /** Associates tooltips with HTML elements or selectors. */
 export interface TooltipManager {
     /** Add a tooltip to the given element. */
-    add(target: HTMLElement, options: {
+    add(target: HTMLElement | JQueryCompatible, options: {
         item?: object,
     } | {
         title?: string|(() => string),
@@ -2975,7 +2984,7 @@ export interface WorkspaceCenter {
  *  Node's ChildProcess.
  */
 export class BufferedProcess {
-    process?: ChildProcess;
+    readonly process?: ChildProcess;
 
     constructor(options: ProcessOptions);
 
@@ -4043,10 +4052,10 @@ export interface MenuManager {
  */
 export interface Package {
     /** The name of the Package. */
-    name: string;
+    readonly name: string;
 
     /** The path to the Package on disk. */
-    path: string;
+    readonly path: string;
 
     // Event Subscription
     /** Invoke the given callback when all packages have been activated. */
@@ -4368,7 +4377,7 @@ export interface Pane {
  */
 export interface Panel<T = object> {
     /** Whether or not the Panel is visible. */
-    visible: boolean;
+    readonly visible: boolean;
 
     // Construction and Destruction
     /** Destroy and remove this panel from the UI. */
@@ -4489,7 +4498,7 @@ export interface Project {
  *  syntax tree to a token including all scope names for the entire path.
  */
 export interface ScopeDescriptor {
-    scopes: string[];
+    readonly scopes: string[];
 
     /** Returns all scopes for this descriptor. */
     getScopesArray(): string[];
@@ -4885,13 +4894,13 @@ export class Task {
  */
 export class TextBuffer {
     /** The unique identifier for this buffer. */
-    id: string;
+    readonly id: string;
 
     /** The number of retainers for the buffer. */
-    refcount: number;
+    readonly refcount: number;
 
     /** Whether or not the bufffer has been destroyed. */
-    destroyed: boolean;
+    readonly destroyed: boolean;
 
     /** Create a new buffer backed by the given file path. */
     static load(filePath: string, params?: BufferLoadOptions): Promise<TextBuffer>;
@@ -6744,11 +6753,11 @@ export interface TokenizeLineResult {
  *  jQuery, which is an expensive dependency we want to eliminate.
  */
 export interface Tooltip {
-    options: TooltipOptions;
-    enabled: boolean;
-    timeout: number;
-    hoverState: "in"|"out"|null;
-    element: JQuery|HTMLElement;
+    readonly options: TooltipOptions;
+    readonly enabled: boolean;
+    readonly timeout: number;
+    readonly hoverState: "in"|"out"|null;
+    readonly element: HTMLElement;
 
     getTitle(): string;
     getTooltipElement(): HTMLElement;
@@ -6765,11 +6774,11 @@ export interface ViewModel {
 }
 
 export interface WindowLoadSettings {
-    appVersion: string;
-    atomHome: string;
-    devMode: boolean;
-    resourcePath: string;
-    safeMode: boolean;
-    env?: { [key: string]: string|undefined };
-    profileStartup?: boolean;
+    readonly appVersion: string;
+    readonly atomHome: string;
+    readonly devMode: boolean;
+    readonly resourcePath: string;
+    readonly safeMode: boolean;
+    readonly env?: { [key: string]: string|undefined };
+    readonly profileStartup?: boolean;
 }
diff --git a/types/bingmaps/Autosuggest.d.ts b/types/bingmaps/Autosuggest.d.ts
deleted file mode 100644
index 7d83ca6e4b..0000000000
--- a/types/bingmaps/Autosuggest.d.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-declare module Microsoft.Maps {
-    /** Options used to customize the autosuggest functionality. */
-    export interface IAutosuggestOptions {
-        /** Specifies if street address suggestions should be returned. Default: true */
-        addressSuggestions?: boolean;
-
-        /**
-        * Specifies if the user’s location should be auto detected using their IP address, if no location information is provided
-        * in the userLocation property. Default: true
-        */
-        autoDetectLocation?: boolean;
-
-        /**
-        * A bounding box that is used to help influence the results such that locations that are in or near this bounding box
-        * are given more weight than they would normally.
-        */
-        bounds?: LocationRect;
-
-        /**
-        * A reference to a map instance. If the useMapView property is set to true, the bounding box of the map view will be used
-        * to influence the weight of suggestions.
-        */
-        map?: Map;
-
-        /** The maximum number of results to return. Can be any value between 1 and 10. Default: 5 */
-        maxResults?: number;
-
-        /** Specifies if place suggestions (city, landmark, etc.) should be returned. Default: true */
-        placeSuggestions?: boolean;
-
-        /**
-        * Indicates if the maps bounding box should be used to influence the suggested results. Ignored if the bounds property is
-        * set. Default: true
-        */
-        useMapView?: boolean;
-
-        /** A coordinate indicating where the user is located. This will influence the results to be more relevant to the user. */
-        userLocation?: Location;
-    }
-
-    /** Represents the suggestion result from the Autosuggest manager. */
-    export interface ISuggestionResult {
-        /** A structured address object for the result.  */
-        address: IAddress;
-
-        /** A LocationRect that can be used to set the map view over the result. */
-        bestView: LocationRect;
-
-        /** Unique entity id to be used for searching the entity. */
-        entityId: string;
-
-        /** The type of the result; Address, Place */
-        entityType: string;
-
-        /** The sub type of result; Address, RoadBlock, PopulatedPlace, CountryRegion, etc. */
-        entitySubType: string;
-
-        /** A nicely formatted suggestion string for the result based on market. */
-        formattedSuggestion: string;
-
-        /**
-        * The coordinate of the result. This value is only returned for place (city, landmarks) results and not for addresses.
-        * Street addresses will need to be geocoded to get their location.
-        */
-        location: Location;
-
-        /** A secondary title that provides additional context to the title value of the suggestion. **/
-        subtitle: string;
-
-        /** The display title for the result (i.e. “Redmond”). */
-        title: string;
-    }
-
-    /**
-     * The AutosuggestManager is the primary class in the Autosuggest module that powers the autosuggest functionality.
-     * @requires The Microsoft.Maps.Autosuggest module.
-     */
-    export class AutosuggestManager {
-       /**
-       * @constructor
-       * @requires The Microsoft.Maps.Autosuggest module.
-       * @param options The options to use with the autosuggest manager.
-       */
-        constructor(options?: IAutosuggestOptions);
-
-        /**
-        * Attaches the Autosuggest functionality to an input box.
-        * @param suggestionBoxId The HTML element identifier of the input box.
-        * @param suggestionContainerId The Id of container where suggestions will be displayed.
-        * @param selectedSuggestionCallback A reference to a callback function that will be called when a user selects a suggestion from the Autosuggest UI.
-        */
-        public attachAutosuggest(suggestionBoxId: string, suggestionContainerId: string, selectedSuggestionCallback: (result: ISuggestionResult) => void) : void;
-
-        /** Detaches the autosuggest functionality from the input box, freeing any resources it has or events it has tied to. */
-        public detachAutosuggest(): void;
-
-        /** Disposes the Autosuggest object, freeing any resources it has or events it has tied to. */
-        public dispose(): void;
-
-        /**
-        * Gets the options currently used by the autosuggest manager.
-        * @returns The options currently used by the autosuggest manager.
-        */
-        public getOptions(): IAutosuggestOptions;
-
-        /**
-        * Sets the options currently used by the autosuggest manager.
-        * @param options The options to use with the autosuggest manager.
-        */
-        public setOptions(options?: IAutosuggestOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/Clustering.d.ts b/types/bingmaps/Clustering.d.ts
deleted file mode 100644
index 17c9425933..0000000000
--- a/types/bingmaps/Clustering.d.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-declare module Microsoft.Maps {
-    /** The options used to customize how the ClusterLayer functions. */
-    export interface IClusterLayerOptions {
-        /**
-        * A callback function that is fired after the clustering for a map view has completed. This is useful if you want to generate a list of locations based on what is in the current view.
-        */
-        callback?: () => void;
-
-        /**
-        * A callback function that allows you to process a clustered pushpin before it is added to a layer. This is useful if you want to add events or set style options on the clustered pushpin.
-        */
-        clusteredPinCallback?: (pin: ClusterPushpin) => void;
-
-        /**
-        * Indicates if the layer should cluster the locations or not. Default: true
-        */
-        clusteringEnabled?: boolean;
-
-        /**
-        * Defines how clusters are positioned on the map. Default: MeanAverage
-        */
-        clusterPlacementType?: ClusterPlacementType;
-
-        /**
-        * The width and height of the gird cells used for clustering in pixels. Default: 45
-        */
-        gridSize?: number;
-
-        /**
-        * Offsets the placement of clustered pushpins by a set number of pixels. This option is only available when the placement type is set to GridCenter.
-        * This is useful if you have multiple cluster layers on the map and you want to offset the clustered pushpins between the layers so that they are visible,
-        * otherwise the clusters from the different layers would overlap completely.
-        */
-        layerOffset?: Point;
-
-        /**
-        * A boolean indicating if the layer is visible or not.
-        */
-        visible?: boolean;
-
-        /**
-        * The z-index of the layer.
-        */
-        zIndex?: number;
-    }
-
-    /**
-    * Used to specify how a clustered pushpin should be positioned relative to the pushpins it contains.
-    * @requires The Microsoft.Maps.Clustering module.
-    */
-    export enum ClusterPlacementType {
-        /**
-        * Mean Average placement calculates the average position of a group of coordinates. This method creates a more realistic representation of the data,
-        * however requires more processing power and increases the chances of pushpins overlapping.
-        */
-        MeanAverage,
-
-        /**
-        * This method is the simplest way to represent a cluster. It places the cluster at the first location in the cluster. This method may not accurately
-        * represent the data but requires little processing power.
-        */
-        FirstLocation
-    }
-
-    /**
-     * This class extends the Pushpin class and has all the same methods and properties plus the following properties.
-     * @requires The Microsoft.Maps.Clustering module.
-     */
-    export class ClusterPushpin extends Pushpin {
-        /** An array of all the pushpins that are in the cluster. */
-        containedPushpins: Pushpin[];
-
-        /**
-        * The grid cell key that can be used retrieve the clustered pushpin(s) from the clustering layer. This is useful when creating a clickable list that
-        * link items in the list to clusters or pushpins on the map. Your list just needs to store the gridKey value.
-        */
-        gridKey: number;
-    }
-
-    /**
-     * This class allows you to easily add in client side clustering to your application. Client Side Clustering is a method where pushpins that are close
-     * together are grouped and represented as a single pushpin, often using a different icon to indicate the cluster. This is a great way to improve both
-     * the user experience and performance of the map.
-     * @requires The Microsoft.Maps.Clustering module.
-     */
-    export class ClusterLayer implements IDataLayer {
-        /**
-        * @constructor
-        * @requires The Microsoft.Maps.Clustering module.
-        * @param pushpins An array of pushpins to cluster in the layer.
-        * @param options The options used to customize how the ClusterLayer functions.
-        */
-        constructor(pushpins: Pushpin[], options?: IClusterLayerOptions);
-
-        /** Clears all the data in the cluster layer. */
-        public clear(): void;
-
-        /**
-        * Gets all the pushpins that are in the current map view. If clustering is disabled, all pushpins in the clustering layer are returned.
-        * @returns All the pushpins that are in the current map view. If clustering is disabled, all pushpins in the clustering layer are returned.
-        */
-        public getDisplayedPushpins(): Pushpin[];
-
-        /**
-        * Gets the current options used by the cluster layer.
-        * @returns The current options used by the cluster layer.
-        */
-        public getOptions(): IClusterLayerOptions;
-
-        /**
-        * Gets all pushpins that are in the layers.
-        * @returns An array of all the pushpins that are in the layers.
-        */
-        public getPushpins(): Pushpin[];
-
-        /**
-        * Gets the original pushpins that are in the specified grid cell.
-        * @param The gridKey index to retrieve the pushpins for.
-        * @returns The original pushpins that are in the specified grid cell.
-        */
-        public getPushpinsByGridKey(gridKey: number): Pushpin[];
-
-        /**
-        * Gets the pushpin in the specified cluster grid cell which can be either a ClusterPushpin if there are multiple pushpins in a cell or a single Pushpin.
-        * @param The gridKey index to retrieve the pushpins for.
-        * @returns The pushpin in the specified cluster grid cell which can be either a ClusterPushpin if there are multiple pushpins in a cell or a single Pushpin.
-        */
-        public getClusterPushpinByGridKey(gridKey: number): ClusterPushpin | Pushpin;
-
-        /**
-        * Sets the clustering options to use in the layer.
-        * @params options The clustering options to use in the layer.
-        */
-        public setOptions(options: IClusterLayerOptions): void;
-
-        /**
-        * Sets the array of pushpins that are used in the clustering layer.
-        * @param pushpins An array of pushpins that are to be used by the clustering layer.
-        */
-        public setPushpins(pushpins: Pushpin[]): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/Contour.d.ts b/types/bingmaps/Contour.d.ts
deleted file mode 100644
index cd2d9767c7..0000000000
--- a/types/bingmaps/Contour.d.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-declare module Microsoft.Maps {
-
-    /**
-     * The contour layer options
-     */
-    interface IContourLayerOptions {
-        /** The z-index of this layer */
-        zIndex?: number;
-
-        /** Whether the layer is visible */
-        visible?: boolean;
-
-        /** A callback function which defines the color of the contour line fill. */
-        colorCallback?: (contourValue: number | string) => string | Color;
-
-        /** The polygon options that apply to all contour lines of this layer */
-        polygonOptions?: IPolygonOptions;
-    }
-
-    /**
-     * The contour line of a contour layer
-     */
-    export class ContourLine extends Polygon {
-        /** The contour lines that are directly nested inside this contour line */
-        public innerContourLines: ContourLine[];
-
-        /** The outer/parent contour line of this contour */
-        public outerContourLine: ContourLine;
-
-        /** The data value associated with this contour line */
-        public contourValue: number | string;
-
-        /**
-         * @constructor
-         * @param boundary The boundary of this contour line
-         * @param contourValue The value associated with this contour line
-         */
-        constructor(boundary: Location[], contourValue?: number | string);
-    }
-
-    /**
-     * The contour layer class.
-     */
-    export class ContourLayer extends Layer {
-        /**
-         * @constructor
-         * @param contourLines The contour lines that compose this layer.
-         * @param options The contour layer options.
-         */
-        constructor(contourLines: ContourLine[], options?: IContourLayerOptions);
-
-        /**
-         * Clears all data on the contour layer.
-         */
-        public clear(): void;
-
-        /**
-         * Gets the contour lines of this layer.
-         * @returns The contour lines of this layer.
-         */
-        public getContourLines(): ContourLine[];
-
-        /**
-         * Gets the polygons that were generated from the contour lines in this layer.
-         * @returns The polygons that were generated from the contour lines in this layer.
-         */
-        public getContourPolygons(): Polygon[];
-
-        /**
-         * Retrieves the options of this contour layer.
-         * @returns The options of this contour layer.
-         */
-        public getOptions(): IContourLayerOptions;
-
-        /**
-         * Sets the contour lines used to calculate the polygon areas of this layer.
-         * @param contourLines The contour lines used to calculate the polygon areas of this layer.
-         */
-        public setContourLines(contourLines: ContourLine[]): void;
-
-        /**
-         * Sets the options of the contour layer.
-         * @param options The new options to update the layer.
-         */
-        public setOptions(options: IContourLayerOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/DataBinning.d.ts b/types/bingmaps/DataBinning.d.ts
deleted file mode 100644
index e33b2d5113..0000000000
--- a/types/bingmaps/DataBinning.d.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/// <reference path="SpatialMath.d.ts"/>
-
-declare module Microsoft.Maps {
-
-    /**
-     * Specifies the shape of data bin rendered in the layer.
-     */
-    export enum DataBinType {
-        /* Renders data bins as circles in a square grid. */
-        circle,
-
-        /* Renders data bins as hexagons with a flat top edge. */
-        hexagon,
-
-        /* Renders data bins as circles in a hexagonal grid. */
-        hexCircle,
-
-        /* Renders data bins as hexagons with a pointy top corner. */
-        pointyHexagon,
-
-        /* Renders data bins as a square grid. */
-        square
-    }
-
-    /**
-     * A set options the define how a data binning layer is rendered.
-     */
-    export interface IDataBinningOptions {
-        /* The name of a property in the Pushpin.metadata object on which to perform calculations (average, count, sum) against the pushpins in each data bin. */
-        aggregationProperty?: string;
-
-        /*
-         * A callback function which defines the color a data bin polygon should be. This callback recieves data bin information
-         * along with the min and max calculated metrics for the data set. If set, this callback function must return a color value.
-         */
-        colorCallback?: (binInfo: IDataBinInfo, min: IDataBinMetrics, max: IDataBinMetrics) => string | Color;
-
-        /* The shape of the data bin to generate. Default: hexagon */
-        dataBinType?: DataBinType;
-
-        /* The distance units of the radius option. Default: meters */
-        distanceUnits?: SpatialMath.DistanceUnits;
-
-        /* The default options used for rendering the data bin polygons. */
-        polygonOptions?: IPolygonOptions;
-
-        /*
-         * A spatial distance which will be converted into a pixel distance at the equater and used to generate symetrically sized data bins
-         * that have the apprimate spatial distance radius. Default: 1000
-         */
-        radius?: number;
-
-        /*
-         * A callback function which defines how much to scale a data bins size. This callback recieves data bin information
-         * along with the min and max calculated metrics for the data set. If set, this callback function must return a number between 0 and 1.
-         */
-        scaleCallback?: (binInfo: IDataBinInfo, min: IDataBinMetrics, max: IDataBinMetrics) => number;
-    }
-
-    /**
-    * A set of values calculated from the pushpins in a data bin.
-    */
-    export interface IDataBinMetrics {
-
-        /* The average value of the aggregation property of the pushpins in a data bin. */
-        average?: number;
-
-        /* The number of pushpins in a data bin. */
-        count?: number;
-
-        /* The number of pushpins in the data bin who's aggregation property has a value. */
-        countNotBlank?: number;
-
-        /* The number of pushpins in the data bin who's aggregation property is a valid number. */
-        countNumbers?: number;
-
-        /* The sum of the aggregation property of the pushpins in a data bin.  */
-        sum?: number;
-    }
-
-    /**
-    * The result of a calculated data bin.
-    */
-    export interface IDataBinInfo {
-        /* An array of all the pushpins that are in the data bin. */
-        containedPushpins: Microsoft.Maps.Pushpin[];
-
-        /* A set of calculated metric values determined using the aggregationProperty value of all the pushpins contained in the data bin. */
-        metrics: IDataBinMetrics;
-    }
-
-    /**
-     *  A polygon which represents a data bin on the map and contains the data bin information.
-     */
-
-    export class DataBinPolygon extends Polygon {
-        /* Information about the data bin; the contained pushpins and calculated metrics. */
-        public dataBinInfo: IDataBinInfo;
-    }
-
-    /**
-     * This class provides a data binning visualization for the map. It takes in an array of pushpins, groups them into
-     * symmetrical shapes that fit together in a grid such as hexagons. Aggregation of data values are done and can be
-     * used to customize how the data bins are rendered on the map (i.e. scale / color) .
-     */
-    export class DataBinningLayer extends Layer {
-        /**
-         * Initializes the data binning layer.
-         * @param pushpins The array of pushpins that are used to generate the data bins.
-         * @param options The options used for calculating and rendering the data bins.
-         */
-        constructor(pushpins?: Pushpin[], options?: IDataBinningOptions);
-
-        /**
-         * Gets the options used for calculating and rendering the data bins.
-         * @returns The options used for calculating and rendering the data bins.
-         */
-        public getOptions(): IDataBinningOptions;
-
-        /**
-         * Gets all pushpins that are in the layers.
-         * @returns All pushpins that are in the layers.
-         */
-        public getPushpins(): Pushpin[];
-
-        /**
-         * Sets the array of pushpins that are used to generate the data bins.
-         * @param pushpins The array of pushpins that are used to generate the data bins.
-         */
-        public setPushpins(pushpins: Pushpin[]): void;
-
-        /**
-         * Clears all the data in the data binning layer.
-         */
-        public clear(): void;
-
-        /**
-         * Cleans up any resources this object is consuming.
-         */
-        public dispose(): void;
-
-        /**
-         * Sets the options used for calculating and rendering the data bins.
-         * @param options The options used for calculating and rendering the data bins.
-         */
-        public setOptions(options: IDataBinningOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/Directions.d.ts b/types/bingmaps/Directions.d.ts
deleted file mode 100644
index 3663fc8c21..0000000000
--- a/types/bingmaps/Directions.d.ts
+++ /dev/null
@@ -1,611 +0,0 @@
-declare module Microsoft.Maps.Directions {
-    /////////////////////////////////////
-    /// Enumerations
-    ////////////////////////////////////
-
-    /** Distance units for calculating the directions in. */
-    export enum DistanceUnit {
-
-        /** A distance in Kilometers. */
-        km,
-
-        /** A distance in Miles. */
-        miles
-    }
-
-    /** Defines the type of route to calculate. */
-    export enum RouteMode {
-        /** Driving directions are calculated. */
-        driving,
-
-        /** Transit directions are calculated. */
-        transit,
-
-        /** Walking directions are calculated. */
-        walking
-    }
-
-    /** Defines features to avoid when calculating the route. */
-    export enum RouteAvoidance {
-        /** Calculate the best route using any travel option available. */
-        none = 0,
-
-        /** Reduce the use of limited access highways when calculating the route. */
-        minimizeHighways = 1,
-
-        /** Reduce the use of roads with tolls when calculating the route. */
-        minimizeToll = 2,
-
-        /** Avoid using limited access highways when calculating the route. */
-        avoidHighways = 4,
-
-        /** Avoid using roads with tolls when calculating the route. */
-        avoidToll = 8,
-
-        /** Avoid using express trains when calculating the route. This option only affects routes with a transitRouteMode that have the culture set to ja-jp. */
-        avoidExpressTrain = 16,
-
-        /** Avoid using airlines when calculating the route. This option only affects routes with a transitRouteMode that have the culture set to ja-jp. */
-        avoidAirline = 32,
-
-        /** Avoid using bullet trains when calculating the route. This option only affects routes with a transitRouteMode that have the culture set to ja-jp. */
-        avoidBulletTrain = 64
-    }
-
-    /** Response codes for a route calculation request. */
-    export enum RouteResponseCode {
-        /** The route was successfully calculated. */
-        success = 0,
-
-        /** An unknown error has occurred. */
-        unknownError = 1,
-
-        /** A nearby road cannot be found for one or more of the route waypoints. */
-        cannotFindNearbyRoad = 2,
-
-        /**
-        * The distance between two route waypoints, or the total length of the route exceeds the limit of the route mode.
-        * Modify the waypoint locations so that they are closer together.
-        */
-        tooFar = 3,
-
-        /**
-        * A route cannot be calculated for the specified waypoints. For example, this code is returned when a route between
-        * “Seattle, WA” and “Honolulu, HI” is requested.
-        */
-        noSolution = 4,
-
-        /** There is no route data for the specified waypoints. */
-        dataSourceNotFound = 5,
-
-        /** There are no transit options available for the specified time. */
-        noAvailableTransitTrip = 7,
-
-        /** The transit stops are so close that walking is always a better option. */
-        transitStopsTooClose = 8,
-
-        /** The transit stops are so close that walking is a better option. */
-        walkingBestAlternative = 9,
-
-        /**
-        * There is no transit data available for the route or for one or more of the specified waypoints,
-        * or the waypoints are in different transit areas that do not overlap.
-        */
-        outOfTransitBounds = 10,
-
-        /** The directions calculation request has timed out. */
-        timeOut = 11,
-
-        /**
-        * One or more waypoints need to be disambiguated. This error does not occur if the
-        * autoDisplayDisambiguation directions render option is set to true.
-        */
-        waypointDisambiguation = 12,
-
-        /** One or more waypoints do not have an address or location specified. */
-        hasEmptyWaypoint = 13,
-
-        /** The maximum number of waypoints, which is 25, has been exceeded. */
-        exceedMaxWaypointLimit = 14,
-
-        /** At least two waypoints are required to calculate a route. */
-        atleastTwoWaypointRequired = 15,
-
-        /** The first or last waypoint is a via point, which is not allowed. */
-        firstOrLastStoppointIsVia = 16,
-
-        /** The search service failed to return results. */
-        searchServiceFailed = 17,
-
-        /** The credentials passed to the Directions module are invalid. */
-        invalidCredentials = 18
-    }
-
-    /** Defines optimization options for calculating directions. */
-    export enum RouteOptimization {
-        /** Calculate a route the shortest time. */
-        shortestTime = 0,
-
-        /** Calculate a route with the shortest distance. */
-        shortestDistance = 1,
-
-        /** The route is calculated to minimize the time and uses current traffic information. */
-        timeWithTraffic = 2,
-
-        /** The route is calculated to minimize the time and avoid road closures. Traffic information is not used in the calculation. */
-        timeAvoidClosure = 3,
-
-        /** Minimize the cost when calculating directions. This option only affects routes with a transitRouteMode that have the culture set to ja-jp.*/
-        minimizeMoney = 4,
-
-        /** Minimize transit transfers when calculating directions. This option only affects routes with a transitRouteMode that have the culture set to ja-jp.*/
-        minimizeTransfers = 5,
-
-        /** Minimize the amount of walking when calculating directions. This option only affects routes with a transitRouteMode that have the culture set to ja-jp.*/
-        minimizeWalking = 6
-    }
-
-    /** An enumeration that specifies the releance of a dateTime when calculating a route. */
-    export enum TimeType {
-        /** The dateTime parameter contains the desired arrival time for a transit request. */
-        arrival,
-
-        /** The dateTime parameter contains the desired departure time for a transit request. */
-        departure,
-
-        /** The dateTime parameter should be ignored and the first available transit taken. */
-        firstAvailable,
-
-        /** The dateTime parameter contains the latest departure time available for a transit request.  */
-        lastAvailable
-    }
-
-    /////////////////////////////////////
-    /// Interfaces
-    ////////////////////////////////////
-
-    /** Contains the arguments for directions events. */
-    export interface IDirectionsEventArgs {
-        /** The calculated route (or routes, if the route mode is transit). */
-        route: IRoute[];
-
-        /** The route summary (or summaries) of the route(s) defined in the route property. */
-        routeSummary: IRouteSummary[];
-    }
-
-    /** Contains arguments for directions error events. */
-    export interface IDirectionsErrorEventArgs {
-        /** The code which identifies the error that occurred. */
-        responseCode: RouteResponseCode;
-
-        /** The error message. */
-        message: string;
-    }
-
-    /** Represents one direction in a set of route directions. */
-    export interface IDirectionsStep {
-        /** The child direction items for this directions step. */
-        childItineraryItems: IDirectionsStep[];
-
-        /** The location of the start of the direction. */
-        coordinate: Location;
-
-        /** The total distance of the step in the unit specified in the distanceUnit property of the DirectionsRequestOptions. */
-        distance: string;
-
-        /** The total time, in seconds, of the direction step. */
-        durationInSeconds: number;
-
-        /** The HTML formatted route instruction associated with the step. */
-        formattedText: string;
-
-        /** A boolean indicating whether the maneuver image is a road shield image. */
-        isImageRoadShield: boolean;
-
-        /** The name of the maneuver image. */
-        maneuverImageName: string;
-
-        /** An array of strings, where each string is a hint to help determine when to move to the next direction step. Not all direction steps have hints. */
-        postIntersectionHints: string[];
-
-        /** An array of strings, where each string is a hint to help determine when you have arrived at this direction step. Not all direction steps have hints. */
-        preIntersectionHints: string[];
-
-        /** The name of the transit stop where this step originates. */
-        startStopName: string;
-
-        /** The transit line associated with this step. */
-        transitLine: ITransitLine;
-
-        /** The URL of the image to use for transit direction steps. */
-        transitStepIcon: string;
-
-        /** The ID of the transit stop. */
-        transitStopId: string;
-
-        /** The name of the transit line end. */
-        transitTerminus: string;
-    }
-
-    /** Represents a route. */
-    export interface IRoute {
-        /** The legs of the route. Each route leg represents the route between two waypoints. */
-        routeLegs: IRouteLeg[];
-
-        /** An array of locations that makes up the path of the route. */
-        routePath: Location[];
-    }
-
-    /** Represents a leg of a route. A route leg is the part of the route between two stop waypoints. */
-    export interface IRouteLeg {
-        /** The end time of the route leg. This property only applies when the routeMode of the DirectionsRequestOptions is set to transit. */
-        endTime: Date;
-
-        /** The location of the last waypoint of this leg. */
-        endWaypointLocation: Location;
-
-        /** The directions steps associated with this route leg. */
-        itineraryItems: IDirectionsStep[];
-
-        /** The index of the route to which this route leg belongs. */
-        originalRouteIndex: number;
-
-        /** The start time of the route leg. This property only applies when the routeMode of the DirectionsRequestOptions is set to transit. */
-        startTime: Date;
-
-        /** The location of the first waypoint of this route leg. */
-        startWaypointLocation: Location;
-
-        /** The sub legs of this route leg. A sub leg of a route is the part of the route between a stop point and a via point or between two via points.*/
-        subLegs: IRouteSubLeg[];
-
-        /** The summary which describes this route leg. */
-        summary: IRouteSummary;
-    }
-
-    /** Represents a route sub leg. A route sub leg is the part of the route between a stop point and a via point or between two via points. */
-    export interface IRouteSubLeg {
-        /** The location of the last waypoint of the sub leg. */
-        actualEnd: Location;
-
-        /** The location of the first waypoint of the sub leg. */
-        actualStart: Location;
-
-        /** The description of the last waypoint of the sub leg. */
-        endDescription: string;
-
-        /** The description of the first waypoint of the sub leg. */
-        startDescription: string;
-    }
-
-    /** Represents a route summary. */
-    export interface IRouteSummary {
-        /** The total travel distance of the route */
-        distance: number;
-
-        /** The cost of the route. This property is only returned if the routeMode of the IDirectionsRequestOptions is set to transit and the map culture is set to ja-jp. */
-        monetaryCost: number;
-
-        /** The location of the northeast corner of bounding box that defines the best map view of the route. */
-        northEast: Location;
-
-        /** The location of the southwest corner of bounding box that defines the best map view of the route. */
-        southWest: Location;
-
-        /** The total travel time, in seconds, for the route. */
-        time: number;
-
-        /**
-        * The total travel time, in seconds, taking into account traffic delays, for the route.
-        * This property is 0 if the avoidTraffic property of the IDirectionsRequestOptions is set to false.
-        */
-        timeWithTraffic: number;
-    }
-
-    /** Contains information about a transit line. */
-    export interface ITransitLine {
-        /** The short name for the transit line. */
-        abbreviatedName: string;
-
-        /** The ID of the agency that owns the transit line. */
-        agencyId: number;
-
-        /** The name of the agency that owns the transit line. */
-        agencyName: string;
-
-        /** The URL of the website of the agency that owns the transit line. */
-        agencyUrl: string;
-
-        /** Phone number for the transit agency. */
-        phoneNumber: string;
-
-        /** Information about the provider of this transit line data. */
-        providerInfo: string;
-
-        /** The uri for the transit agencies website. */
-        uri: string;
-
-        /** The full name of this transit line. */
-        verboseName: string;
-    }
-
-    /** Options that can be used to define a waypoint. */
-    export interface IWaypointOptions {
-        /**
-        * The address string of the waypoint. For example, the following strings are valid for this parameter: "Seattle", "1 Microsoft Way, Redmond, WA". Either the address or location property must be specified.
-        */
-        address?: string;
-
-        /**
-        * A boolean indicating whether the waypoint is a via point. A via point is a point along the route that is not a stop point. Set this property to
-        * true if you just want the route to pass through this location. Default: false
-        */
-        isViaPoint?: boolean;
-
-        /** The location of the waypoint. Either the address or location property must be specified. */
-        location?: Location;
-    }
-
-    /** Contains options for the directions to calculate. */
-    export interface IDirectionsRequestOptions {
-        /** The unit to use when displaying direction distances. */
-        distanceUnit?: DistanceUnit;
-
-        /** The number of routes to calculate. */
-        maxRoutes?: number;
-
-        /** The features to avoid when calculating the route. */
-        routeAvoidance?: RouteAvoidance[];
-
-        /** A boolean indicating whether the route line on the map can be dragged with the mouse cursor.  */
-        routeDraggable?: boolean;
-
-        /** If multiple routes are returned, the index of the route and directions to display. */
-        routeIndex?: number;
-
-        /** The type of directions to calculate. */
-        routeMode?: RouteMode;
-
-        /** The optimization setting for the route calculation. */
-        routeOptimization?: RouteOptimization;
-
-        /** The type of the time specified. The default value is departure. */
-        timeType?: TimeType;
-
-        /** The time to use when calculating the route. If this property is set to null, the current time is used */
-        time?: Date;
-    }
-
-    /** Represents render options for a route. */
-    export interface IDirectionsRenderOptions {
-        /** A boolean indicating whether to automatically set the map view to the best map view of the calculated route. Default: true */
-        autoUpdateMapView?: boolean;
-
-        /** A boolean indicating whether to display the disclaimer about the accuracy of the directions. Default: true */
-        displayDisclaimer?: boolean;
-
-        /** A boolean indicating whether to display the icons for each direction maneuver. Default: true */
-        displayManeuverIcons?: boolean;
-
-        /** A boolean indicating whether to display direction hints that describe when a direction step was missed. Default: true */
-        displayPostItineraryItemHints?: boolean;
-
-        /**
-        * A boolean indicating whether to display direction hints that describe what to look for before you come to the next
-        * direction step. The default value is true.
-        */
-        displayPreItineraryItemHints?: boolean;
-
-        /** A boolean indicating whether to display the route selector control. Default: true */
-        displayRouteSelector?: boolean;
-
-        /** A boolean indicating whether to display direction warnings. Default: true */
-        displayStepWarnings?: boolean;
-
-        /** A boolean indicating whether to display a warning about walking directions. Default: true */
-        displayWalkingWarning?: boolean;
-
-        /** The polyline options that define how to draw the route line on the map, if the RouteMode is driving. */
-        drivingPolylineOptions?: IPolylineOptions;
-
-        /** The pushpin options that define how the first waypoint should be rendered. */
-        firstWaypointPushpinOptions?: IPushpinOptions;
-
-        /** The DOM element inside which the directions itinerary will be rendered. */
-        itineraryContainer?: HTMLElement;
-
-        /** The pushpin options that define how the last waypoint should be rendered. */
-        lastWaypointPushpinOptions?: IPushpinOptions;
-
-        /** A boolean indicating whether to show the input panel. Default: false */
-        showInputPanel?: boolean;
-
-        /** The options that define how to draw the route line on the map, if the RouteMode is transit. */
-        transitPolylineOptions?: IPolylineOptions;
-
-        /** The options that define how to draw the route line on the map, if the RouteMode is walking. */
-        walkingPolylineOptions?: IPolylineOptions;
-
-        /** The options that define the pushpin to use for all route waypoints by default. The first and last waypoints in the route will be overriden by firstWaypointPushpinOptions and lastWaypointPushpinOptions if set.  */
-        waypointPushpinOptions?: IPushpinOptions;
-    }
-
-    /////////////////////////////////////
-    /// Classes
-    ////////////////////////////////////
-
-    /** An object used to define a start, end or stop location along a route. */
-    export class Waypoint {
-        /**
-         * @constructor
-         * @param options: Options used to define the Waypoint.
-         */
-        constructor(options: IWaypointOptions);
-
-        /** Releases any resources associated with the waypoint. */
-        public dispose(): void;
-
-        /**
-         * Gets the address associated with the waypoint.
-         * @returns The address associated with the waypoint.
-         */
-        public getAddress(): string;
-
-        /**
-         * Gets the location of the waypoint.
-         * @returns The location of the waypoint.
-         */
-        public getLocation(): Location;
-
-        /**
-         * Gets a boolean value indicating whether the waypoint is a via point.
-         * @returns A boolean value indicating whether the waypoint is a via point.
-         */
-        public isViapoint(): boolean;
-
-        /**
-         * Sets options for the waypoint. For these options to take effect, you must recalculate the route.
-         * @param options Options used to define the Waypoint.
-         */
-        public setOptions(options: IWaypointOptions): void;
-    }
-
-    /** The main class in the Directions module that process direction calculations and rendering. */
-    export class DirectionsManager {
-
-        /**
-         * @constructor
-         * @param map A map to calculate directions for.
-         * @param waypoints An array of waypoints to be added to the route.
-         */
-        constructor(map: Map, waypoints?: Waypoint[]);
-
-        /**
-         * Adds a waypoint to the route at the given index, if specified. If an index is not specified, the waypoint is added as the last waypoint in the route. The maximum number of walking or driving waypoints is 25. The maximum number of transit waypoints is 2. Up to 10 via points are allowed between two stop waypoints. To recalculate the route, use calculateDirections.
-         * @param waypoint The waypoint to be added to the directions manager.
-         * @param index An index at which the waypoint is to be added.
-         */
-        public addWaypoint(waypoint: Waypoint, index?: number): void;
-
-        /**
-         * Calculates directions based on request and render options set
-         */
-        public calculateDirections(): void;
-
-        /** Clears the directions request and render options and removes all waypoints */
-        public clearAll(): void;
-
-        /**
-         * Clears the directions displayed and removes the route line from the map.
-         * This method does not remove waypoints from the route and retains all calculated direction information and option settings.
-         */
-        public clearDisplay(): void;
-
-        /** Deletes the DirectionsManager object and releases any associated resources. */
-        public dispose(): void;
-
-        /**
-         * Gets all the waypoints in the directions manager.
-         * @returns All the waypoints in the directions manager.
-         */
-        public getAllWaypoints(): Waypoint[];
-
-        /**
-         * Gets the currently displayed route information.
-         * @returns The currently displayed route information.
-         */
-        public getCurrentRoute(): IRoute;
-
-        /**
-        * Gets the route render options.
-        * @returns The route render options
-        */
-        public getRenderOptions(): IDirectionsRenderOptions;
-
-        /**
-         * Gets the directions request options.
-         * @returns The directions request options.
-         */
-        public getRequestOptions(): IDirectionsRequestOptions;
-
-        /**
-         * Gets the current calculated route(s)
-         * @returns The current calculated route(s). If the route was not successfully calculated, null is returned.
-         */
-        public getRouteResult(): IRoute[];
-
-        /**
-        * Removes the given waypoint or the waypoint identified by the given index from the route.
-        * @param waypointOrIndex A Waypoint object to be removed or the index of the waypoint to be removed
-        */
-        public removeWaypoint(waypointOrIndex: Waypoint | number): void;
-
-        /**
-         * Sets the specified render options for the route.
-         * @param options The options that customize the rendering of the calculated route.
-         */
-        public setRenderOptions(options: IDirectionsRenderOptions): void;
-
-        /**
-         * Sets the specified route calculation options.
-         * @param options The route calculation options.
-         */
-        public setRequestOptions(options: IDirectionsRequestOptions): void;
-
-       /**
-        * Displays an input panel for calculating directions in the specified container. Provides autosuggest for location inputs.
-        * @param inputContainerId The id name of the HTML container in which to render the directions input panel.
-        */
-        public showInputPanel(inputContainerId: string): void;
-    }
-}
-
-declare module Microsoft.Maps {
-    /** A static class that manages events within the map SDK. */
-    module Events {
-        /////////////////////////////////////
-        /// addHandler Definitions
-        ////////////////////////////////////
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * • directionsError
-        * • directionsUpdated
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: Directions.DirectionsManager, eventName: string, handler: (eventArg?: Directions.IDirectionsEventArgs | Directions.IDirectionsErrorEventArgs) => void): IHandlerId;
-
-        /////////////////////////////////////
-        /// addOne Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * • directionsError
-         * • directionsUpdated
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Directions.DirectionsManager, eventName: string, handler: (eventArg?: Directions.IDirectionsEventArgs | Directions.IDirectionsErrorEventArgs) => void): void;
-
-        /////////////////////////////////////
-        /// addThrottledHandler Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * • directionsError
-         * • directionsUpdated
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Directions.DirectionsManager, eventName: string, handler: (eventArg?: Directions.IDirectionsEventArgs | Directions.IDirectionsErrorEventArgs) => void, throttleInterval: number): IHandlerId;
-    }
-}
diff --git a/types/bingmaps/DrawingTools.d.ts b/types/bingmaps/DrawingTools.d.ts
deleted file mode 100644
index bd5c938e4e..0000000000
--- a/types/bingmaps/DrawingTools.d.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-declare module Microsoft.Maps {
-    /** An object that contains the event arguments for when the drawing mode changes in the drawing tools. **/
-    export interface IDrawingModeChangedData {
-
-        /** The shape being modified by the drawing tools. **/
-        shape: IPrimitive;
-
-        /** The new drawing mode. **/
-        mode: DrawingTools.DrawingMode;
-    }
-
-    /**
-     * The DrawingManager class manages the ability to draw and edit multiple shapes on the map. Shapes managed by this class are rendered on a separate drawing layer.
-     * User can use a mouse or a touch screen to draw on the map. When they are done, pressing the escape button or any button on the toolbar will exit the current drawing mode.
-     * This class does not have a publicly accessible constructor and can only be accessed using the showDrawingManager of the DrawingTools class.
-     */
-    export interface DrawingManager {
-        /**
-        * Adds a shapes to the layer, at the specified index if specified.
-        • @param data The shape(s) to be added to the layer.
-        • @param index The index at which to insert the shape into the layer.
-        */
-        add(data: IPrimitive | IPrimitive[], index?: number): void;
-
-        /**
-        * Disposes the drawing manager instance.
-        */
-        dispose(): void;
-
-        /**
-        * Resets the drawing manager and clears all shapes in the drawing layer.
-        */
-        clear(): void;
-
-        /**
-        * Gets the current drawing mode of the drawing manager.
-        * @returns The current drawing mode of the drawing manager.
-        */
-        getDrawingMode(): DrawingTools.DrawingMode;
-
-        /**
-        * Gets an array of shapes that are in the layer. This can be used to iterate over the individual shapes.
-        * @returns An array of shapes that are in the layer. This can be used to iterate over the individual shapes.
-        */
-        getPrimitives(): IPrimitive[];
-
-        /**
-        * Returns the index of the shape in the drawing layer.
-        * @param primitive The shape to find the index of.
-        * @param fromIndex The index to start the search from.
-        * @returns The index of the shape in the drawing layer. Returns -1 if shape is not found.
-        */
-        indexOf(primitive: IPrimitive, fromIndex?: number): number;
-
-        /**
-        * Removes a shape from the layer and returns it.
-        * @param primitive The shape to remove from the layer.
-        * @returns The shape that was removed from the layer.
-        */
-        remove(primitive: IPrimitive): IPrimitive;
-
-        /**
-        * Removes a shape from the layer at the specified index.
-        * @param index The index of the shape to remove from the layer.
-        * @returns The shape that was removed from the layer.
-        */
-        removeAt(index: number): IPrimitive;
-
-        /**
-        * Sets the drawing mode of the drawing manager.
-        * @param mode The drawing mode to set the DrawingManager to.
-        */
-        setDrawingMode(mode: DrawingTools.DrawingMode): void;
-
-        /**
-        * Replaces all shapes in the layer with the new array of shapes that have been provided.
-        * @param primitives An array of shapes to add to the drawing layer.
-        */
-        setPrimitives(primitives: IPrimitive[]): void;
-    }
-
-    /**
-    * Provides a set of tools for drawing and editing shapes on top of the map.
-    * @requires The Microsoft.Maps.DrawingTools module.
-    */
-    export class DrawingTools {
-        /**
-         * @constructor
-         * @requires The Microsoft.Maps.DrawingTools module.
-         * @param map A map instanct to attach the drawing tools to.
-         */
-        constructor(map: Map);
-
-        /**
-        * Initializes the drawing layer and instructs it to create a new shape of a given type.
-        * @param shapeType The type of new shape to create.
-        * @param created A callback function that is fired after the initial shape is created.
-        */
-        public create(shapeType: DrawingTools.ShapeType, created?: (shape: IPrimitive) => void): void;
-
-        /** Disposes the instance of the DrawingTools class. */
-        public dispose(): void;
-
-        /**
-        * Adds a shape to the drawing layer and puts it into edit mode.
-        * @param shape A shape to put into editting mode.
-        */
-        public edit(shape: IPrimitive): void;
-
-        /**
-         * Finishes any shape create / edit operation currently in progress, and returns the shape that was created or editted through a specified callback function.
-         * @param finished A callback function to return the completed shape with.
-         */
-        public finish(finished?: (shape: IPrimitive) => void): void;
-
-        /**
-        * Creates a drawing manager which allows multi-shape editing and displays the toolbar.
-        * @param callback A callback function that is triggered after the DrawingTools have loaded.
-        */
-        public showDrawingManager(callback?: (manager: DrawingManager) => void): void;
-    }
-
-    export module Events {
-        /////////////////////////////////////
-        /// addHandler Definitions
-        ////////////////////////////////////
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): IHandlerId;
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * disposed, drawingChanged, drawingChanging, drawingEnded, drawingErased, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: DrawingManager, eventName: string, handler: (eventArg?: IPrimitive | DrawingTools.DrawingMode) => void): IHandlerId;
-
-        /////////////////////////////////////
-        /// addOne Definitions
-        ////////////////////////////////////
-
-        /**
-        * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered.
-        */
-        export function addOne(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * disposed, drawingChanged, drawingChanging, drawingEnded, drawingErased, drawingModeChanged, drawingStarted
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: DrawingManager, eventName: string, handler: (eventArg?: IPrimitive | DrawingTools.DrawingMode) => void): void;
-
-        /////////////////////////////////////
-        /// addThrottledHandler Definitions
-        ////////////////////////////////////
-
-        /**
-        * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addThrottledHandler(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * disposed, drawingChanged, drawingChanging, drawingEnded, drawingErased, drawingModeChanged, drawingStarted
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: DrawingManager, eventName: string, handler: (eventArg?: IPrimitive | DrawingTools.DrawingMode) => void, throttleInterval: number): IHandlerId;
-    }
-
-}
-
-declare module Microsoft.Maps.DrawingTools {
-    /**
-    * The different drawing modes that the drawing manager can be set to.
-    * @requires The Microsoft.Maps.DrawingTools module.
-    */
-    export enum DrawingMode {
-        /** Edit an existing shape. Click on a shape to edit it. */
-        edit,
-
-        /** Erase and existing shape. Click on the shapes to erase them. */
-        erase,
-
-        /** Sets the drawing manager into an idle mode. */
-        none,
-
-        /** Allow the user to draw a polygon. */
-        polygon,
-
-        /** Allow the user to draw a polyline. */
-        polyline,
-
-        /** Allow the user to draw a pushpin. */
-        pushpin
-    }
-
-    /**
-    * The different types of shapes that are created or edited by the drawing tools.
-    * @requires The Microsoft.Maps.DrawingTools module.
-    */
-    export enum ShapeType {
-        /** A polygon shape type. */
-        polygon,
-
-        /** A polyline shape type. */
-        polyline
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/GeoJson.d.ts b/types/bingmaps/GeoJson.d.ts
deleted file mode 100644
index 94726ab542..0000000000
--- a/types/bingmaps/GeoJson.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-declare module Microsoft.Maps {
-
-    /** GeoJSON object definition */
-    export interface IGeoJsonObject {
-        /**
-         * Type of the object
-         * could be one of the following:
-         * Point
-         * LineString
-         * Polygon
-         * MultiPoint
-         * MultiLineString
-         * MultiPolygon
-         * GeometryCollection
-         * Feature
-         * FeatureCollection
-         */
-        type: string;
-
-        /** Geometric coordinates of the object */
-        coordinates?: number[] | number[][] | number[][][] | number[][][][];
-
-        /** Additional properties of the object as a key,value pair */
-        properties?: any;
-
-        /** Set of features (only applicable if the type is 'featurecollection') */
-        features?: IGeoJsonObject[];
-
-        /** Set of geometries (only applicable if the type is 'geometrycollection') */
-        geometries?: IGeoJsonObject[];
-
-        /** Geometry (only applicable if the type is 'feature') */
-        geometry?: IGeoJsonObject;
-
-        /** identifier of a feature (only applicable if the type is 'feature') */
-        id?: any;
-    }
-
-    /**
-     * Class responsible for reading/writing geo data in GeoJson format
-     * @requires The Microsoft.Maps.GeoJson module.
-     */
-    export module GeoJson {
-       /**
-       * Reads the data from a given url and returns the shapes.
-       * @param url GeoJson download url.
-       * @param callback Callback function that needs to be called once the data is downloaded and parsed.
-       * @param jsonpQueryParam The name of the url query param to make a jsonp request.
-       * @param styles Styles that needs to be applied.
-       */
-        export function readFromUrl(url: string, callback: (data: IPrimitive | IPrimitive[]) => void, jsonpQueryParam?: string, styles?: IStylesOptions): void;
-
-        /**
-         * Reads the data in geoJson format and returns the shapes.
-         * @param geoJson GeoJson data object that needs to be parsed into shapes.
-         * @param styles Styles that needs to be applied.
-         * @returns An array of shapes.
-         */
-        export function read(geoJson: IGeoJsonObject | string, styles?: IStylesOptions): IPrimitive | IPrimitive[];
-
-        /**
-        * Writes the data into geoJson format.
-        * @param data Data that needs to be serialized.
-        * @returns A geoJson formatted string.
-        */
-        export function write(data: IPrimitive | IPrimitive[]): IGeoJsonObject;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/HeatMapLayer.d.ts b/types/bingmaps/HeatMapLayer.d.ts
deleted file mode 100644
index c90813b00d..0000000000
--- a/types/bingmaps/HeatMapLayer.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-declare module Microsoft.Maps {
-    /** A standard dictionary object (associative array). */
-    export interface IDictionary<T> {
-        [K: string]: T;
-    }
-
-    /** Options for customizing how the heat map is rendered. */
-    export interface IHeatMapLayerOptions {
-        /**
-        * The temperature gradient that is used to colorize the map. Default gradient:
-        *    {
-        *        '0.00': 'rgb(255,0,255)', // Magenta
-        *        '0.25': 'rgb(0,0,255)', // Blue
-        *        '0.50': 'rgb(0,255,0)', // Green
-        *        '0.75': 'rgb(255,255,0)', // Yellow
-        *        '1.00': 'rgb(255,0,0)' // Red
-        *    }
-        */
-        colorGradient?: IDictionary<string>;
-
-        /**
-        * The intensity of each heat point. This is a decimal value between 0 and 1. This is used to specify how "hot" a single data point should be. Default: 0.5
-        */
-        intensity?: number;
-
-        /**
-        * The opacity of the HeatMapLayer canvas. Value should be a decimal between 0 and 1. Default: 1
-        */
-        opacity?: number;
-
-        /**
-        * The radius to draw each data point on the map. Default: 10
-        */
-        radius?: number;
-
-        /**
-        * The distance units of the radius. Possible values are:
-        *
-        * • 'pixels' (defualt)
-        * • 'meters'
-        *
-        * When set to pixels the size of each data point will always be the same radius, regardless of zoom level. When set to meters, the size of the data points
-        * will scale based on zoom level so as to ensure that the radius is spatially accurate.
-        */
-        unit?: 'meters' | 'pixel';
-
-        /** A boolean indicating if the heat map layer is visible or not. **/
-        visible?: boolean;
-    }
-
-    /**
-     * Class for rendering data as a heat map layer.
-     * @requires The Microsoft.Maps.Heatmap module.
-     */
-    export class HeatMapLayer implements IDataLayer {
-        /**
-         * @constructor
-         * @requires The Microsoft.Maps.Heatmap module.
-         * @param locations Set of locations to visualize as a heat map.
-         * @param options Options for customizing how the heat map is rendered.
-         */
-        constructor(locations: (Location | Pushpin)[], options?: IHeatMapLayerOptions);
-
-        /** Clears all data in the heat map layer. */
-        public clear(): void;
-
-        /** Disposes the heat map layer. */
-        public dispose(): void;
-
-        /**
-         * Gets a boolean indicating if the heat map layer is visible or not.
-         * @returns A boolean indicating if the heat map layer is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-        * @deprecated
-        * Hides the heat map layer.
-        */
-        public hide(): void;
-
-        /**
-         * Specifies the locations to use when generating the heat map.
-         * @param locations Set of locations.
-         */
-        public setLocations(locations: (Location | Pushpin)[]): void;
-
-        /**
-        * Sets the options to use with the heat map layer.
-        * @param options Set of heat map layer options.
-        */
-        public setOptions(options: IHeatMapLayerOptions): void;
-
-        /**
-        * Sets the visibility of the heat map layer.
-        * @param visible A boolean indicating if the heat map layer is visible or not.
-        */
-        public setVisible(visible: boolean): void;
-
-        /**
-        * @deprecated
-        * Shows the heat map layer.
-        */
-        public show(): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/Search.d.ts b/types/bingmaps/Search.d.ts
deleted file mode 100644
index 0d799c7078..0000000000
--- a/types/bingmaps/Search.d.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * Provides an easy method for geocoding address and searching for points of interest from JavaScript.
- * @requires The Microsoft.Maps.Search module.
- */
-declare module Microsoft.Maps.Search {
-    /**
-     * Defines the match precision of a geocdoed result.
-     * @requires The Microsoft.Maps.Search module.
-     */
-    export enum LocationPrecision {
-        /** The geocode result was matched to a point on a road using interpolation. */
-        interpolated,
-
-        /**
-        * The geocode result was matched to a point on a road using interpolation with an additional offset to shift the
-        * Location to the side of the street.
-        */
-        InterpolatedOffset,
-
-        /** The geocode result was matched to the center of a parcel (property boundary). */
-        parcel,
-
-        /** The geocode result was matched to the rooftop of a building. */
-        rooftop
-    }
-
-    /**
-     * Defines the geocoding level of the location match found by the geocoder.
-     * @requires The Microsoft.Maps.Search module.
-     */
-    export enum MatchCode {
-        /** No match was found. */
-        none,
-
-        /** The match was good. */
-        good,
-
-        /** The match was ambiguous. Multiple results were returned. */
-        ambiguous,
-
-        /** The match was found by a broader search. */
-        upHierarchy,
-
-        /** The match was found, but possibly using a modified query. */
-        modified
-    }
-
-    /**
-     * Defines the confidence of the location match found by the geocoding service.
-     * @requires The Microsoft.Maps.Search module.
-     */
-    export enum MatchConfidence {
-        /** The confidence of the match is high. */
-        high,
-
-        /** The confidence of the match is medium. */
-        medium,
-
-        /** The confidence of the match is low. */
-        low,
-
-        /** The confidence of the match is unknown. */
-        unknown
-    }
-
-    /** A object that represents a geocoded location. */
-    export interface IGeocodeLocation {
-        /** The map location of this geocode location match. */
-        location: Location;
-
-        /** The name of this geocode location match. */
-        name: string;
-
-        /** The precision of this geocode location match. */
-        precision: string | LocationPrecision;
-    }
-
-    /** An object that represents an place result. */
-    export interface IPlaceResult {
-        /** The geocoded address of the place result. */
-        address: IAddress;
-
-        /** The location rectangle that defines the boundaries of the best map view of the place result. */
-        bestView: LocationRect;
-
-        /** The classification of the geographic entity returned, such as PopulatedPlace. */
-        entityType: string;
-
-        /** The geocoded location of the best result. */
-        location: Location;
-
-        /** The geocoded locations. */
-        locations: IGeocodeLocation[];
-
-        /** The match code of the best result. */
-        matchCode: string | MatchCode;
-
-        /** The match confidence of the best result. */
-        matchConfidence: string | MatchConfidence;
-
-        /** The name of the place result, if one exists. */
-        name: string;
-    }
-
-    /** An object that represents a geocode result returned by REST service. */
-    export interface IGeocodeResult {
-        /** An array of geocode results. */
-        results: IPlaceResult[];
-    }
-
-    /** The options for a geocode request. */
-    export interface IGeocodeRequestOptions {
-        /**
-         * A location rectangle that defines the boundaries of the area in which to search for
-         * location results. The default is the bounds of the map view associated with this
-         * instance of the SearchManager, which is usually the current map view.
-         */
-        bounds?: LocationRect;
-
-        /**
-         * The name of the function to call when a successful result is returned from the
-         * geocode request. The callback function must accept two parameters: result, which is
-         * a GeocodeResult type, and a userData object.
-         */
-        callback: (geocodeResult: IGeocodeResult, userData: any) => void;
-
-        /** The maximum number of results to return. Required. The maximum number than can be returned is 20. */
-        count?: number;
-
-        /**
-         * The name of the function to call when the request is returned with an error. The
-         * error callback function must accept an IGeocodeRequestOptions object.
-         */
-        errorCallback?: (geocodeRequestOptions: IGeocodeRequestOptions) => void;
-
-        /** Specifies to include the two-letter ISO country code. */
-        includeCountryIso2?: boolean;
-
-        /** Specifies to include the neighborhood in the response when it is available. */
-        includeNeighborhood?: boolean;
-
-        /** A number indicating how long to wait, in seconds, for the geocode request to return. The default value is 5 seconds. */
-        timeout?: number;
-
-        /** An object containing any data that needs to be passed to the callback when the request is completed. */
-        userData?: any;
-
-        /** A string containing the address or place to be matched to a location on the map.  */
-         where: string;
-    }
-
-    /** The options for a reverse geocode request. */
-    export interface ReverseGeocodeRequestOptions {
-        /**
-         * A reference to a function to call when a successful result is returned from the geocode request. The callback function
-         * will receive a PlaceResult object as an argument.
-         */
-        callback: (placeResult: IPlaceResult, userData: any) => void;
-
-        /**
-         * A reference to a function to call when the request is returned with an error. The error callback function will receive
-         * an object containing the geocode request options used in the request.
-         */
-        errorCallback?: (reverseGeocodeRequestOptions: ReverseGeocodeRequestOptions) => void;
-
-        /** Specifies to include the two-letter ISO country code. Default: false */
-        includeCountryIso2?: boolean;
-
-        /**
-         *  An array of entity types selected from the following options.
-         * • Address
-         * • Neighborhood
-         * • PopulatedPlace
-         * • Postcode1
-         * • AdminDivision1
-         * • AdminDivision2
-         * • CountryRegion
-         * These entity types are ordered from the most specific entity to the least specific entity. When entities of more than one entity type are found, only the most specific
-         * entity is returned. For example, if you specify Address and AdminDistrict1 as entity types and entities were found for both types, only the Address entity information is
-         * returned in the response. One exception to this rule is when both PopulatedPlace and Neighborhood entity types are specified and information is found for both. In this case,
-         * the information for both entity types is returned. Also, more than one Neighborhood may be returned because the area covered by two different neighborhoods can overlap.
-         */
-        includeEntityTypes?: string[];
-
-        /**
-         * Specifies to include the neighborhood in the response when it is available. Note: This feature isn’t
-         * available in all locations.
-         */
-        includeNeighborhood?: boolean;
-
-        /** The location to use to match to geographic entities and addresses. */
-        location: Location;
-
-        /** A number indicating how long to wait, in seconds, for the reverse geocode request to  return. The default value is 5 seconds. */
-        timeout?: number;
-
-        /** An object containing any data that needs to be passed to the callback when the request is completed. */
-        userData?: any;
-    }
-
-    /**
-    * A class that contains methods for returning search and location results.
-    * @requires The Microsoft.Maps.Search module.
-    */
-    export class SearchManager {
-        /**
-         * @constructor
-         * @requires The Microsoft.Maps.Search module.
-         * @param map A Map object
-         */
-        constructor(map: Map);
-
-        /**
-         * Matches the address or place query in the specified request
-         * options to a location and returns the results to the request
-         * options callback function.
-         * @param request Options for sending geocode request
-         */
-        public geocode(request: IGeocodeRequestOptions): void;
-
-        /**
-         * Matches the specified location to an address and returns the
-         * address results to the specified request options callback function.
-         * @param request Options for sending reverse geocode request
-         */
-        public reverseGeocode(request: ReverseGeocodeRequestOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/SpatialDataService.d.ts b/types/bingmaps/SpatialDataService.d.ts
deleted file mode 100644
index 627ab7cbad..0000000000
--- a/types/bingmaps/SpatialDataService.d.ts
+++ /dev/null
@@ -1,440 +0,0 @@
-/**
- * This module wraps the Query and GeoData REST API’s in the Bing Spatial Dara Services and expose them as an easy to use JavaScript library.
- * @requires The Microsoft.Maps.SpatialDataService module.
- */
-declare module Microsoft.Maps.SpatialDataService {
-
-    //////////////////////////////////////////////
-    /// GeoData API
-    //////////////////////////////////////////////
-
-    /** Represents the options for requests boundary data from the GeoData API in the Bing Spatial Data Services. */
-    export interface IGetBoundaryRequestOptions {
-        /**
-        * The level of detail for the boundary polygons returned. An integer between 0 and 3, where 0 specifies the coarsest level of boundary detail and 3
-        * specifies the best. Default: 0
-        */
-        lod?: number;
-
-        /**
-        * The entity type to return. Default: CountryRegion
-        * Supported entity types:
-        * AdminDivision1, AdminDivision2, CountryRegion, eighborhood, PopulatedPlace, Postcode1, Postcode2, Postcode3, Postcode4
-        * Note: Not all entity types are available in all areas.
-        */
-        entityType?: string;
-
-        /**
-        * Specifies the preferred language to use for any metadata text about the entity or polygons. Defaults to the culture used by the map control, which
-        * usually automatically detected based on user's browser settings. Setting this property will override the default value.
-        */
-        culture?: string;
-
-        /**
-        * Specifies whether the response should include all of the boundary polygons for the requested entity or just return a single polygon that represents
-        * the main outline of the entity. Default: false
-        */
-        getAllPolygons?: boolean;
-
-        /**
-        * Specifies whether the response should include metadata about the entity, such as AreaSqKm and others. Default: false
-        */
-        getEntityMetadata?: boolean;
-
-        /**
-        * Specifies the user’s home country or region.Defaults to the region setting of the user who loads the map.
-        * Warning: Setting this property will override the default value, which is the region the user is actually in, and will allow the user to see boundaries
-        * which may not align with the views of their region.This could result in geopolitically sensitive borders being returned.
-        */
-        userRegion?: string;
-    }
-
-    /** Represents the primitive object for a boundary returned by the GeoData API. */
-    export interface IGeoDataPrimitive {
-        /** A unique ID associated with this polygon primitive. */
-        PrimitiveID: string;
-
-        /**
-        * A comma-delimited sequence starting with the version number of the polygon set followed by a list of compressed polygon
-         * "rings" (closed paths represented by sequences of latitude and-longitude points).
-        */
-        Shape: string;
-
-        /** The number of vertex points used to define the polygon. */
-        NumPoints: string;
-
-        /**
-        * An ID identifying the data provider that supplied the data. This ID number will reference one of the sources listed in the
-        * array of CopyrightSources in the Copyright property of the GeoDataResultSet object.
-        */
-        SourceID: string;
-    }
-
-    /** Represents the copyright source object for a boundary returned by the GeoData API. */
-    export interface ICopyrightSource {
-        /** The copyright string from the source. */
-        Copyright: string;
-
-        /** An ID identifying the data provider that supplied the data. */
-        SourceID: string;
-
-        /** The name of the data provider represented by this Source element. */
-        SourceName: string;
-    }
-
-    /** Represents the copyright object for a boundary returned by the GeoData API. */
-    export interface ICopyright {
-        /** The copyright URL for the GeoData service. */
-        CopyrightURL: string;
-
-        /** A collection of CopyrightSource objects that give information about the sources of the polygon data that is returned. */
-        Sources: ICopyrightSource[];
-    }
-
-    /** Represents the name object for a boundary returned by the GeoData API. */
-    export interface IName {
-        /** The name of boundary. Example: "United States" */
-        EntityName: string;
-
-        /** The culture of the region. */
-        Culture: string;
-
-        /** An ID identifying the data provider that supplied the data. */
-        SourceID: string;
-    }
-
-    /** Represents the metadata object for a boundary returned by the GeoData API. Not all properties will be returned for all results. */
-    export interface IMetadata {
-        /** The approximate total surface area (in square kilometers) covered by all the polygons that comprise this entity. */
-        AreaSqKm: string;
-
-        /**
-        * An area on the Earth that provides the best map view for this entity. This area is defined as a bounding box in the format of a
-        * “MULTIPOINT ((WestLongitude SouthLatitude), (EastLongitude NorthLatitude))”.
-        */
-        BestMapViewBox: string;
-
-        /** The culture associated with this entity. Example: en */
-        OfficialCulture: string;
-
-        /** The approximate population within this entity. Example: PopClass20000to99999 */
-        PopulationClass: string;
-
-        /** The regional culture associated with this entity. */
-        RegionalCulture: string;
-    }
-
-    /** Represents a single result object returned by the GeoData API. */
-    export interface IGeoDataResult {
-        /** Copyright information for the returned boundary data. */
-        Copyright: ICopyright;
-
-        /** A unique ID number associated with this entity. */
-        EntityID: string;
-
-        /**
-        * A collection of metadata information associated with the entity. The getEntityMetadata option of the request must be set
-        * to true. Note, not all boundaries will return this metadata.
-        */
-        EntityMetadata: IMetadata;
-
-        /** Information about the name of the boundary location. */
-        Name: IName;
-
-        /** A Polygon object that has been generated from the data in the Primitives property. */
-        Polygons: Polygon[];
-
-        /** An array of objects that contain the polygon information for the boundary. */
-        Primitives: IGeoDataPrimitive[];
-    }
-
-    /** Represents the set of results returned by the GeoData API. */
-    export interface IGeoDataResultSet {
-        /** Copyright information for the GeoData API. */
-        Copyright: string;
-
-        /** The location provided in the query that generated this result. */
-        location: string |  Location;
-
-        /** Results of the boundary data. */
-        results: IGeoDataResult[];
-    }
-
-    /**
-     * This is a static class that provides the ability to request polygons that describe the boundaries of a geographic entities, such as an AdminDivision1
-     * (such as a state or province) or a Postcode1 (such as a zip code) that contain a given point (latitude and longitude) or address. This uses the GeoData
-     * API in the Bing Spatial Data Services.
-     * @requires The Microsoft.Maps.SpatialDataService module.
-     */
-    export module GeoDataAPIManager {
-        /**
-         * Gets a boundary for the specified request. If the specified location value is a string, it will be geocoded and the coordinates of the result will
-         * be used to find a boundary of the specified entityType that intersects with this coordinate.
-         * @requires The Microsoft.Maps.SpatialDataService module.
-         * @param locations The locations to retrieve boundaries for. If the specified location value is a string, it will be geocoded and the coordinates of
-         * the result will be used to find a boundary of the specified entityType that intersects with this coordinate.
-         * @param request The request options for retrieving a boundary.
-         * @param credentials A bing maps key or a map instance which can be used to provide credentials to access the data source. Note that the map will need
-         * to be loaded with a bing maps key that has access to the data source.
-         * @param callback A callback function to return the results to. If an array of locations are specified the callback function will be triggered for each location in the array.
-         */
-        export function getBoundary(locations: string | Location | (string | Location)[], request: IGetBoundaryRequestOptions, credentials: string | Map, callback: (results: IGeoDataResultSet) => void): void;
-    }
-
-    //////////////////////////////////////////////
-    /// Query API
-    //////////////////////////////////////////////
-
-    /**
-    * An enumeration that defines how to compare the filters value against the corresponding property value.
-    * @requires The Microsoft.Maps.SpatialDataService module.
-    */
-    export enum FilterCompareOperator {
-        /** Determines if a string value ends with a specified string value. */
-        endsWith,
-
-        /** Determines if two values are equal. */
-        equals,
-
-        /** Determines if a first value is greater than a second value. */
-        greaterThan,
-
-        /** Determines if a first value is greater than or equal to a second value. */
-        greaterThanOrEqual,
-
-        /** Determines if a value is within an array. */
-        isIn,
-
-        /** Determines if a first value is less than a second value. */
-        lessThan,
-
-        /**  Determines if a first value is less than or equal a second value. */
-        lessThanOrEqual,
-
-        /** Determines if a string value does not end with a specified string value. */
-        notEndsWith,
-
-        /** Determines if two values are not equal. */
-        notEquals,
-
-        /** Determines if a string value does not start with a specified string value. */
-        notStartsWith,
-
-        /** Determines if a string value starts with a specified string value. */
-        startsWith
-    }
-
-    /**
-    * An enumeration that defines how two or more filters are linked together.
-    * @requires The Microsoft.Maps.SpatialDataService module.
-    */
-    export enum FilterLogicalOperator {
-        /** Connects two or more filters that both must be true. */
-        and,
-
-        /** Connects two or more filters where one of them must be true. */
-        or
-    }
-
-    /**
-    * A Fitler object that defines the logic behind a filter expression that can be executed against a JSON object or generate
-    * a filter string that can be used with the Bing Spatial Data Services.
-    */
-    export interface IFilter {
-        /**
-        * Executes the filter logic against a JSON object and returns a boolean indicating if the object meets the requirements of the Filter.
-        * @returns A boolean indicating if the specified object meets the requirements of the Filter.
-        */
-        execute(object: any): boolean;
-
-        /**
-        * Converts the filter logic into a string format that is compatible with the Bing Spatial Data Services.
-        * @returns A filter string that is formatted such that it is compatible with the Bing Spatial Data Services.
-        */
-        toString(): string;
-    }
-
-    /**
-     * The Fitler class defines the logic behind a filter expression that can be executed against a JSON object or generate
-     * a filter string that can be used with the Bing Spatial Data Services.
-     * @requires The Microsoft.Maps.SpatialDataService module.
-     */
-    export class Filter implements IFilter {
-        /**
-         * @constructor
-         * @requires The Microsoft.Maps.SpatialDataService module.
-         * @param propertyName The name of the property in the object to test against. Can also provide child properties i.e. 'root.child'.
-         * @param operator The operator to use when comparing the specified property to value to the provided value.
-         * @param value A value to compare against.
-         */
-        constructor(propertyName: string, operator: string | FilterCompareOperator, value: any);
-
-        /**
-        * Executes the filter logic against a JSON object and returns a boolean indicating if the object meets the requirements of the Filter.
-        * @returns A boolean indicating if the specified object meets the requirements of the Filter.
-        */
-        public execute(object: any): boolean;
-
-        /**
-        * Converts the filter logic into a string format that is compatible with the Bing Spatial Data Services.
-        * @returns A filter string that is formatted such that it is compatible with the Bing Spatial Data Services.
-        */
-        public toString(): string;
-    }
-
-    /**
-     * A class that groups two or more logical filters or filter groups together. It can be executed against a JSON or generate
-     * a filter string that can be used with the Bing Spatial Data Services.
-     * @requires The Microsoft.Maps.SpatialDataService module.
-     */
-    export class FilterGroup implements IFilter {
-        /**
-        * @constructor
-        * @requires The Microsoft.Maps.SpatialDataService module.
-        * @param filters An array consisting of Filter or FilterGroup objects to combine.
-        * @param operator The logical operator for combining the filters together.
-        * @param not A boolean is the logical inverse should of the filter should be used.
-        */
-        constructor(filters: IFilter[], operator: FilterLogicalOperator, not?: boolean)
-
-        /**
-        * Executes the filter logic against a JSON object and returns a boolean indicating if the object meets the requirements of the Filter.
-        * @returns A boolean indicating if the specified object meets the requirements of the Filter.
-        */
-        public execute(object: any): boolean;
-
-        /**
-        * Converts the filter logic into a string format that is compatible with the Bing Spatial Data Services.
-        * @returns A filter string that is formatted such that it is compatible with the Bing Spatial Data Services.
-        */
-        public toString(): string;
-    }
-
-    /** Options for find near route query API. */
-    export interface ISpatialFilterOptions {
-        /**
-         * One of the following values:
-         * • nearby – Searches in a radius around a location.
-         * • nearRoute – Searches for results that are within 1 mile of a route.
-         * • intersects – Searches for results that intersect with the specified geometry.
-         * Note: Note that the NavteqNA and NavteqEU data sources only support nearby queries.
-         */
-        spatialFilterType: string;
-
-        /** Location at which the filter should be applied (only for nearby filter). */
-        location?: string | Location;
-
-        /**
-         * Radius to use when performing a nearby search. The distance in kilometers and must be between 0.16 and 1000 kilometers
-         * (only for nearby filter).
-         */
-        radius?: number;
-
-        /** Start location of the route (only for nearroute filter). */
-        start?: string | Location;
-
-        /** End location of the route (only for nearroute filter). */
-        end?: string | Location;
-
-        /** Intersection object. Can be a well known text string or a LocationRect object (only for intersects filter). */
-        intersects?: string | LocationRect | IPrimitive;
-    }
-
-    /** Options for find near route query API. */
-    export interface IFindNearRouteOptions extends ISpatialFilterOptions {
-        /**
-         * One of the following values:
-         *  • Driving [default]
-         *  • Walking
-         */
-        travelMode?: string;
-
-        /**
-         * An integer value between 0 and 359 that represents degrees from north
-         * where north is 0 degrees and the heading is specified clockwise from north.
-         * For example, setting the heading of 270 degrees creates a route that initially heads west
-         */
-        heading?: number;
-
-        /**
-         * An integer distance specified in meters.
-         * Use this parameter to make sure that the moving vehicle has enough distance
-         * to make the first turn
-         */
-        distanceBeforeFirstTurn?: number;
-
-        /**
-         * A list of values that limit the use of highways and toll roads in the route.
-         * Use one of the following values:
-         * • highways - Avoids the use of highways in the route.
-         * • tolls - Avoids the use of toll roads in the route.
-         * • minimizeHighways - Minimizes (tries to avoid) the use of highways in the route.
-         * • minimizeTolls - Minimizes (tries to avoid) the use of toll roads in the route.
-         */
-        avoid?: string[];
-
-        /**
-         * One of the following values:
-         * • distance - The route is calculated to minimize the distance.Traffic information is not used.
-         * • time[default] - The route is calculated to minimize the time.Traffic information is not used.
-         * • timeWithTraffic - The route is calculated to minimize the time and uses current traffic information.
-         */
-        optimize?: string;
-    }
-
-    /** Set of options that can be specified for query APIs. */
-    export interface IQueryAPIOptions {
-        /** A queryurl containing the access id, data source name and the entity type name. */
-        queryUrl: string;
-
-        /** Specifies a conditional expression for a list of properties and values. */
-        filter?: IFilter;
-
-        /** Specifies whether or not to return a count of the results in the response. Default: false */
-        inlineCount?: boolean;
-
-        /** Specifies to query the staged version of the data source instead of the published version. Default: false */
-        isStaging?: boolean;
-
-        /**
-         * Specifies one or more properties to use to sort the results of a query.
-         * You can specify up to three (3) properties. Results are sorted in ascending order.
-         * Note: You cannot use the latitude and longitude properties to sort results. You can use the elevation property.
-         */
-        orderBy?: string[];
-
-        /**
-         * Specifies the data source properties to return in the response. If the $select query option is not specified or
-         * if it is set to "" ($select=), all data source properties are returned. Default: "*,_distance"
-         */
-        select?: string[];
-
-        /** Specifies to not return a specified number of query results. */
-        skip?: number;
-
-        /** Spatial filter options to apply. */
-        spatialFilter?: ISpatialFilterOptions | IFindNearRouteOptions;
-
-        /** Specifies the maximum number of results to return in the query response. Default: 25 */
-        top?: number;
-    }
-
-    /**
-     * This is a static class that provides that ability to query data sources that are hosted by the Bing Spatial Data Services using the Query API.
-     * @requires The Microsoft.Maps.SpatialDataService module.
-     */
-    export module QueryAPIManager {
-        /**
-         * Perform a search
-         * @requires The Microsoft.Maps.SpatialDataService module.
-         * @param queryOptions - Options for the query
-         * @param credentials - Credentials for the query
-         * @param callback - The function to call once the results are retrieved
-         * @param styles - (Optional) Styles of the data that needs to be rendered on map
-         */
-        export function search(queryOptions: IQueryAPIOptions,
-            credentials: string | Map,
-            callback: (data: IPrimitive[], inlineCount?: number) => void,
-            styles?: IStylesOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/SpatialMath.d.ts b/types/bingmaps/SpatialMath.d.ts
deleted file mode 100644
index 4fe3b4ea12..0000000000
--- a/types/bingmaps/SpatialMath.d.ts
+++ /dev/null
@@ -1,530 +0,0 @@
-//////////////////////////////////////////////
-/// Core Library
-//////////////////////////////////////////////
-
-/**
- * This module provides a bunch of useful spatial math calculations.
- * @requires The Microsoft.Maps.SpatialMath module.
- */
-declare module Microsoft.Maps.SpatialMath {
-
-    /**
-     * Distance Unit enumerator
-     * @requires The Microsoft.Maps.SpatialMath module.
-     **/
-    export enum DistanceUnits {
-        /** A distance in meters */
-        Meters,
-
-        /** A distance in kilometers */
-        Kilometers,
-
-        /** A distance in miles */
-        Miles,
-
-        /** A distance in Feet */
-        Feet,
-
-        /** A distance in Yards */
-        Yards,
-
-        /** A distance in Nautical Miles */
-        NauticalMiles
-    }
-
-    /**
-     * Area units enumerator
-     * @requires The Microsoft.Maps.SpatialMath module.
-     **/
-    export enum AreaUnits {
-        /** Area in square meters */
-        SquareMeters,
-
-        /** Area in square kilometers */
-        SquareKilometers,
-
-        /** Area in square miles */
-        SquareMiles,
-
-        /** Area in square Feet */
-        SquareFeet,
-
-        /** Area in square Yards */
-        SquareYards,
-
-        /** Area in Acres */
-        Acres,
-
-        /** Area in Hectares */
-        Hectares
-    }
-
-    //////////////////////////////////////////////
-    /// Core Calculations
-    //////////////////////////////////////////////
-
-    /**
-     * Converts an area from one area units to another.
-     * @param area A number that represents an area to convert.
-     * @param fromUnits The area units the original area is in.
-     * @param toUnits The area units to convert to.
-     * @returns An area in the new units.
-     **/
-    export function convertArea(area: number, fromUnits: AreaUnits, toUnits: AreaUnits): number;
-
-    /**
-     * Converts a distance from one distance units to another.
-     * @param distance A number that represents a distance to convert.
-     * @param fromUnits The distance units the original distance is in.
-     * @param toUnits The disired distance units to convert to.
-     * @returns A distance in the new units.
-     **/
-    export function convertDistance(distance: number, fromUnits: DistanceUnits, toUnits: DistanceUnits): number;
-
-     /**
-     * Calculates an array of locations that form a cardinal spline between the specified array of locations.
-     * @param locations The array of locations to calculate the spline through.
-     * @param tension A number that indicates the tightness of the curve. Can be any number, although a value between 0 and 1 is usually used. Default: 0.5
-     * @param nodeSize Number of nodes to insert between each Location. Default: 15
-     * @param close A boolean indicating if the spline should be a closed ring or not. Default: false
-     * @returns An array of locations that form a cardinal spline between the specified array of locations.
-     */
-    export function getCardinalSpline(locations: Location[], tension ?: number, nodeSize ?: number, close ?: boolean): Location[];
-
-    /**
-     * Calculates a destination Location based on a starting Location, a heading, a distance, and a distance unit type.
-     * @param origin Location that the destination is relative to.
-     * @param bearing A heading angle between 0 - 360 degrees. 0 - North, 90 - East, 180 - South, 270 - West.
-     * @param distance Distance that destination is away.
-     * @param units Unit of distance measurement. Default is Meters.
-     * @returns A Location that is the specified distance away from the origin.
-     **/
-    export function getDestination(origin: Location, bearing: number, distance: number, units?: DistanceUnits): Location;
-
-    /**
-     * Calculate the distance between two Location objects on the surface of the earth using the Haversine formula.
-     * @param origin First Location to calculate distance between.
-     * @param destination Second Location to calculate distance between.
-     * @param units Unit of distance measurement. Default is Meters.
-     * @param highAccuracy When set enabled, will use the slower but more accurate Vincenty formula for calculating distances, rather than the Haversine formula.
-     * @returns The shortest distance between two Locations in the specifed units.
-     **/
-    export function getDistanceTo(origin: Location, destination: Location, units?: DistanceUnits, highAccuracy?: boolean): number;
-
-    /**
-     * Retrieves the radius of the earth in a specific distance unit for WGS84.
-     * @param units Unit of distance measurement. Default: Meters
-     * @returns A number that represents the radius of the earth in a specific distance unit.
-     **/
-    export function getEarthRadius(units?: DistanceUnits): number;
-
-    /**
-     * Takes an array of Locations objects and fills in the space between them with accurately positioned Locations to form an approximated Geodesic path.
-     * @param path Array of Location objects that form a path to fill in.
-     * @param nodeSize Number of nodes to insert between each Location. Default: 15
-     * @returns An array of Location objects that form a geodesic paths.
-     **/
-    export function getGeodesicPath(path: Location[], nodeSize?: number): Location[];
-
-    /**
-     * Calculates the heading from one Location object to another.
-     * @param origin Point of origin.
-     * @param destination Destination to calculate relative heading to.
-     * @returns A heading in degrees between 0 and 360. 0 degrees points due North.
-     **/
-    export function getHeading(origin: Location, destination: Location): number;
-
-    /**
-     * Calculates the distance between all Location objects in an array.
-     * @param path The array of Location objects that make up the path to calculate the length of.
-     * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
-     * @returns The distance between all Locations in between all Location objects in an array on the surface of a earth in the specifed units.
-     **/
-    export function getLengthOfPath(path: Location[], units?: DistanceUnits, highAccuracy?: boolean): number;
-
-    /**
-     * Calculates the Location object on a path that is a specified distance away from the start of the path. If the specified distance is longer
-     * than the length of the path, the last Location of the path will be returned.
-     * @param path A polyline or array of Location coordinates that form a path.
-     * @param distance The distance along the path (from the start) to calculate the location for.
-     * @param units Unit of distance measurement. Default is Meters.
-     * @returns A Location object that is the specified distance away from the start of the path when following the path.
-     **/
-    export function getLocationAlongPath(path: Polyline | Location[], distance: number, units?: DistanceUnits): Location;
-
-    /**
-     * Calculates an array of Location objects that are an equal distance away from a central point to create a regular polygon.
-     * @param origin Center of the regular polygon.
-     * @param radius Radius of the regular polygon.
-     * @param numberOfPoints Number of points the polygon should have.
-     * @param units Unit of distance measurement for radius. Default is Meters.
-     * @param offset An offset to rotate the polygon clockwise in degrees. When 0 the first Location will align with North.
-     * @returns An array of Location objects that form a regular polygon.
-     **/
-    export function getRegularPolygon(origin: Location, radius: number, numberOfPoints: number, units?: DistanceUnits, offset?: number): Location[];
-
-    /**
-     * Calculates a Location object that is a fractional distance between two Location objects.
-     * @param origin First Location to calculate mid-point between.
-     * @param destination Second Location to calculate mid-point between.
-     * @param fraction The fractional parameter to calculate a mid-point for. Default 0.5.
-     * @returns A Location that lies a fraction of the distance between two Location objects, relative to the first Location object.
-     **/
-    export function interpolate(origin: Location, destination: Location, fraction?: number): Location;
-
-    /**
-     * Takes a LocationRect and converts it to a polygon.
-     * @param bounds The LocationRect to convert to a Polygon.
-     * @returns A polygon representation of the LocationRect.
-     **/
-    export function locationRectToPolygon(bounds: LocationRect): Polygon;
-
-    /**
-     * Takes a Location object and converts it into a Degree Minute Seconds string in the format. For example: 40° 26′ 46″ N 79° 58′ 56″ W
-     * @param loc The Location object to convert into a Degree Minute Seconds string.
-     * @returns A string in Degree Minute Seconds format or null if invalid Location object is provided.
-     */
-    export function toDegMinSec(loc: Location): string;
-
-    /**
-     * Tries to parse the given string that is in Degree Minute Seconds format. For Example: 35° 26′ 31″ E or 40° 26′ 46″ N 79° 58′ 56″ W
-     * @param input A string in Degree Minute Seconds format to parse.
-     * @returns Returns a decimal degree value if only a single angle is provided. If two angles provided in the string, then a
-     * Location object is returned. If string is in an invalid format, null is returned.
-     */
-    export function tryParseDegMinSec(input: string): number | Location;
-}
-
-
-//////////////////////////////////////////////
-/// Tile Calculations
-//////////////////////////////////////////////
-
-/**
-* A colleciton of mathematical algorithms based on the tile pyramid used by Bign Maps.
-* @requires The Microsoft.Maps.SpatialMath module.
-*/
-declare module Microsoft.Maps.SpatialMath.Tiles {
-    //Based on https://msdn.microsoft.com/en-us/library/bb259689.aspx
-
-    /**
-     * Calculates the full width of the map in pixels at a specific zoom level from -180 degrees to 180 degrees.
-     * @param zoom Zoom level to calculate width at.
-     * @param tileWidth Width of tile.
-     * @returns Width of map in pixels.
-     **/
-    export function mapSize(zoom: number): number;
-
-    /**
-     * Calculates the Ground resolution at a specific degree of latitude in the specified units per pixel.
-     * @param latitude Degree of latitude to calculate resolution at.
-     * @param zoom Zoom level to calculate resolution at.
-     * @param units Distance unit type to calculate resolution in.
-     * @returns Ground resolution in distance unit per pixels.
-     **/
-    export function groundResolution(latitude: number, zoom: number, units?: SpatialMath.DistanceUnits): number;
-
-    /**
-     * Converts a Pixel coordinate into a Geospatial Location at a specified zoom level.
-     * Global Pixel coordinates are relative to the top left corner of the map (90, -180)
-     * @param point Pixel coordinate.
-     * @param zoom Zoom level.
-     * @returns A Location that is at the specified pixel location at a specified zoom level.
-     **/
-    export function globalPixelToLocation(point: Point, zoom: number): Location;
-
-    /**
-     * Converts a point from latitude/longitude WGS-84 Location (in degrees)
-     * into pixel XY coordinates at a specified level of detail.
-     * @param loc Location to convert to a global pixel.
-     * @param zoom Level of detail, from 1 (lowest detail) to 23 (highest detail).
-     * @returns Point object containing the the global pixel location of a Location.
-     **/
-    export function locationToGlobalPixel(loc: Location, zoom: number): Point;
-
-    /**
-     * Calculates the PyramidTileId that a global pixel intersects with at a specific zoom level.
-     * @param pixel The pixel coordinate to calculate the tile for.
-     * @param zoom The zoom level to calculate the tile for.
-     * @returns A PyramidTileId that a global pixel intersects with at a specific zoom level.
-     **/
-    export function globalPixelToTile(pixel: Point, zoom: number): PyramidTileId;
-
-    /**
-     * Converts a PyramidTileId into a global pixel coordinates of the upper-left pixel of the specified tile.
-     * @param tile A PyramidTileId to calculate the upper-left pixel for.
-     * @returns Global pixel coordinate of the top left corner of a tile.
-     **/
-    export function tileToGlobalPixel(tile: PyramidTileId): Point;
-
-    /**
-     * Calculates the PyramidTileId that a Location object intersects with at a specific zoom level.
-     * @param loc The location to calulate the tile for.
-     * @param zoom The zoom level to use to calculate the tile.
-     * @returns A PyramidTileId that a Location object intersects with at a specific zoom level.
-     **/
-    export function locationToTile(loc: Location, zoom: number): PyramidTileId;
-
-    /**
-     * Calculates all the PyramidTileId's that are within a LocationRect at a specific zoom level.
-     * @param bounds A LocationRect to search for tiles in.
-     * @param zoom The zoom level to calculate tiles for.
-     * @returns A list of PyramidTileId's that are within the specified LocationRect and zoom level.
-     **/
-    export function getTilesInBounds(bounds: LocationRect, zoom: number): PyramidTileId[];
-
-    /**
-     * Calculates the LocationRect (bounding box) of a PyramidTileId.
-     * @param tile A PyramidTileId to calculate the LocationRect of.
-     * @returns The bounding box of a tile.
-     **/
-    export function tileToLocationRect(tile: PyramidTileId): LocationRect;
-}
-
-
-//////////////////////////////////////////////
-/// Geometry Calculations
-//////////////////////////////////////////////
-
-/**
-* A colleciton of geometry calculations that can be performed against Bing Maps shapes.
-* @requires The Microsoft.Maps.SpatialMath module.
-*/
-declare module Microsoft.Maps.SpatialMath.Geometry {
-
-    /** Defines how the end of a line should be buffered. */
-    export enum BufferEndCap {
-        /** Adds a rounded end to a buffered line. */
-        Round,
-
-        /** Adds a flat end to a buffered line that touches the end of the line. */
-        Flat,
-
-        /** Adds a square end to a buffered line that has a buffer area at the end of the line. */
-        Square
-    }
-
-    /**
-     * Calculates the area of a shape.
-     * @param shape The shape to calculate the area of.
-     * @param areaUnits The unit of measurement to calculate the area in.
-     * @returns The area of a shape in the specified unit of measurement.
-     */
-    export function area(shape: IPrimitive | IPrimitive[], areaUnits?: AreaUnits): number;
-
-    /**
-     * Calculates a bounding box that encloses a set of shapes and/or locations.
-     * @param shapes The shape(s) to calculate the bounding box for.
-     * @returns A location rect that encloses the shapes and/or locations.
-     */
-    export function bounds(shapes: Location | IPrimitive | (Location | IPrimitive)[]): LocationRect;
-
-    /**
-     * Calcuates a shape with an updated boundary that has been inflated/deflated by a speicifed distance.
-     * @param shape The shape to buffer.
-     * @param distance The distance to buffer the shape by.
-     * @param units The distance units to buffer the shape by.
-     * @param endCapType The type of end cap to use for the joints of the buffer, default value is round.
-     * @param options A set of polygon options to apply to the generated shape.
-     * @returns A buffered version of the shape.
-     */
-    export function buffer(shape: Location | IPrimitive | (Location | IPrimitive)[], distance: number, units?: DistanceUnits, endCapType?: BufferEndCap, options?: IPolygonOptions): IPrimitive | IPrimitive[];
-
-    /**
-     * Calculates the center of a shape.
-     * @param shape The shape to calculate the center of.
-     * @returns The center of the specified shape.
-     */
-    export function centroid(shape: IPrimitive | IPrimitive[]): Location;
-
-    /**
-     * Calculates an approximate concave hull that best fits the data.
-     * A concave hull is a shape that represents that a possible concave geometry that encloses all shapes in the specified data set.
-     * If a single unique Location is in the data set, a Pushpin is returned. If only two unique Locations are provided, or if all Locations form a line, a Polyline is returned.
-     * If 3 or more unique Locations are in the data set a Polygon, or array of Polygons will be returned.
-     * @param shapes Shape(s) whose Location(s) or Location(s) are to be used to generate a concave hull.
-     * @param allowMultiPolygons A boolean indicating if the resulting concave hull can be a MultiPolygon. Default: false
-     * @param allowHoles A boolean indicating if the polygons in the resulting concave hull can have holes in them. Default: false
-     * @param options A set of polygon options to apply to the generated shape.
-     * @returns An approximate concave hull that best fits the data.
-     * If a single unique Location is in the data set, a Pushpin is returned. If only two unique Locations are provided, or if all Locations form a line, a Polyline is returned.
-     * If 3 or more unique Locations are in the data set a Polygon, or array of Polygons will be returned.
-     */
-    export function concaveHull(shapes: Location | IPrimitive | (Location | IPrimitive)[], allowMultiPolygons?: boolean, allowHoles?: boolean, options?: IPolygonOptions): IPrimitive | IPrimitive[];
-
-    /**
-     * Given two shapes, determines if the first one contains the second one
-     * (or, the second shape is a subset of the first shape) or not.
-     * @param shapeA The first shape to test against the second.
-     * @param shapeB The second shape to test against the first.
-     * @returns A boolean indicating if the first shape contains the second shape.
-     */
-    export function contains(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[]): boolean;
-
-    /**
-     * Calculates a convex hull. A convex hull is a shape that represents that minimum convex geometry that encloses all shapes in the specified data set.
-     * @param shapes Shape(s) whose Location(s) or Location(s) are to be used to generate a convex hull.
-     * @param options A set of polygon options to apply to the generated shape.
-     * @returns An array of locations that form a convex hull that encloses all locations of the shapes provided in an array.
-     */
-    export function convexHull(shapes: Location | IPrimitive | (Location | IPrimitive)[], options?: IPolygonOptions): IPrimitive | IPrimitive[];
-
-    /**
-     * Creates Delaunay Triangles from the Location objects of the provided shapes.
-     * @param shapes Location(s) of shape(s) or Location(s) to generate a Delaunay Triangles from.
-     * @param options A set of polyline or polygon options to apply to the generated shape.
-     * @returns An array of shapes that form the polygon triangles of the delaunay triangles.
-     */
-    export function delaunayTriangles(shapes: Location | IPrimitive | (Location | IPrimitive)[], options?: IPolygonOptions): Polygon[];
-
-    /**
-     * Returns an object that represents area of an initial shape subtracted by the overlapping area of a second shape.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape to subtract from the first.
-     * @returns A set of shapes that represent the area of the first shape that is not overlapped by the second shape.
-     */
-    export function difference(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Calculates the approximate shortest distance between any two shapes.
-     * @param shapeA The first shape to calculate the distance from.
-     * @param shapeB The second shape to calculate the distance to.
-     * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
-     * @returns The shorested distance between the shapes in the specified units.
-     */
-    export function distance(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[], units?: DistanceUnits, highAccuracy?: boolean): number;
-
-    /**
-     * Returns an object that represents the area where two shapes intersect.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @returns A set of shapes that represents the area where two shapes intersect.
-     */
-    export function intersection(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Determines if two shapes intersect or not.
-     * @param shapeA The first shape to test against the second.
-     * @param shapeB The second shape to test against the first.
-     * @returns A boolean indicating if the two shapes intersect.
-     */
-    export function intersects(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[]): boolean;
-
-    /**
-     * Tests to see if the shape is valid and meets the requirements of an SQL Geography type and other OGC compliant systems. Polylines & Polygons can't be self intersecting. For Polygons,
-     * coordinates in an exterior rings have a counter-clockwise orientation, while holes have a clockwise orientation.
-     * @param shape The shape to test for validity.
-     * @returns Returns a boolean indicting if the specified shape(s) is valid or not.
-     */
-    export function isValid(shape: IPrimitive | IPrimitive[]): boolean;
-
-    /**
-     * Calculates the distance between all Locations in a shape. If the shape is a polygon, the length of the perimeter of all rings is calculated.
-     * @param shape The shape to calculate the length of.
-     * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
-     * @returns The distance between all Locations in a polyline or the perimeter of a ploygon on the surface of a earth in the specifed units.
-     */
-    export function calculateLength(shape: IPrimitive | IPrimitive[], units ?: DistanceUnits, highAccuracy ?: boolean): number;
-
-    /**
-     * Takes a shape and returns a copy of it that meets the requirements of an SQL Geography type and other OGC compliant systems. Polylines & Polygons can't be self intersecting. For Polygons,
-     * coordinates in an exterior rings have a counter-clockwise orientation, while holes have a clockwise orientation.
-     * @param shape The shape to make valid.
-     * @returns Valiated version of the provided shape. May be a different shape type than what was provided. i.e. A polygon may be broken up into an array of polygons (MultiPolygon).
-     */
-    export function makeValid(shape: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Calculates the nearest Location objects between to shapes that lie on the shapes.
-     * If the shapes do not overlap, this calculates a location on each shape that is closest to the other shape.
-     * If the shapes overlap, a location that is within the intersection area of the shapes will be added twice to an array, once for each shape, and returned.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @returns An array of two Location objects that represent the nearest points between two shapes.
-     * The Location objects are in the same order as the input shapes.
-     * Returns null if nearest points were unable to be computed.
-     */
-    export function nearestLocations(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[]): Location[];
-
-    /**
-     * Reduces the resolution of a shape using the Douglas-Peucker algorithm.
-     * @param shape The shape to reduce the resolution of.
-     * @param tolerance A tolerance distance in meters used by the reduction algorithms.
-     * @returns A version of the specified shape that has been reduced.
-     */
-    export function reduce(shape: IPrimitive | IPrimitive[], tolerance: number): IPrimitive | IPrimitive[];
-
-    /**
-     * Rotates a shape around a given Location for the specified angle of rotation. If an origin is not provided, the centroid of the shape is used.
-     * @param shape The shape to be rotated.
-     * @param angle The amount to rotate the shape in degrees.
-     * @param origin The location to rotate the shape around. Defaults to the centroid of the shape.
-     */
-    export function rotate(shape: IPrimitive | IPrimitive[], angle: number, origin?: Location): void;
-
-    /**
-     * Calculates the shortest path that between two shapes and returns a Polyline.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @param options A set of polyline options to apply to the generated polyline.
-     * @returns A polyline that represents the shortest path between two shapes.
-     */
-    export function shortestLineTo(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[], options?: IPolylineOptions): Polyline;
-
-    /**
-     * Snaps the locations of one shape that are within the specified tolerance distance away from another shape.
-     * @param locs The locations to snap to the shape.
-     * @param shape The shape to snap the locations to.
-     * @param tolerance A maximum distance (in the specified units) that the snapped location can be from the input location. Default: Infinity
-     * @param toleranceUnits The distance units of the tolerance value. Default: Meters
-     * @returns A snapped location if only one location is provided, otherwise returns an array of snapped locations.
-     */
-    export function snapLocationsToShape(locs: Location | Location[], shape: IPrimitive | IPrimitive[], tolerance?: number, toleranceUnits?: DistanceUnits): Location | Location[];
-
-    /**
-     * Snaps the locations of one shape that are within the specified tolerance distance away from another shape.
-     * @param shapeToSnap The shape to snap the locations of.
-     * @param shape The shape to snap the locations to.
-     * @param tolerance A maximum distance (in the specified units) that the snapped location can be from the input location. Default: Infinity
-     * @param toleranceUnits The distance units of the tolerance value. Default: Meters
-     */
-    export function snapShapeToShape(shapeToSnap: IPrimitive | IPrimitive[], shape: IPrimitive | IPrimitive[], tolerance?: number, toleranceUnits?: DistanceUnits): void;
-
-    /**
-     * Returns an object that represents all points that are either in one shape instance or another, but not those points that lie in both instances.
-     * "Sym" stands for Symmetric. symDifference is an OGC standard name for this calculation used in most spatial math libraries, including SQL.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @returns A shape that represents the symetric difference between two shapes.
-     */
-    export function symDifference(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Returns an object that represents the union of two shapes. If shapes don't overlap, an array of each individual shapes will be returned.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @returns A shape that represents the union of two shapes.
-     */
-    export function union(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Performs a union operation on a set of shapes.
-     * If a shape doesn't overlap with the rest, the returned result will be an array of shapes containing this shape and the union of the rest.
-     * @param shapes An array of shapes to union together.
-     * @returns A shape that represents the union of all specified shapes.
-     */
-    export function unionAggregate(shapes: IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Creates a Voronoi diagram from the Location objects of the provided shapes. The diagram is returned as an array of Polygons.
-     * If a clip region is specified, the diagram will be clipped accordingly.
-     * @param shapes Location(s) of shape(s) or Location(s) to generate a Voronoi diagram.
-     * @param clipRegion A region to clip the voronoi diagram to.
-     * @param options A set of polygon options to apply to the generated shape.
-     * @returns An array of polygons that form a Voronoi diagram.
-     */
-    export function voronoiDiagram(shapes: Location | IPrimitive | (Location | IPrimitive)[], clipRegion?: LocationRect | Polygon, options?: IPolygonOptions): Polygon[];
-}
\ No newline at end of file
diff --git a/types/bingmaps/Traffic.d.ts b/types/bingmaps/Traffic.d.ts
deleted file mode 100644
index 1c78256053..0000000000
--- a/types/bingmaps/Traffic.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Adds a traffic incident and flow data to the map.
- * @requires The Microsoft.Maps.Traffic module.
- */
-declare module Microsoft.Maps.Traffic {
-    /** Options that can be customized in the Traffic manager. */
-    export interface ITrafficOptions {
-        /** Displays the traffic flow layer. */
-        flowVisible?: boolean;
-
-        /** Displays all traffic incidents. */
-        incidentsVisible?: boolean;
-
-        /** Displays the traffic legend. */
-        legendVisible?: boolean;
-
-        /**
-        * Sets the opacity of the traffic flow tile layer. Must be a number between 0 and 1. The default is 1 unless the map
-        * mode is set to lite, in which case the default is set to 0.7.
-        */
-        opacity?: number;
-    }
-
-    /**
-     * The TrafficManager class provides the ability to show traffic flow and incident data on top of the map. When creating an
-     * instance of the TrafficManager class the map must be passed as an argument to the constructor.
-     * @requires The Microsoft.Maps.Traffic module.
-     */
-    export class TrafficManager {
-        /**
-        * @constructor
-        * @requires The Microsoft.Maps.Traffic module.
-        * @param map A map instnce to attach the traffic manager to.
-        */
-        constructor(map: Map);
-
-        /** Hides all traffic data. */
-        public hide(): void;
-
-        /** Hides the traffic flow layer. */
-        public hideFlow(): void;
-
-        /** Hides all traffic incidents. */
-        public hideIncidents(): void;
-
-        /** Hides the traffic legend. */
-        public hideLegend(): void;
-
-        /**
-        * Sets the options for the traffic manager.
-        * @param options The options for the traffic manager.
-        */
-        public setOptions(options: ITrafficOptions): void;
-
-        /** Displays all traffic data. */
-        public show(): void;
-
-        /** Displays the traffic flow layer. */
-        public showFlow(): void;
-
-        /** Displays all traffic incidents. */
-        public showIncidents(): void;
-
-        /** Displays the traffic legend. */
-        public showLegend(): void;
-
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/WellKnownText.d.ts b/types/bingmaps/WellKnownText.d.ts
deleted file mode 100644
index 51c42203ce..0000000000
--- a/types/bingmaps/WellKnownText.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-declare module Microsoft.Maps {
-    /**
-     * Class responsible for readon/writing geo data in well known text format
-     * @requires The Microsoft.Maps.WellKnownText module.
-     */
-    export module WellKnownText {
-        /**
-         * Reads the data in wellknowntext format and returns the shapes. Multi-Geometry type shapes are returned as an array of shapes.
-         * @param wkt The well known text string that needs to be parsed into shapes.
-         * @param styles Styles to apply to the shapes.
-         * @returns One of more shapes.
-         */
-        export function read(wkt: string, styles?: IStylesOptions): IPrimitive | IPrimitive[];
-
-        /**
-         * Writes the data into wellknowntext format.
-         * @param data The data that needs to be serialized.
-         * @returns Well known text formatted string.
-         */
-        export function write(data: IPrimitive | IPrimitive[]): string;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/bingmaps-tests.ts b/types/bingmaps/bingmaps-tests.ts
deleted file mode 100644
index 962c3047fa..0000000000
--- a/types/bingmaps/bingmaps-tests.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-namespace BingMapsTests {
- 
-    // An interactive set of Bing Maps AJAX control usages can be found at http://www.bingmapsportal.com/isdk/ajaxv7
-    // A full API description can be found at http://msdn.microsoft.com/en-us/library/gg427610.aspx
-    export class TestFixture {
-
-        public createMap(
-            // This key can be acquired at http://www.microsoft.com/maps/create-a-bing-maps-key.aspx
-            bingMapsApiKey: string,
-            // This is the HTML container that the map will be drawn inside of
-            target: HTMLElement,
-            // These positions will be placed as pushpins onto the map
-            mapPositions: Array<Position>,
-            // This will fire if the geolocation fails and will pass the original target (parameter 2)
-            onFailure: (element: HTMLElement) => any) {
-            
-            var self = this;
-            var map: Microsoft.Maps.Map;
-
-            navigator.geolocation.getCurrentPosition((position: Position) => {
-
-                var locations: Array<Microsoft.Maps.Location> = new Array<Microsoft.Maps.Location>();
-                var options: Microsoft.Maps.IMapLoadOptions;
-
-                function loadMap() {
-                    options = {
-                        credentials: bingMapsApiKey,
-                        enableClickableLogo: false,
-                        showDashboard: false,
-                        showScalebar: false,
-                        center: self.toLocation(position),
-                        zoom: 16,
-                        mapTypeId: Microsoft.Maps.MapTypeId.road
-                    };
-
-                    target.innerHTML = "";
-
-                    map = new Microsoft.Maps.Map(target, options);
-
-                    for (var i = 0; i < mapPositions.length; ++i) {
-
-                        var mapPosition: Position = mapPositions[i];
-                        var location: Microsoft.Maps.Location = self.createPushpin(map, mapPosition);
-
-                        locations.push(location);
-                    }
-
-                    // Sets the view of the map to the smallest size that contains all of the
-                    // specified locations (in this case the pusphin locations)
-                    map.setView({ bounds: Microsoft.Maps.LocationRect.fromLocations(locations) });
-                }
-
-                if ((<any>window).Windows != undefined) {
-                    // Running in Win8 app
-                    Microsoft.Maps.loadModule("Microsoft.Maps.Map", { callback: loadMap });
-                } else {
-                    // Running anywhere else
-                    loadMap();
-                }
-            }, () => onFailure(target), { maximumAge: 3000, timeout: 5000, enableHighAccuracy: true });
-
-        }
-
-        // Converts a standard HTML geolocation Position to a Location
-        private toLocation(position: Position): Microsoft.Maps.Location {
-            return new Microsoft.Maps.Location(position.coords.latitude, position.coords.longitude);
-        }
-
-        // Creates a pushpin on a specified map and returns the Location for potentially setting the map view
-        private createPushpin(map: Microsoft.Maps.Map, position: Position): Microsoft.Maps.Location {
-
-            var location: Microsoft.Maps.Location;
-            var pushpin: Microsoft.Maps.Pushpin;
-
-            location = this.toLocation(position);
-            pushpin = new Microsoft.Maps.Pushpin(location, null);
-
-            map.entities.push(pushpin);
-
-            return location;
-        }
-    }
-}
diff --git a/types/bingmaps/index.d.ts b/types/bingmaps/index.d.ts
deleted file mode 100644
index b629e3b903..0000000000
--- a/types/bingmaps/index.d.ts
+++ /dev/null
@@ -1,2850 +0,0 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Autosuggest.d.ts" />
-/// <reference path="Clustering.d.ts" />
-/// <reference path="Contour.d.ts" />
-/// <reference path="DataBinning.d.ts" />
-/// <reference path="Directions.d.ts" />
-/// <reference path="DrawingTools.d.ts" />
-/// <reference path="GeoJson.d.ts" />
-/// <reference path="HeatMapLayer.d.ts" />
-/// <reference path="Search.d.ts" />
-/// <reference path="SpatialDataService.d.ts" />
-/// <reference path="SpatialMath.d.ts" />
-/// <reference path="Traffic.d.ts" />
-/// <reference path="WellKnownText.d.ts" />
-
-/**
- *  The Bing Maps V8 developer API.
- */
-declare module Microsoft.Maps {
-
-	//////////////////////////////////////////////
-    /// Custom Map Styles
-    //////////////////////////////////////////////
-
-	 /** The styles options that can be applied to map elements. */
-    export interface IMapElementStyle {
-        /**
-        * Hex color used for filling polygons, the background of point icons, and for the center of lines if they have split.
-        */
-        fillColor?: string;
-
-        /**
-        * The hex color of a map label.
-        */
-        labelColor?: string;
-
-        /**
-        * The outline hex color of a map label.
-        */
-        labelOutlineColor?: string;
-
-        /**
-        * Species if a map label type is visible or not.
-        */
-        labelVisible?: boolean;
-
-        /**
-        * Hex color used for the outline around polygons, the outline around point icons, and the color of lines.
-        */
-        strokeColor?: string;
-
-        /**
-        * Specifies if the map element is visible or not.
-        */
-        visible?: boolean;
-    }
-
-    /** The style options that can be appliction to bordered map elements. */
-    export interface IBorderedMapElementStyle extends IMapElementStyle {
-        /**
-        * Secondary/casing line hex color of the border of a filled polygon.
-        */
-        borderOutlineColor?: string;
-
-        /**
-        * Primary line hex color of the border of a filled polygon.
-        */
-        borderStrokeColor?: string;
-
-        /**
-        * Specifies if a border is visible or not.
-        */
-        borderVisible?: boolean;
-    }
-
-    /** Global style settings */
-    export interface ISettingsStyle {
-        /** A hex color value that all land is first flushed to before things are drawn on it. */
-        landColor?: string;
-
-		/** Specifies whether or not to draw elevation shading on the map. */
-		shadedReliefVisible?: boolean;
-    }
-
-    /** Map Elements which can be styled. */
-    export interface IMapElements {
-
-        /** Admin1, state, province, etc. */
-        adminDistrict?: IBorderedMapElementStyle;
-
-        /** Icon representing the capital of a state/province. */
-        adminDistrictCapital?: IMapElementStyle;
-
-        /** Area of land encompassing an airport. */
-        airport?: IMapElementStyle;
-
-        /** Area of land use, not to be confused with Structure */
-        area?: IMapElementStyle;
-
-        /** An arterial road is a high-capacity urban road. Its primary function is to deliver traffic from collector roads to freeways or expressways, and between urban centers efficiently. */
-        arterialRoad?: IMapElementStyle;
-
-        /** A structure such as a house, store, factory. */
-        building?: IMapElementStyle;
-
-        /** Restaurant, hospital, school, etc. */
-        business?: IMapElementStyle;
-
-        /** Icon representing the capital populated place. */
-        capital?: IMapElementStyle;
-
-        /** Area of a cemetery */
-        cemetery?: IMapElementStyle;
-
-        /** Area of a whole continent */
-        continent?: IMapElementStyle;
-
-        /** A controlled-access highway is a type of road which has been designed for high-speed vehicular traffic, with all traffic flow and ingress/egress regulated. Also known as a highway, freeway, motorway, expressway, interstate, parkway. */
-        controlledAccessHighway?: IMapElementStyle;
-
-        /** A country or independent sovereign state. */
-        countryRegion?: IBorderedMapElementStyle;
-
-        /** Icon representing the capital of a country/region. */
-        countryRegionCapital?: IMapElementStyle;
-
-        /** Admin2, county, etc. */
-        district?: IBorderedMapElementStyle;
-
-        /** An area of land used for educational purposes such as a school campus. */
-        education?: IMapElementStyle;
-
-        /** A school or other educational building. */
-        educationBuilding?: IMapElementStyle;
-
-        /** Restaurant, caf�, etc. */
-        foodPoint?: IMapElementStyle;
-
-        /** Area of forest land. */
-        forest?: IMapElementStyle;
-
-        /** An area of land where the game of golf is played. */
-        golfCourse?: IMapElementStyle;
-
-        /** Lines representing ramps typically alongside ControlledAccessHighways */
-        highSpeedRamp?: IMapElementStyle;
-
-        /** A highway. */
-        highway?: IMapElementStyle;
-
-        /** An area of land reserved for Indigenous people. */
-        indigenousPeoplesReserve?: IMapElementStyle;
-
-        /** Labeling of area of an island.  */
-        island?: IMapElementStyle;
-
-        /** Major roads. */
-        majorRoad?: IMapElementStyle;
-
-        /** The base map element in which all other map elements inherit from. */
-        mapElement?: IMapElementStyle;
-
-        /** Area of land used for medical purposes. Generally, hospital campuses. */
-        medical?: IMapElementStyle;
-
-        /** A building which provides medical services. */
-        medicalBuilding?: IMapElementStyle;
-
-		/** A military area. */
-        military?: IMapElementStyle;
-
-        /** A natural point of interest. */
-        naturalPoint?: IMapElementStyle;
-
-        /** Area of land used for nautical purposes. */
-        nautical?: IMapElementStyle;
-
-        /** Area defined as a neighborhood. Labels only. */
-        neighborhood?: IMapElementStyle;
-
-        /** Area of any kind of park. */
-        park?: IMapElementStyle;
-
-        /** Icon representing the peak of a mountain. */
-        peak?: IMapElementStyle;
-
-        /** All point features that are rendered with an icon of some sort */
-        point?: IMapElementStyle;
-
-        /** Restaurant, hospital, school, marina, ski area, etc. */
-        pointOfInterest?: IMapElementStyle;
-
-        /** A political border. */
-        political?: IBorderedMapElementStyle;
-
-        /** Icon representing size of populated place (city, town, etc). */
-        populatedPlace?: IMapElementStyle;
-
-        /** Railway lines */
-        railway?: IMapElementStyle;
-
-        /** Line representing the connecting entrance/exit to a highway. */
-        ramp?: IMapElementStyle;
-
-        /** Area of nature reserve. */
-        reserve?: IMapElementStyle;
-
-        /** River, stream, or other passage. Note that this may be a line or polygon and may connect to non-river water bodies. */
-        river?: IMapElementStyle;
-
-        /** Lines that represent all roads */
-        road?: IMapElementStyle;
-
-        /** Icon representing the exit, typically from a controlled access highway. */
-        roadExit?: IMapElementStyle;
-
-        /** Sign representing a compact name for a road. For example, I-5. */
-        //roadShield?: IMapElementStyle;
-
-        /** Land area covered by a runway. See also Airport for the land area of the whole airport. */
-        runway?: IMapElementStyle;
-
-        /** Area generally used for beaches, but could be used for sandy areas/golf bunkers in the future. */
-        sand?: IMapElementStyle;
-
-        /** A shopping center or mall. */
-        shoppingCenter?: IMapElementStyle;
-
-		/** Area of a stadium. */
-		stadium?: IMapElementStyle;
-
-        /** A street. */
-        street?: IMapElementStyle;
-
-        /** Buildings and other building-like structures */
-        structure?: IMapElementStyle;
-
-        /** A toll road. */
-        tollRoad?: IMapElementStyle;
-
-        /** Walking trail, either through park or hiking trail */
-        trail?: IMapElementStyle;
-
-        /** Icon representing a bus stop, train stop, airport, etc. */
-        transit?: IMapElementStyle;
-
-        /** A transit building. */
-        transitBuilding?: IMapElementStyle;
-
-        /** Lines that are part of the transportation network (roads, trains, ferries, etc) */
-        transportation?: IMapElementStyle;
-
-        /** An unpaved street. */
-        unpavedStreet?: IMapElementStyle;
-
-        /** Forests, grassy areas, etc. */
-        vegetation?: IMapElementStyle;
-
-        /** Icon representing the peak of a volcano. */
-        volcanicPeak?: IMapElementStyle;
-
-        /** Anything that looks like water */
-        water?: IMapElementStyle;
-
-        /** Icon representing a water feature location such as a waterfall. */
-        waterPoint?: IMapElementStyle;
-
-        /** Ferry route lines */
-        waterRoute?: IMapElementStyle;
-    }
-
-    /** Defines a custom map style. */
-    export interface ICustomMapStyle {
-        /** A list of map elements to be styled. */
-        elements?: IMapElements;
-
-        /** Global Settings. */
-        settings?: ISettingsStyle;
-
-        /** The version of the style syntax used. */
-        version: string;
-    }
-
-    //////////////////////////////////////////////
-    /// Enumerations
-    //////////////////////////////////////////////
-
-    /** This enumeration defines how the map labels are displayed. */
-    export enum LabelOverlay {
-        /**
-        * Map labels are hidden. Note that this will have no effect on road maps unless the allowHidingLabelsOfRoad map option
-        * is set to true.
-        */
-        hidden,
-
-        /**  Map labels are visible. */
-        visible
-    }
-
-    /** This enumeration is used to specify the type of map style that should be displayed by the map. */
-    export enum MapTypeId {
-        /** The aerial map type which uses top-down satellite & airplane imagery. */
-        aerial,
-
-        /** High resolution aerial imagery taken at 45 degrees to the ground, from 4 different directions. */
-        birdseye,
-
-        /** A darker version of the road maps. */
-        canvasDark,
-
-        /** A lighter version of the road maps which also has some of the details such as hill shading disabled. */
-        canvasLight,
-
-        /** A grayscale version of the road maps. */
-        grayscale,
-
-        /** Displays a blank canvas that uses the mercator map project. It basically removed the base maps layer. */
-        mercator,
-
-        /** Ordnance survey map type (en-gb only). */
-        ordnanceSurvey,
-
-        /** Road map type. */
-        road,
-
-        /** Provides streetside panoramas from the street level. */
-        streetside
-    }
-
-    /** The NavigationBarMode can be used to customize the layout and style of the navigation bar. */
-    export enum NavigationBarMode {
-        /**
-        * A compact navigation bar that includes a smaller drop down for the map type and zoom buttons. Recommended for small
-        * maps or screen such as a mobile device.
-        */
-        compact,
-
-        /**
-        * The default navigation bar that has a drop down for the map type, a locate me button, and zoom buttons. Recommended for
-        * medium to large maps in desktop browsers.
-        */
-        default,
-
-        /**
-        * A minified navigation bar that has a button to toggle between road and aerial maps, zoom buttons, and a button to turn
-        * traffic information on and off. Recommended for small maps or screen such as a mobile device.
-        */
-        minified
-    }
-
-    /** The NavigationBarOrientation enumeration is used to define how the navigation bar controls are laid out. */
-    export enum NavigationBarOrientation {
-        /** Repositions the buttons in the navigation bar such that they are aligned horizontally. */
-        horizontal,
-
-        /** Repositions the buttons in the navigation bar such that they are aligned vertically. */
-        vertical
-    }
-
-    /** This enumeration is used to specify how the overview map for the streetside map mode should be displayed. */
-    export enum OverviewMapMode {
-        /** Shows the overview map in an expanded state. */
-        expanded,
-
-        /** Hides the overview map. */
-        hidden,
-
-        /** Shows the overview map in a minimized state. */
-        minimized
-    }
-
-    /** Contains enum to show how pixels are defined. */
-    export enum PixelReference {
-        /** The pixel is defined relative to the map control�s root element, where the top left corner of the map control is (0, 0). */
-        control,
-
-        /** The pixel is defined relative to the page, where the top left corner of the HTML page is (0, 0). */
-        page,
-
-        /** The pixel is defined in viewport coordinates, relative to the center of the map, where the center of the map is (0, 0). */
-        viewport
-    }
-
-    //////////////////////////////////////////////
-    /// Interfaces
-    //////////////////////////////////////////////
-
-    /** Represents a structured address object. */
-    export interface IAddress {
-        /**
-        * The street line of an address. The addressLine property is the most precise, official line for an address relative to the postal agency
-        * servicing the area specified by the locality or postalCode properties.
-        */
-        addressLine: string;
-
-        /**
-        * The subdivision name within the country or region for an address. This element is also commonly treated as the first order administrative
-        * subdivision. An example is a US state, such as �Oregon�.
-        */
-        adminDistrict: string;
-
-        /** The country or region name of the address. */
-        countryRegion: string;
-
-        /** A string specifying the two-letter ISO country code. */
-        countryRegionISO2: string;
-
-        /** The second, third, or fourth order subdivision within a country, dependency, or region. An example is a US county, such as �King�. */
-        district: string;
-
-        /** A nicely formatted address string for the result. */
-        formattedAddress: string;
-
-        /** The locality, such as the primary city, that corresponds to an address. An example is �Seattle�. */
-        locality: string;
-
-        /** The post code, postal code, or ZIP code of an address. An example is a US ZIP code, such as �98152�. */
-        postalCode: string;
-    }
-
-    /** The event args for when a layer frame is being loaded in an AnimtedTileLayer. **/
-    export interface IAnimatedFrameEventArgs {
-        /** The animated tile layer that the frame belongs to. **/
-        animatedTileLayer: AnimatedTileLayer;
-
-        /** The index of the frame being loaded. **/
-        index: number;
-    }
-
-    /** An object that defines the options for an AnimatedTileLayer. **/
-    export interface IAnimatedTileLayerOptions {
-        /** A boolean that specifies whether the animation should auto-start when it is added to the map or not. Default: true **/
-        autoPlay?: boolean;
-
-        /** The number of miliseconds between two layer frames. Default: 1000 **/
-        frameRate?: number;
-
-        /** A custom loading screen to show on the map when the map tiles are being fetched. **/
-        loadingScreen?: CustomOverlay;
-
-        /** The max amount of total loading time of all tiles in a viewport in milliseconds. Default: 15000 **/
-        maxTotalLoadTime?: number;
-
-        /** The array of tile layer sources to animate through. **/
-        mercator: TileSource[];
-
-        /** A boolean specifying if the animated tile layer is visible or not. **/
-        visible?: boolean;
-    }
-
-    /** Represents the options that can be used when initializing a custom overlay. **/
-    export interface ICustomOverlayOptions {
-        /**
-        * Specifies if the custom overlay should eb rendered above or below the label layer of the map. When above,
-        * elements in the overlay can be clickable. Default: True
-        */
-        beneathLabels?: boolean;
-    }
-
-    /** Base data layer interface. */
-    export interface IDataLayer extends ILayer {
-        /** Clears all data in the layer. */
-        clear(): void;
-    }
-
-    /** Event args included in entity collection events. */
-    export interface IEntityCollectionChangedEventArgs {
-        /** The entity collection the event was triggered from. */
-        collection: EntityCollection;
-
-        /** The IPrimitive object that the event occurred for. */
-        data: IPrimitive;
-    }
-
-    /** An object the identifies an event that has been attached to an object. */
-    export interface IHandlerId {
-    }
-
-    /** Base layer interface. */
-    export interface ILayer {
-    }
-
-    /**
-     * @deprecated use IMouseEventArgs
-	 * A LayerMouseEventArgs object is returned by many the mouse event handlers attached to a Layer.
-	 */
-    export interface ILayerMouseEventArgs {
-        /**
-		* @deprecated use target
-		* The IPrimitive shape (pushpin, polyline, polygon) that the event occurred on.
-		*/
-        primitive: IPrimitive;
-    }
-
-    /** The options that can be used to customize an infobox. */
-    export interface IInfoboxOptions {
-        /**
-        * @deprecated Use HTML buttons and links in description instead.
-        */
-        actions?: IInfoboxActions[];
-
-        /** The string displayed inside the infobox. */
-        description?: string;
-
-        /**
-        * The HTML that represents the infobox. Note that infobox options are ignored if custom HTML is set. Also, if custom HTML is used to represent the
-        * infobox, the infobox is anchored at the top-left corner.
-        */
-        htmlContent?: string;
-
-        /** The location on the map where the infobox�s anchor is attached. */
-        location?: Location;
-
-        /** The maximium size that the infobox height can expand to based on it�s content. Default: 126 **/
-        maxHeight?: number;
-
-        /** The maximium size that the infobox width can expand to based on it�s content. Default: 256 **/
-        maxWidth?: number;
-
-        /**
-        * The amount the infobox pointer is shifted from the location of the infobox, or if showPointer is false, then it is the amount the info box bottom
-        * left edge is shifted from the location of the infobox. If custom HTML is set, it is the amount the top-left corner of the infobox is shifted from
-        * its location. The default offset value is (0,0), which means there is no offset.
-        */
-        offset?: Point;
-
-        /**
-        * A boolean indicating whether to show the close dialog button on the infobox. The default value is true. By default, the close button is displayed
-        * as an X in the top right corner of the infobox. This property is ignored if custom HTML is used to represent the infobox.
-        */
-        showCloseButton?: boolean;
-
-        /**
-        * A boolean indicating whether to display the infobox with a pointer. The default value is true. In this case the infobox is anchored at the bottom
-        * point of the pointer. If this property is set to false, the infobox is anchored at the bottom left corner. This property is ignored if custom HTML
-        * is used to represent the infobox.
-        */
-        showPointer?: boolean;
-
-        /** The title of the infobox. */
-        title?: string;
-
-        /**
-        * A boolean indicating whether to show or hide the infobox. The default value is true. A value of false indicates that the infobox is hidden,
-        * although it is still an entity on the map.
-        */
-        visible?: boolean;
-
-        /** The z-index of the infobox with respect to other items on the map. */
-        zIndex?: number;
-    }
-
-    /**
-    * @deprecated Use HTML buttons and links in description instead.
-    */
-    export interface IInfoboxActions {
-        /** The text to display for the action. */
-        label: string;
-
-        /** The function to call when the label is clicked.  */
-        eventHandler: (eventArg?: MouseEvent) => void;
-    }
-
-    /** An object that contains information about an infobox event. **/
-    export interface IInfoboxEventArgs {
-        /** The event that occurred. **/
-        eventName: string;
-
-        /** The x-value of the pixel coordinate on the page of the mouse cursor. **/
-        pageX: number;
-
-        /** The y-value of the pixel coordinate on the page of the mouse cursor. **/
-        pageY: number;
-
-        /** The infobox object that fired the event. **/
-        target: Infobox;
-
-        /** The type of the object that fired the event.This will always be 'infobox'. **/
-        targetType: string;
-
-        /** Original mouse event from the browser. */
-        originalEvent?: MouseEvent;
-    }
-
-    /** Map or View options */
-    export interface IMapLoadOptions extends IMapOptions, IViewOptions {
-        /** The Bing Maps Key used to authenticate the application. This property can only be set when using the Map constructor. */
-        credentials: string;
-    }
-
-    /**
-    * An object that can be used to customize the map. Some of the map options can be changed after the map has loaded by using
-    * the setOptions function on the map.
-    */
-    export interface IMapOptions {
-
-        /**
-        * A boolean that, when set to true, allows the road labels to be hidden. Default: false
-        * This property can only be set when using the Map constructor. This property can only be set when using the Map constructor.
-        */
-        allowHidingLabelsOfRoad?: boolean;
-
-        /** A boolean indicating if the infobox is allowed to overflow outside the bounds of the map. Default: false. */
-        allowInfoboxOverflow?: boolean;
-
-        /** The color to use for the map control background. The default color is #EAE8E1. This property can only be set when using the Map constructor. */
-        backgroundColor?: string | Color;
-
-        /** Custom map styles used to modify the look and feel of the base map. */
-        customMapStyle?: ICustomMapStyle;
-
-        /** A boolean value indicating whether to disable the user�s ability to control the using the keyboard. Default: false */
-        disableKeyboardInput?: boolean;
-
-        /** A boolean value indicating if mousing over the map type selector should open it or not. Default: true */
-        disableMapTypeSelectorMouseOver?: boolean;
-
-        /** A boolean value indicating whether to disable the user's ability to pan the map. Default: false */
-        disablePanning?: boolean;
-
-        /**
-        * Scrolling the mouse wheel over the map will zoom it in or out, but will not scroll the page.
-        * Setting this property to true disables the zooming of the map and instead reverts back to scrolling the page instea.
-        * Default: false
-        */
-        disableScrollWheelZoom?: boolean;
-
-        /**
-        * A boolean indicating whether to disable streetside mode.If this property is set to true, streetside will be removed from
-        * the navigation bar, and the automatic coverage overlay will be disabled when zoomed in at lower zoom levels. Default false
-        * This property can only be set when using the Map constructor.
-        */
-        disableStreetside?: boolean;
-
-        /**
-        * A boolean indicating whether to disable the automatic streetside coverage layer that appears when zoomed in at lower zoom
-        * levels. Default false
-        * This property can only be set when using the Map constructor.
-        **/
-        disableStreetsideAutoCoverage?: boolean;
-
-        /** A boolean value indicating whether to disable the user's ability to zoom in or out. Default: false */
-        disableZooming?: boolean;
-
-        /**
-        * A boolean value indicating whether the Bing(TM) logo on the map is clickable. Default: true.
-        * This property can only be set when using the Map constructor.
-        */
-        enableClickableLogo?: boolean;
-
-        /**
-        * A boolean value indicating whether to use the inertia animation effect during map navigation. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        enableInertia?: boolean;
-
-        /**
-        * A boolean that indicates if the map should be rendered using lite mode. When set to true vector map labels are
-        * disabled and map labels are rendered directly into the map tiles. This offers improved performance, but will result
-        * in the labels being rendered behind data on the map and the labels will also not use collision dection with pushpins.
-        * If this property is not set, the map set this value based on the target device and browser as vector labels perform
-        * better in some scenrarios than others.
-        * This property can only be set when using the Map constructor.
-        */
-        liteMode?: boolean;
-
-        /** A bounding area that restricts the map view. */
-        maxBounds?: LocationRect;
-
-        /** The maximum zoom level that the map can be zoomed into. */
-        maxZoom?: number;
-
-        /** The minimum zoom level that the map cab be zoomed out to. */
-        minZoom?: number;
-
-        /** Specifies how the navigation bar should be rendered on the map. */
-        navigationBarMode?: NavigationBarMode;
-
-        /** A boolean whether what orientation should be used when laying out the navigation controls. */
-        navigationBarOrientation?: NavigationBarOrientation;
-
-        /**
-        * A boolean value indicating whether to display the �breadcrumb control�. The breadcrumb control shows the current center location�s geography hierarchy.
-        * The default value is false. Requires the showLocateMeButton map option to be set to true. The breadcrumb control displays best when the width of the map
-        * is at least 400 pixels.
-        */
-        showBreadcrumb?: boolean;
-
-        /**
-        * A boolean value indicating whether to show the map navigation control. Default: true�This property can only be set when using the Map constructor.
-        */
-        showDashboard?: boolean;
-
-        /**
-        * A boolean value indicating whether to show a button that centers the map over the user's location in the map navigation control. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showLocateMeButton?: boolean;
-
-        /**
-        * A boolean value indicating whether or not to show the map Bing logo. The default value is true.
-        * This property can only be set when using the Map constructor.
-        */
-        showLogo?: boolean;
-
-        /**
-        * A boolean value indicating whether to show the map type selector in the map navigation control. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showMapTypeSelector?: boolean;
-
-        /**
-        * A boolean value indicating whether to show the scale bar. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showScalebar?: boolean;
-
-        /** When using the minified navigation bar, a traffic button is displayed. Setting this option to false will hide this button. */
-        showTrafficButton?: boolean;
-
-        /**
-        * A boolean value indicating whether to show a link to the End User Terms of Use, which appears to the right of the copyrights, or not. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showTermsLink?: boolean;
-
-        /**
-        * A boolean value indicating whether to show the zoom buttons in the map navigation control. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showZoomButtons?: boolean;
-
-        /** A set of properties for the streetside mode of the map. */
-        streetsideOptions?: IStreetsideOptions;
-
-        /** Additional support map types that should be added to the navigaiton bar such as canvasDark, canvasLight, and grayscale.*/
-        supportedMapTypes?: MapTypeId[];
-    }
-
-    /** A MapTypeChangeEventArgs object is returned by the map when using the mapTypeChanged event. */
-    export interface IMapTypeChangeEventArgs {
-        /** The map type that map has changed to. */
-        newMapTypeId: MapTypeId;
-
-        /** The map type that the map has changed from. */
-        oldMapTypeId: MapTypeId;
-
-        /** The map instance the event occured on */
-        target: Map;
-
-        /** The type of object the event was attached to. Should always be "map" */
-        targetType: string;
-    }
-
-    /** Interface for module options. */
-    export interface IModuleOptions {
-        /** A callback function that is fired after the module has loaded. */
-        callback?: () => void;
-
-        /** A function that is called if there is an error loading the module. */
-        errorCallback?: () => void;
-
-        /** A Bing Maps key that is used with the module when the module is loaded without a map. */
-        credentials?: string;
-    }
-
-    /** A MouseEventArgs object is returned by many the mouse event handlers. */
-    export interface IMouseEventArgs extends ILayerMouseEventArgs {
-        /** The event that occurred. */
-        eventName: string;
-
-        /** A boolean indicating if the primary button, such as the left mouse button or a tap on a touch screen, was used during a mouse down or up event. */
-        isPrimary: boolean;
-
-        /** A boolean indicating if the secondary mouse button, such as the right mouse button, was used during a mouse down or up event. */
-        isSecondary: boolean;
-
-        /** If the target is a shape, this will be the layer that the shape is in. */
-        layer: Layer;
-
-        /** The map location of where the event occurred. */
-        location: Location;
-
-        /** The x-value of the pixel coordinate on the page of the mouse cursor. */
-        pageX: number;
-
-        /** The y-value of the pixel coordinate on the page of the mouse cursor. */
-        pageY: number;
-
-        /** The pixel coordinate of the mouse cusrsor relative to the top left corner of the map div. */
-        point: Point;
-
-        /** The object that triggered the event. */
-        target: Map | IPrimitive;
-
-        /** The type of the object that the event is attached to. Valid values include the following: �map�, 'layer', �polygon�, �polyline�, or �pushpin� */
-        targetType: string;
-
-        /**
-        * Returns the x-value of the pixel coordinate, relative to the map, of the mouse.
-        * @returns The x-value of the pixel coordinate, relative to the map, of the mouse.
-        */
-        getX(): number;
-
-        /**
-        * Returns the y-value of the pixel coordinate, relative to the map, of the mouse.
-        * @returns The y-value of the pixel coordinate, relative to the map, of the mouse.
-        */
-        getY(): number;
-    }
-
-    /**
-     * An object tthat contains information about a streetside scene.
-     */
-    export interface IPanoramaInfo {
-        /** The capture date of the streetside scene. */
-        cd?: string;
-    }
-
-    /**
-    * All shapes; Pushpins, Polylines and Polygons, derive from the IPrimitive interface. This means that they can be
-    * passed into any function that takes in an IPrimitive object. Also, any function that returns an IPrimitive is capable
-    * of returning any of these shapes.
-    */
-    export interface IPrimitive {
-        /** Optional property to store any additional metadata for this primitive. */
-        metadata?: any;
-
-        /**
-         * Gets the css cursor value when the primitive has events on it.
-         * @returns css cursor string when primitive has events on it.
-         */
-        getCursor(): string;
-
-        /**
-         * Gets whether the primitive is visible.
-         * @returns A boolean indicating whether the primitive is visible or not.
-         */
-        getVisible(): boolean;
-
-        /**
-        * Sets the options for customizing the IPrimitive.
-        * @param options The options for customizing the IPrimitive.
-        */
-        setOptions(options: IPrimitiveOptions): void;
-    }
-
-    /**  A IPrimitiveChangedEventArgs object is returned by the changed event on IPrimitive shapes. */
-    export interface IPrimitiveChangedEventArgs {
-        /** The IPrimitive shape the event occured on. */
-        sender: IPrimitive;
-
-        /** The name of the change that occured; 'locations' or 'options'. */
-        name: string;
-    }
-
-    /** Options used for customizing IPrimitive objects. */
-    export interface IPrimitiveOptions {
-        /** The css cursor to show when the IPrimitive has mouse events on it. Default value is pointer (hand). */
-        cursor?: string;
-
-        /** Boolean indicating whether the IPrimitive is visible. */
-        visible?: boolean;
-    }
-
-    /** Options used for customizing Polylines. */
-    export interface IPolylineOptions extends IPrimitiveOptions {
-        /** Indicates if drawn shape should be generalized based on the zoom level to improve rendering performance. Default true **/
-        generalizable?: boolean;
-
-        /** CSS string or Color object as the poly's color. */
-        strokeColor?: string | Color;
-
-        /** An array of numbers separated by spaces, or a string separated by spaces/commas specifying the repetitive stroke pattern. */
-        strokeDashArray?: number[] | string;
-
-        /** The thickness of the poly stroke. */
-        strokeThickness?: number;
-    }
-
-    /** Options used for customizing Polygons. */
-    export interface IPolygonOptions extends IPolylineOptions {
-        /** CSS string or Color object as the polygon's filling color. */
-        fillColor?: string | Color;
-    }
-
-    /** Options used for customizing Pushpins. */
-    export interface IPushpinOptions extends IPrimitiveOptions {
-        /** The point on the pushpin icon, in pixels, which is anchored to the pushpin location. An anchor of (0,0) is the top left corner of the icon. */
-        anchor?: Point;
-
-        /** Specifies what color to make the default pushpin. */
-        color?: string | Color;
-
-        /** A boolean indicating whether the pushpin can be dragged to a new position with the mouse or by touch. */
-        draggable?: boolean;
-
-        /** Specifies whether to enable the clicked style on the pushpin. */
-        enableClickedStyle?: boolean;
-
-        /** Specifies whether to enable the hover style on the pushpin. */
-        enableHoverStyle?: boolean;
-
-        /**
-        * Defines the the icon to use for the pushpin.This can be a URL to an Image or SVG file, an image data URI, or an inline SVG string.
-        * Tip: When using inline SVG, you can pass in placeholders `{color}` and `{text}` in your SVG string. This placeholder will be replaced by the pushpins color or text property value when rendered.
-        */
-        icon?: string;
-
-        /** Whether the clickable area of pushpin should be an ellipse instead of a rectangle. */
-        roundClickableArea?: boolean;
-
-        /**
-        * A secondary title label value to display under the pushpin. Uses label collision detection. This label automatically changes color between white
-        * and dark grey depending on which map style is selected. Requires the title label to be set.
-        */
-        subTitle?: string;
-
-        /**
-        * The title label value to display under the pushpin. This label automatically changes color between white and dark grey depending on which map
-        * style is selected. Pushpin Titles support label collision detection, as described below.
-        */
-        title?: string;
-
-        /** A short string of text that is overlaid on top of the pushpin. */
-        text?: string;
-
-        /** The amount the text is shifted from the pushpin icon. The default value is (0,5). */
-        textOffset?: Point;
-    }
-
-    /** An object that represents a min and max value range. */
-    export interface IRange {
-        /** The minimum value. */
-        min: number;
-
-        /** The maximum value. */
-        max: number;
-    }
-
-    /** The options that can be used to customize how the streetside map mode is displayed to the user. */
-    export interface IStreetsideOptions {
-        /** A boolean indicating if the ability to navigate between image bubbles should be disabled in streetside map mode. Default: false */
-        disablePanoramaNavigation?: boolean;
-
-        /** The location that the streetside panorama should be looking towards. This can be used instead of a heading. */
-        locationToLookAt?: Location;
-
-        /** A callback function that is triggered after the streetside view has not loaded successfully. */
-        onErrorLoading?: () => void;
-
-        /** A callback function that is triggered after the streetside view has loaded successfully. */
-        onSuccessLoading?: () => void;
-
-        /**
-        * Specifies how to render the overview map when in streetside mode.
-        * Default: Microsoft.Maps.OverviewMapMode.expanded
-        */
-        overviewMapMode?: OverviewMapMode;
-
-        /**
-        * Information for a streetside panorama scene to load.
-        */
-        panoramaInfo?: IPanoramaInfo;
-
-        /** The radius to search in for available streetside panoramas. */
-        panoramaLookupRadius?: number;
-
-        /** A boolean indicating if the current address being viewed should be hidden when in streetside map mode. Default: true */
-        showCurrentAddress?: boolean;
-
-        /** A boolean indicating if the exit button should be hidden when in streetside map mode. Default: true */
-        showExitButton?: boolean;
-
-        /** A boolean indicating if the heading compass button is hidden when in streetside map mode. Default: true */
-        showHeadingCompass?: boolean;
-
-        /** A boolean indicating if the link to report a problem with a streetside image is hidden when in streetside map mode. Default: true */
-        showProblemReporting?: boolean;
-
-        /** A boolean indicating if the zoom buttons should be displayed when in streetside map mode. Default: true */
-        showZoomButtons?: boolean;
-    }
-
-    /** Defines a set of styles for pushpins, polylines, and polygons. */
-    export interface IStylesOptions {
-        /** Sets the options for all pushpins. */
-        pushpinOptions?: IPushpinOptions;
-
-        /** Sets the options for all polylines. */
-        polylineOptions?: IPolylineOptions;
-
-        /** Sets the options for all polygons. */
-        polygonOptions?: IPolygonOptions;
-    }
-
-    /** Interface to specify style css while registering a module */
-    export interface IStyleUrl {
-        /** List of style css urls o be downloaded */
-        styleURLs: string[];
-    }
-
-    /** Represents options that can be used to customize a tile layer. */
-    export interface ITileLayerOptions {
-
-        /**
-        * The number of milliseconds allowed for the tile layer image download. If the timeout occurs before the image is fully
-        * downloaded, the map control considers the download a failure. The default value is 10000.
-        */
-        downloadTimeout?: number;
-
-        /** The tile source for the tile layer. */
-        mercator: TileSource;
-
-        /** The opacity of the tile layer, defined by a number between 0 (not visible) and 1. */
-        opacity?: number;
-
-        /**
-        * A boolean indicating whether to show or hide the tile layer. The default value is true. A value of false indicates that
-        * the tile layer is hidden, although it is still an entity on the map.
-        */
-        visible?: boolean;
-
-        /** The z-index of the tile layer. */
-        zIndex?: number;
-    }
-
-    /** Represents options that can be used to define a tile source. */
-    export interface ITileSourceOptions {
-        /**
-        * A bounding box that specifies where tiles are available.
-        * Note: This will not crop tiles to the specific bounding box, it limits the tiles it loads to those that intersect this bounding box.
-        */
-        bounds?: LocationRect;
-
-        /** The maximum zoom level tiles that tiles should be rendered at. */
-        maxZoom?: number;
-
-        /** The minimum zoom level tiles that tiles should be rendered at. */
-        minZoom?: number;
-
-        /**
-        * Required. This can be a string or a callback function that constructs the URLs used to retrieve tiles from the tile source.
-        * When using a string, the uriConstructor will allow you to specify placeholders that will be replaced with the tiles value (i.e. {quadkey}).
-        * See the Tile URL Parameters section for a list of supported parameters.
-        * Besides using formatted tile URLs, you can also specify a callback function as the uriConstructor. This is useful if you need to be able to
-        * build custom tile URL�s that may require some additional calculations for a tile.
-        */
-        uriConstructor: string | ((tile: PyramidTileId) => string);
-    }
-
-    /** Represents options that can be used to set the view of the map. */
-    export interface IViewOptions {
-        /** The bounding rectangle of the map view. If both bounds and center are specified, bounds takes precedence over center. */
-        bounds?: LocationRect;
-
-        /** The location of the center of the map view. If both bounds and center are specified, bounds takes precedence over center. */
-        center?: Location;
-
-        /**
-        * The directional heading of the map. The heading is represented in geometric degrees with 0 or 360 = North, 90 = East,
-        * 180 = South, and 270 = West.
-        */
-        heading?: number;
-
-        /** Indicates how the map labels are displayed. */
-        labelOverlay?: LabelOverlay;
-
-        /** The map type of the view. */
-        mapTypeId?: MapTypeId;
-
-        /** The amount of padding in pixels to be added to each side of the bounds of the map view. */
-        padding?: number;
-
-        /** The angle relative to the horizon to tilt a streetside panorama image. */
-        pitch?: number;
-
-        /** The zoom level of the map view. */
-        zoom?: number;
-    }
-
-    //////////////////////////////////////////////
-    /// Modular Framework
-    //////////////////////////////////////////////
-
-    /**
-     * Loads the specified registered module, making its functionality available. You can provide the name of a single module or an array of names in.
-     * Options or a callback function that is called when the module is loaded can be specified.
-     * @param moduleName Name of the module to load. Can be the name of a custom module or a built in module name. Built in modules:
-     * Microsoft.Maps.Autosuggest, Microsoft.Maps.Clustering, Microsoft.Maps.Directions, Microsoft.Maps.DrawingTools, Microsoft.Maps.GeoJSON,
-     * Microsoft.Maps.HeatMap, Microsoft.Maps.Search, Microsoft.Maps.SpatialDataService, Microsoft.Maps.SpatialMath, Microsoft.Maps.Traffic,
-     * Microsoft.Maps.WellKnownText
-     * @param options A callback function or options containing additional information and a callback to call once a module is loaded
-     */
-    export function loadModule(moduleName: string | string[], options?: (() => void) | IModuleOptions): void;
-
-    /**
-     * Registers a module with the map control. The name of the module is specified in moduleKey, the module script is defined in scriptURL, and the
-     * options provides the location of a *.css file to load with the module.
-     * @param moduleName Name of the module to load.
-     * @param url Url to where the module code is located.
-     * @param styles List of css files to download.
-     */
-    export function registerModule(moduleName: string, url: string, styles?: IStyleUrl): void;
-
-    /**
-     * Signals that the specified module has been loaded and if specified, calls the callback function in loadModule. Call this method at the end of your custom module script.
-     * @param moduleName Name of the module that is loaded.
-     */
-    export function moduleLoaded(moduleName: string): void;
-
-    //////////////////////////////////////////////
-    /// Classes
-    //////////////////////////////////////////////
-
-    /**
-     * Provides a layer which can smoothly animate through an array of tile layer sources.
-     */
-    export class AnimatedTileLayer {
-        /**
-         * @contstructor
-         * @param options Options that define how to animate between the specified tile layers.
-         */
-        constructor(options?: IAnimatedTileLayerOptions);
-
-        /**
-        * Gets the frame rate of this animated tile layer.
-        * @returns The frame rate of this animated tile layer.
-        **/
-        public getFrameRate(): number;
-
-        /**
-        * Gets the loading screen overlay when tiles are being fetched.
-        * @returns The loading screen overlay when tiles are being fetched.
-        **/
-        public getLoadingScreen(): CustomOverlay;
-
-        /**
-        * Gets the maximum total tile fetching time of this animated tile layer.
-        * @returns The maximum total tile fetching time of this animated tile layer
-        **/
-        public getMaxTotalLoadTime(): number;
-
-        /**
-        * Gets the tile sources associated with this layer.
-        * @returns The tile sources associated with this layer.
-        **/
-        public getTileSources(): TileSource[];
-
-        /**
-        * Gets the visibility of this animated tile layer.
-        * @returns The visibility of this animated tile layer.
-        **/
-        public getVisible(): boolean;
-
-        /** Pause the tile layer animation. **/
-        public pause(): void;
-
-        /** Play the animation either from start or where it was paused. **/
-        public play(): void;
-
-        /**
-        * Sets the options for the animated tile layer.
-        * @params Options that define how to animate between the specified tile layers.
-        **/
-        public setOptions(options: IAnimatedTileLayerOptions): void;
-
-        /** Stop the layer animation, hide layer, and reset frame to the beginning. **/
-        public stop(): void;
-    }
-
-    /** Class that represents a color */
-    export class Color {
-        /** The opacity of the color. The range of valid values are an interger between 0 and 255, or a decimal between 0 and 1. */
-        public a: number;
-
-        /** The red value of the color. The range of valid values is 0 to 255 */
-        public r: number;
-
-        /** The green value of the color. The range of valid values is 0 to 255 */
-        public g: number;
-
-        /** The blue value of the color. The range of valid values is 0 to 255 */
-        public b: number;
-
-        /**
-         * @constructor
-         * @param a The alpha value in argb format
-         * @param r The r value in argb format
-         * @param g The g value in argb format
-         * @param b The b value in argb format
-         */
-        constructor(a: number, r: number, g: number, b: number);
-
-        /**
-         * Clones the color.
-         * @param color The color class that needs to be clones.
-         * @returns The colne of the color.
-         */
-        public static clone(color: Color): Color;
-
-        /**
-         * Creates the color from a hex string.
-         * @param hex The color represented as '#rrggbb' format.
-         * @returns The color object.
-         */
-        public static fromHex(hex: string): Color;
-
-        /**
-         * Clones the color.
-         * @returns The clone of the color.
-         */
-        public clone(): Color;
-
-        /**
-         * Gets the opacity of this color.
-         * @returns The opacity between 0 and 1 of this color.
-         */
-        public getOpacity(): number;
-
-        /**
-         * Converts the color to hex notation.
-         * @returns The hex notation as '#rrggbb' (ignores a).
-         */
-        public toHex(): string;
-
-        /**
-         * Converts the color to rgba notation.
-         * @returns The rgba notation as rgba(rr, gg, bb, aa)
-         */
-        public toRgba(): string;
-    }
-
-    /**
-     * You can use this class to create custom overlays on top of the map. These can be static overlays such as custom
-     * navigation bars, or dynamic overlays such as custom visualization layers. CustomOverlays can be added to the map
-     * just like any other layer using the map.layers property.
-     */
-    export class CustomOverlay implements ILayer {
-        /** A reference the the map instance that the overlay was added to. This will be null until the onLoad function has fired. **/
-        _map: Map;
-
-        /**
-         * @constructor
-         * @param options The options to use when initializing the custom overlay.
-         */
-        constructor(options?: ICustomOverlayOptions);
-
-        /**
-         * Gets the html element of this custom overlay.
-         * @returns The htmlElement of this overlay.
-         */
-        public getHtmlElement(): HTMLElement;
-
-        /**
-         * Gets the map that this overlay is attached to.
-         * @returns The map that this overlay is attached to.
-         */
-        public getMap(): Map;
-
-        /**
-         * Updates the html element of this custom overlay.
-         * @param htmlElement The new htmlElement to set for the overlay.
-         */
-        public setHtmlElement(htmlElement: HTMLElement): void;
-
-        /**
-         * Implement this method to perform any task that should be done when the overlay is added to the map.
-         */
-        public onAdd(): void;
-
-        /**
-         * Implement this methof to perform any task that should be done after the overlay has been added to the map.
-         */
-        public onRemove(): void;
-
-        /**
-         * Implement this method to perform any tasks that should be done when the overlay is removed from the map.
-         */
-        public onLoad(): void;
-    }
-
-    /**
-     * Use the Layer class.
-     * @deprecated in V8
-     */
-    export class EntityCollection extends Layer {
-        /**
-         * @constructor Deprecated. Use the Layer class.
-         * @deprecated in V8
-         */
-        constructor();
-
-        /**
-         * Removes all shapes from the collection.
-         */
-        public clear(): void;
-
-        /**
-         * Gets the item at a specified index.
-         * @param index Index of the item to get.
-         * @returns The item at a specified index.
-         */
-        public get(index: number): IPrimitive;
-
-        /**
-         * Gets the number of items in this collection.
-         * @returns The count of the items.
-         */
-        public getLength(): number;
-
-        /**
-         * Gets the index of the item in the list.
-         * @param primitive The item to get the index of.
-         * @returns The index of the item in the list.
-         */
-        public indexOf(primitive: IPrimitive): number;
-
-        /**
-        * Inserts the item into the list at a specific index.
-        * @param primitive The item to insert.
-        * @param index Index of the item to be inserted.
-        */
-        public insert(primitive: IPrimitive, index: number): void;
-
-        /**
-         * Returns the last element in the list after removing it.
-         * @returns The last element in the list after removing it.
-         */
-        public pop(): IPrimitive;
-
-        /**
-         * Adds the item to the end of the list.
-         * @param primitive Item to be added.
-         */
-        public push(primitive: IPrimitive | IPrimitive[]): void;
-
-        /**
-         * Removes the item from the list.
-         * @param primitive Item to be removed.
-         * @returns The item to be removed.
-         */
-        public remove(primitive: IPrimitive): IPrimitive;
-
-        /**
-         * Removes the item from the list at a specified index.
-         * @param index Index of the item that needs to be removed.
-         * @returns The item to be removed at a specified index.
-         */
-        public removeAt(index: number): IPrimitive;
-    }
-
-    /** A static class that manages events within the map SDK. */
-    export module Events {
-        /////////////////////////////////////
-        /// addHandler Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported events:
-         * click, dblclick, maptypechanged, mousedown, mousemove, mouseout, mouseover, mouseup, mousewheel, rightclick, viewchange, viewchangeend, viewchangestart
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: Map, eventName: string, handler: (eventArg?: IMouseEventArgs | IMapTypeChangeEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, drag, dragend, dragstart, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: Pushpin, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): IHandlerId;
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * changed, click, dblclick, mousedown, mouseout, mouseover, mouseup
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: Polyline | Polygon, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, infoboxChanged, mouseenter, mouseleave
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, dblclick, mousedown, mouseout, mouseover, mouseup, rightclick
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: Layer, eventName: string, handler: (eventArg?: IMouseEventArgs) => void): IHandlerId;
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * � entityadded
-        * � entityremoved
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: EntityCollection, eventName: string, handler: (eventArg?: IEntityCollectionChangedEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach.
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: any, eventName: string, handler: (eventArg?: any) => void): IHandlerId;
-
-        /////////////////////////////////////
-        /// addOne Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported events:
-         * click, dblclick, maptypechanged, mousedown, mousemove, mouseout, mouseover, mouseup, mousewheel, rightclick, viewchange, viewchangeend, viewchangestart
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Map, eventName: string, handler: (eventArg?: IMouseEventArgs | IMapTypeChangeEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, drag, dragend, dragstart, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Pushpin, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Polyline | Polygon, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, infoboxChanged, mouseenter, mouseleave
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, dblclick, mousedown, mouseout, mouseover, mouseup, rightclick
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Layer, eventName: string, handler: (eventArg?: IMouseEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * � entityadded
-         * � entityremoved
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: EntityCollection, eventName: string, handler: (eventArg?: IEntityCollectionChangedEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach.
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: any, eventName: string, handler: (eventArg?: any) => void): void;
-
-        /////////////////////////////////////
-        /// addThrottledHandler Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported events:
-         * click, dblclick, maptypechanged, mousedown, mousemove, mouseout, mouseover, mouseup, mousewheel, rightclick, viewchange, viewchangeend, viewchangestart
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Map, eventName: string, handler: (eventArg?: IMouseEventArgs | IMapTypeChangeEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, drag, dragend, dragstart, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Pushpin, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Polyline | Polygon, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-        * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * click, infoboxChanged, mouseenter, mouseleave
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addThrottledHandler(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, dblclick, mousedown, mouseout, mouseover, mouseup, rightclick
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Layer, eventName: string, handler: (eventArg?: IMouseEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * � entityadded
-         * � entityremoved
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: EntityCollection, eventName: string, handler: (eventArg?: IEntityCollectionChangedEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach.
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: any, eventName: string, handler: (eventArg?: any) => void, throttleInterval: number): IHandlerId;
-
-        /////////////////////////////////////
-        /// All other definitions
-        ////////////////////////////////////
-
-        /**
-         * Checks if the target has any attached event handler.
-         * @param target The object to check if an event is attached to it.
-         * @param eventName The name of the event to check to see is attached.
-         * @returns A boolean indicating if the specified event type is attached to the object.
-         */
-        export function hasHandler(target: any, eventName: string): boolean;
-
-        /**
-         * Invokes an event on the target. This causes all handlers for the specified event name to be called.
-         * @param target The object to invoke the event on.
-         * @param eventName The name of the event to invoke.
-         * @param args Arguments for the event handler.
-         */
-        export function invoke(target: any, evenName: string, args: any): void;
-
-        /**
-         * Detaches the specified handler from the event. The handlerId is returned by the addHandler and addThrottledHandler methods.
-         * @param handlerId The handler id of the event to remove.
-         */
-        export function removeHandler(handlerId: IHandlerId): void;
-    }
-
-    /**
-     * Standard compass headings; north, south, east, west.
-     */
-    export class Heading {
-        /** A heading pointing north, 0 degrees. */
-        static North: number;
-
-        /** A heading pointing south, 180 degrees. */
-        static South: number;
-
-        /** A heading pointing east, 90 degrees. */
-        static East: number;
-
-        /** A heading pointing west, 270 degrees. */
-        static West: number;
-    }
-
-    /**
-    * An infobox, also sometimes refer to as an info window or popup, is a simple panel that displays information over top the map. This is
-    * often used to display information linked to a location after clicking on a pushpin.
-    */
-    export class Infobox {
-
-        /**
-         * @constructor
-         * @param location The location to display the infobox at.
-         * @param options Options for rendering the infobox.
-         */
-        constructor(location: Location, options?: IInfoboxOptions);
-
-        /**
-        * @deprecated Use HTML buttons and links in description instead.
-        */
-        public getActions(): IInfoboxActions[];
-
-        /**
-        * Gets the point on the infobox which is anchored to the map. An anchor of (0,0) is the top left corner of the infobox.
-        * @returns The anchor point of the infobox.
-        */
-        public getAnchor(): Point;
-
-        /**
-        * Gets the string that is printed inside the infobox.
-        * @returns The description value of the infobox options.
-        */
-        public getDescription(): string;
-
-        /**
-        * Gets the height of the infobox.
-        * @returns The height of the infobox.
-        */
-        public getHeight(): number;
-
-        /**
-        * Gets the infobox as HTML.
-        * @returns The HTML string used to create a custom infobox.
-        */
-        public getHtmlContent(): string;
-
-        /**
-        * Gets the location on the map where the infobox�s anchor is attached.
-        * @returns The location of the infobox.
-        */
-        public getLocation(): Location;
-
-        /**
-         * Gets the maximium height setting for the infobox.
-         * @returns the maximium height setting for the infobox.
-         */
-        public getMaxHeight(): number;
-
-        /**
-         * Gets the maximium width setting for the infobox.
-         * @returns the maximium width setting for the infobox.
-         */
-        public getMaxWidth(): number;
-
-        /**
-        * Gets the amount the infobox pointer is shifted from the location of the infobox, or if showPointer is false, then it is the amount the infobox
-        * bottom left edge is shifted from the location of the infobox. The default value is (0,0), which means there is no offset.
-        * @returns The offset of the infobox.
-        */
-        public getOffset(): Point;
-
-        /**
-        * Gets the infobox options.
-        * @returns The infobox options currently used by the infobox.
-        */
-        public getOptions(): IInfoboxOptions;
-
-        /**
-        * Gets a boolean indicating whether the infobox close button is shown.
-        * @returns A boolean indicating if the close button is shown or not.
-        */
-        public getShowCloseButton(): boolean;
-
-        /**
-        * Gets a boolean indicating whether the infobox is drawn with a pointer.
-        * @returns A boolean indicating if the pointer of the infobox is shown or not.
-        */
-        public getShowPointer(): boolean;
-
-        /**
-        * Gets a string that is the title of the infobox.
-        * @returns The title property of the infobox.
-        */
-        public getTitle(): string;
-
-        /**
-        * Gets whether the infobox is visible. A value of false indicates that the infobox is hidden, although it is still an entity on the map.
-        * @returns A boolean indicating if the infobox is visible or not.
-        */
-        public getVisible(): boolean;
-
-        /**
-        * Gets the width of the infobox.
-        * @returns The width of the infobox.
-        */
-        public getWidth(): number;
-
-        /**
-        * Gets the z-index of the infobox.
-        * @returns The z-index of the infobox.
-        */
-        public getZIndex(): number;
-
-        /**
-        * Sets the HTML content of the infobox. You can use this method to change the look of the infobox. Note that infobox options are ignored if
-        * custom HTML is set. Also, when custom HTML is used to represent the infobox, the infobox is anchored at the bottom-left corner.
-        * @param content The HTML string to use to generate the infobox.
-        */
-        public setHtmlContent(content: string): void;
-
-        /**
-        * Sets the location on the map where the anchor of the infobox is attached.
-        * @param loc The location to display the infobox at.
-        */
-        public setLocation(loc: Location): void;
-
-        /**
-         * Adds the infobox to the map. To remove an Infobox from the map, simply pass null into this function.
-         * @param map A map instance to display the infoboox on, or null if removing infobox from map.
-         */
-        public setMap(map: Map): void;
-
-        /**
-        * Sets options for the infobox.
-        * @param options The options to assign to the infobox.
-        */
-        public setOptions(options: IInfoboxOptions): void;
-    }
-
-    /**
-    * The Layer class makes it easy to organize groups of data by storing them in separate layers on the map. Grouping your data into layers
-    * provides a number of benefits such as the ability to hide or attach events to all IPrimitive shapes in a layer with a single line of code,
-    * while also providing providing a performance benefit over manually looping through each shape and performing these tasks.
-    */
-    export class Layer implements IDataLayer {
-
-        /** Optional property to store any additional metadata for this layer. */
-        public metadata: any;
-
-        /**
-         * @constructor
-         * @param id Unique string identifier for the layer.
-         */
-        constructor(id?: string);
-
-        /**
-         * Adds a shapes to the layer, at the specified index if specified.
-         * @param primitive The shape(s) to be added to the layer.
-         * @param index The index at which to insert the shape into the layer.
-         */
-        public add(primitive: IPrimitive | IPrimitive[], index?: number): void;
-
-        /**
-         * Clears all the data
-         */
-        public clear(): void;
-
-        /**
-         * Cleans up any resources this object is consuming
-         */
-        public dispose(): void;
-
-        /**
-         * Gets the id of the layer.
-         * @returns The id assigned to the layer.
-         */
-        public getId(): string;
-
-        /**
-        * Gets an array of shapes that are in the layer. This can be used to iterate over the individual shapes.
-        * @returns An array of shapes that are in the layer.
-        */
-        public getPrimitives(): IPrimitive[];
-
-        /**
-         * Gets a value indicating whether the layer is visible or not.
-         * @returns A boolean indicating if the layer is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-         * Gets the zIndex of the layer.
-         * @returns The zIndex of the layer.
-         */
-        public getZIndex(): number;
-
-        /**
-         * Removes a primitive
-         * @param primitive primitive that needs to be removed
-         * @returns The primitive that needs to be removed
-         */
-        public remove(primitive: IPrimitive): IPrimitive;
-
-        /**
-         * Removes a primitive at a specified index
-         * @param index index of the primitive that needs to be removed
-         * @returns The primitive that needs to be removed at this index
-         */
-        public removeAt(index: number): IPrimitive;
-
-        /**
-         * Replaces all shapes in the layer with the new array of shapes that have been provided.
-         * @param primitives The array of shapes to add to the layer.
-         */
-        public setPrimitives(primitives: IPrimitive[]): void;
-
-        /**
-         * Sets whether the layer is visible or not.
-         * @param value A value indicating if the layer should be displayed or not.
-         */
-        public setVisible(value: boolean): void;
-
-        /**
-         * Sets the zIndex of the layer.
-         * @param zIndex The zIndex value to assign to the layer.
-         */
-        public setZIndex(zIndex: number): void;
-    }
-
-    /**
-    * The layers property of the map is a LayerCollection object and contains all the layers that have been added to the map.
-    * Note: This class is only exposed in the map.layers property. No other instance of this class can be created.
-    */
-    export class LayerCollection extends Array {
-        /** The number of layers in the collection. */
-        public length: number;
-
-        /**
-        * Removes all layers from the map.
-        */
-        public clear(): void;
-
-        /**
-        * Gets the index of a layer in the collection.
-        * @param layer The layer to get the index of.
-        * @returns The index of the specified layer.
-        */
-        public indexOf(layer: ILayer): number;
-
-        /**
-        * Adds a layer to the map.
-        * @param layer The layer to insert into the collection.
-        */
-        public insert(layer: ILayer): void;
-
-        /**
-        * Adds an array of layers to the map.
-        * @param layers The layers to insert into the collection.
-        */
-        public insertAll(layers: ILayer[]): void;
-
-        /**
-        * Removes a layer from the map.
-        * @param layer The layer to remove from the collection.
-        */
-        public remove(layer: ILayer): void;
-
-        /**
-        * Removes a layer from the map at the specified index in the collection.
-        * @param idx The index of the layer to remove.
-        */
-        public removeAt(idx: number): void;
-    }
-
-    /**
-  * This class stores the coordinate information needed to mark locations on a map. The Location class consists of two properties:
-  * latitude and longitude.
-  */
-    export class Location {
-        /** The location north or south of the equator from +90 to -90 */
-        public latitude: number;
-
-        /** The location east or west of the prime meridian +180 to -180 */
-        public longitude: number;
-
-        /**
-        * @constructor
-        * @param latitude The location north or south of the equator from +90 to -90
-        * @param longitude The location east or west of the prime meridian +180 to -180
-        */
-        constructor(latitude: any, longitude: any);
-
-        /**
-        * Determines if two locations are equal.
-        * @param location1 The first location to test.
-        * @param location2 The second location to test.
-        * @returns True if both locations are equivalent.
-        */
-        static areEqual(location1: Location, location2: Location): boolean;
-
-        /**
-        * Creates a deep copy of the map location.
-        * @returns A deep copy of the map location.
-        */
-        public clone(): Location;
-
-        /**
-        * Creates a proper Location from an object that has the same signature.
-        * @param source A Location or Location-like object that contains the same properties.
-        * @returns A copy of the map location.
-        */
-        static cloneFrom(source: Location): Location;
-
-        /**
-        * Normalizes the longitude by wrapping it around the earth.
-        * @param longitude The input longitude.
-        * @returns The longitude normalized to within -180 and +180.
-        */
-        static normalizeLongitude(longitude: number): number;
-
-        /**
-        * Parses a location string of the form "lat,long".
-        * @param str The location string.
-        * @returns The parsed location or null otherwise.
-        */
-        static parseLatLong(str: string): Location;
-
-        /**
-        * Converts the Location to a string representation.
-        * @returns A string representation of the location.
-        */
-        public toString(): string;
-    }
-
-    /**
-     * The LocationRect class, also known as a bounding box, consists of a set of coordinates that are used to represent rectangular area on the map.
-     */
-    export class LocationRect {
-        /** The location that defines the center of the rectangle. */
-        public center: Location;
-
-        /** The height, in degrees, of the rectangle. */
-        public height: number;
-
-        /** The width, in degrees, of the rectangle. */
-        public width: number;
-
-        /**
-        * @constructor
-        * @param center The center of the LocationRect.
-        * @param width The width of the LocationRect in degrees.
-        * @param height The height of the LocationRect in degrees.
-        */
-        constructor(center: Location, width: number, height: number);
-
-        /**
-        * Gets a LocationRect using the specified locations for the northwest and southeast corners.
-        * @param northwest The north west corner of the LocationRect.
-        * @param southeast The south east corner of the LocationRect.
-        * @returns A LocationRect using the specified locations for the northwest and southeast corners.
-        */
-        static fromCorners(northwest: Location, southeast: Location): LocationRect;
-
-        /**
-        * Gets a LocationRect using the specified northern and southern latitudes and western and eastern longitudes for the rectangle boundaries.
-        * @param north The northern latitude of the LocationRect.
-        * @param west The western longitude of the LocationRect.
-        * @param south The southern latitude of the LocationRect.
-        * @param east The eastern longitude of the LocationRect.
-        * @returns A LocationRect defined by the specified northern and southern latitudes and western and eastern longitudes for the rectangle boundaries.
-        */
-        static fromEdges(north: number, west: number, south: number, east: number): LocationRect;
-
-        /**
-        * Gets a LocationRect using a list of locations.
-        * @param locations A list of locations.
-        * @returns A LocationRect that encloses all the specified locations.
-        */
-        static fromLocations(...locations: Location[]): LocationRect;
-
-        /**
-        * Gets a LocationRect using an array of locations.
-        * @param locations An array of locations.
-        * @returns A LocationRect that encloses all the specified locations.
-        */
-        static fromLocations(locations: Location[]): LocationRect;
-
-        /**
-        * Creates a LocationRect from a string with the following format: "north,west,south,east". North, west, south and east specify the coordinate number values.
-        * @param str A string that repsents a LocationRect with the format "north,west,south,east".
-        * @returns A LocationRect defined by the specified northern and southern latitudes and western and eastern longitudes for the rectangle boundaries that have been parsed by the string.
-        */
-        static fromString(str: string): LocationRect;
-
-        /**
-        * Gets a copy of the LocationRect object.
-        * @retruns A copy of the LocationRect object.
-        */
-        public clone(): LocationRect;
-
-        /**
-        * Gets whether the specified Location is within the LocationRect.
-        * @returns A boolean indicating if a location is within a LocationRect.
-        */
-        public contains(location: Location): boolean;
-
-        /**
-         * Determines if the LocationRect crosses the 180th meridian.
-         * @returns A boolean indicating if the LocationRect crosses the international date line (-180/180 degrees longitude).
-         */
-        public crossesInternationalDateLine(): boolean;
-
-        /**
-        * Gets the longitude that defines the eastern edge of the LocationRect.
-        * @returns The eastern longitude value of the LocationRect.
-        */
-        public getEast(): number;
-
-        /**
-        * Gets the latitude that defines the northern edge of the LocationRect.
-        * @returns The northern latitude value of the LocationRect.
-        */
-        public getNorth(): number;
-
-        /**
-        * Gets the Location that defines the northwest corner of the LocationRect.
-        * @returns The northwest corner location of the LocationRect.
-        */
-        public getNorthwest(): Location;
-
-        /**
-        * Gets the latitude that defines the southern edge of the LocationRect.
-        * @returns The southern latitude value of the LocationRect.
-        */
-        public getSouth(): number;
-
-        /**
-        * Gets the Location that defines the southeast corner of the LocationRect.
-        * @returns The southeast corner location of the LocationRect.
-        */
-        public getSoutheast(): Location;
-
-        /**
-        * Gets the latitude that defines the western edge of the LocationRect.
-        * @returns The western longitude value of the LocationRect.
-        */
-        public getWest(): number;
-
-        /**
-        * Gets whether the specified LocationRect intersects with this LocationRect.
-        * @param rect A second LocationRect to test for intersection with.
-        * @returns A boolean indicating if a second LocationRect interests with this LocationRect.
-        */
-        public intersects(rect: LocationRect): boolean;
-
-        /**
-         * Scales the size of a LocationRect by multiplying the width and height properties by a percentage.
-         * @param percentage A percentage value to increase the size of the LocationRect by.
-         */
-        public inflate(percentage: number): void;
-
-        /**
-         * If a LocationRect crosses the international date line, this method splits it into two LocationRect objects and returns them as an array.
-         * @returns An array of LocationRects, that are split by the international date line (-180/180 degrees longitude)
-         */
-        public splitByInternationalDateLine(): LocationRect[];
-
-        /**
-        * Converts the LocationRect object to a string.
-        * @returns A string version of the LocationRect.
-        */
-        public toString(): string;
-    }
-
-    /** The map object generates an interactive map within a specified DOM element. */
-    export class Map {
-        /** Entities of the map */
-        public entities: EntityCollection;
-
-        /** Set of map layers */
-        public layers: LayerCollection;
-
-        /**
-         * @constructor
-         * @param parentElement The parent element of the map as a CSS selector string or HTMLElement.
-         * @param options Options used when creating the map.
-         */
-        constructor(parentElement: string | HTMLElement, options: IMapLoadOptions);
-
-		/**
-		* Gets the streetside panorama information closest to the specified bounding box and returns using a success callback function.
-		* This information can then be used to set the map view to that streetside panorama.
-		*/
-        public static getClosestPanorama(bounds: LocationRect, success: (panoramaInfo: IPanoramaInfo) => void, missingCoverage: () => void): void;
-
-        /** Returns the branch name; release, experimental, frozen. */
-        public static getVersion(): string;
-
-
-        /** Deletes the Map object and releases any associated resources. */
-        public dispose(): void;
-
-        /**
-         * Gets the location rectangle that defines the boundaries of the current map view.
-         * @returns The location rectangle that defines the boundaries of the current map view.
-         */
-        public getBounds(): LocationRect;
-
-        /**
-         * Gets the location of the center of the current map view.
-         * @returns The location of the center of the current map view.
-         */
-        public getCenter(): Location;
-
-        /**
-          * Gets to the specified callback an array of strings representing the attributions of the imagery currently displayed on the map.
-          * @param callback The callback function that needs to be called after retrieving the copyright information.
-          */
-        public getCopyrights(callback: (copyrights: string[]) => void): void;
-
-        /**
-         * Gets the session ID. This method calls the callback function with the session ID as the first parameter
-         * @param callback The callback function that needs to be called with the session id.
-         */
-        public getCredentials(callback: (creds: string) => void): void;
-
-        /**
-         * Gets the current culture.
-         * @returns The current culture.
-         */
-        public getCulture(): string;
-
-        /**
-         * Gets the height of the map control.
-         * @returns The height of the map control.
-         */
-        public getHeight(): number;
-
-        /**
-         * Returns the heading of the current map view.
-         * @returns Returns the heading of the current map view.
-         */
-        public getHeading(): number;
-
-        /**
-         * Gets the string that represents the imagery currently displayed on the map.
-         * @returns The string that represents the imagery currently displayed on the map.
-         */
-        public getImageryId(): string;
-
-        /**
-         * Gets a string that represents the current map type displayed on the map.
-         * @returns A string that represents the current map type displayed on the map.
-         */
-        public getMapTypeId(): MapTypeId;
-
-        /**
-         * Gets the current scale in meters per pixel of the center of the map.
-         * @returns The current scale in meters per pixel of the center of the map.
-         */
-        public getMetersPerPixel(): number;
-
-        /**
-         * Gets the map options that have been set.
-         * @returns the map options that have been set.
-         */
-        public getOptions(): IMapOptions;
-
-        /**
-         * Gets the x coordinate of the top left corner of the map control, relative to the page.
-         * @returns The x coordinate of the top left corner of the map control, relative to the page.
-         */
-        public getPageX(): number;
-
-        /**
-         * Gets the y coordinate of the top left corner of the map control, relative to the page.
-         * @returns The y coordinate of the top left corner of the map control, relative to the page.
-         */
-        public getPageY(): number;
-
-        /**
-         * Returns the pitch of the current streetside map view.
-         * @returns Returns the pitch of the current streetside map view.
-         */
-        public getPitch(): number;
-
-        /**
-         * Gets the map root node.
-         * @returns the map root node.
-         */
-        public getRootElement(): HTMLElement;
-
-        /**
-         * Gets the user region.
-         * @returns The user region.
-         */
-        public getUserRegion(): string;
-
-        /**
-         * Gets the width of the map control.
-         * @returns the width of the map control.
-         */
-        public getWidth(): number;
-
-        /**
-         * Gets the zoom level of the current map view.
-         * @returns Returns the zoom level of the current map view.
-         */
-        public getZoom(): number;
-
-        /**
-         * Gets the range of valid zoom levels for the current map view.
-         * @returns The range of valid zoom levels for the current map view.
-         */
-        public getZoomRange(): IRange;
-
-        /**
-         * Gets a boolean indicating whether the map is in a regular Mercator nadir mode.
-         * @returns A boolean indicating whether the map is in a regular Mercator nadir mode.
-         */
-        public isMercator(): boolean;
-
-        /**
-         * Gets a boolean indicating if the current map type allows the heading to change; false if the display heading is fixed.
-         * @returns true if the current map type allows the heading to change; false if the display heading is fixed.
-         */
-        public isRotationEnabled(): boolean;
-
-        /**
-         * Sets the current map type.
-         * @param mapTypeId The map imagery type of the map to set.
-         */
-        public setMapType(mapTypeId: MapTypeId): void;
-
-        /**
-         * Sets the map options.
-         * @param options The map options to be set.
-         */
-        public setOptions(options: IMapOptions): void;
-
-        /**
-         * Sets the view of the map.
-         * @param viewOptions The view options to be set.
-         */
-        public setView(viewOptions: IViewOptions): void;
-
-        /**
-         * Converts a specified Location or a Location array to a Point or Point array on the map
-         * relative to the specified PixelReference. If no reference is specified, PixelReference.viewport
-         * is taken.
-         * @param location The given Location or Location[] to convert.
-         * @param reference The PixelReference to specify the reference point.
-         * @returns The converted Point or Point[], or null if the conversion fails.
-         */
-        public tryLocationToPixel(location: Location | Location[], reference?: any): Point | Point[];
-
-        /**
-         * Converts a specified Point or a Point array to a Location or Location array on the map
-         * relative to the specified PixelReference. If no reference is specified, PixelReference.viewport
-         * is taken.
-         * @param point The given Point or Point[] to convert.
-         * @param reference The PixelReference to specify the reference point.
-         * @returns The converted Location or Location[], or null if the conversion fails.
-         */
-        public tryPixelToLocation(point: Point | Point[], reference?: any): Location | Location[];
-    }
-
-    /**
-    * This class is used to represent a pixel coordinate or offset. This is often used by pushpin anchors, and map location to pixel conversion calculations.
-    */
-    export class Point {
-        /** The x coordinate */
-        public x: number;
-
-        /** The y coordinate */
-        public y: number;
-
-        /**
-        * @constructor
-        * @param x The x coordinate.
-        * @param y The y coordinate.
-        */
-        constructor(x: number, y: number);
-
-        /**
-        * Adds the x and y values of two points and returns a new Point.
-        * @param point The point to add.
-        * @returns A new point created by the sum of two points.
-        */
-        public add(point: Point): Point;
-
-        /**
-        * Creates a copy of the current point.
-        * @returns A new instance of the current point.
-        */
-        public clone(): Point;
-
-        /**
-        * Compares the x and y values of two points to see if they are equal. If a tolerance value is specified, it checks to see if the linear distance between the points is less than or equal to the tolerance value.
-        * @param point The point to compare to.
-        * @param tolerance Optional, tolerance (>= 0) to avoid false result because of floating point errors.
-        * @returns true if this point equals point, false otherwise
-        */
-        public equals(point: Point, tolerance?: number): boolean;
-
-        /**
-        * Subtracts the x and y values of a points and returns a new Point.
-        * @param point The point to subtract.
-        * @returns A new point created by the subtraction of two points.
-        */
-        public subtract(point: Point): Point;
-
-        /**
-        * Converts the Point to a string representation.
-        * @returns A string representation of the point.
-        */
-        public toString(): string;
-    }
-
-    /**
-   * This compression algorithm encodes/decodes an array of locations into a string.
-   * This algorithm is used for generating a compressed collection of locations for use
-   * with the Bing Maps REST Elevation Service. This algorithm is also used for decoding
-   * the compressed coordinates returned by the GeoData API.
-   *
-   * These algorithms come from the following documentation:
-   * http://msdn.microsoft.com/en-us/library/jj158958.aspx
-   * http://msdn.microsoft.com/en-us/library/dn306801.aspx
-   */
-    export class PointCompression {
-        /**
-        * Decodes a collection of locations from a compressed string.
-        * @param value Compressed string to decode.
-        * @returns An array of locations that have been decoded from the compressed string.
-        */
-        public static decode(value: string): Location[];
-
-        /**
-        * Compresses an array of locations into a string.
-        * @param locations Collection of coordinates to compress.
-        * @returns A compressed string representing an array of locations.
-        */
-        public static encode(locations: Location[]): string;
-    }
-
-    /**
-   * A polygon is an area defined by a closed ring of locations. A simple polygon consists of an array of Location objects that form a boundary.
-   * A complex polygon consists of several arrays of Locations, where the first array is the outline of the polygon, and the subsequent arrays are holes in the polygon.
-   * The Polygon class derives from the IPrimitive interface.
-   */
-    export class Polygon implements IPrimitive {
-        /**
-         * Information that is linked to the polygon.
-         * Some modules such as the GeoJSON, and Spatial Data Service modules will also often add information to this property.
-         */
-        public metadata: any;
-
-        /**
-         * @constructor
-         * @param rings A Location array for basic polygon with single outer perimeter,
-         * or an array of Location arrays for advanced polygon (multi-polygon, polygon with holes, or combination of polygons).
-         * @param options Options used to customize polygon.
-         */
-        constructor(rings: Location[] | Location[][], options?: IPolygonOptions);
-
-        /**
-         * Gets the css cursor value when polygon has events on it.
-         * @returns CSS cursor string when polygon has events on it.
-         */
-        public getCursor(): string;
-
-        /**
-        * Gets the fill color of the inside of the polygon. Will be string or Color object depending on the the what method was used in the pushpin options.
-        * @returns The fill color of the inside of the polygon.
-        */
-        public getFillColor(): string | Color;
-
-        /**
-         * Returns whether the polygon is generalizable based on zoom level or not.
-         * @returns whether the polygon is generalizable based on zoom level or not.
-         */
-        public getGeneralizable(): boolean;
-
-        /**
-         * Gets the first ring of the polygon (for V7 compatability).
-         * @returns An array of Locations that is the first ring of the polygon; or an empty array if the polygon has no ring at all.
-         */
-        public getLocations(): Location[];
-
-        /**
-         * Gets an array of location arrays, where each location array defines a ring of the polygon.
-         * @returns An array of location arrays, where each location array defines a ring of the polygon.
-         */
-        public getRings(): Location[][];
-
-        /**
-         * Gets the color of the border stroke of the polygon. Will be string or Color object depending on the the what method was used in the pushpin options.
-         * @returns The color of the border stroke of the polygon.
-         */
-        public getStrokeColor(): string | Color;
-
-        /**
-         * Gets the stroke dash array of the polygon, in format of either array or string, whichever user provides.
-         * @returns The stroke dash array of the polygon.
-         */
-        public getStrokeDashArray(): number[] | string;
-
-        /**
-         * Gets the thickness of the border stroke of the polygon.
-         * @returns The thickness of the border stroke of the polygon as a number.
-         */
-        public getStrokeThickness(): number;
-
-        /**
-         * Gets whether the polygon is visible.
-         * @returns A boolean indicating whether the polygon is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-         * Sets locations (single ring) of the polygon. (for V7 compatability)
-         * @param locations A Location[] that defines the only ring of the polygon
-         */
-        public setLocations(locations: Location[]): void;
-
-        /**
-         * Sets the properties for the polygon.
-         * @param options The IPolygonOptions object containing the options to customize the polygon.
-         */
-        public setOptions(options: IPolygonOptions): void;
-
-        /**
-         * Sets rings of the polygon.
-         * @param rings A Location[][] where each Location[] defines a ring of the polygon.
-         */
-        public setRings(rings: Location[] | Location[][]): void;
-    }
-
-    /**
-    * Polylines allow you to draw connected lines on a map. In many spatial database systems, this is also known as a LineString.
-    * The Polyline class derives from the IPrimitive interface.
-    */
-    export class Polyline implements IPrimitive {
-        /**
-         * Information that is linked to the polyline.
-         * Some modules such as the GeoJSON, and Spatial Data Service modules will also often add information to this property.
-         */
-        public metadata: any;
-
-        /**
-        * @constructor
-        * @param locations An array of locations that make up the path of the polyine.
-        * @param options Options used to customize polyline.
-        */
-        constructor(locations: Location[], options?: IPolylineOptions);
-
-        /**
-         * Gets the css cursor value when polyline has events on it.
-         * @returns CSS cursor string when polyline has events on it.
-         */
-        public getCursor(): string;
-
-        /**
-         * Returns whether the polyline is generalizable based on zoom level or not.
-         * @returns whether the polyline is generalizable based on zoom level or not.
-         */
-        public getGeneralizable(): boolean;
-
-        /**
-         * Gets the locations that make up the polyline.
-         * @returns An array that defines the path of the polyline.
-         */
-        public getLocations(): Location[];
-
-        /**
-         * Gets the color of the border stroke of the polyline. Will be string or Color object depending on the the what method was used in the polyline options.
-         * @returns The stroke color of the polyline.
-         */
-        public getStrokeColor(): string | Color;
-
-        /**
-         * Gets the stroke dash array of the polyline, in format of either array or string, whichever user provides.
-         * @returns The stroke dash array of the polyline.
-         */
-        public getStrokeDashArray(): number[] | string;
-
-        /**
-         * Gets the thickness of the border stroke of the polyline.
-         * @returns The thickness of the border stroke of the polyline as a number.
-         */
-        public getStrokeThickness(): number;
-
-        /**
-         * Gets whether the polyline is visible.
-         * @returns A boolean indicating whether the polyline is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-         * Sets locations of the polyline.
-         * @param locations A Location[] that defines path of the polyline
-         */
-        public setLocations(locations: Location[]): void;
-
-        /**
-         * Sets the properties for the polyline.
-         * @param options The IPolylineOptions object containing the options to customize the polyline.
-         */
-        public setOptions(options: IPolylineOptions): void;
-    }
-
-    /**
-    * Pushpins, sometimes also referred to as markers or MapIcons on other mapping platforms, are one of the primary ways of marking a location on a map.
-    * The Pushpin class derives from the IPrimitive interface.
-    */
-    export class Pushpin implements IPrimitive {
-
-        /**
-         * Information that is linked to the pushpin.
-         * Some modules such as the GeoJSON, and Spatial Data Service modules will also often add information to this property.
-         */
-        public metadata: any;
-
-        /**
-        * @constructor
-        * @param location A Location object that specifies where to display the pushpin.
-        * @param options Options used when creating the Pushpin.
-        */
-        constructor(location: Location, options?: IPushpinOptions);
-
-        /**
-         * Gets the point on the Pushpin icon which is anchored to the pushpin location.
-         * An anchor of (0,0) is the top left corner of the icon.
-         * @returns The point on the Pushpin icon which is anchored to the pushpin location.
-         */
-        public getAnchor(): Point;
-
-        /**
-         * Gets whether the pushpin clicked style is enabled
-         * @returns Whether the pushpin clicked style is enabled.
-         */
-        public getClickedStyleEnabled(): boolean;
-
-        /**
-         * Gets the color option of the pushpin.
-         * @returns The color option of the pushpin.
-         */
-        public getColor(): string | Color;
-
-        /**
-        * Gets the css cursor value when pushpin has events on it.
-        * @returns CSS cursor string when pushpin has events on it.
-        */
-        public getCursor(): string;
-
-        /**
-         * Gets a boolean indicating if the pushpin is draggable or not.
-         * @returns A boolean indicating if the pushpin is draggable or not.
-         */
-        public getDraggable(): boolean;
-
-        /**
-         * Gets whether the pushpin hover style is enabled
-         * @returns Whether the pushpin hover style is enabled.
-         */
-        public getHoverStyleEnabled(): boolean;
-
-        /**
-         * Gets the custom Pushpin source icon string which can be a url to an image or SVG, inline SVG string, or data URI.
-         * @returns the custom Pushpin icon source string, which can be a url to an image or SVG, inline SVG string, or data URI.
-         */
-        public getIcon(): string;
-
-        /**
-         * Returns the location of the pushpin.
-         * @returns The location of the pushpin.
-         */
-        public getLocation(): Location;
-
-        /**
-         * Returns whether the clickable area of the pushpin is an ellipse.
-         * @returns A boolean indicating whether the clickable area of the pushpin is an ellipse.
-         */
-        public getRoundClickableArea(): boolean;
-
-        /**
-         * Gets the subtitle label of the Pushpin.
-         * @returns The subtitle label of the Pushpin.
-         */
-        public getSubTitle(): string;
-
-        /**
-         * Gets the text within the Pushpin icon.
-         * @returns The text within the Pushpin icon.
-         */
-        public getText(): string;
-
-        /**
-         * Gets the amount the text is shifted from the Pushpin icon.
-         * @returns the amount the text is shifted from the Pushpin icon.
-         */
-        public getTextOffset(): Point;
-
-        /**
-         * Gets the title label of the Pushpin.
-         * @returns the title label of the Pushpin.
-         */
-        public getTitle(): string;
-
-        /**
-         * Gets whether the pushpin is visible.
-         * @returns A boolean indicating whether the pushpin is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-         * Sets the location of the Pushpin.
-         * @param location The location of the Pushpin.
-         */
-        public setLocation(location: Location): void;
-
-        /**
-         * Sets the properties for the pushpin.
-         * @param options The IPushpinOptions object containing the options to customize the pushpin.
-         */
-        public setOptions(options: IPushpinOptions): void;
-    }
-
-    /**
-    * Used to represent the location of a map tile in the quadkey tile pyramid system used by the map.
-    * If using a tile source where the uriConstructor property is set to a callback function, that callback function will recieve
-    * an instance of the PyramidTileId class.
-    */
-    export class PyramidTileId {
-        /** The height of the tile. */
-        public pixelHeight: number;
-
-        /** The width of the tile. */
-        public pixelWidth: number;
-
-        /** The quadkey ID of the tile. */
-        public quadKey: string;
-
-        /** The x tile coordinate. */
-        public x: number;
-
-        /** The y tile coordinate. */
-        public y: number;
-
-        /** The zoom level of the tile. */
-        public zoom: number;
-
-        /**
-         * @constructor
-         * @param x The integer x position of the tile within the tile layer at the specified zoom level.
-         * @param y The integer y position of the tile within the tile layer at the specified zoom level.
-         * @param zoom The zoom level of the tile.
-         * @param width The tile's width in pixels. Default value: 256
-         * @param height The tile's height in pixels. Default value: 256
-         */
-        constructor(x: number, y: number, zoom: number, width?: number, height?: number)
-
-        /**
-         * Compares two PyramidTileId objects and returns a boolean indicating if the two PyramidTileId are equal.
-         * @param tileId1 The first PyramidTileId to compare to the second.
-         * @param tileId2 The second PyramidTileId to compare to the first.
-         * @returns A boolean indicating if the two PyramidTileId are equal.
-         */
-        public static areEqual(tileId1: PyramidTileId, tileId2: PyramidTileId): boolean;
-
-        /**
-         * Generates a PyramidTileId from a quadkey tile id string.
-         * @param quadkey The quadkey tile id string to convert into a PyramidTileId object.
-         * @param width The tile's width in pixels. Default value: 256
-         * @param height The tile's height in pixels. Default value: 256
-         */
-        public static fromQuadKey(quadkey: string, width?: number, height?: number): PyramidTileId;
-    }
-
-    /** Provides static functions for generating random test data. */
-    export class TestDataGenerator {
-        /**
-        * Generates a random hex or rgba color string.
-        * @param withAlpha A boolean indicating if the color should have an alpha value or not. if set to true, a rgba value will be returned with an alpha value of 0.5.
-        * @returns A css color string, hex or rgba.
-        */
-        public static getColor(withAlpha?: boolean): string;
-
-        /**
-        * Generates random Location objects.
-        * @param num The number of locations to generate. If set to one a single Location will be returned. If greater than one and array will be returned.
-        * @param bounds The bounding box in which all the locations should fall within.
-        * @returns One or more random Locations.
-        */
-        public static getLocations(num?: number, bounds?: LocationRect): Location | Location[];
-
-        /**
-        * Generates random pushpins.
-        * @param num The number of pushpins to generate. If set to one a single Pushpin will be returned. If greater than one and array will be returned.
-        * @param bounds The bounding box in which all the pushpins should fall within.
-        * @param options The options to use for rendering the pushpins. Default is random.
-        * @returns One or more random Pushpins.
-        */
-        public static getPushpins(num?: number, bounds?: LocationRect, options?: IPushpinOptions): Pushpin | Pushpin[];
-
-        /**
-        * Generates random polylines.
-        * @param num The number of polylines to generate. If set to one a single Polyline will be returned. If greater than one and array will be returned.
-        * @param bounds The bounding box in which all the locations of the polylines should fall within.
-        * @param size The number of locations each polylines should have. Default: random between 3 and 10.
-        * @param scaleFactor A number that scales the size of the polylines based on size of the bounding box. A value of 0.1 would generate polylines that are no larger than 10% of the width/height of the map. Default: 0.1
-        * @param options The options to use for rendering the polylines. Default is random.
-        * @returns One or more random Polylines.
-        */
-        public static getPolylines(num?: number, bounds?: LocationRect, size?: number, scaleFactor?: number, options?: IPolylineOptions): Polyline | Polyline[];
-
-        /**
-        * Generates random polygons.
-        * @param num The number of polygons to generate. If set to one a single Polygon will be returned. If greater than one and array will be returned.
-        * @param bounds The bounding box in which all the locations of the polygon should fall within.
-        * @param size The number of locations each polygon should have. Default: random between 3 and 10.
-        * @param scaleFactor A number that scales the size of the polygons based on the size of the bounding box. A value of 0.1 would generate polygons that are no larger than 10% of the width/height of the map. Default: 0.1
-        * @param options The options to use for rendering the polygons. Default is random.
-        * @param addHole A boolean indicating if the generated polygon should have a hole or not. Note that this will double the number of Location objects that are in the Polygon. Default: false
-        * @returns One or more random polygons.
-        */
-        public static getPolygons(num?: number, bounds?: LocationRect, size?: number, scaleFactor?: number, options?: IPolygonOptions, addHole?: boolean): Polygon | Polygon[];
-    }
-
-    /** Represents a tile layer that can be overlaid on top of the map. */
-    export class TileLayer implements ILayer {
-        /**
-        * @constructor
-        * @param options The options to use to define the tile layer.
-        */
-        constructor(options: ITileLayerOptions);
-
-        /**
-        * Gets the opacity of the tile layer, defined as a double between 0 (not visible) and 1.
-        * @returns The opacity of the tile layer, defined as a double between 0 (not visible) and 1.
-        */
-        public getOpacity(): number;
-
-        /**
-        * Gets the tile source of the tile layer.
-        * @returns The tile source of the tile layer.
-        */
-        public getTileSource(): TileSource;
-
-        /**
-        * Gets a boolean that indicates if the tile layer is visible or not.
-        * @returns A boolean that indicates if the tile layer is visible or not.
-        */
-        public getVisible(): boolean;
-
-        /**
-        * Gets the zIndex of the tile layer.
-        * @returns The zIndex of the tile layer.
-        */
-        public getZIndex(): number;
-
-        /**
-        * Sets the opacity of the tile layer. Value must be a number between 0 and 1.
-        * @param opacity The opacity of the tile layer. Value must be a number between 0 and 1.
-        */
-        public setOpacity(opacity: number): void;
-
-        /**
-        * Sets options for the tile layer.
-        * @param options The options for the tile layer.
-        */
-        public setOptions(options: ITileLayerOptions): void;
-
-        /**
-        * Sets the visibility of the tile layer.
-        * @param show A boolean indicating if the tile layer should be visible or not.
-        */
-        public setVisible(show: boolean): void;
-
-        /**
-        * Sets the zIndex of the tile layer.
-        * @param idx The zIndex of the tile layer.
-        */
-        public setZIndex(idx: number): void;
-    }
-
-    /** Defines the data source for a tile layer. */
-    export class TileSource {
-        /**
-        * @constructor
-        * @param options The options to use to define the tile source.
-        */
-        constructor(options: ITileSourceOptions);
-
-        /**
-        * Gets the specified bounding box of the of the tile source.
-        * @returns The specified bounding box of the of the tile source.
-        */
-        public getBounds(): LocationRect;
-
-        /**
-        * Gets the pixel height of each tile in the tile source.
-        * @returns The pixel height of each tile in the tile source.
-        */
-        public getHeight(): number;
-
-        /**
-        * Gets the maximum zoom level specified for the tile source.
-        * @returns The maximum zoom level specified for the tile source.
-        */
-        public getMaxZoom(): number;
-
-        /**
-        * Gets the minimum zoom level specified for the tile source.
-        * @returns The minimum zoom level specified for the tile source.
-        */
-        public getMinZoom(): number;
-
-        /**
-        * Gets a string that constructs tile URLs used to retrieve tiles for the tile layer.
-        * @returns A string that constructs tile URLs used to retrieve tiles for the tile layer.
-        */
-        public getUriConstructor(): string | ((tile: PyramidTileId) => string);
-
-        /**
-        * Gets the pixel width of each tile in the tile source.
-        * @returns The pixel width of each tile in the tile source.
-        */
-        public getWidth(): number;
-    }
-}
diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index c7d1acc899..11d311a276 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -85,7 +85,7 @@ export class ECPair {
 
     static fromPublicKeyBuffer(buffer: Buffer, network: Network): ECPair;
 
-    static fromWIF(string: string, network: Network): ECPair;
+    static fromWIF(string: string, network?: Network): ECPair;
 
     static makeRandom(options?: { compressed?: boolean, network?: Network, rng?: Rng }): ECPair;
 }
diff --git a/types/boom/boom-tests.ts b/types/boom/boom-tests.ts
index 4d133b2545..5ffd808de4 100644
--- a/types/boom/boom-tests.ts
+++ b/types/boom/boom-tests.ts
@@ -1,10 +1,10 @@
-import Boom = require('boom');
+import * as Boom from 'boom';
 
 // 4xx and data type
 
 const badRequestError = Boom.badRequest('message', {some: 'data'});
 badRequestError.data.some;
-const badRequestError2: Boom.Boom = Boom.badImplementation('message');
+const badRequestError2: Boom = Boom.badImplementation('message');
 
 const unauthorizedError1 = Boom.unauthorized('message', 'scheme', {some: 'attribute'});
 unauthorizedError1.output.payload.attributes === { some: 'attribute', error: 'message' };
@@ -24,127 +24,131 @@ unauthorizedError4.output.headers === { 'WWW-Authenticate': 'scheme some="attrib
 
 const paymentRequiredError = Boom.paymentRequired('message', {some: 'data'});
 paymentRequiredError.data.some;
-const paymentRequiredError2: Boom.Boom = Boom.paymentRequired('message');
+const paymentRequiredError2: Boom = Boom.paymentRequired('message');
 
 const forbiddenError = Boom.forbidden('message', {some: 'data'});
 forbiddenError.data.some;
-const forbiddenError2: Boom.Boom = Boom.forbidden('message');
+const forbiddenError2: Boom = Boom.forbidden('message');
 
 const notFoundError = Boom.notFound('message', {some: 'data'});
 notFoundError.data.some;
-const notFoundError2: Boom.Boom = Boom.notFound('message');
+const notFoundError2: Boom = Boom.notFound('message');
 
 const methodNotAllowedError = Boom.methodNotAllowed('message', {some: 'data'});
 methodNotAllowedError.data.some;
-const methodNotAllowedError2: Boom.Boom = Boom.methodNotAllowed('message');
+const methodNotAllowedError2: Boom = Boom.methodNotAllowed('message');
 
 const notAcceptableError = Boom.notAcceptable('message', {some: 'data'});
 notAcceptableError.data.some;
-const notAcceptableError2: Boom.Boom = Boom.notAcceptable('message');
+const notAcceptableError2: Boom = Boom.notAcceptable('message');
 
 const proxyAuthRequiredError = Boom.proxyAuthRequired('message', {some: 'data'});
 proxyAuthRequiredError.data.some;
-const proxyAuthRequiredError2: Boom.Boom = Boom.proxyAuthRequired('message');
+const proxyAuthRequiredError2: Boom = Boom.proxyAuthRequired('message');
 
 const clientTimeoutError = Boom.clientTimeout('message', {some: 'data'});
 clientTimeoutError.data.some;
-const clientTimeoutError2: Boom.Boom = Boom.clientTimeout('message');
+const clientTimeoutError2: Boom = Boom.clientTimeout('message');
 
 const conflictError = Boom.conflict('message', {some: 'data'});
 conflictError.data.some;
 
 const resourceGoneError = Boom.resourceGone('message', {some: 'data'});
 resourceGoneError.data.some;
-const resourceGoneError2: Boom.Boom = Boom.resourceGone('message');
+const resourceGoneError2: Boom = Boom.resourceGone('message');
 
 const lengthRequiredError = Boom.lengthRequired('message', {some: 'data'});
 lengthRequiredError.data.some;
-const lengthRequiredError2: Boom.Boom = Boom.lengthRequired('message');
+const lengthRequiredError2: Boom = Boom.lengthRequired('message');
 
 const preconditionFailedError = Boom.preconditionFailed('message', {some: 'data'});
 preconditionFailedError.data.some;
-const preconditionFailedError2: Boom.Boom = Boom.preconditionFailed('message');
+const preconditionFailedError2: Boom = Boom.preconditionFailed('message');
 
 const entityTooLargeError = Boom.entityTooLarge('message', {some: 'data'});
 entityTooLargeError.data.some;
-const entityTooLargeError2: Boom.Boom = Boom.lengthRequired('message');
+const entityTooLargeError2: Boom = Boom.lengthRequired('message');
 
 const uriTooLongError = Boom.uriTooLong('message', {some: 'data'});
 uriTooLongError.data.some;
-const uriTooLongError2: Boom.Boom = Boom.uriTooLong('message');
+const uriTooLongError2: Boom = Boom.uriTooLong('message');
 
 const unsupportedMediaTypeError = Boom.unsupportedMediaType('message', {some: 'data'});
 unsupportedMediaTypeError.data.some;
-const unsupportedMediaTypeError2: Boom.Boom = Boom.unsupportedMediaType('message');
+const unsupportedMediaTypeError2: Boom = Boom.unsupportedMediaType('message');
 
 const rangeNotSatisfiableError = Boom.rangeNotSatisfiable('message', {some: 'data'});
 rangeNotSatisfiableError.data.some;
-const rangeNotSatisfiableError2: Boom.Boom = Boom.rangeNotSatisfiable('message');
+const rangeNotSatisfiableError2: Boom = Boom.rangeNotSatisfiable('message');
 
 const expectationFailedError = Boom.expectationFailed('message', {some: 'data'});
 expectationFailedError.data.some;
-const expectationFailedError2: Boom.Boom = Boom.expectationFailed('message');
+const expectationFailedError2: Boom = Boom.expectationFailed('message');
 
 const teapotError = Boom.teapot('message', {some: 'data'});
 teapotError.data.some;
-const teapotError2: Boom.Boom = Boom.teapot('message');
+const teapotError2: Boom = Boom.teapot('message');
 
 const badDataError = Boom.badData('message', {some: 'data'});
 badDataError.data.some;
-const badDataError2: Boom.Boom = Boom.badData('message');
+const badDataError2: Boom = Boom.badData('message');
 
 const lockedError = Boom.locked('message', {some: 'data'});
 lockedError.data.some;
-const lockedError2: Boom.Boom = Boom.locked('message');
+const lockedError2: Boom = Boom.locked('message');
+
+const failedDependencyError = Boom.failedDependency('message', {some: 'data'});
+failedDependencyError.data.some;
+const failedDependencyError2: Boom = Boom.failedDependency('message');
 
 const preconditionRequiredError = Boom.preconditionRequired('message', {some: 'data'});
 preconditionRequiredError.data.some;
-const preconditionRequiredError2: Boom.Boom = Boom.preconditionRequired('message');
+const preconditionRequiredError2: Boom = Boom.preconditionRequired('message');
 
 const tooManyRequestsError = Boom.tooManyRequests('message', {some: 'data'});
 tooManyRequestsError.data.some;
-const tooManyRequestsError2: Boom.Boom = Boom.tooManyRequests('message');
+const tooManyRequestsError2: Boom = Boom.tooManyRequests('message');
 
 const illegalError = Boom.illegal('message', {some: 'data'});
 illegalError.data.some;
-const illegalError2: Boom.Boom = Boom.illegal('message');
+const illegalError2: Boom = Boom.illegal('message');
 
 // 5xx and data type
 
 const badImplementationError = Boom.badImplementation('message', {some: 'data'});
 badImplementationError.data.some;
-const badImplementationError2: Boom.Boom = Boom.badImplementation('message');
+const badImplementationError2: Boom = Boom.badImplementation('message');
 
 const internalError = Boom.internal('message', {some: 'data'});
 internalError.data.some;
-const internalError2: Boom.Boom = Boom.internal('message');
+const internalError2: Boom = Boom.internal('message');
 
 const notImplementedError = Boom.notImplemented('message', {some: 'data'});
 notImplementedError.data.some;
-const notImplementedError2: Boom.Boom = Boom.notImplemented('message');
+const notImplementedError2: Boom = Boom.notImplemented('message');
 
 const badGatewayError = Boom.badGateway('message', {some: 'data'});
 badGatewayError.data.some;
-const badGatewayError2: Boom.Boom = Boom.badGateway('message');
+const badGatewayError2: Boom = Boom.badGateway('message');
 
 const serverUnavailableError = Boom.serverUnavailable('message', {some: 'data'});
 serverUnavailableError.data.some;
-const serverUnavailableError2: Boom.Boom = Boom.serverUnavailable('message');
+const serverUnavailableError2: Boom = Boom.serverUnavailable('message');
 
 const gatewayTimeoutError = Boom.gatewayTimeout('message', {some: 'data'});
 gatewayTimeoutError.data.some;
-const gatewayTimeoutError2: Boom.Boom = Boom.gatewayTimeout('message');
+const gatewayTimeoutError2: Boom = Boom.gatewayTimeout('message');
 
 // boomify
 const boomifiedError = Boom.boomify(new Error('test'), { statusCode: 400, message: 'some message' });
 
 // isBoom
 
-const isBoomError = new Boom.Boom('test')
+const isBoomError = new Boom('test')
 
 Boom.isBoom(isBoomError);
 
-const maybeBoom = <any>new Boom.Boom('test');
+const maybeBoom = <any>new Boom('test');
 if(Boom.isBoom(maybeBoom)) {
     // isBoom is a type guard that allows accessing these properties:
     maybeBoom.output.headers;
@@ -152,7 +156,7 @@ if(Boom.isBoom(maybeBoom)) {
 
 // constructor
 
-const constructorError: Boom.Boom = new Boom.Boom('test');
+const constructorError: Boom = new Boom('test');
 
 constructorError.message;
 
@@ -180,11 +184,11 @@ interface CustomPayload extends Boom.Payload {
  * Test assignment of custom error data:
  */
 const errorWithData = Boom.badImplementation('', { custom1: 'test', customType: 'Custom1', isCustom: true } as CustomData1);
-const errorWithNoExplicitDataType: Boom.Boom = errorWithData; // can assign to error without explicit data type
-const errorWithExplicitType: Boom.Boom<CustomData> = errorWithData; // can assign to union data type
-const errorWithConcreteCustomData: Boom.Boom<CustomData1> = errorWithData; // can assign to concrete data type
+const errorWithNoExplicitDataType: Boom = errorWithData; // can assign to error without explicit data type
+const errorWithExplicitType: Boom<CustomData> = errorWithData; // can assign to union data type
+const errorWithConcreteCustomData: Boom<CustomData1> = errorWithData; // can assign to concrete data type
 // assignment to CustomData2 would not be possible
-// const errorWithConcreteCustomData2: Boom.Boom<CustomData2> = errorWithData;
+// const errorWithConcreteCustomData2: Boom<CustomData2> = errorWithData;
 
 // Some complex error data types for testing purposes:
 interface CustomDataBase {
diff --git a/types/boom/index.d.ts b/types/boom/index.d.ts
index ed48f181cf..b38dafe038 100644
--- a/types/boom/index.d.ts
+++ b/types/boom/index.d.ts
@@ -1,23 +1,22 @@
-// Type definitions for boom 7.1.1
+// Type definitions for boom 7.2.0
 // Project: https://github.com/hapijs/boom
 // Definitions by: Igor Rogatty <https://github.com/rogatty>
 //                 AJP <https://github.com/AJamesPhillips>
 //                 Jinesh Shah <https://github.com/jineshshah36>
 //                 Timon van Spronsen <https://github.com/TimonVS>
+//                 Daniel Machado <https://github.com/danielmachado>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-export = Boom;
-
-declare namespace Boom {
-
-    /**
+ export = Boom;
+/**
      * boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:
      * @see {@link https://github.com/hapijs/boom#boom}
      */
-    export class Boom<Data = any> extends Error {
+declare class Boom<Data = any> extends Error {
+
         /** Creates a new Boom object using the provided message and then calling boomify() to decorate the error with the Boom properties. */
-        constructor(message?: string | Error, options?: Options<Data>);
+        constructor(message?: string | Error, options?: Boom.Options<Data>);
         /** isBoom - if true, indicates this is a Boom object instance. */
         isBoom: boolean;
         /** isServer - convenience bool indicating status code >= 500. */
@@ -25,7 +24,7 @@ declare namespace Boom {
         /** message - the error message. */
         message: string;
         /** output - the formatted response. Can be directly manipulated after object construction to return a custom error response. Allowed root keys: */
-        output: Output;
+        output: Boom.Output;
         /** reformat() - rebuilds error.output using the other object properties. */
         reformat: () => string;
         /** "If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object." mentioned in @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes} */
@@ -33,7 +32,7 @@ declare namespace Boom {
         /** https://github.com/hapijs/boom#createstatuscode-message-data and https://github.com/hapijs/boom/blob/v4.3.0/lib/index.js#L99 */
         data: Data;
     }
-
+declare namespace Boom {
     interface Options<Data> {
         /** statusCode - the HTTP status code. Defaults to 500 if no status code is already set. */
         statusCode?: number;
@@ -49,7 +48,7 @@ declare namespace Boom {
         override?: boolean;
     }
 
-    export interface Output {
+    interface Output {
         /** statusCode - the HTTP status code (typically 4xx or 5xx). */
         statusCode: number;
         /** headers - an object containing any HTTP headers where each key is a header name and value is the header content. (Limited value type to string https://github.com/hapijs/boom/issues/151 ) */
@@ -58,7 +57,7 @@ declare namespace Boom {
         payload: Payload;
     }
 
-    export interface Payload {
+     interface Payload {
         /** statusCode - the HTTP status code, derived from error.output.statusCode. */
         statusCode: number;
         /** error - the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode. */
@@ -80,13 +79,13 @@ declare namespace Boom {
      * @param options optional additional options
      * @see {@link https://github.com/hapijs/boom#boomifyerror-options}
      */
-    export function boomify(error: Error, options?: { statusCode?: number, message?: string, override?: boolean }): Boom<null>;
+     function boomify(error: Error, options?: { statusCode?: number, message?: string, override?: boolean }): Boom<null>;
 
     /**
      * Identifies whether an error is a Boom object. Same as calling instanceof Boom.
      * @param error the error object to identify.
      */
-    export function isBoom(error: Error): error is Boom
+     function isBoom(error: Error): error is Boom
 
     // 4xx
     /**
@@ -95,7 +94,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadrequestmessage-data}
      */
-    export function badRequest<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function badRequest<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 401 Unauthorized error
@@ -106,10 +105,10 @@ declare namespace Boom {
      * @param attributes an object of values to use while setting the 'WWW-Authenticate' header. This value is only used when scheme is a string, otherwise it is ignored. Every key/value pair will be included in the 'WWW-Authenticate' in the format of 'key="value"' as well as in the response payload under the attributes key. Alternatively value can be a string which is use to set the value of the scheme, for example setting the token value for negotiate header. If string is used message parameter must be null. null and undefined will be replaced with an empty string. If attributes is set, message will be used as the 'error' segment of the 'WWW-Authenticate' header. If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object.
      * @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes}
      */
-    export function unauthorized(message?: string, scheme?: string, attributes?: {[index: string]: string}): Boom<null>;
-    export function unauthorized(message?: string, scheme?: string[]): Boom<null>;
-    export function unauthorized(message?: null, scheme?: string, attributes?: {[index: string]: string} | string): Boom<null>;
-    export function unauthorized(message?: null, scheme?: string[]): Boom<null>;
+     function unauthorized(message?: string, scheme?: string, attributes?: {[index: string]: string}): Boom<null>;
+     function unauthorized(message?: string, scheme?: string[]): Boom<null>;
+     function unauthorized(message?: null, scheme?: string, attributes?: {[index: string]: string} | string): Boom<null>;
+     function unauthorized(message?: null, scheme?: string[]): Boom<null>;
 
     /**
      * Returns a 402 Payment Required error
@@ -117,7 +116,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompaymentrequiredmessage-data}
      */
-    export function paymentRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function paymentRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 403 Forbidden error
@@ -125,7 +124,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomforbiddenmessage-data}
      */
-    export function forbidden<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function forbidden<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 404 Not Found error
@@ -133,7 +132,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotfoundmessage-data}
      */
-    export function notFound<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function notFound<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 405 Method Not Allowed error
@@ -142,7 +141,7 @@ declare namespace Boom {
      * @param allow optional string or array of strings (to be combined and separated by ', ') which is set to the 'Allow' header.
      * @see {@link https://github.com/hapijs/boom#boommethodnotallowedmessage-data-allow}
      */
-    export function methodNotAllowed<Data = null>(message?: string, data?: Data, allow?: string | string[]): Boom<Data>;
+     function methodNotAllowed<Data = null>(message?: string, data?: Data, allow?: string | string[]): Boom<Data>;
 
     /**
      * Returns a 406 Not Acceptable error
@@ -150,7 +149,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotacceptablemessage-data}
      */
-    export function notAcceptable<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function notAcceptable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 407 Proxy Authentication Required error
@@ -158,7 +157,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomproxyauthrequiredmessage-data}
      */
-    export function proxyAuthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function proxyAuthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 408 Request Time-out error
@@ -166,7 +165,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomclienttimeoutmessage-data}
      */
-    export function clientTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function clientTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 409 Conflict error
@@ -174,7 +173,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomconflictmessage-data}
      */
-    export function conflict<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function conflict<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 410 Gone error
@@ -182,7 +181,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomresourcegonemessage-data}
      */
-    export function resourceGone<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function resourceGone<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 411 Length Required error
@@ -190,7 +189,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomlengthrequiredmessage-data}
      */
-    export function lengthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function lengthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 412 Precondition Failed error
@@ -198,7 +197,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompreconditionfailedmessage-data}
      */
-    export function preconditionFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function preconditionFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 413 Request Entity Too Large error
@@ -206,7 +205,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomentitytoolargemessage-data}
      */
-    export function entityTooLarge<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function entityTooLarge<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 414 Request-URI Too Large error
@@ -214,7 +213,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomuritoolongmessage-data}
      */
-    export function uriTooLong<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function uriTooLong<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 415 Unsupported Media Type error
@@ -222,7 +221,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomunsupportedmediatypemessage-data}
      */
-    export function unsupportedMediaType<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function unsupportedMediaType<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 416 Requested Range Not Satisfiable error
@@ -230,7 +229,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomrangenotsatisfiablemessage-data}
      */
-    export function rangeNotSatisfiable<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function rangeNotSatisfiable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 417 Expectation Failed error
@@ -238,7 +237,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomexpectationfailedmessage-data}
      */
-    export function expectationFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function expectationFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 418 I'm a Teapot error
@@ -246,7 +245,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomteapotmessage-data}
      */
-    export function teapot<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function teapot<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 422 Unprocessable Entity error
@@ -254,7 +253,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombaddatamessage-data}
      */
-    export function badData<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function badData<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 423 Locked error
@@ -262,7 +261,15 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomlockedmessage-data}
      */
-    export function locked<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function locked<Data = null>(message?: string, data?: Data): Boom<Data>;
+
+    /**
+     * Returns a 424 Failed Dependency error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomfaileddependencymessage-data}
+     */
+     function failedDependency<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 428 Precondition Required error
@@ -270,7 +277,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompreconditionrequiredmessage-data}
      */
-    export function preconditionRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function preconditionRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 429 Too Many Requests error
@@ -278,7 +285,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomtoomanyrequestsmessage-data}
      */
-    export function tooManyRequests<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function tooManyRequests<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 451 Unavailable For Legal Reasons error
@@ -286,7 +293,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomillegalmessage-data}
      */
-    export function illegal<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function illegal<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     // 5xx
     /**
@@ -296,7 +303,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
      */
-    export function badImplementation<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function badImplementation<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 500 Internal Server Error error
@@ -305,7 +312,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
      */
-    export function internal<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function internal<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 501 Not Implemented error with your error message to the user
@@ -313,7 +320,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotimplementedmessage-data}
      */
-    export function notImplemented<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function notImplemented<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 502 Bad Gateway error with your error message to the user
@@ -321,7 +328,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadgatewaymessage-data}
      */
-    export function badGateway<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function badGateway<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 503 Service Unavailable error with your error message to the user
@@ -329,7 +336,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomserverunavailablemessage-data}
      */
-    export function serverUnavailable<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function serverUnavailable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 504 Gateway Time-out error with your error message to the user
@@ -337,5 +344,5 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomgatewaytimeoutmessage-data}
      */
-    export function gatewayTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function gatewayTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
 }
diff --git a/types/boom/v3/index.d.ts b/types/boom/v3/index.d.ts
index adf433c9f4..d9c34be4fb 100644
--- a/types/boom/v3/index.d.ts
+++ b/types/boom/v3/index.d.ts
@@ -48,6 +48,7 @@ declare namespace Boom {
     export function expectationFailed(message?: string, data?: any): BoomError;
     export function badData(message?: string, data?: any): BoomError;
     export function locked(message?: string, data?: any): BoomError;
+    export function failedDependency(message?: string, data?: any): BoomError;
     export function preconditionRequired(message?: string, data?: any): BoomError;
     export function tooManyRequests(message?: string, data?: any): BoomError;
     export function illegal(message?: string, data?: any): BoomError;
diff --git a/types/boom/v4/boom-tests.ts b/types/boom/v4/boom-tests.ts
index 1819be25cb..33e86699e8 100644
--- a/types/boom/v4/boom-tests.ts
+++ b/types/boom/v4/boom-tests.ts
@@ -98,6 +98,10 @@ const lockedError = Boom.locked('message', {some: 'data'});
 lockedError.data.some;
 const lockedError2: Boom.BoomError = Boom.locked('message');
 
+const failedDependencyError = Boom.failedDependency('message', {some: 'data'});
+failedDependencyError.data.some;
+const failedDependencyError2: Boom.BoomError = Boom.failedDependency('message');
+
 const preconditionRequiredError = Boom.preconditionRequired('message', {some: 'data'});
 preconditionRequiredError.data.some;
 const preconditionRequiredError2: Boom.BoomError = Boom.preconditionRequired('message');
diff --git a/types/boom/v4/index.d.ts b/types/boom/v4/index.d.ts
index 76cd2d6b46..50d7a7d59a 100644
--- a/types/boom/v4/index.d.ts
+++ b/types/boom/v4/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Igor Rogatty <https://github.com/rogatty>
 //                 AJP <https://github.com/AJamesPhillips>
 //                 Jinesh Shah <https://github.com/jineshshah36>
+//                 Daniel Machado <https://github.com/danielmachado>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -258,6 +259,14 @@ declare namespace Boom {
      */
     export function locked<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
+    /**
+     * Returns a 424 Failed Dependency error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomfaileddependencymessage-data}
+     */
+    export function failedDependency<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
     /**
      * Returns a 428 Precondition Required error
      * @param message optional message.
diff --git a/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts b/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts
new file mode 100644
index 0000000000..5434971f41
--- /dev/null
+++ b/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts
@@ -0,0 +1,123 @@
+function BootstrapDialogOptionsTests() {
+    const options1: BootstrapDialog.DialogOptions = { };
+    const options2: BootstrapDialog.DialogOptions = {
+        animate: false,
+        buttons: [{id: "btn-1"}],
+        callback: (result: boolean) => { },
+        closable: false,
+        closeByBackdrop: false,
+        closeByKeyboard: false,
+        data: {name: "value"},
+        draggable: false,
+        description: "",
+        buttonLabel: "",
+        message: "",
+        onhide: (dialog: BootstrapDialog.DialogContext) => { },
+        onhidden: (dialog: BootstrapDialog.DialogContext) => { },
+        onshow: (dialog: BootstrapDialog.DialogContext) => { },
+        onshown: (dialog: BootstrapDialog.DialogContext) => { },
+        size: BootstrapDialog.SIZE_LARGE,
+        title: "",
+        type: BootstrapDialog.TYPE_DEFAULT,
+        btnCancelLabel: "",
+        btnOKClass: "",
+        btnOKLabel: "",
+        cssClass: "",
+        spinicon: "",
+        autodestroy: false,
+        nl2br: false,
+    };
+    options2.onhide = (dialog: BootstrapDialog.DialogContext): void => { };
+    options2.onhide = (dialog: BootstrapDialog.DialogContext): boolean => false;
+    options2.message = "";
+    options2.message = $("#element");
+    options2.message = (dialog?: BootstrapDialog.DialogContext): string => {
+        return "";
+    };
+    options2.message = (dialog?: BootstrapDialog.DialogContext): JQuery => {
+        return $("#element");
+    };
+    // BootstrapDialog.SIZE_xxx constants.
+    options2.size = BootstrapDialog.SIZE_LARGE;
+    options2.size = BootstrapDialog.SIZE_NORMAL;
+    options2.size = BootstrapDialog.SIZE_SMALL;
+    options2.size = BootstrapDialog.SIZE_WIDE;
+    options2.title = "";
+    options2.title = $("#element");
+    // BootstrapDialog.TYPE_xxx constants.
+    options2.type = BootstrapDialog.TYPE_DANGER;
+    options2.type = BootstrapDialog.TYPE_DEFAULT;
+    options2.type = BootstrapDialog.TYPE_INFO;
+    options2.type = BootstrapDialog.TYPE_PRIMARY;
+    options2.type = BootstrapDialog.TYPE_SUCCESS;
+    options2.type = BootstrapDialog.TYPE_WARNING;
+}
+
+function BootstrapDialogStaticTests() {
+    BootstrapDialog.alert("");
+    BootstrapDialog.alert("", () => { });
+    BootstrapDialog.confirm("");
+    BootstrapDialog.confirm("", (result: boolean) => { });
+    const instance1: BootstrapDialog.DialogInstance = BootstrapDialog.show({});
+    // BUTTON_SIZES
+    BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_NORMAL] = '';
+    const buttonSize: string = BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_NORMAL];
+    // Buttons order
+    BootstrapDialog.BUTTONS_ORDER_CANCEL_OK = "";
+    BootstrapDialog.BUTTONS_ORDER_OK_CANCEL = "";
+    // DEFAULT_TEXTS
+    BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_DEFAULT] = 'Information';
+    const defaultText: string = BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_DEFAULT];
+    // Miscellaneous
+    BootstrapDialog.ICON_SPINNER = "";
+    BootstrapDialog.NAMESPACE = "";
+}
+
+function BootstrapDialogContextTests() {
+    const dialog1: BootstrapDialog.DialogContext = BootstrapDialog({});
+    dialog1.close();
+    dialog1.enableButtons(false);
+    const button: JQuery = dialog1.getButton("");
+    const value: any = dialog1.getData("name");
+    const modal: JQuery = dialog1.getModal();
+    const content: JQuery = dialog1.getModalContent();
+    const dialog: JQuery = dialog1.getModalDialog();
+    const header: JQuery = dialog1.getModalHeader();
+    const footer: JQuery = dialog1.getModalFooter();
+    const body: JQuery = dialog1.getModalBody();
+    const title: string = dialog1.getTitle();
+    dialog1.open();
+    dialog1.realize();
+    dialog1.setClosable(false);
+    dialog1.setData("name", "value");
+    dialog1.setData("", null);
+    dialog1.setMessage("");
+    dialog1.setTitle("");
+    dialog1.setType(BootstrapDialog.TYPE_DEFAULT);
+}
+
+function BootstrapDialogInstanceTests() {
+    const instance1: BootstrapDialog.DialogInstance = BootstrapDialog.show({});
+    const modal: JQuery = instance1.$modal;
+    const modalBody: JQuery = instance1.$modalBody;
+    const modalContent: JQuery = instance1.$modalContent;
+    const modalDialog: JQuery = instance1.$modalDialog;
+    const modalHeader: JQuery = instance1.$modalHeader;
+    const modalFooter: JQuery = instance1.$modalFooter;
+    const options: BootstrapDialog.DialogOptions = instance1.options;
+    const opened: boolean = instance1.opened;
+}
+
+function BootstrapDialogButtonTests() {
+    const button1: BootstrapDialog.DialogButton = { };
+    const button2: BootstrapDialog.DialogButton = {
+        id: "",
+        label: "",
+        hotkey: 0,
+        icon: "",
+        cssClass: "",
+        data: {name: "value"},
+        autospin: false,
+        action: (dialog: BootstrapDialog.DialogContext) => { },
+    };
+}
diff --git a/types/bootstrap3-dialog/index.d.ts b/types/bootstrap3-dialog/index.d.ts
new file mode 100644
index 0000000000..d9612167f8
--- /dev/null
+++ b/types/bootstrap3-dialog/index.d.ts
@@ -0,0 +1,197 @@
+// Type definitions for bootstrap3-dialog 1.35
+// Project: http://nakupanda.github.io/bootstrap3-dialog
+// Definitions by: Dante <https://github.com/nakupanda>
+//                 Craig Boland <https://github.com/cnboland>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+declare namespace BootstrapDialog {
+    interface DialogStatic {
+        BUTTON_SIZES: any;
+        BUTTONS_ORDER_CANCEL_OK: string;
+        BUTTONS_ORDER_OK_CANCEL: string;
+        DEFAULT_TEXTS: any;                 /** For text localization. */
+        ICON_SPINNER: string;
+        NAMESPACE: string;
+
+        SIZE_NORMAL: string;
+        SIZE_SMALL: string;
+        SIZE_WIDE: string;
+        SIZE_LARGE: string;
+
+        TYPE_DEFAULT: string;
+        TYPE_INFO: string;
+        TYPE_PRIMARY: string;
+        TYPE_SUCCESS: string;
+        TYPE_WARNING: string;
+        TYPE_DANGER: string;
+
+        (options: DialogOptions): DialogContext;
+        alert(message: string, closeCallback?: () => void): void;
+        confirm(message: string, closeCallback?: (result: boolean) => void): void;
+        show(options: DialogOptions): DialogInstance;
+    }
+
+    interface DialogOptions {
+        /** Dialog header type. See BootstrapDialog.TYPE_xxx constants. */
+        type?: string;
+        /** Text size. See BootstrapDialog.SIZE_xxx constants. By default - SIZE_NORMAL */
+        size?: string;
+        /** Dialog title. Either string or JQuery element. */
+        title?: string | JQuery;
+        /** Dialog message. Either string, JQuery element, or function that returns either string or JQuery element. */
+        message?: string | JQuery | ((dialog?: DialogContext) => string | JQuery);
+        /**
+         * When set to true, you can close the dialog by:
+         *  - Clicking the close icon in dialog header.
+         *  - Clicking outside the dialog.
+         *  - ESC key.
+         *
+         * FALSE by default.
+         */
+        closable?: boolean;
+        /** Whether dialog will close by clicking outside of it. */
+        closeByBackdrop?: boolean;
+        /** Whether dialog will close by ESC. */
+        closeByKeyboard?: boolean;
+        /** Whether fade-out background while showing the dialog. TRUE by default. */
+        animate?: boolean;
+        /** Data to be bound to the dialog. */
+        data?: any;
+        /** Whether dialog could be dragged by its header. Cursor could be changed (see doc)! FALSE by default. */
+        draggable?: boolean;
+        /**
+         * If provided, 'aria-describedby' attribute will be added to the dialog with the description string as its value. This can improve accessibility, as the description can be read by screen
+         * readers.
+         */
+        description?: string;
+        /** Default button title. OK by default. */
+        buttonLabel?: string;
+        buttons?: DialogButton[];
+        /** Result will be true if button was click, while it will be false if users close the dialog directly. */
+        callback?: (result: boolean) => void;
+        /** If provided, it will be invoked when the dialog is popping up. */
+        onshow?(dialog?: DialogContext): void;
+        /** If provided, it will be invoked when the dialog is popped up. */
+        onshown?(dialog?: DialogContext): void;
+        /**
+         * If provided, it will be invoked when the dialog is popping down.
+         * Return FALSE to don`t close the dialog. Don`t return anything by default.
+         */
+        onhide?(dialog?: DialogContext): any;
+        /** If provided, it will be invoked when the dialog is popped down. */
+        onhidden?(dialog?: DialogContext): void;
+
+        /** 'Cancel' by default. */
+        btnCancelLabel?: string;
+        /** 'OK' by default. */
+        btnOKLabel?: string;
+        /** If you didn't specify it, dialog type will be used. */
+        btnOKClass?: string;
+        /** Additional css classes that will be added to your dialog. */
+        cssClass?: string;
+        /** Icon class name, for example 'glyphicon glyphicon-check'. */
+        spinicon?: string;
+        /**
+         * When it's true, all modal stuff will be removed from the DOM tree after the dialog is popped down,
+         * set it to false if you need your dialog (same instance) pups up and down again and again.
+         * Default is true.
+         */
+        autodestroy?: boolean;
+        /**
+         * Automatically convert line breaking character to <br /> if it's set to true,
+         * everything keeps original if it's false.
+         */
+        nl2br?: boolean;
+    }
+
+    interface DialogInstance {
+        $modal: JQuery;
+        $modalBody: JQuery;
+        $modalContent: JQuery;
+        $modalDialog: JQuery;
+        $modalHeader: JQuery;
+        $modalFooter: JQuery;
+        options: DialogOptions;
+        opened: boolean;
+    }
+
+    interface DialogButton {
+        /** If id is set, you can use dialogInstance.getButton(id) to get the button later. */
+        id?: string;
+        label?: string;
+        /** Hotkey char code */
+        hotkey?: number;
+        /** If set, the specified icon will be added to the button. */
+        icon?: string;
+        /** Additional css class to be added to the button. */
+        cssClass?: string;
+        /** Object containing data attributes to be added to the button. */
+        data?: any;
+        /**  If it's true, after clicked the button a spinning icon appears. */
+        autospin?: boolean;
+        /**
+         * If provided, the callback will be invoked after the button is clicked, and the dialog instance
+         * will be passed to the callback function.
+         */
+        action?: (dialog: DialogContext) => void;
+    }
+
+    interface DialogButtonInstance {
+        toggleEnable(enabled: boolean): void;
+        /** Equals to $button.toggleEnable(true); */
+        enable(): void;
+        /** Equals to $button.toggleEnable(false); */
+        disable(): void;
+        toggleSpin(spin: boolean): void;
+        /** Equals to $button.toggleSpin(true); */
+        spin(): void;
+        /** Equals to $button.toggleSpin(false); */
+        stopSpin(): void;
+    }
+
+    interface DialogContext {
+        /** Open the dialog. Usage: dialogInstance.open() */
+        open(): void;
+        /**  	Close the dialog. Usage: dialogInstance.close() */
+        close(): void;
+        /**
+         * Calling dialog.open() will automatically get this method called first, but if you want to do something on your dialog
+         * before it's shown, you can manually call dialog.realize() before calling dialog.open().
+         */
+        realize(): void;
+        getTitle(): string;
+        setTitle(title: string): void;
+        setMessage(message: string): void;
+        /** Bind data entry to dialog instance, value can be any types that javascript supports. */
+        setData(dataName: string, value: any): void;
+        /** Get data entry according to the given key, returns null if no data entry found. */
+        getData(dataName: string): any;
+        getButton(buttonId: string): JQuery;
+        /**
+         * When set to true (default), dialog can be closed by clicking close icon in dialog header,
+         * or by clicking outside the dialog, or, ESC key is pressed.
+         */
+        setClosable(closable: boolean): void;
+        /** See BootstrapDialog.TYPE_xxx constants. */
+        setType(dialogType: string): void;
+        /** Disable all buttons in dialog footer when it's false, enable all when it's true. */
+        enableButtons(enable: boolean): void;
+        /** Return the raw modal, equivalent to $('<div class='modal fade'...></div>') */
+        getModal(): JQuery;
+        /** Return the raw modal content. */
+        getModalContent(): JQuery;
+        /** Return the raw modal dialog. */
+        getModalDialog(): JQuery;
+        /** Return the raw modal header. */
+        getModalHeader(): JQuery;
+        /** Return the raw modal footer. */
+        getModalFooter(): JQuery;
+        /** Return the raw modal body. */
+        getModalBody(): JQuery;
+    }
+}
+
+declare const BootstrapDialog: BootstrapDialog.DialogStatic;
diff --git a/types/bootstrap3-dialog/tsconfig.json b/types/bootstrap3-dialog/tsconfig.json
new file mode 100644
index 0000000000..cdf93479b7
--- /dev/null
+++ b/types/bootstrap3-dialog/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap3-dialog-tests.ts"
+    ]
+}
diff --git a/types/bootstrap3-dialog/tslint.json b/types/bootstrap3-dialog/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bootstrap3-dialog/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/braft-editor/braft-editor-tests.tsx b/types/braft-editor/braft-editor-tests.tsx
index 999850acaa..48513f6de4 100644
--- a/types/braft-editor/braft-editor-tests.tsx
+++ b/types/braft-editor/braft-editor-tests.tsx
@@ -12,7 +12,7 @@ class BraftEditorTest extends React.Component<BraftEditor.editorProps> {
             height: 500,
             initialContent: this.state.content,
             onChange: this.handleChange,
-            onHTMLChange: this.handleHTMLChange
+            onHTMLChange: this.handleHTMLChange,
         };
         return (
             <div>
diff --git a/types/braft-editor/index.d.ts b/types/braft-editor/index.d.ts
index 505403d2f3..1ad5f728ad 100644
--- a/types/braft-editor/index.d.ts
+++ b/types/braft-editor/index.d.ts
@@ -15,8 +15,8 @@ declare namespace BraftEditor {
 	}
 	interface editorProps {
 		editorState?: any;
-		contentFormat?: RawDraftContentState;
-		initialContent?: RawDraftContentState | null;
+		contentFormat?: 'raw' | 'html';
+		initialContent?: string | null;
 		onChange?: (content: RawDraftContentState) => void;
 		onRawChange?: (content: RawDraftContentState) => void;
 		onHTMLChange?: (content: string) => void;
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index a7a9ea350b..97844cfbbb 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -5,6 +5,7 @@
 //                 Marshall Cottrell <https://github.com/marshall007>
 //                 Weeco <https://github.com/weeco>
 //                 Gabriel Terwesten <https://github.com/blaugold>
+//                 Oleg Repin <https://github.com/iamolegga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -51,6 +52,8 @@ declare namespace Bull {
     settings?: AdvancedSettings;
 
     limiter?: RateLimiter;
+
+    defaultJobOptions?: JobOptions;
   }
 
   interface AdvancedSettings {
diff --git a/types/case-sensitive-paths-webpack-plugin/index.d.ts b/types/case-sensitive-paths-webpack-plugin/index.d.ts
index 38fdd9c032..58cdccf25f 100644
--- a/types/case-sensitive-paths-webpack-plugin/index.d.ts
+++ b/types/case-sensitive-paths-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Urthen/case-sensitive-paths-webpack-plugin#readme
 // Definitions by: Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 338e38e223..c637164d30 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -198,6 +198,8 @@ declare namespace Chart {
         cutoutPercentage?: number;
         circumference?: number;
         rotation?: number;
+        // Plugins can require any options
+        plugins?: { [plugin: string]: any };
     }
 
     interface ChartFontOptions {
diff --git a/types/chroma-js/chroma-js-tests.ts b/types/chroma-js/chroma-js-tests.ts
index 82cfb7274d..fdd1b5946b 100644
--- a/types/chroma-js/chroma-js-tests.ts
+++ b/types/chroma-js/chroma-js-tests.ts
@@ -1,3 +1,6 @@
+import { Color } from "chroma-js";
+import chroma = require("chroma-js");
+
 function test_chroma() {
     chroma('hotpink');
     chroma('#ff3399');
@@ -187,3 +190,9 @@ function test_types() {
     const color: chroma.Color = chroma('orange');
     const scale: chroma.Scale = chroma.scale('RdYlBu');
 }
+
+// the following should actually, pass, but TS can't disambiguate between a parameter
+// which is passed as undefined/null or not passed at all
+// const scaleColors1: Color[] = chroma.scale(['black', 'white']).colors(12);
+const scaleColors2: Color[] = chroma.scale(['black', 'white']).colors(12, null);
+const scaleColors3: Color[] = chroma.scale(['black', 'white']).colors(12, undefined);
diff --git a/types/chroma-js/index.d.ts b/types/chroma-js/index.d.ts
index c18484dc1f..797752c8ad 100644
--- a/types/chroma-js/index.d.ts
+++ b/types/chroma-js/index.d.ts
@@ -303,10 +303,10 @@ declare namespace chroma {
          * You can call scale.colors(n) to quickly grab `c` equi-distant colors from a color scale. If called with no
          * arguments, scale.colors returns the original array of colors used to create the scale.
          */
-        colors(c?: number, format?: 'hex' | 'name'): string[];
-        colors(c?: number, format?: null | 'alpha' | 'darken' | 'brighten' | 'saturate' | 'desaturate'): Color[];
-        colors(c?: number, format?: 'luminance' | 'temperature'): number[];
-        colors<K extends keyof ColorSpaces>(c?: number, format?: K): Array<ColorSpaces[K]>;
+        colors(c: number | undefined, format: undefined | null | 'alpha' | 'darken' | 'brighten' | 'saturate' | 'desaturate'): Color[];
+        colors(c: number | undefined, format: 'luminance' | 'temperature'): number[];
+        colors<K extends keyof ColorSpaces>(c: number | undefined, format: K): Array<ColorSpaces[K]>;
+        colors(c: number | undefined, format?: 'hex' | 'name'): string[];
 
         /**
          * If you want the scale function to return a distinct set of colors instead of a continuous gradient, you can
diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index cde1de9092..d12bf94302 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -5041,7 +5041,7 @@ declare namespace chrome.runtime {
 
     export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> {}
 
-    export interface PortMessageEvent extends chrome.events.Event<(message: Object, port: Port) => void> {}
+    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> {}
 
     export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
 
diff --git a/types/clean-webpack-plugin/index.d.ts b/types/clean-webpack-plugin/index.d.ts
index afe8a65b69..7c23e51df5 100644
--- a/types/clean-webpack-plugin/index.d.ts
+++ b/types/clean-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/johnagan/clean-webpack-plugin
 // Definitions by: Jed Fox <https://github.com/j-f1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/coinbase/coinbase-tests.ts b/types/coinbase/coinbase-tests.ts
index 793833355e..fb804ac566 100644
--- a/types/coinbase/coinbase-tests.ts
+++ b/types/coinbase/coinbase-tests.ts
@@ -85,7 +85,7 @@ client.getAccount("abcdef", (error: Error, account: coinbase.Account): void => {
     });
 });
 
-client.getBuyPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+client.getBuyPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.Price): void => undefined);
 
 client.getCurrencies((error: Error, result: coinbase.Currency[]): void => undefined);
 
@@ -95,10 +95,10 @@ client.getPaymentMethod("foo", (error: Error, result: coinbase.PaymentMethod): v
 
 client.getPaymentMethods((error: Error, result: coinbase.PaymentMethod[]): void => undefined);
 
-client.getSellPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+client.getSellPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.Price): void => undefined);
 
-client.getSpotPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
-client.getSpotPrice({ currencyPair: "USD-BTC", date: "2017-22-01" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+client.getSpotPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.Price): void => undefined);
+client.getSpotPrice({ currencyPair: "USD-BTC", date: "2017-22-01" }, (error: Error, result: coinbase.Price): void => undefined);
 
 client.getTime((error: Error, result: coinbase.Time): void => undefined);
 
diff --git a/types/coinbase/index.d.ts b/types/coinbase/index.d.ts
index ae1e041203..6057f58142 100644
--- a/types/coinbase/index.d.ts
+++ b/types/coinbase/index.d.ts
@@ -294,6 +294,33 @@ export interface MoneyHash {
     currency: string;
 }
 
+/**
+ * Price response
+ */
+export interface Price {
+    data: {
+        /**
+         * Currency e.g. "BTC" (see Client#getCurrencies() for available strings)
+         */
+        base: string;
+        /**
+         * Amount as floating-point in a string
+         */
+        amount: string;
+        /**
+         * Currency e.g. "EUR" (see Client#getCurrencies() for available strings)
+         */
+        currency: string;
+    };
+    warnings?: [
+        {
+            id: string
+            message: string
+            url: string
+        }
+    ];
+}
+
 export type ResourceType = "account" | "transaction" | "address" | "user" | "buy" | "sell" | "deposit" | "withdrawal" | "payment_method";
 
 /**
@@ -1308,7 +1335,7 @@ export class Client {
      * If you need more accurate price estimate for a specific payment method or amount, @see Account#buy() and `quote: true` option.
      * Scope: none
      */
-    getBuyPrice(opts: GetBuyPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+    getBuyPrice(opts: GetBuyPriceOpts, cb: (error: Error, result: Price) => void): void;
 
     /**
      * Get the total price to sell one bitcoin or ether. Note that exchange rates fluctuates so the price is only correct for seconds at the time.
@@ -1316,7 +1343,7 @@ export class Client {
      * estimate for a specific payment method or amount, see sell bitcoin endpoint and quote: true option.
      * Scope: none
      */
-    getSellPrice(opts: GetSellPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+    getSellPrice(opts: GetSellPriceOpts, cb: (error: Error, result: Price) => void): void;
 
     /**
      * Get the current market price for bitcoin. This is usually somewhere in between the buy and sell price.
@@ -1324,7 +1351,7 @@ export class Client {
      * You can also get historic prices with date parameter.
      * Scope: none
      */
-    getSpotPrice(opts: GetSpotPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+    getSpotPrice(opts: GetSpotPriceOpts, cb: (error: Error, result: Price) => void): void;
 
     /**
      * Get the API server time.
diff --git a/types/compression-webpack-plugin/index.d.ts b/types/compression-webpack-plugin/index.d.ts
index bfb769ed2f..a7b38383ef 100644
--- a/types/compression-webpack-plugin/index.d.ts
+++ b/types/compression-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/webpack-contrib/compression-webpack-plugin
 // Definitions by: Anton Kandybo <https://github.com/dublicator>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/compression/compression-tests.ts b/types/compression/compression-tests.ts
index dc284ce2df..192ec309e8 100644
--- a/types/compression/compression-tests.ts
+++ b/types/compression/compression-tests.ts
@@ -1,4 +1,3 @@
-
 import express = require('express');
 import compress = require('compression');
 
@@ -7,3 +6,15 @@ app.use(compress());
 app.use(compress({
     threshold: 512
 }));
+app.use(compress({
+    threshold: 512,
+    filter: (req, res) => {
+        if (req.headers['x-no-compression']) {
+            // don't compress responses with this request header
+            return false;
+        }
+
+        // fallback to standard filter function
+        return compress.filter(req, res);
+    }
+}));
\ No newline at end of file
diff --git a/types/compression/index.d.ts b/types/compression/index.d.ts
index 68d687a9c4..813a823a96 100644
--- a/types/compression/index.d.ts
+++ b/types/compression/index.d.ts
@@ -1,13 +1,26 @@
 // Type definitions for compression
 // Project: https://github.com/expressjs/compression
 // Definitions by: Santi Albo <https://github.com/santialbo>
+//                 Rob van der Burgt <https://github.com/rburgt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
 import * as express from 'express';
 
+declare function e(options?: e.CompressionOptions): express.RequestHandler;
+
 declare namespace e {
-    interface CompressionOptions  {
+    /**
+     * Default filter, used for extending filter given in CompressionOptions
+     * See https://github.com/expressjs/compression#filter-1 regarding the usage
+     */
+    export function filter(req: express.Request, res: express.Response): boolean;
+
+    interface CompressionFilter {
+        (req: express.Request, res: express.Response): boolean;
+    }
+
+    interface CompressionOptions {
         /**
          * See https://github.com/expressjs/compression#chunksize regarding the usage.
          */
@@ -31,7 +44,7 @@ declare namespace e {
         /**
          * See https://github.com/expressjs/compression#threshold regarding the usage.
          */
-        threshold?: number|string;
+        threshold?: number | string;
 
         /**
          * See https://github.com/expressjs/compression#windowbits regarding the usage.
@@ -41,8 +54,8 @@ declare namespace e {
         /**
          * See https://github.com/expressjs/compression#filter regarding the usage.
          */
-        filter?: Function;
-        
+        filter?: CompressionFilter;
+
         /**
          * See https://nodejs.org/api/zlib.html#zlib_class_options regarding the usage.
          */
@@ -55,5 +68,4 @@ declare namespace e {
     }
 }
 
-declare function e(options?: e.CompressionOptions): express.RequestHandler;
 export = e;
diff --git a/types/copy-webpack-plugin/index.d.ts b/types/copy-webpack-plugin/index.d.ts
index 72331b4c6d..eedf42f450 100644
--- a/types/copy-webpack-plugin/index.d.ts
+++ b/types/copy-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kevlened/copy-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack'
 import { IOptions } from 'minimatch'
diff --git a/types/csv2json/csv2json-tests.ts b/types/csv2json/csv2json-tests.ts
new file mode 100644
index 0000000000..b211fd9aee
--- /dev/null
+++ b/types/csv2json/csv2json-tests.ts
@@ -0,0 +1,8 @@
+import csv2json = require("csv2json");
+import fs = require("fs");
+
+fs.createReadStream('data.csv')
+  .pipe(csv2json({
+    separator: ';'
+  }))
+  .pipe(fs.createWriteStream('data.json'));
diff --git a/types/csv2json/index.d.ts b/types/csv2json/index.d.ts
new file mode 100644
index 0000000000..6906d3e925
--- /dev/null
+++ b/types/csv2json/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for csv2json 1.4
+// Project: https://github.com/julien-f/csv2json
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Writable } from "stream";
+
+declare namespace csv2json {
+  interface Options {
+    dynamicTyping?: boolean;
+    separator?: string;
+  }
+}
+
+declare function csv2json(options?: csv2json.Options): Writable;
+
+export = csv2json;
diff --git a/types/csv2json/tsconfig.json b/types/csv2json/tsconfig.json
new file mode 100644
index 0000000000..79a635ca7d
--- /dev/null
+++ b/types/csv2json/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "csv2json-tests.ts"
+    ]
+}
diff --git a/types/csv2json/tslint.json b/types/csv2json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/csv2json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/d3-contour/d3-contour-tests.ts b/types/d3-contour/d3-contour-tests.ts
index 2879e71e79..4563521751 100644
--- a/types/d3-contour/d3-contour-tests.ts
+++ b/types/d3-contour/d3-contour-tests.ts
@@ -63,6 +63,8 @@ let contGen: d3Contour.Contours = d3Contour.contours();
 
 // size(...) -------------------------------------------------------------------
 
+const multiPolygon: d3Contour.ContourMultiPolygon = contGen.contour(values, 5);
+
 // set with chainability
 contGen = contGen.size([n, m]);
 
@@ -111,7 +113,11 @@ interface CustomDatum {
 
 // Get contour generator -------------------------------------------------------
 
-const contDensDefault: d3Contour.ContourDensity<[number, number]> = d3Contour.contourDensity();
+// test generic parameter defaults for ContourDensity and contourDensity
+const contDensDefault: d3Contour.ContourDensity = d3Contour.contourDensity();
+// tslint:disable-next-line: use-default-type-parameter
+const contDensDefaultCopy: d3Contour.ContourDensity<[number, number]> = contDensDefault;
+// test with explicit generic parameter
 let contDensCustom: d3Contour.ContourDensity<CustomDatum> = d3Contour.contourDensity<CustomDatum>();
 
 // Configure contour generator =================================================
diff --git a/types/d3-contour/index.d.ts b/types/d3-contour/index.d.ts
index 1d82faae40..c0b3d70b5e 100644
--- a/types/d3-contour/index.d.ts
+++ b/types/d3-contour/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for d3-contour 1.1
+// Type definitions for d3-contour 1.2
 // Project: https://d3js.org/d3-contour/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Hugues Stefanski <https://github.com/Ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// Last module patch version validated against: 1.1.0
+// Last module patch version validated against: 1.2.0
 
 import { MultiPolygon } from 'geojson';
 import { ThresholdArrayGenerator, ThresholdCountGenerator } from 'd3-array';
@@ -41,6 +41,17 @@ export interface Contours {
      */
     (values: number[]): ContourMultiPolygon[];
 
+    /**
+     * Computes a single contour, returning a GeoJSON MultiPolygon geometry object.
+     * This geometry object represents the area where the input values are greater than or equal to the given threshold value;
+     * the threshold value for the geometry object is exposed as geometry.value.
+     *
+     * @param values  Array of input values. The input values must be an array of length n×m where [n, m] is the contour generator’s size;
+     * furthermore, each values[i + jn] must represent the value at the position ⟨i, j⟩.
+     * @param threshold Threshold value.
+     */
+    contour(values: number[], threshold: number): ContourMultiPolygon;
+
     /**
      * Return the expected size of the input values grid, which defaults to [1,1].
      */
@@ -109,8 +120,13 @@ export function contours(): Contours;
 
 /**
  * A contour generator for density estimates.
+ *
+ * The generic refers to the data type of an element in the data array
+ * used with the density contour generator. If omitted, the default setting assumes that,
+ * the elements of the data array used with the density contour generator are two-element arrays.
+ * The first element corresponds to the x-dimension, the second to the y-dimension.
  */
-export interface ContourDensity<Datum> {
+export interface ContourDensity<Datum = [number, number]> {
     /**
      * Estimates the density contours for the given array of data, returning an array of GeoJSON MultiPolygon geometry objects.
      * Each geometry object represents the area where the estimated number of points per square pixel is greater than or equal to
@@ -227,21 +243,15 @@ export interface ContourDensity<Datum> {
     bandwidth(bandwidth: number): this;
 }
 
-/**
- * Construct a new contour generator for density estimates with the default settings.
- *
- * The default settings assume that, the elements of the data array used
- * with the density contour generator are two-element arrays. The first element
- * corresponds to the x-dimension, the second to the y-dimension.
- */
-export function contourDensity(): ContourDensity<[number, number]>;
 /**
  * Construct a new contour generator for density estimates.
  *
  * The generic refers to the data type of an element in the data array
- * used with the density contour generator.
+ * used with the density contour generator. If omitted, the default setting assumes that,
+ * the elements of the data array used with the density contour generator are two-element arrays.
+ * The first element corresponds to the x-dimension, the second to the y-dimension.
  *
  * Important: ensure that the x- and y-accessor functions are configured to
  * match the data type used for the generic Datum.
  */
-export function contourDensity<Datum>(): ContourDensity<Datum>;
+export function contourDensity<Datum = [number, number]>(): ContourDensity<Datum>;
diff --git a/types/d3-drag/d3-drag-tests.ts b/types/d3-drag/d3-drag-tests.ts
index 848e3d1256..3bc7e6f851 100644
--- a/types/d3-drag/d3-drag-tests.ts
+++ b/types/d3-drag/d3-drag-tests.ts
@@ -67,7 +67,8 @@ let containerAccessor: (this: SVGCircleElement, d: CircleDatum, i: number, group
 containerAccessor = function(d, i, group) {
     console.log('Node Id of circle: ', d.nodeId);
     // console.log(this.a); // fails, a is not a property of SVGCircleElement
-    return this.ownerSVGElement; // this-type is SVGCircleElement
+    /* tslint:disable-next-line:no-unnecessary-type-assertion */
+    return this.ownerSVGElement!; // this-type is SVGCircleElement
 };
 
 // Test chainability
@@ -75,7 +76,8 @@ circleDrag = circleDrag
     .container(function(d, i, group) { // container accessor function setter
         console.log('Node Id of circle: ', d.nodeId); // CircleDatum type
         // console.log(this.a); // fails, a is not a property of SVGCircleElement
-        return this.ownerSVGElement; // this-type is SVGCircleElement
+        /* tslint:disable-next-line:no-unnecessary-type-assertion */
+        return this.ownerSVGElement!; // this-type is SVGCircleElement
     });
 
 // Test chainability
diff --git a/types/datadog-tracer/datadog-tracer-tests.ts b/types/datadog-tracer/datadog-tracer-tests.ts
new file mode 100644
index 0000000000..b0fa4744b1
--- /dev/null
+++ b/types/datadog-tracer/datadog-tracer-tests.ts
@@ -0,0 +1,9 @@
+import Tracer = require('datadog-tracer');
+
+const tracer = new Tracer({
+    service: 'test'
+});
+
+tracer.on('error', (e: any) => {
+    void(0);
+});
diff --git a/types/datadog-tracer/index.d.ts b/types/datadog-tracer/index.d.ts
new file mode 100644
index 0000000000..e7a11245fe
--- /dev/null
+++ b/types/datadog-tracer/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for datadog-tracer 0.4
+// Project: https://github.com/rochdev/datadog-tracer-js#readme
+// Definitions by: Dinesh Saravanan Kumaraswamy <https://github.com/dineshsaravanan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+import * as opentracing from "opentracing";
+import { EventEmitter } from "events";
+
+export as namespace Tracer;
+export = Tracer;
+
+interface TracerOptions {
+    service: string;
+    hostname?: string;
+    port?: number;
+    protocol?: string;
+    endpoint?: string;
+}
+
+declare class Tracer extends opentracing.Tracer {
+    constructor(tracerOptions: TracerOptions);
+
+    on(method: "error", cb?: (e: any) => void): void;
+    addEventListener(method: "error", cb?: (e: any) => void): void;
+}
diff --git a/types/datadog-tracer/package.json b/types/datadog-tracer/package.json
new file mode 100644
index 0000000000..ce14cc9e91
--- /dev/null
+++ b/types/datadog-tracer/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "opentracing": "^0.14.1"
+    }
+}
diff --git a/types/datadog-tracer/tsconfig.json b/types/datadog-tracer/tsconfig.json
new file mode 100644
index 0000000000..f117daa17e
--- /dev/null
+++ b/types/datadog-tracer/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "datadog-tracer-tests.ts"
+    ]
+}
diff --git a/types/datadog-tracer/tslint.json b/types/datadog-tracer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/datadog-tracer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/dc/index.d.ts b/types/dc/index.d.ts
index 69ee20a93e..4ba0e5e4ab 100644
--- a/types/dc/index.d.ts
+++ b/types/dc/index.d.ts
@@ -176,6 +176,7 @@ declare namespace dc {
         legend: IGetSet<Legend, T>;
         options(optionsObject: any): T;
         renderlet(fn: (chart: T) => any): T;
+        useViewBoxResizing: IGetSet<boolean, T>;
 
         on(event: "renderlet", fn: (chart: T, filter: any) => any): T;
         on(event: "pretransition", fn: (chart: T, filter: any) => any): T;
@@ -484,4 +485,4 @@ declare namespace dc {
         boxPlot(parent: string, chartGroup?: string): BoxPlot;
         selectMenu(parent: string, chartGroup?: string): SelectMenu;
     }
-}
\ No newline at end of file
+}
diff --git a/types/dispatchr/addons/BaseStore.d.ts b/types/dispatchr/addons/BaseStore.d.ts
new file mode 100644
index 0000000000..6507a7fcf4
--- /dev/null
+++ b/types/dispatchr/addons/BaseStore.d.ts
@@ -0,0 +1,16 @@
+/// <reference types="node" />
+
+import { Dispatcher, DispatcherInterface, DispatcherContext, Store } from '../index';
+import { EventEmitter } from 'events';
+
+declare class BaseStore<S = {}> extends EventEmitter implements Store<S> {
+    constructor(dispatcher: DispatcherInterface);
+    initialize?(): void;
+    getContext(): DispatcherContext;
+    addChangeListener(callback: () => void): void;
+    removeChangeListener(callback: () => void): void;
+    shouldDehydrate(): boolean;
+    emitChange(): void;
+}
+
+export = BaseStore;
diff --git a/types/dispatchr/addons/createStore.d.ts b/types/dispatchr/addons/createStore.d.ts
new file mode 100644
index 0000000000..86a1f24fbb
--- /dev/null
+++ b/types/dispatchr/addons/createStore.d.ts
@@ -0,0 +1,20 @@
+import { StoreClass, Store } from '../index';
+
+type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
+type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
+interface StoreOptions {
+    storeName: string;
+    handlers: { [event: string]: string };
+    statics?: { [prop: string]: any };
+    mixins?: object[];
+    initialize?(): void;
+    dehydrate?(): any;
+    rehydrate?(state: any): void;
+}
+
+// see: https://github.com/yahoo/fluxible/blob/dispatchr-v1.2.0/packages/dispatchr/addons/createStore.js#L9
+type StoreThis<T extends StoreOptions> = Omit<T, 'statics'|'storeName'|'handlers'|'mixins'> & Store;
+
+declare function createStore<T extends StoreOptions>(options: T & ThisType<StoreThis<T>>): StoreClass;
+export = createStore;
diff --git a/types/dispatchr/dispatchr-tests.ts b/types/dispatchr/dispatchr-tests.ts
new file mode 100644
index 0000000000..fcf0490f44
--- /dev/null
+++ b/types/dispatchr/dispatchr-tests.ts
@@ -0,0 +1,46 @@
+import { createDispatcher, Store } from 'dispatchr';
+import createStore = require('dispatchr/addons/createStore');
+import BaseStore = require('dispatchr/addons/BaseStore');
+
+const TestStore = createStore({
+    storeName: 'TestStore',
+
+    handlers: {
+        ACTION_NAME: 'actionHandler'
+    },
+
+    statics: {
+        staticMethod() {}
+    },
+
+    initialize() { },
+
+    actionHandler() {
+        this.emitChange();
+        this.additionalMethod();
+    },
+
+    additionalMethod() {}
+});
+
+class ExtendedStore extends BaseStore {
+    static handlers = {
+        ACTION_NAME: 'actionHandler'
+    };
+
+    actionHandler() {
+        this.emitChange();
+    }
+}
+
+const dispatcher = createDispatcher({
+    errorHandler(e, context) {
+        e.meta;
+        e.type;
+        e.message;
+    },
+    stores: [TestStore]
+});
+
+const context = dispatcher.createContext({});
+context.dispatch('ACTION_NAME', {});
diff --git a/types/dispatchr/index.d.ts b/types/dispatchr/index.d.ts
new file mode 100644
index 0000000000..b5cf63009d
--- /dev/null
+++ b/types/dispatchr/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for dispatchr 1.2
+// Project: https://github.com/yahoo/fluxible#readme
+// Definitions by: Ragg <https://github.com/Ragg->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+
+export interface DispatcherState {
+    stores: { [storeName: string]: any };
+}
+
+export interface DispatcherOption {
+    stores?: StoreClass[];
+    errorHandler?: (e: DispatcherError, context: DispatcherContext) => void;
+}
+
+export interface StoreClass {
+    storeName: string;
+    new(): Store;
+}
+
+export interface Store<S = {}> extends EventEmitter {
+    dehydrate?(): S;
+    rehydrate?(state: S): void;
+    shouldDehydrate?(): boolean;
+    emitChange(): void;
+}
+
+export interface Dispatcher {
+    createContext(context: object): DispatcherContext;
+    registerStore(store: StoreClass): void;
+    isRegistered(store: StoreClass | string): boolean;
+    getStoreName(store: StoreClass | string): string;
+}
+
+export interface DispatcherInterface {
+    getContext(): DispatcherContext;
+    getStore: DispatcherContext['getStore'];
+    waitFor: DispatcherContext['waitFor'];
+}
+
+export interface DispatcherContext {
+    getStore(name: string): Store;
+    getStore<T extends StoreClass>(name: T): T;
+
+    dispatch(actionName: string, payload: any): void;
+
+    dehydrate(): DispatcherState;
+    rehydrate(dispatcherState: DispatcherState): void;
+
+    waitFor(stores: ReadonlyArray<string|StoreClass>, callback: () => void): void;
+    dispatcherInterface: DispatcherInterface;
+}
+
+export interface DispatcherError {
+    message: string;
+    type: string;
+    meta: {
+        actionName?: string,
+        payload?: any,
+        error: Error
+    };
+}
+
+export function createDispatcher(options: DispatcherOption): Dispatcher;
diff --git a/types/dispatchr/tsconfig.json b/types/dispatchr/tsconfig.json
new file mode 100644
index 0000000000..e94ec73c3c
--- /dev/null
+++ b/types/dispatchr/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "esModuleInterop": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "addons/createStore.d.ts",
+        "addons/BaseStore.d.ts",
+        "dispatchr-tests.ts"
+    ]
+}
diff --git a/types/dispatchr/tslint.json b/types/dispatchr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dispatchr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/dragula/index.d.ts b/types/dragula/index.d.ts
index f91e8b70ac..51998fb583 100644
--- a/types/dragula/index.d.ts
+++ b/types/dragula/index.d.ts
@@ -13,7 +13,7 @@ declare namespace dragula {
     interface DragulaOptions {
         containers?: Element[];
         isContainer?: (el?: Element) => boolean;
-        moves?: (el?: Element, container?: Element, handle?: Element) => boolean;
+        moves?: (el?: Element, container?: Element, handle?: Element, sibling?: Element) => boolean;
         accepts?: (el?: Element, target?: Element, source?: Element, sibling?: Element) => boolean;
         invalid?: (el?: Element, target?: Element) => boolean;
         direction?: string;
diff --git a/types/duplicate-package-checker-webpack-plugin/index.d.ts b/types/duplicate-package-checker-webpack-plugin/index.d.ts
index fd2906aa46..1eff56e9d5 100644
--- a/types/duplicate-package-checker-webpack-plugin/index.d.ts
+++ b/types/duplicate-package-checker-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/darrenscerri/duplicate-package-checker-webpack-plugin#readme
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
new file mode 100644
index 0000000000..ef0980abfd
--- /dev/null
+++ b/types/dwt/addon.pdf.d.ts
@@ -0,0 +1,73 @@
+/*!
+* Dynamsoft WebTwain PDF Addon
+* Product: Dynamsoft Web Twain
+* Web Site: http://www.dynamsoft.com
+*
+* Copyright 2018, Dynamsoft Corporation
+* Author: Dynamsoft Support Team
+* Version: 13.4
+*/
+
+declare enum EnumDWT_ConverMode {
+    CM_DEFAULT = 0,
+    TWPT_CM_RENDERALLGRAY = 1
+}
+
+/**
+ * @class
+ */
+interface PDF {
+    /**
+     * Download and install pdf rasterizer add-on on the local system.
+     * @method Dynamsoft.WebTwain#Download
+     * @param {string} remoteFile specifies the value of which frame to get.
+     * @param {function} optionalAsyncSuccessFunc optional.
+     * The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional.
+     * The function to call when the download fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    Download(remoteFile: string,
+        optionalAsyncSuccessFunc?: () => void,
+        optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     *  Input the password to decrypt PDF files using PDF Rasterizer add-on.
+     * @method Dynamsoft.WebTwain#SetPassword
+     * @param {string} password Specifies the PDF password.
+     * @return {bool}
+     */
+    SetPassword(password: string): boolean;
+
+    /**
+     *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN.
+     * @method Dynamsoft.WebTwain#SetConvertMode
+     * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
+     * @return {bool}
+     */
+    SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
+
+    /**
+     *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
+     * @method Dynamsoft.WebTwain#ReadRect
+     * @param {float} fResolution Specifies the resolution for convert image from PDF file.
+     * @return {bool}
+     */
+    SetResolution(fResolution: number): boolean;
+
+    /**
+     * Judges whether the local PDF is text-based or not.
+     * @method Dynamsoft.WebTwain#ReadRect
+     * @param {string} localFile specifies the local path of the target PDF.
+     * @return {bool}
+     */
+    IsTextBasedPDF(localFile: string): boolean;
+}
+
+interface WebTwainAddon {
+    PDF: PDF;
+}
+
+interface WebTwain {
+	Addon: WebTwainAddon;
+}
diff --git a/types/dwt/dwt-tests.ts b/types/dwt/dwt-tests.ts
index 16a56f1cd2..1be94acca1 100644
--- a/types/dwt/dwt-tests.ts
+++ b/types/dwt/dwt-tests.ts
@@ -103,8 +103,8 @@ function downloadImage() {
 function loadPDF() {
     const DWObject = Dynamsoft.WebTwainEnv.GetWebTwain('dwtcontrolContainer');
     if (DWObject) {
-        DWObject.Addon.PDF.SetResolution(200);
-        DWObject.Addon.PDF.SetConvertMode(1);
+		DWObject.Addon.PDF.SetResolution(200);
+		DWObject.Addon.PDF.SetConvertMode(1);
         DWObject.IfShowFileDialog = true;
         DWObject.LoadImageEx(" ", 5);
     }
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index b19980603e..b940c6ae4e 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for dwt 13.3
+// Type definitions for dwt 13.4
 // Project: http://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
 // Definitions by: Xiao Ling <https://github.com/yushulx>
 //                 Josh Hall <https://github.com/jbh>
+//                 Lincoln Hu <https://github.com/lincoln2018>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -10,68 +11,11 @@
 * Product: Dynamsoft Web Twain
 * Web Site: http://www.dynamsoft.com
 *
-* Copyright 2017, Dynamsoft Corporation
+* Copyright 2018, Dynamsoft Corporation
 * Author: Dynamsoft Support Team
-* Version: 13.3
+* Version: 13.4
 */
 
-/**
- * Dynamsoft WebTwain Addon PDF
- */
-declare enum EnumDWT_ConverMode {
-    CM_DEFAULT = 0,
-    TWPT_CM_RENDERALLGRAY = 1
-}
-
-/**
- * @class
- */
-interface PDF {
-    /**
-     * Download and install pdf rasterizer add-on on the local system. 
-     * @method Dynamsoft.WebTwain#Download 
-     * @param {string} remoteFile specifies the value of which frame to get.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
-     */
-    Download(remoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    /**
-     *  Input the password to decrypt PDF files using PDF Rasterizer add-on. 
-     * @method Dynamsoft.WebTwain#SetPassword 
-     * @param {string} password Specifies the PDF password.
-     * @return {bool}
-     */
-    SetPassword(password: string): boolean;
-
-    /**
-     *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN. 
-     * @method Dynamsoft.WebTwain#SetConvertMode 
-     * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
-     * @return {bool}
-     */
-    SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
-
-    /**
-     *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
-     * @method Dynamsoft.WebTwain#ReadRect 
-     * @param {float} fResolution Specifies the resolution for convert image from PDF file.
-     * @return {bool}
-     */
-    SetResolution(fResolution: number): boolean;
-
-    /**
-     * Judges whether the local PDF is text-based or not.
-     * @method Dynamsoft.WebTwain#ReadRect 
-     * @param {string} localFile specifies the local path of the target PDF.
-     * @return {bool}
-     */
-    IsTextBasedPDF(localFile: string): boolean;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
 /**
  * @namespace Dynamsoft
  */
@@ -1318,21 +1262,11 @@ interface Container {
     Height: string | number;
 }
 
-interface WebTwainAddon {
-    PDF: PDF;
-}
-
 /**
  * @class
  */
 // properties (get/set) / sync functions
 interface WebTwain {
-    /**
-     * Returns addon.
-     * @type {WebTwainAddon}
-     */
-    Addon: WebTwainAddon;
-
     /**
      * Returns or sets whether multi-page selection is supported.
      * @type {bool}
diff --git a/types/dwt/tsconfig.json b/types/dwt/tsconfig.json
index db2ac6bbf4..13f35fcfbf 100644
--- a/types/dwt/tsconfig.json
+++ b/types/dwt/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "addon.pdf.d.ts",
         "dwt-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 10c4659998..e21f84dc48 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -266,6 +266,30 @@ client.search({
   }
 });
 
+client.updateByQuery({
+  index: 'myIndex',
+  type: 'mytype',
+}, (error, response) => {
+  const {
+    took,
+    timed_out,
+    updated,
+    deleted,
+    batches,
+    version_conflicts,
+    noops,
+    retries,
+    throttled_millis,
+    throttled_until_millis,
+    total,
+    failures
+  } = response;
+
+  const { bulk, search } = retries;
+
+  // ...
+});
+
 client.indices.updateAliases({
   body: {
     actions: [
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index c6b05da9a0..e60e8d86c3 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -89,8 +89,8 @@ export class Client {
     termvectors(params: TermvectorsParams, callback: (error: any, response: any) => void): void;
     update(params: UpdateDocumentParams): Promise<any>;
     update(params: UpdateDocumentParams, callback: (error: any, response: any) => void): void;
-    updateByQuery(params: UpdateDocumentByQueryParams): Promise<any>;
-    updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: any) => void): void;
+    updateByQuery(params: UpdateDocumentByQueryParams): Promise<UpdateDocumentByQueryResponse>;
+    updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: UpdateDocumentByQueryResponse) => void): void;
     close(): void;
 }
 
@@ -785,6 +785,25 @@ export interface UpdateDocumentByQueryParams extends GenericParams {
     type: NameList;
 }
 
+export interface UpdateDocumentByQueryResponse {
+    took: number;
+    timed_out: boolean;
+    updated: number;
+    deleted: number;
+    batches: number;
+    version_conflicts: number;
+    noops: number;
+    retries: {
+        bulk: number;
+        search: number;
+    };
+    throttled_millis: number;
+    requests_per_second: number;
+    throttled_until_millis: number;
+    total: number;
+    failures: any[];
+}
+
 export interface Cat {
     aliases(params: CatAliasesParams, callback: (error: any, response: any) => void): void;
     aliases(params: CatAliasesParams): Promise<any>;
diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index 7b78770489..9eec5ed467 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -23,6 +23,9 @@ declare module 'ember-data' {
     type AttributesFor<Model> = keyof Model; // TODO: filter to attr properties only (TS 2.8)
     type RelationshipsFor<Model> = keyof Model; // TODO: filter to hasMany/belongsTo properties only (TS 2.8)
 
+    export interface ChangedAttributes {
+        [key: string]: [any, any] | undefined;
+    }
     interface AttributeMeta<Model extends DS.Model> {
         type: keyof TransformRegistry;
         options: object;
@@ -500,7 +503,7 @@ declare module 'ember-data' {
              * Returns an object, whose keys are changed properties, and value is
              * an [oldProp, newProp] array.
              */
-            changedAttributes(): {};
+            changedAttributes(): ChangedAttributes;
             /**
              * If the model `hasDirtyAttributes` this function will discard any unsaved
              * changes. If the model `isNew` it will be removed from the store.
diff --git a/types/ember-data/test/model.ts b/types/ember-data/test/model.ts
index a18167dbee..63bda2588e 100644
--- a/types/ember-data/test/model.ts
+++ b/types/ember-data/test/model.ts
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import DS from 'ember-data';
+import DS, { ChangedAttributes } from 'ember-data';
 import { assertType } from "./lib/assert";
 
 const Person = DS.Model.extend({
@@ -30,3 +30,7 @@ assertType<Date>(user.get('createdAt'));
 
 user.serialize();
 user.serialize({ includeId: true });
+user.serialize({ includeId: true });
+
+const attributes = user.changedAttributes();
+assertType<ChangedAttributes>(attributes);
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index a89d6bcc6f..dd3ed1ec64 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -2078,6 +2078,7 @@ declare module 'ember' {
              * Transition the application into another route. The route may
              * be either a single route or route path:
              */
+            transitionTo(name: string, options?: {}): Transition;
             transitionTo(name: string, ...models: any[]): Transition;
             transitionTo(name: string, options: {}): Transition;
         }
@@ -3305,6 +3306,7 @@ declare module 'ember' {
          * @param options   optional hash with a queryParams property containing a
          *                  mapping of query parameters
          */
+        isActive(routeName: string, options?: { queryParams: object }): boolean;
         isActive(routeName: string, models: RouteModel, options?: { queryParams: object }): boolean;
         isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): boolean;
         isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): boolean;
@@ -3322,6 +3324,7 @@ declare module 'ember' {
          *                       containing a mapping of query parameters
          * @returns              the Transition object associated with this attempted transition
          */
+        replaceWith(routeNameOrUrl: string, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, models: RouteModel, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): Ember.Transition;
@@ -3339,6 +3342,7 @@ declare module 'ember' {
          *                       containing a mapping of query parameters
          * @returns              the Transition object associated with this attempted transition
          */
+        transitionTo(routeNameOrUrl: string, options?: { queryParam: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, models: RouteModel, options?: { queryParams: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): Ember.Transition;
@@ -3355,6 +3359,7 @@ declare module 'ember' {
          *                  a mapping of query parameters
          * @returns         the string representing the generated URL
          */
+        urlFor(routeName: string, options?: { queryParams: object }): string;
         urlFor(routeName: string, models: RouteModel, options?: { queryParams: object }): string;
         urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): string;
         urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): string;
diff --git a/types/ember/test/router.ts b/types/ember/test/router.ts
index 9ec79ce281..c663083679 100755
--- a/types/ember/test/router.ts
+++ b/types/ember/test/router.ts
@@ -22,3 +22,21 @@ AppRouter.map(function() {
     this.mount('my-engine');
     this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine'});
 });
+
+const RouterServiceConsumer = Ember.Service.extend({
+    router: Ember.inject.service('router'),
+    transitionWithoutModel() {
+        Ember.get(this, 'router')
+        .transitionTo('some-route');
+    },
+    transitionWithModel() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router')
+        .transitionTo('some.other.route', model);
+    },
+    transitionWithModelAndOptions() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router')
+        .transitionTo('index', model, { queryParams: { search: 'ember' }});
+    }
+});
diff --git a/types/enhanced-resolve/index.d.ts b/types/enhanced-resolve/index.d.ts
index 5a39b4f6d0..1cf3a3397a 100644
--- a/types/enhanced-resolve/index.d.ts
+++ b/types/enhanced-resolve/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for enhanced-resolve v3.0.0
 // Project: https://github.com/webpack/enhanced-resolve.git
-// Definitions by: e-cloud <https://github.com/e-cloud>, Onigoetz <https://github.com/onigoetz> 
+// Definitions by: e-cloud <https://github.com/e-cloud>, Onigoetz <https://github.com/onigoetz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 /// <reference types="tapable" />
diff --git a/types/enhanced-resolve/tsconfig.json b/types/enhanced-resolve/tsconfig.json
index 9c87f7e7a1..c2716adaa1 100644
--- a/types/enhanced-resolve/tsconfig.json
+++ b/types/enhanced-resolve/tsconfig.json
@@ -14,7 +14,10 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "tapable": ["tapable/v0"]
+        }
     },
     "files": [
         "index.d.ts",
diff --git a/types/es6-shim/index.d.ts b/types/es6-shim/index.d.ts
index 51824fc932..2cf61a9362 100644
--- a/types/es6-shim/index.d.ts
+++ b/types/es6-shim/index.d.ts
@@ -500,7 +500,7 @@ interface PromiseConstructor {
     /**
      * Creates a new Promise.
      * @param executor A callback used to initialize the promise. This callback is passed two arguments:
-     * a resolve callback used resolve the promise with a value or the result of another promise,
+     * a resolve callback used to resolve the promise with a value or the result of another promise,
      * and a reject callback used to reject the promise with a provided reason or error.
      */
     new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
diff --git a/types/event-emitter-es6/event-emitter-es6-tests.ts b/types/event-emitter-es6/event-emitter-es6-tests.ts
new file mode 100644
index 0000000000..8001d2605e
--- /dev/null
+++ b/types/event-emitter-es6/event-emitter-es6-tests.ts
@@ -0,0 +1,17 @@
+import EventEmitter = require("event-emitter-es6");
+
+const ee = new EventEmitter();
+const ee1 = new EventEmitter({ emitDelay: 50 });
+const ee2 = new EventEmitter({ strictMode: true });
+const ee3 = new EventEmitter({ strictMode: false, emitDelay: 5 });
+const ee4 = new EventEmitter({});
+
+ee.on("test", () => {});
+ee.once("test", () => {});
+ee.off("test", () => {});
+ee.off("test");
+ee.emit("test");
+ee.emit("test", 1, 2, 3, "a", "b", "c");
+ee.emitSync("test");
+ee.emitSync("test", 1, 2, 3, "a", "b", "c");
+ee.destroy();
diff --git a/types/event-emitter-es6/index.d.ts b/types/event-emitter-es6/index.d.ts
new file mode 100644
index 0000000000..840f2ddf38
--- /dev/null
+++ b/types/event-emitter-es6/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for event-emitter-es6 1.1
+// Project: https://github.com/insane-jo/event-emitter#readme
+// Definitions by: Anton Strömkvist <https://github.com/ahstro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Options {
+  emitDelay?: number;
+  strictMode?: boolean;
+}
+
+type Listener = (...args: any[]) => void;
+
+declare class EventEmitter {
+  constructor(options?: Options);
+  on(type: string, listener: Listener): void;
+  once(type: string, listener: Listener): void;
+  off(type: string, listener?: Listener): void;
+  emit(type: string, ...eventArgs: any[]): void;
+  emitSync(type: string, ...eventArgs: any[]): void;
+  destroy(): void;
+}
+
+export = EventEmitter;
diff --git a/types/event-emitter-es6/tsconfig.json b/types/event-emitter-es6/tsconfig.json
new file mode 100644
index 0000000000..f450ea2a8a
--- /dev/null
+++ b/types/event-emitter-es6/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "event-emitter-es6-tests.ts"
+    ]
+}
diff --git a/types/event-emitter-es6/tslint.json b/types/event-emitter-es6/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/event-emitter-es6/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts b/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts
new file mode 100644
index 0000000000..828771242e
--- /dev/null
+++ b/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts
@@ -0,0 +1,33 @@
+import * as DataFormatter from "excel-style-dataformatter";
+import * as enLocales from "excel-style-dataformatter/lib/locales/en-US";
+import * as ruLocales from "excel-style-dataformatter/lib/locales/ru";
+
+const localesOptions: DataFormatter.LocalesOptions = {
+	name: "test",
+	months: ['january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december'],
+	monthsShort: ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'],
+	days: ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'],
+	daysShort: ['su', 'mo', 'tu', 'we', 'th', 'fr', 'sa'],
+	thousandSeparator: ',',
+	decimalSeparator: '.',
+	formats: {
+		'Test format 1': '#.#',
+		'Test format 2': '$ #,##0.00;[Red]$ -#,##0.00',
+	}
+};
+const formatterOptions: DataFormatter.FormatterOptions = {
+	debug: true,
+	UTCOffset: 100,
+	locale: "test",
+	transformCode: (code: string): string => {
+		return code + "string";
+	},
+	locales: [localesOptions, ruLocales]
+};
+const dataFormatter1 = new DataFormatter(formatterOptions);
+const dataFormatter2 = new DataFormatter();
+dataFormatter2.defineLocales([enLocales, ruLocales]);
+dataFormatter2.setLocale("ru");
+dataFormatter2.setUTCOffset(null);
+dataFormatter2.setUTCOffset(100);
+const result: DataFormatter.FormatResult = dataFormatter2.format("testValue", "testType", "testFormat");
diff --git a/types/excel-style-dataformatter/index.d.ts b/types/excel-style-dataformatter/index.d.ts
new file mode 100644
index 0000000000..7f76ee6987
--- /dev/null
+++ b/types/excel-style-dataformatter/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for excel-style-dataformatter 2.0
+// Project: https://github.com/fakundo/Excel-Style-Javascript-DataFormatter
+// Definitions by: SanderDeWaal1992 <https://github.com/SanderDeWaal1992>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class DataFormatter {
+	constructor(options?: DataFormatter.FormatterOptions);
+
+	/**
+	 * Format a value
+	 * @param value
+	 * @param type value type
+	 * @param format format preset
+	 */
+	format(value: any, type: string, format: string): DataFormatter.FormatResult;
+	/**
+	 * Defines locales
+	 * @param  locales
+	 */
+	defineLocales(locales: DataFormatter.LocalesOptions[]): void;
+	/**
+	 * Sets locale
+	 * If locale doesn't exist, sets default
+	 * @param locale
+	 */
+	setLocale(locale: string): void;
+	/**
+	 * Sets UTC offset for dates
+	 * @param offset in minutes
+	 */
+	setUTCOffset(offset: number | null): void;
+}
+
+declare namespace DataFormatter {
+	interface LocalesOptions {
+		name: string;
+		months: string[];
+		monthsShort: string[];
+		days: string[];
+		daysShort: string[];
+		thousandSeparator: string;
+		decimalSeparator: string;
+		formats: {
+			[index: string]: string
+		};
+	}
+	interface FormatterOptions {
+		debug?: boolean;
+		UTCOffset?: number | null;
+		locale?: string;
+		transformCode?: (code: any) => any;
+		locales?: LocalesOptions[];
+	}
+
+	interface FormatResult {
+		value: string;
+		align: string;
+		color: string;
+		pattern: string;
+	}
+}
+
+export = DataFormatter;
diff --git a/types/excel-style-dataformatter/lib/locales/en-US.d.ts b/types/excel-style-dataformatter/lib/locales/en-US.d.ts
new file mode 100644
index 0000000000..591678aea8
--- /dev/null
+++ b/types/excel-style-dataformatter/lib/locales/en-US.d.ts
@@ -0,0 +1,4 @@
+import * as DataFormatter from "../../index";
+
+declare const locale: DataFormatter.LocalesOptions;
+export = locale;
diff --git a/types/excel-style-dataformatter/lib/locales/ru.d.ts b/types/excel-style-dataformatter/lib/locales/ru.d.ts
new file mode 100644
index 0000000000..591678aea8
--- /dev/null
+++ b/types/excel-style-dataformatter/lib/locales/ru.d.ts
@@ -0,0 +1,4 @@
+import * as DataFormatter from "../../index";
+
+declare const locale: DataFormatter.LocalesOptions;
+export = locale;
diff --git a/types/excel-style-dataformatter/tsconfig.json b/types/excel-style-dataformatter/tsconfig.json
new file mode 100644
index 0000000000..563681d3ac
--- /dev/null
+++ b/types/excel-style-dataformatter/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+		"strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+		"lib/locales/en-US.d.ts",
+		"lib/locales/ru.d.ts",
+        "excel-style-dataformatter-tests.ts"
+    ]
+}
diff --git a/types/excel-style-dataformatter/tslint.json b/types/excel-style-dataformatter/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/excel-style-dataformatter/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/execa/execa-tests.ts b/types/execa/execa-tests.ts
index 2525091f2a..ecc966d3d5 100644
--- a/types/execa/execa-tests.ts
+++ b/types/execa/execa-tests.ts
@@ -1,46 +1,38 @@
 import assert = require('assert');
 import execa = require('execa');
-import { PassThrough } from "stream";
+import { PassThrough } from 'stream';
 
-execa('unicorns')
-    .then(result => {
-        assert(result.cmd === 'unicorns');
-        assert(result.code === 0);
-        assert(result.failed === false);
-        assert(result.killed === false);
-        assert(result.signal === null);
-        assert(result.stderr === 'bad unicorns');
-        assert(result.stdout === 'good unicorns');
-        assert(result.timedOut === false);
-    });
+execa('unicorns').then(result => {
+    assert(result.cmd === 'unicorns');
+    assert(result.code === 0);
+    assert(result.failed === false);
+    assert(result.killed === false);
+    assert(result.signal === null);
+    assert(result.stderr === 'bad unicorns');
+    assert(result.stdout === 'good unicorns');
+    assert(result.timedOut === false);
+});
 
-execa('foo')
-    .catch(error => {
-        assert(error.cmd === 'foo');
-        assert(error.code === 128);
-        assert(error.failed === true);
-        assert(error.killed === false);
-        assert(error.signal === 'SIGINT');
-        assert(error.stderr === 'stderr');
-        assert(error.stdout === 'stdout');
-        assert(error.timedOut === false);
-    });
+execa('foo').catch(error => {
+    assert(error.cmd === 'foo');
+    assert(error.code === 128);
+    assert(error.failed === true);
+    assert(error.killed === false);
+    assert(error.signal === 'SIGINT');
+    assert(error.stderr === 'stderr');
+    assert(error.stdout === 'stdout');
+    assert(error.timedOut === false);
+});
 
-execa('noop', ['foo'])
-    .then(result => result.stderr.toLocaleLowerCase());
+execa('noop', ['foo']).then(result => result.stderr.toLocaleLowerCase());
 
-execa.stdout('unicorns')
-    .then(stdout => stdout.toLocaleLowerCase());
-execa.stdout('echo', ['unicorns'])
-    .then(stdout => stdout.toLocaleLowerCase());
+execa.stdout('unicorns').then(stdout => stdout.toLocaleLowerCase());
+execa.stdout('echo', ['unicorns']).then(stdout => stdout.toLocaleLowerCase());
 
-execa.stderr('unicorns')
-    .then(stderr => stderr.toLocaleLowerCase());
-execa.stderr('echo', ['unicorns'])
-    .then(stderr => stderr.toLocaleLowerCase());
+execa.stderr('unicorns').then(stderr => stderr.toLocaleLowerCase());
+execa.stderr('echo', ['unicorns']).then(stderr => stderr.toLocaleLowerCase());
 
-execa.shell('echo unicorns')
-    .then(result => result.stdout.toLocaleLowerCase());
+execa.shell('echo unicorns').then(result => result.stdout.toLocaleLowerCase());
 
 {
     let result: string;
@@ -54,14 +46,14 @@ execa.shell('echo unicorns')
 execa('echo', ['unicorns']).stdout.pipe(process.stdout);
 execa('echo', ['unicorns']).stderr.pipe(process.stderr);
 
-execa('forever', {extendEnv: false}).pid;
-execa('forever', {argv0: 'hi'}).pid;
-execa('forever', {localDir: '~'}).pid;
-execa('forever', {reject: false}).pid;
-execa('forever', {cleanup: false}).pid;
-execa('forever', {stdin: 1}).pid;
-execa('forever', {stdout: 'ignore'}).pid;
-execa('forever', {stderr: undefined}).pid;
+execa('forever', { extendEnv: false }).pid;
+execa('forever', { argv0: 'hi' }).pid;
+execa('forever', { localDir: '~' }).pid;
+execa('forever', { reject: false }).pid;
+execa('forever', { cleanup: false }).pid;
+execa('forever', { stdin: 1 }).pid;
+execa('forever', { stdout: 'ignore' }).pid;
+execa('forever', { stderr: undefined }).pid;
 
 async () => {
     const { stdout } = await execa('noop', ['foo'], { stripEof: false });
@@ -119,7 +111,9 @@ async () => {
 }
 
 async () => {
-    const { timedOut, code } = await execa('delay', ['3000', '22'], { timeout: 9000 });
+    const { timedOut, code } = await execa('delay', ['3000', '22'], {
+        timeout: 9000
+    });
     assert(timedOut === true);
     assert(code === 22);
 };
@@ -131,3 +125,10 @@ async () => {
 
     assert(stdout === 'foo');
 };
+
+const args: ReadonlyArray<string> = ['bar'];
+const stdio: ReadonlyArray<'ignore'> = ['ignore'];
+execa('foo', args);
+execa('foo', args, {
+    stdio
+});
diff --git a/types/execa/index.d.ts b/types/execa/index.d.ts
index c3aced26ee..067d36c368 100644
--- a/types/execa/index.d.ts
+++ b/types/execa/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for execa 0.8
+// Type definitions for execa 0.9
 // Project: https://github.com/sindresorhus/execa#readme
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 //                 BendingBender <https://github.com/BendingBender>
@@ -23,7 +23,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for a result `Object` with `stdout` and `stderr` properties.
          */
-        (file: string, args?: string[], options?: Options): ExecaChildProcess;
+        (
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): ExecaChildProcess;
         (file: string, options?: Options): ExecaChildProcess;
 
         /**
@@ -32,7 +36,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for `stdout`.
          */
-        stdout(file: string, args?: string[], options?: Options): Promise<string>;
+        stdout(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): Promise<string>;
         stdout(file: string, options?: Options): Promise<string>;
 
         /**
@@ -41,7 +49,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for `stderr`.
          */
-        stderr(file: string, args?: string[], options?: Options): Promise<string>;
+        stderr(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): Promise<string>;
         stderr(file: string, options?: Options): Promise<string>;
 
         /**
@@ -59,7 +71,11 @@ declare namespace execa {
          * @returns the same result object as `child_process.spawnSync`.
          * @throws an `Error` if the command fails.
          */
-        sync(file: string, args?: string[], options?: SyncOptions): ExecaReturns;
+        sync(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: SyncOptions
+        ): ExecaReturns;
         sync(file: string, options?: SyncOptions): ExecaReturns;
 
         /**
@@ -71,7 +87,15 @@ declare namespace execa {
         shellSync(command: string, options?: Options): ExecaReturns;
     }
 
-    type StdIOOption = 'pipe' | 'ipc' | 'ignore' | Stream | number | null | undefined;
+    type StdIOOption =
+        | 'pipe'
+        | 'ipc'
+        | 'ignore'
+        | 'inherit'
+        | Stream
+        | number
+        | null
+        | undefined;
 
     interface CommonOptions {
         /**
@@ -103,7 +127,7 @@ declare namespace execa {
          *
          * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
          */
-        stdio?: 'pipe' | 'ignore' | 'inherit' | StdIOOption[];
+        stdio?: 'pipe' | 'ignore' | 'inherit' | ReadonlyArray<StdIOOption>;
         /**
          * Prepare child to run independently of its parent process.
          * Specific behavior depends on the platform.
@@ -253,10 +277,16 @@ declare namespace execa {
     type ExecaError = Error & ExecaReturns;
 
     interface ExecaChildPromise {
-        catch<TResult = never>(onrejected?: ((reason: ExecaError) => TResult | PromiseLike<TResult>) | null): Promise<ExecaReturns | TResult>;
+        catch<TResult = never>(
+            onrejected?:
+                | ((reason: ExecaError) => TResult | PromiseLike<TResult>)
+                | null
+        ): Promise<ExecaReturns | TResult>;
     }
 
-    type ExecaChildProcess = ChildProcess & ExecaChildPromise & Promise<ExecaReturns>;
+    type ExecaChildProcess = ChildProcess &
+        ExecaChildPromise &
+        Promise<ExecaReturns>;
 }
 
 declare var execa: execa.ExecaStatic;
diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index 187d62b2ee..d1b543c591 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -199,10 +199,7 @@ async () => {
         onError={(error) => console.log(error)} />
 );
 () => (
-    <AppLoading
-        startAsync={null}
-        onFinish={null}
-        onError={null} />
+    <AppLoading />
 );
 
 const barcodeReadCallback = () => {};
@@ -292,14 +289,37 @@ async () => {
 };
 
 async () => {
+    // Video test
     const result = await ImagePicker.launchImageLibraryAsync({
-        mediaTypes: ImagePicker.MediaTypeOptions.Videos
+        mediaTypes: ImagePicker.MediaTypeOptions.Videos,
     });
 
     if (!result.cancelled) {
         result.uri;
         result.width;
         result.height;
+        result.duration;
+        result.type;
+    }
+};
+
+async () => {
+    // Image test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Images,
+        base64: true,
+        aspect: [4, 3],
+        quality: 1,
+        exif: true,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.exif;
+        result.base64;
+        result.type;
     }
 };
 
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index a747a881e6..8661cac727 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -5,6 +5,7 @@
 //                 Jan Aagaard <https://github.com/janaagaard75>
 //                 Sergio Sánchez <https://github.com/ssanchezmarc>
 //                 Fernando Helwanger <https://github.com/fhelwanger>
+//                 Umidbek Karimov <https://github.com/umidbekkarimov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -99,20 +100,16 @@ export namespace Amplitude {
 
 // #region AppLoading
 /** The following props are recommended, but optional for the sake of backwards compatibility (they were introduced in SDK21). If you do not provide any props, you are responsible for coordinating loading assets, handling errors, and updating state to unmount the `AppLoading` component. */
-export type AppLoadingProps = {
+export interface AppLoadingProps {
     /** A `function` that returns a `Promise`. The `Promise` should resolve when the app is done loading data and assets. */
-    startAsync: () => Promise<void>;
+    startAsync?: () => Promise<void>;
 
     /** Required if you provide `startAsync`. Called when `startAsync` resolves or rejects. This should be used to set state and unmount the `AppLoading` component. */
-    onFinish: () => void;
+    onFinish?: () => void;
 
     /** If `startAsync` throws an error, it is caught and passed into the function provided to `onError`. */
     onError?: (error: Error) => void;
-} | {
-    startAsync: null;
-    onFinish: null;
-    onError?: null;
-};
+}
 
 /**
  * A React component that tells Expo to keep the app loading screen open if it is the first and only component rendered in your app. When it is removed, the loading screen will disappear and your app will be visible.
@@ -1421,6 +1418,10 @@ export namespace ImagePicker {
         uri: string;
         width: number;
         height: number;
+        type: 'video' | 'image';
+        base64?: string;
+        exif?: object;
+        duration?: number;
     }
 
     type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
@@ -1437,6 +1438,8 @@ export namespace ImagePicker {
         allowsEditing?: boolean;
         aspect?: [number, number];
         quality?: number;
+        base64?: boolean;
+        exif?: boolean;
         mediaTypes?: keyof _MediaTypeOptions;
     }
 
diff --git a/types/expo/tsconfig.json b/types/expo/tsconfig.json
index 03b9c139b1..7711f49776 100644
--- a/types/expo/tsconfig.json
+++ b/types/expo/tsconfig.json
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
+            "dom",
             "es6"
         ],
         "jsx": "react",
@@ -21,4 +22,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/expo/v23/expo-tests.tsx b/types/expo/v23/expo-tests.tsx
index 0764a4d53e..51b3f30d39 100644
--- a/types/expo/v23/expo-tests.tsx
+++ b/types/expo/v23/expo-tests.tsx
@@ -106,10 +106,7 @@ async () => {
         onError={(error) => console.log(error)} />
 );
 () => (
-    <AppLoading
-        startAsync={null}
-        onFinish={null}
-        onError={null} />
+    <AppLoading />
 );
 
 const barcodeReadCallback = () => {};
diff --git a/types/expo/v23/index.d.ts b/types/expo/v23/index.d.ts
index 54154d8d6b..78de7bf415 100644
--- a/types/expo/v23/index.d.ts
+++ b/types/expo/v23/index.d.ts
@@ -330,15 +330,12 @@ export class Video extends Component<VideoProps, VideoState> {
 /**
  * AppLoading
  */
-export type AppLoadingProperties = {
-    startAsync: () => Promise<void>;
-    onFinish: () => void;
+export interface AppLoadingProperties {
+    startAsync?: () => Promise<void>;
+    onFinish?: () => void;
     onError?: (error: Error) => void;
-} | {
-    startAsync: null;
-    onFinish: null;
-    onError?: null;
-};
+}
+
 export class AppLoading extends Component<AppLoadingProperties> { }
 
 /**
diff --git a/types/expo/v23/tsconfig.json b/types/expo/v23/tsconfig.json
index 3d85e281ed..295d9da342 100644
--- a/types/expo/v23/tsconfig.json
+++ b/types/expo/v23/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "jsx": "react",
         "noImplicitAny": true,
@@ -29,4 +30,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/expo/v24/expo-tests.tsx b/types/expo/v24/expo-tests.tsx
index 77f9bbba87..8749a5993c 100644
--- a/types/expo/v24/expo-tests.tsx
+++ b/types/expo/v24/expo-tests.tsx
@@ -196,10 +196,7 @@ async () => {
         onError={(error) => console.log(error)} />
 );
 () => (
-    <AppLoading
-        startAsync={null}
-        onFinish={null}
-        onError={null} />
+    <AppLoading />
 );
 
 const barcodeReadCallback = () => {};
diff --git a/types/expo/v24/index.d.ts b/types/expo/v24/index.d.ts
index 4bf5e48dc9..829e9730a7 100644
--- a/types/expo/v24/index.d.ts
+++ b/types/expo/v24/index.d.ts
@@ -99,20 +99,16 @@ export namespace Amplitude {
 
 // #region AppLoading
 /** The following props are recommended, but optional for the sake of backwards compatibility (they were introduced in SDK21). If you do not provide any props, you are responsible for coordinating loading assets, handling errors, and updating state to unmount the `AppLoading` component. */
-export type AppLoadingProps = {
+export interface AppLoadingProps {
     /** A `function` that returns a `Promise`. The `Promise` should resolve when the app is done loading data and assets. */
-    startAsync: () => Promise<void>;
+    startAsync?: () => Promise<void>;
 
     /** Required if you provide `startAsync`. Called when `startAsync` resolves or rejects. This should be used to set state and unmount the `AppLoading` component. */
-    onFinish: () => void;
+    onFinish?: () => void;
 
     /** If `startAsync` throws an error, it is caught and passed into the function provided to `onError`. */
     onError?: (error: Error) => void;
-} | {
-    startAsync: null;
-    onFinish: null;
-    onError?: null;
-};
+}
 
 /**
  * A React component that tells Expo to keep the app loading screen open if it is the first and only component rendered in your app. When it is removed, the loading screen will disappear and your app will be visible.
diff --git a/types/expo/v24/tsconfig.json b/types/expo/v24/tsconfig.json
index 87b7b33224..dffdd0aa8c 100644
--- a/types/expo/v24/tsconfig.json
+++ b/types/expo/v24/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "jsx": "react",
         "noImplicitAny": true,
@@ -29,4 +30,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/express-bunyan-logger/express-bunyan-logger-tests.ts b/types/express-bunyan-logger/express-bunyan-logger-tests.ts
new file mode 100644
index 0000000000..daac949c0e
--- /dev/null
+++ b/types/express-bunyan-logger/express-bunyan-logger-tests.ts
@@ -0,0 +1,24 @@
+import Bunyan = require('bunyan');
+import expressBunyan = require('express-bunyan-logger');
+
+// works with no options
+const middleware = expressBunyan({});
+const middleware2 = expressBunyan.errorLogger({});
+
+// format accepts both string and function
+const middleware3 = expressBunyan({
+    format: ':name'
+});
+const middleware4 = expressBunyan({
+    format(meta: any) {
+        return 'foo';
+    }
+});
+
+// works when provided a bunyan logger
+const logger = Bunyan.createLogger({
+    name: 'myLogger'
+});
+const middleware5 = expressBunyan({
+    logger
+});
diff --git a/types/express-bunyan-logger/index.d.ts b/types/express-bunyan-logger/index.d.ts
new file mode 100644
index 0000000000..6697a26a20
--- /dev/null
+++ b/types/express-bunyan-logger/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for express-bunyan-logger 1.3
+// Project: https://github.com/villadora/express-bunyan-logger
+// Definitions by: Shrey Jain <https://github.com/shreyjain1994>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import Bunyan = require('bunyan');
+import express = require('express');
+
+export = Factory;
+
+declare function Factory(options?: Factory.Options): express.RequestHandler;
+
+declare namespace Factory {
+    type FormatFunction = (meta: any) => string;
+    type IncludesFunction = (req: express.Request, res: express.Response) => any;
+    type RequestIdGenFunction = (req: express.Request) => string;
+    type LevelFunction = (status: number, err: Error | null, meta: any) => string;
+
+    interface Options {
+        logger?: Bunyan;
+        format?: string | FormatFunction;
+        parseUA?: boolean;
+        levelFn?: LevelFunction;
+        includesFn?: IncludesFunction;
+        excludes?: string[];
+        obfuscate?: string[];
+        obfuscatePlaceholder?: string;
+        serializers?: { [field: string]: Bunyan.Serializer };
+        immediate?: boolean;
+        genReqId?: RequestIdGenFunction;
+    }
+
+    function errorLogger(options?: Options): express.ErrorRequestHandler;
+}
diff --git a/types/express-bunyan-logger/tsconfig.json b/types/express-bunyan-logger/tsconfig.json
new file mode 100644
index 0000000000..8079293b99
--- /dev/null
+++ b/types/express-bunyan-logger/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-bunyan-logger-tests.ts"
+    ]
+}
diff --git a/types/express-bunyan-logger/tslint.json b/types/express-bunyan-logger/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-bunyan-logger/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-graphql/express-graphql-tests.ts b/types/express-graphql/express-graphql-tests.ts
index 482b15c186..6fdfc0d945 100644
--- a/types/express-graphql/express-graphql-tests.ts
+++ b/types/express-graphql/express-graphql-tests.ts
@@ -14,13 +14,13 @@ const graphqlOption: graphqlHTTP.OptionsObj = {
     extensions: (args) => { }
 };
 
-const graphqlOptionRequest = (request: express.Request): graphqlHTTP.OptionsObj => ({
+const graphqlOptionRequest = (request: express.Request, response: express.Response): graphqlHTTP.OptionsObj => ({
     graphiql: true,
     schema: schema,
     context: request.session
 });
 
-const graphqlOptionRequestAsync = async (request: express.Request): Promise<graphqlHTTP.OptionsObj> => {
+const graphqlOptionRequestAsync = async (request: express.Request, response: express.Response): Promise<graphqlHTTP.OptionsObj> => {
     return {
         graphiql: true,
         schema: await Promise.resolve(schema),
diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index 166bdae6e7..ade08f1729 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -16,7 +16,7 @@ declare namespace graphqlHTTP {
      * Used to configure the graphQLHTTP middleware by providing a schema
      * and other configuration options.
      */
-    export type Options = ((req: Request) => OptionsObj) | ((req: Request) => Promise<OptionsObj>) | OptionsObj
+    export type Options = ((req: Request, res: Response) => OptionsObj) | ((req: Request, res: Response) => Promise<OptionsObj>) | OptionsObj
     export type OptionsObj = {
         /**
          * A GraphQL schema from graphql-js.
diff --git a/types/extract-text-webpack-plugin/index.d.ts b/types/extract-text-webpack-plugin/index.d.ts
index 9f17a66da0..61b381d253 100644
--- a/types/extract-text-webpack-plugin/index.d.ts
+++ b/types/extract-text-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/webpack-contrib/extract-text-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>, kayo <https://github.com/katyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin, NewLoader, OldLoader } from 'webpack';
 
diff --git a/types/ez-plus/ez-plus-tests.ts b/types/ez-plus/ez-plus-tests.ts
new file mode 100644
index 0000000000..df442607f4
--- /dev/null
+++ b/types/ez-plus/ez-plus-tests.ts
@@ -0,0 +1,14 @@
+import { Options } from "ez-plus";
+
+$(document).ready(() => {
+    // basic usage
+    $('#image').ezPlus();
+
+    // with options
+    const options: Options = {
+        zoomLens: true,
+        zoomType: 'lens',
+        cursor: 'crosshair'
+    };
+    $('#image').ezPlus(options);
+});
diff --git a/types/ez-plus/index.d.ts b/types/ez-plus/index.d.ts
new file mode 100644
index 0000000000..3a372108d3
--- /dev/null
+++ b/types/ez-plus/index.d.ts
@@ -0,0 +1,214 @@
+// Type definitions for jQuery ElevateZoom Plus Plugin 1.2
+// Project: https://github.com/igorlino/elevatezoom-plus
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export interface Options {
+    /**
+     * Activate responsivenes
+     */
+    responsive?: boolean;
+
+    /**
+     * Activate zoom on mouse scroll
+     */
+    scrollZoom?: boolean;
+
+    /**
+     * Activate simultaneous crossfade of images on gallery change
+     */
+    imageCrossfade?: boolean;
+
+    /**
+     * Activate spinner icon or url
+     */
+    loadingIcon?: boolean | string;
+
+    /**
+     * Activate easing
+     */
+    easing?: boolean;
+    easingType?: string;
+    easingDuration?: number;
+
+    /**
+     * Used when zoomType set to lens
+     */
+    lensSize?: number;
+
+    /**
+     * Width of the zoomWindow
+     */
+    zoomWindowWidth?: number;
+
+    /**
+     * Height of the zoomWindow
+     */
+    zoomWindowHeight?: number;
+
+    /**
+     * x-axis offset of the zoom window
+     */
+    zoomWindowOffsetX?: number;
+
+    /**
+     * y-axis offset of the zoom window
+     */
+    zoomWindowOffsetY?: number;
+    zoomWindowPosition?: number | string;
+
+    /**
+     * Speed of Lens fadeIn
+     */
+    lensFadeIn?: number;
+
+    /**
+     * Speed of Lens fadeOut
+     */
+    lensFadeOut?: number;
+
+    /**
+     * Speed of Window fadeIn
+     */
+    zoomWindowFadeIn?: number;
+
+    /**
+     * Speed of Window fadeOut
+     */
+    zoomWindowFadeOut?: number;
+
+    /**
+     * Speed of Tint fadeIn
+     */
+    zoomTintFadeIn?: number;
+
+    /**
+     * Speed of Tint fadeOut
+     */
+    zoomTintFadeOut?: number;
+
+    /**
+     * Border Size of the ZoomBox
+     */
+    borderSize?: number;
+
+    /**
+     * Enable Lens
+     */
+    zoomLens?: boolean;
+
+    /**
+     * Border Colour
+     */
+    borderColour?: string;
+
+    /**
+     * Width in pixels of the lens border
+     */
+    lensBorder?: number;
+
+    /**
+     * Type of lens
+     */
+    lensShape?: 'square' | 'round';
+
+    /**
+     * Type of zoom
+     */
+    zoomType?: 'lens' | 'window' | 'inner';
+    containLensZoom?: boolean;
+
+    /**
+     * Colour of the lens background
+     */
+    lensColour?: string;
+
+    /**
+     * Opacity of lens
+     */
+    lensOpacity?: number;
+    lenszoom?: boolean;
+
+    /**
+     * Enable a tint overlay
+     */
+    tint?: boolean;
+
+    /**
+     * Colour of the tin
+     */
+    tintColour?: string;
+
+    /**
+     * Opacity of the tint
+     */
+    tintOpacity?: number;
+
+    /**
+     * This assigns a set of gallery links to the zoom image
+     */
+    gallery?: string;
+
+    /**
+     * Type of cursor
+     */
+    cursor?: 'default' | 'cursor' | 'crosshair';
+    container?: string;
+
+    /**
+     * Attribute to plugin use for zoom
+     */
+    attrImageZoomSrc?: string;
+
+    /**
+     * In pixels the dimensions you want to constrain on
+     */
+    constrainSize?: number | false;
+    constrainType?: 'width' | 'height';
+    debug?: boolean;
+    easingAmount?: number;
+    enabled?: boolean;
+    galleryActiveClass?: string;
+    gallerySelector?: string | false;
+    galleryItem?: string;
+    galleryEvent?: string;
+    mantainZoomAspectRatio?: boolean;
+    maxZoomLevel?: number | false;
+    minZoomLevel?: number;
+    preloading?: 0 | 1;
+    respond?: any[];
+
+    /**
+     * Steps of the scrollzoom
+     */
+    scrollZoomIncrement?: number;
+    touchEnabled?: boolean;
+    zoomActivation?: 'click' | 'hover';
+
+    /**
+     * Zoom container parent selector
+     */
+    zoomContainerAppendTo?: string;
+
+    /**
+     * Identifier for the zoom container
+     */
+    zoomId?: number;
+
+    /**
+     * Zoom level of image
+     */
+    zoomLevel?: number;
+    zIndex?: number;
+}
+declare global {
+    interface JQuery {
+        /**
+         * Initialize ElevateZoom Plugin
+         */
+        ezPlus(options?: Options): JQuery;
+    }
+}
diff --git a/types/ez-plus/tsconfig.json b/types/ez-plus/tsconfig.json
new file mode 100644
index 0000000000..14e9266312
--- /dev/null
+++ b/types/ez-plus/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "ez-plus-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/ez-plus/tslint.json b/types/ez-plus/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/ez-plus/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file
diff --git a/types/feathersjs__authentication-client/index.d.ts b/types/feathersjs__authentication-client/index.d.ts
index 16f4f4a415..04275eb93c 100644
--- a/types/feathersjs__authentication-client/index.d.ts
+++ b/types/feathersjs__authentication-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Abraao Alves <https://github.com/AbraaoAlves>, Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
+// TypeScript Version: 2.3
 
 export default function feathersAuthClient(config?: FeathersAuthClientConfig): () => void;
 
diff --git a/types/feathersjs__authentication-jwt/index.d.ts b/types/feathersjs__authentication-jwt/index.d.ts
index cc9e58be0d..b55adeed46 100644
--- a/types/feathersjs__authentication-jwt/index.d.ts
+++ b/types/feathersjs__authentication-jwt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Application } from '@feathersjs/feathers';
 import { Request } from 'express';
@@ -45,7 +45,7 @@ export interface FeathersAuthenticationJWTOptions {
 }
 
 export class JWTVerifier {
-    constructor(app: Application<any>, options: any); // the class constructor
+    constructor(app: Application, options: any); // the class constructor
 
     verify(req: Request, payload: any, done: (error: any, user?: any, info?: any) => void): void;
 }
diff --git a/types/feathersjs__authentication-local/index.d.ts b/types/feathersjs__authentication-local/index.d.ts
index 8b6af17a33..e935419263 100644
--- a/types/feathersjs__authentication-local/index.d.ts
+++ b/types/feathersjs__authentication-local/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import {
     Application,
@@ -57,7 +57,7 @@ export interface FeathersAuthenticationLocalOptions {
 }
 
 export class LocalVerifier {
-    constructor(app: Application<any>, options: any);
+    constructor(app: Application, options: any);
 
     _comparePassword<T>(entity: T, password: string): Promise<T>; // compares password using bcrypt
     _normalizeResult<T>(results: T[] | Paginated<T>): Promise<T>; // normalizes result from service to account for pagination
diff --git a/types/feathersjs__authentication-oauth1/index.d.ts b/types/feathersjs__authentication-oauth1/index.d.ts
index 54d4d2614a..eee59fd64a 100644
--- a/types/feathersjs__authentication-oauth1/index.d.ts
+++ b/types/feathersjs__authentication-oauth1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import {
     Application,
@@ -60,7 +60,7 @@ export interface FeathersAuthenticationOAuth1Options {
 }
 
 export class OAuth1Verifier {
-    constructor(app: Application<any>, options: any);
+    constructor(app: Application, options: any);
 
     _updateEntity(entity: any, data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // updates an existing entity
     _createEntity(data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // creates an entity if they didn't exist already
diff --git a/types/feathersjs__authentication-oauth2/index.d.ts b/types/feathersjs__authentication-oauth2/index.d.ts
index 5ac6976dac..fbce7514cd 100644
--- a/types/feathersjs__authentication-oauth2/index.d.ts
+++ b/types/feathersjs__authentication-oauth2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import {
     Application,
@@ -62,7 +62,7 @@ export interface FeathersAuthenticationOAuth2Options {
 }
 
 export class OAuth2Verifier {
-    constructor(app: Application<any>, options: any)
+    constructor(app: Application, options: any)
 
     _updateEntity(entity: any, data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // updates an existing entity
     _createEntity(data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // creates an entity if they didn't exist already
diff --git a/types/feathersjs__configuration/index.d.ts b/types/feathersjs__configuration/index.d.ts
index fe597c8360..abd7e53d70 100644
--- a/types/feathersjs__configuration/index.d.ts
+++ b/types/feathersjs__configuration/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
+// TypeScript Version: 2.3
 
 import { Application } from '@feathersjs/feathers';
 
diff --git a/types/feathersjs__express/index.d.ts b/types/feathersjs__express/index.d.ts
index eb49f00a78..f50203432f 100644
--- a/types/feathersjs__express/index.d.ts
+++ b/types/feathersjs__express/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Application as FeathersApplication } from '@feathersjs/feathers';
 import * as express from 'express';
diff --git a/types/feathersjs__primus-client/index.d.ts b/types/feathersjs__primus-client/index.d.ts
index 4e51cd159c..fb348379ea 100644
--- a/types/feathersjs__primus-client/index.d.ts
+++ b/types/feathersjs__primus-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
+// TypeScript Version: 2.3
 
 // primus removed its typings from the repo https://github.com/primus/primus/pull/623, as of 01/2018 there are none on DT
 export default function feathersPrimusClient(socket: any, options?: FeathersPrimusClientOptions): () => void;
diff --git a/types/feathersjs__socketio-client/index.d.ts b/types/feathersjs__socketio-client/index.d.ts
index f155bc50de..83fd71b0ed 100644
--- a/types/feathersjs__socketio-client/index.d.ts
+++ b/types/feathersjs__socketio-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
+// TypeScript Version: 2.3
 
 /// <reference types="socket.io-client" />
 
diff --git a/types/feathersjs__socketio/index.d.ts b/types/feathersjs__socketio/index.d.ts
index 7ba889dfbe..f0e082bf45 100644
--- a/types/feathersjs__socketio/index.d.ts
+++ b/types/feathersjs__socketio/index.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
 
-/// <reference types="socket.io" />
 /// <reference types="feathersjs__socket-commons"/>
+import SocketIO = require("socket.io");
 
 export default function feathersSocketIO(callback?: (io: SocketIO.Server) => void): () => void;
 export default function feathersSocketIO(options: number | SocketIO.ServerOptions, callback?: (io: SocketIO.Server) => void): () => void;
diff --git a/types/fetch-mock/fetch-mock-tests.ts b/types/fetch-mock/fetch-mock-tests.ts
index 1d4b706105..84218fb9e1 100644
--- a/types/fetch-mock/fetch-mock-tests.ts
+++ b/types/fetch-mock/fetch-mock-tests.ts
@@ -61,6 +61,7 @@ fetchMock.patch("http://test.com", 200);
 fetchMock.patchOnce("http://test.com", 200);
 
 fetchMock.get("http://test.com", 200, {method: "GET"});
+fetchMock.get("http://test.com", 200, {method: "GET", overwriteRoutes: true});
 fetchMock.post("http://test.com", 200, {method: "POST"});
 fetchMock.put("http://test.com", 200, {method: "PUT"});
 fetchMock.delete("http://test.com", 200, {method: "DELETE"});
diff --git a/types/fetch-mock/index.d.ts b/types/fetch-mock/index.d.ts
index 15babcba34..fc94b18106 100644
--- a/types/fetch-mock/index.d.ts
+++ b/types/fetch-mock/index.d.ts
@@ -5,6 +5,7 @@
 //                 Risto Keravuori <https://github.com/merrywhether>
 //                 Chris Sinclair <https://github.com/chrissinclair>
 //                 Matt Tennison <https://github.com/matttennison>
+//                 Quentin Bouygues <https://github.com/quentinbouygues>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -120,6 +121,12 @@ declare namespace fetchMock {
          * as specified above
          */
         matcher?: MockMatcher;
+        /**
+         * This option allows for existing routes in a mock to be overwritten.
+         * It’s also possible to define multiple routes with ‘the same’ matcher.
+         * Default behaviour is to error
+         */
+        overwriteRoutes?: boolean;
         /**
          * as specified above
          */
diff --git a/types/firefox-webext-browser/firefox-webext-browser-tests.ts b/types/firefox-webext-browser/firefox-webext-browser-tests.ts
index 01d9cf9f3d..38169d573a 100644
--- a/types/firefox-webext-browser/firefox-webext-browser-tests.ts
+++ b/types/firefox-webext-browser/firefox-webext-browser-tests.ts
@@ -8,3 +8,7 @@ browser.manifest; // $ExpectError
 browser._manifest; // $ExpectType typeof _manifest
 browser._manifest.WebExtensionLangpackManifest; // $ExpectError
 browser._manifest.NativeManifest; // $ExpectError
+
+// browser.runtime
+const port = browser.runtime.connect();
+port.postMessage(); // $ExpectError
diff --git a/types/firefox-webext-browser/index.d.ts b/types/firefox-webext-browser/index.d.ts
index dcbfb48648..d04b7f6aca 100644
--- a/types/firefox-webext-browser/index.d.ts
+++ b/types/firefox-webext-browser/index.d.ts
@@ -2296,10 +2296,10 @@ declare namespace browser.runtime {
     /** An object which allows two way communication with other pages. */
     interface Port {
         name: string;
-        disconnect: () => void;
+        disconnect(): void;
         onDisconnect: events.Event;
         onMessage: events.Event;
-        postMessage: () => void;
+        postMessage(message: object): void;
         /** This property will **only** be present on ports passed to onConnect/onConnectExternal listeners. */
         sender?: MessageSender;
     }
diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index 366a3998d7..9057edae6d 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -18,16 +18,27 @@ export import Joi = require("joi");
 
 // #region Frisby FrisbySpec Methods
 // Reference file: https://github.com/vlucas/frisby/blob/master/src/frisby/spec.js
+
+// **************************************CHANGE LOG**************************************
+// C.E.W. This is an attempt to create some sort of changelog for these types.
+// If you make any changes, please try and note those changes in this section.
+// If this section gets too long we can always trim it.
+// ## 2018-03-05
+// ### Changed
+// - Update _Frisbyspec.get_, _Frisbyspec.post_, _Frisbyspec.put_, _Frisbyspec.del_, _Frisbyspec.patch_,  _Frisbyspec.fetch_ to allow _params_ to be optional.
+// - Update _FrisbySpec.then_ to allow _onRejected_ to be optional.
+// **************************************CHANGE LOG**************************************
+
 export class FrisbySpec {
     constructor(...args: any[]);
     catch(onRejected?: (error: Error) => void): FrisbySpec;
-    del(url: string, params: {}): FrisbySpec;
+    del(url: string, params?: {}): FrisbySpec;
     done(doneFn: (...args: any[]) => void): FrisbySpec;
     expect(expectName: string, ...args: any[]): FrisbySpec;
     expectNot(expectName: string): FrisbySpec;
-    fetch(url: string, params: {}, options?: {}): FrisbySpec;
+    fetch(url: string, params?: {}, options?: {}): FrisbySpec;
     fromJSON(json: {}): FrisbySpec;
-    get(url: string, params: {}): FrisbySpec;
+    get(url: string, params?: {}): FrisbySpec;
     getBaseUrl(): string | boolean;
     inspectBody(): FrisbySpec;
     inspectHeaders(): FrisbySpec;
@@ -37,12 +48,12 @@ export class FrisbySpec {
     inspectRequestHeaders(): FrisbySpec;
     inspectResponse(): FrisbySpec;
     inspectStatus(): FrisbySpec;
-    patch(url: string, params: {}): FrisbySpec;
-    post(url: string, params: {}): FrisbySpec;
+    patch(url: string, params?: {}): FrisbySpec;
+    post(url: string, params?: {}): FrisbySpec;
     promise(): Promise<nodeFetch.Response>;
-    put(url: string, params: {}): FrisbySpec;
+    put(url: string, params?: {}): FrisbySpec;
     setup(opts: {}, replace: boolean): FrisbySpec;
-    then(onFulfilled: {} | ((...args: any[]) => void), onRejected: (...args: any[]) => void): FrisbySpec;
+    then(onFulfilled: {} | ((...args: any[]) => void), onRejected?: (...args: any[]) => void): FrisbySpec;
     timeout(timeout: number): number;
     use(fn: (...args: any[]) => void): FrisbySpec;
     static addExpectHandler(expectName: string, expectFn: (...args: any[]) => any): void;
diff --git a/types/generate-changelog/generate-changelog-tests.ts b/types/generate-changelog/generate-changelog-tests.ts
new file mode 100644
index 0000000000..0b99857715
--- /dev/null
+++ b/types/generate-changelog/generate-changelog-tests.ts
@@ -0,0 +1,8 @@
+import * as changelog from 'generate-changelog';
+
+changelog.generate({
+    exclude: ['chore'],
+    minor: true,
+    repoUrl: 'https://github.com/lob/generate-changelog',
+    tag: 'v1.6.0...v1.7.0'
+}).then(changelog => changelog.trim());
diff --git a/types/generate-changelog/index.d.ts b/types/generate-changelog/index.d.ts
new file mode 100644
index 0000000000..2a6ba0ed56
--- /dev/null
+++ b/types/generate-changelog/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for generate-changelog 1.7
+// Project: https://github.com/lob/generate-changelog#readme
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Options {
+    /** exclude listed commit types (e.g. `['chore', 'style', 'refactor']`) */
+    exclude?: string[];
+    /** whether it should be a patch changelog */
+    patch?: boolean;
+    /** whether it should be a minor changelog */
+    minor?: boolean;
+    /** whether it should be a major changelog */
+    major?: boolean;
+    /** repo URL that will be used when linking commits */
+    repoUrl?: string;
+    /** generate from specific tag or range (e.g. `v1.2.3` or `v1.2.3..v1.2.4`)' */
+    tag?: string;
+}
+
+export function generate(options: Options): Promise<string>;
diff --git a/types/generate-changelog/tsconfig.json b/types/generate-changelog/tsconfig.json
new file mode 100644
index 0000000000..458186fe12
--- /dev/null
+++ b/types/generate-changelog/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "generate-changelog-tests.ts"
+    ]
+}
diff --git a/types/generate-changelog/tslint.json b/types/generate-changelog/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/generate-changelog/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/geojson/geojson-tests.ts b/types/geojson/geojson-tests.ts
index ce8c62418e..c5c3fa2bdd 100644
--- a/types/geojson/geojson-tests.ts
+++ b/types/geojson/geojson-tests.ts
@@ -231,7 +231,7 @@ interface TestProperty {
 }
 
 const testProps: TestProperty = {
-    foo: "bar",
+    foo: "baz",
     hello: "world"
 };
 
@@ -248,3 +248,77 @@ const typedPropertiesFeatureCollection: FeatureCollection<Point> = {
     type: "FeatureCollection",
     features: [typedPropertiesFeature]
 };
+
+// Strict Null Checks
+
+let isNull: null;
+let isPoint: Point;
+let isPointOrNull: Point | null;
+let isProperty: TestProperty;
+let isPropertyOrNull: TestProperty | null;
+
+const featureAllNull: Feature<null, null> = {
+    type: "Feature",
+    properties: null,
+    geometry: null
+};
+
+const featurePropertyNull: Feature<Point, null> = {
+    type: "Feature",
+    properties: null,
+    geometry: point
+};
+
+const featureGeometryNull: Feature<null, TestProperty> = {
+    type: "Feature",
+    properties: testProps,
+    geometry: null
+};
+
+const featureNoNull: Feature<Point, TestProperty> = {
+    type: "Feature",
+    properties: testProps,
+    geometry: point
+};
+
+const collectionAllNull: FeatureCollection<null, null> = {
+    type: "FeatureCollection",
+    features: [featureAllNull],
+};
+
+const collectionMaybeNull: FeatureCollection<Point | null, TestProperty | null> = {
+    type: "FeatureCollection",
+    features: [featureAllNull, featurePropertyNull, featureGeometryNull, featureNoNull],
+};
+
+const collectionPropertyMaybeNull: FeatureCollection<Point, TestProperty | null> = {
+    type: "FeatureCollection",
+    features: [featurePropertyNull, featureNoNull],
+};
+
+const collectionGeometryMaybeNull: FeatureCollection<Point | null, TestProperty> = {
+    type: "FeatureCollection",
+    features: [featureGeometryNull, featureNoNull],
+};
+
+const collectionNoNull: FeatureCollection<Point, TestProperty> = {
+    type: "FeatureCollection",
+    features: [featureNoNull],
+};
+
+isNull = featureAllNull.geometry;
+isPoint = featurePropertyNull.geometry;
+isNull = featureAllNull.properties;
+isProperty = featureGeometryNull.properties;
+
+isNull = collectionAllNull.features[0].geometry;
+isPointOrNull = collectionMaybeNull.features[0].geometry;
+isPoint = collectionPropertyMaybeNull.features[0].geometry;
+isPointOrNull = collectionGeometryMaybeNull.features[0].geometry;
+isPoint = collectionNoNull.features[0].geometry;
+
+isNull = collectionAllNull.features[0].properties;
+isPropertyOrNull = collectionMaybeNull.features[0].properties;
+isPropertyOrNull = collectionPropertyMaybeNull.features[0].properties;
+isProperty = collectionGeometryMaybeNull.features[0].properties;
+isProperty = collectionNoNull.features[0].properties;
diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index 85f02aaad0..9a0ab3cd8b 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -139,12 +139,12 @@ export type GeoJsonProperties = { [name: string]: any; } | null;
  * A feature object which contains a geometry and associated properties.
  * https://tools.ietf.org/html/rfc7946#section-3.2
  */
-export interface Feature<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
+export interface Feature<G extends GeometryObject | null, P = GeoJsonProperties> extends GeoJsonObject {
     type: "Feature";
     /**
      * The feature's geometry
      */
-    geometry: G | null;
+    geometry: G;
     /**
      * A value that uniquely identifies this feature in a
      * https://tools.ietf.org/html/rfc7946#section-3.2.
@@ -153,14 +153,14 @@ export interface Feature<G extends GeometryObject, P = GeoJsonProperties> extend
     /**
      * Properties associated with this feature.
      */
-    properties: P | null;
+    properties: P;
 }
 
 /**
  * A collection of feature objects.
  *  https://tools.ietf.org/html/rfc7946#section-3.3
  */
-export interface FeatureCollection<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
+export interface FeatureCollection<G extends GeometryObject | null, P = GeoJsonProperties> extends GeoJsonObject {
     type: "FeatureCollection";
     features: Array<Feature<G, P>>;
 }
diff --git a/types/geojson/tsconfig.json b/types/geojson/tsconfig.json
index 071f17c65d..86021d5757 100644
--- a/types/geojson/tsconfig.json
+++ b/types/geojson/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts
index a76d98dd7f..19d17deb22 100644
--- a/types/gijgo/index.d.ts
+++ b/types/gijgo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Gijgo v0.6.2
+// Type definitions for Gijgo v1.8.2
 // Project: http://gijgo.com
 // Definitions by: Atanas Atanasov <https://github.com/atatanasov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,23 +10,28 @@ declare module Gijgo {
     interface GridPager {
         limit?: number;
         sizes?: Array<number>;
-        leftControls?: any;
-        rightControls?: any;
+        leftControls?: Array<any>;
+        rightControls?: Array<any>;
     }
 
     interface GridColumn {
         align?: string;
         cssClass?: string;
         decimalDigits?: number;
+        editField?: string;
         editor?: any;
         events?: any;
         field?: string;
+        filter?: any;
+        filterable?: boolean;
         format?: string;
         headerCssClass?: string;
         hidden?: boolean;
         icon?: string;
         minWidth?: number;
+        mode?: string;
         priority?: number;
+        renderer?: any;
         sortable?: boolean;
         stopPropagation?: boolean;
         title?: string;
@@ -36,11 +41,13 @@ declare module Gijgo {
         width?: number;
     }
 
-    interface GridDefaultParams {
+    interface GridParamNames {
         direction?: string;
         limit?: string;
         page?: string;
         sortBy?: string;
+        groupBy?: string;
+        groupByDirection?: string;
     }
 
     interface GridMapping {
@@ -48,24 +55,62 @@ declare module Gijgo {
         totalRecordsField?: string;
     }
 
+    interface GridIcons {
+        expandRow?: string;
+        collapseRow?: string;
+        expandGroup?: string;
+        collapseGroup?: string;
+    }
+
+    interface GridGrouping {
+        groupBy: string;
+    }
+
+    interface GridHeaderFilter {
+        type: string;
+    }
+
+    interface GridInlineEditing {
+        mode?: string;
+        managementColumn?: boolean;
+    }
+
+    interface GridOptimisticPersistence {
+        localStorage: Array<string>;
+        sessionStorage: Array<string>;
+    }
+
     interface GridSettings<Entity> {
         //Configuration options
         autoGenerateColumns?: boolean;
         autoLoad?: boolean;
+        columnReorder?: boolean;
         columns?: Array<GridColumn>;
         dataSource?: any;
         defaultColumnSettings?: GridColumn;
-        defaultParams?: GridDefaultParams;
         detailTemplate?: string;
+        fixedHeader?: boolean;
         fontSize?: string;
-        mapping?: string;
+        grouping?: GridGrouping;
+        headerFilter?: GridHeaderFilter;
+        icons?: GridIcons;
+        iconsLibrary?: string;
+        inlineEditing?: GridInlineEditing;
+        keepExpandedRows?: boolean;
+        locale?: string;
+        mapping?: any;
         minWidth?: number;
         notFoundText?: string;
+        optimisticPersistence?: GridOptimisticPersistence;
+        orderNumberField?: string;
         pager?: GridPager;
+        paramNames?: GridParamNames;
         primaryKey?: string;
         resizableColumns?: boolean;
         resizeCheckInterval?: number;
         responsive?: boolean;
+        rowReorder?: boolean;
+        rowReorderColumn?: string;
         selectionMethod?: string;
         selectionType?: string;
         showHiddenColumnsAsDetails?: boolean;
@@ -83,14 +128,16 @@ declare module Gijgo {
         columnShow?: (e: any, column: GridColumn) => any;
         dataBinding?: (e: any, records: Array<Entity>) => any;
         dataBound?: (e: any, records: Array<Entity>, totalRecords: number) => any;
+        dataFiltered?: (e: any, records: Array<Entity>) => any;
         destroying?: (e: any) => any;
-        detailCollapse?: (e: any, detailWrapper: JQuery, record: Entity) => any;
-        detailExpand?: (e: any, detailWrapper: JQuery, record: Entity) => any;
+        detailCollapse?: (e: any, detailWrapper: JQuery, id: string) => any;
+        detailExpand?: (e: any, detailWrapper: JQuery, id: string) => any;
         initialized?: (e: any) => any;
         pageChanging?: (e: any, newPage: number) => any;
         pageSizeChange?: (e: any, newPage: number) => any;
         resize?: (e: any, newWidth: number, oldWidth: number) => any;
         rowDataBound?: (e: any, $row: JQuery, id: string, record: Entity) => any;
+        rowDataChanged?: (e: any, id: string, record: Entity) => any;
         rowRemoving?: (e: any, $row: JQuery, id: string, record: Entity) => any;
         rowSelect?: (e: any, $row: JQuery, id: string, record: Entity) => any;
         rowUnselect?: (e: any, $row: JQuery, id: string, record: Entity) => any;
@@ -98,17 +145,23 @@ declare module Gijgo {
 
     interface Grid<Entity, Params> extends JQuery {
         addRow(record: Entity): Grid<Entity, Params>;
+        cancel(id: string): Grid<Entity, Params>; 
         clear(showNotFoundText?: boolean): Grid<Entity, Params>;
+        collapseAll(): Grid<Entity, Params>; 
         count(): number;
         destroy(keepTableTag?: boolean, keepWrapperTag?: boolean): void;
+        downloadCSV(filename?: string, includeAllRecords?: boolean): Grid<Entity, Params>;
+        edit(id: string): Grid<Entity, Params>; 
+        expandAll(): Grid<Entity, Params>; 
         //get(position: number): Entity; //TODO: rename to getByPosition to avoid conflicts with jquery.get
         getAll(): Array<Entity>;
         getById(id: string): Entity;
         getChanges(): Array<Entity>;
+        getCSV(includeAllRecords?: boolean): string;
         getSelected(): string;
         getSelections(): Array<string>;
         hideColumn(field: string): Grid<Entity, Params>;
-        makeResponsive(): void;
+        makeResponsive(): Grid<Entity, Params>;
         reload(params?: Params): Grid<Entity, Params>;
         removeRow(id: string): Grid<Entity, Params>;
         render(response: any): Grid<Entity, Params>;
@@ -117,22 +170,25 @@ declare module Gijgo {
         showColumn(field: string): Grid<Entity, Params>;
         title(text: any): any;
         unSelectAll(): Grid<Entity, Params>;
+        update(id: string): Grid<Entity, Params>; 
         updateRow(id: string, record: Entity): Grid<Entity, Params>;
     }
 
-    //Dialog
+    // Dialog
     interface DialogSettings {
-        //Configuration options
         autoOpen?: boolean;
+        closeButtonInHeader?: boolean;
         closeOnEscape?: boolean;
         draggable?: boolean;
         height?: number | string;
+        locale?: string;
         maxHeight?: number;
         maxWidth?: number;
         minHeight?: number;
         minWidth?: number;
         modal?: boolean;
         resizable?: boolean;
+        scrollable?: boolean;
         title?: string;
         uiLibrary?: string;
         width?: number;
@@ -153,9 +209,217 @@ declare module Gijgo {
 
     interface Dialog extends JQuery {
         close(): Dialog;
+        content(constent: string): string | Dialog;
+        destroy(keepHtml: boolean): void;
         isOpen(): boolean;
         open(): Dialog;
     }
+
+    // Checkbox
+    interface CheckboxSettings {
+        uiLibrary?: string;
+        iconsLibrary?: string;
+
+        //Events
+        change?: (e: any, state: string) => any;
+    }
+
+    interface Checkbox extends JQuery {
+        //toggle(): Checkbox;
+        state(value: string):  string | Checkbox;
+        destroy(): void;
+    }
+
+    // DatePicker
+    interface DatePickerIcons {
+        rightIcon?: string;
+    }
+
+    interface DatePickerSettings {
+        showOtherMonths?: boolean;
+        selectOtherMonths?: boolean;
+        width?: number;
+        minDate?: Date | string | Function;
+        maxDate?: Date | string | Function;
+        format?: string;
+        value?: string;
+        uiLibrary?: string;
+        iconsLibrary?: string;
+        weekStartDay?: number;
+        disableDates?: Array<any> | Function;
+        disableDaysOfWeek?: Array<number>;
+        calendarWeeks?: boolean;
+        keyboardNavigation?: boolean;
+        locale?: string;
+        icons?: DatePickerIcons;
+
+        //Events
+        change?: (e: any) => any;
+        open?: (e: any) => any;
+        close?: (e: any) => any;
+    }
+
+    interface DatePicker extends JQuery {
+        close(): DatePicker;
+        destroy(): void;
+        open(): DatePicker;
+        value(value: string):  string | DatePicker;
+    }
+
+    // DropDown
+    interface DropDownIcons {
+        dropdown?: string;
+    }
+
+    interface DropDownSettings {
+        dataSource?: any;
+        textField?: string;
+        valueField?: string;
+        selectedField?: string;
+        width?: number;
+        maxHeight?: any;
+        uiLibrary?: string;
+        iconsLibrary?: string;
+        icons?: DropDownIcons;
+
+        //Events
+        change?: (e: any) => any;
+        dataBound?: (e: any) => any;
+    }
+
+    interface DropDown extends JQuery {
+        value(value: string):  string | DropDown;
+        destroy(): void;
+    }
+
+    // Editor
+    interface EditorSettings {
+        height?: number | string;
+        width?: number | string;
+        uiLibrary?: string;
+        iconsLibrary?: string;
+        locale?: string;
+
+        //Events
+        changing?: (e: any) => any;
+        changed?: (e: any) => any;
+    }
+
+    interface Editor extends JQuery {
+        content(html: string):  string | Editor;
+        destroy(): void;
+    }
+
+    // TimePicker
+    interface TimePickerSettings {
+        width?: number;
+        modal?: boolean;
+        header?: boolean;
+        footer?: boolean;
+        format?: string;
+        uiLibrary?: string;
+        value?: string;
+        mode?: string;
+        locale?: string;
+
+        //Events
+        change?: (e: any) => any;
+        open?: (e: any) => any;
+        close?: (e: any) => any;
+    }
+
+    interface TimePicker extends JQuery {
+        close(): TimePicker;
+        destroy(): void;
+        open(): TimePicker;
+        value(value: string):  string | TimePicker;
+    }
+
+    // Tree
+    interface TreeIcons {
+        expand?: string;
+        collapse?: string;
+    }
+
+    interface TreeParamNames {
+        parentId?: string;
+    }
+
+    interface TreeSettings {
+        autoLoad?: boolean;
+        selectionType?: string;
+        cascadeSelection?: boolean;
+        dataSource?: any;
+        primaryKey?: string;
+        textField?: string;
+        childrenField?: string;
+        hasChildrenField?: string;
+        imageCssClassField?: string;
+        imageUrlField?: string;
+        imageHtmlField?: string;
+        disabledField?: string;
+        width?: number;
+        border?: boolean;
+        uiLibrary?: string;
+        iconsLibrary?: string;
+        icons?: TreeIcons;
+
+        checkboxes?: boolean;
+        checkedField?: string;
+        cascadeCheck?: boolean;
+        dragAndDrop?: boolean;
+        paramNames: TreeParamNames;
+        lazyLoading?: boolean;
+
+
+        //Events
+        initialized?: (e: any) => any;
+        dataBinding?: (e: any) => any;
+        dataBound?: (e: any) => any;
+        select?: (e: any, node: any, id: string) => any;
+        unselect?: (e: any, node: any, id: string) => any;
+        expand?: (e: any, node: any, id: string) => any;
+        collapse?: (e: any, node: any, id: string) => any;
+        enable?: (e: any, node: any, id: string) => any;
+        disable?: (e: any, node: any, id: string) => any;
+        destroying?: (e: any) => any;
+        nodeDataBound?: (e: any, node: any, id: string) => any;
+        checkboxChange?: (e: any, node: any, record: any, state: string) => any;
+        nodeDrop?: (e: any, id: string, parentId: string, orderNumber: number) => any;
+    }
+
+    interface Tree extends JQuery {
+        reload(params: any):  any;
+        render(response: any): any;
+        addNode(data: any, parentNode: any, position: number): Tree;
+        removeNode(node: any): Tree;
+        destroy(): void;
+        expand(node: any, cascade: boolean): Tree;
+        collapse(node: any, cascade: boolean) : Tree;
+        expandAll(): Tree;
+        collapseAll() : Tree;
+        getDataById(id: string) : any;
+        getDataByText(text: string) : any;
+        getNodeById(id: string) : any;
+        getNodeByText(id: string) : any;
+        getAll(): Array<any>;
+        //select(node: any) : Tree;
+        unselect(node: any) : Tree;
+        selectAll() : Tree;
+        unselectAll() : Tree;
+        getSelections() : Array<string>;
+        getChildren(node: any, cascade: boolean) : Array<any>;
+        enable(node: any, cascade: boolean) : Tree;
+        disable(node: any, cascade: boolean) : Tree;
+        enableAll() : Tree;
+        disableAll() : Tree;
+
+        getCheckedNodes() : Array<string>;
+        checkAll() : Tree;
+        uncheckAll(): Tree;
+        check(node: any) : Tree;
+        uncheck(node: any) : Tree;
+    }
 }
 
 
@@ -165,4 +429,16 @@ interface JQuery {
     grid<Entity, Params>(settings: Gijgo.GridSettings<Entity>): Gijgo.Grid<Entity, Params>;
 
     dialog(settings: Gijgo.DialogSettings): Gijgo.Dialog;
+
+    checkbox(settings: Gijgo.CheckboxSettings): Gijgo.Checkbox;
+
+    datepicker(settings: Gijgo.DatePickerSettings): Gijgo.DatePicker;
+
+    dropdown(settings: Gijgo.DropDownSettings): Gijgo.DropDown;
+
+    editor(settings: Gijgo.EditorSettings): Gijgo.Editor;
+
+    timepicker(settings: Gijgo.TimePickerSettings): Gijgo.TimePicker;
+
+    tree(settings: Gijgo.TreeSettings): Gijgo.Tree;
 }
diff --git a/types/got/got-tests.ts b/types/got/got-tests.ts
index 7857bddbab..7048533295 100644
--- a/types/got/got-tests.ts
+++ b/types/got/got-tests.ts
@@ -52,6 +52,20 @@ got('todomvc.com', {
     encoding: 'utf8',
     hostname: 'todomvc'
 }).then(response => str = response.body);
+got('todomvc.com', {
+    form: true,
+    body: [{}],
+    encoding: 'utf8',
+    hostname: 'todomvc',
+    timeout: 2000
+}).then(response => str = response.body);
+got('todomvc.com', {
+    form: true,
+    body: [{}],
+    encoding: 'utf8',
+    hostname: 'todomvc',
+    timeout: {connect: 20, request: 20, socket: 20}
+}).then(response => str = response.body);
 // following must lead to type checking error: got('todomvc.com', {form: true, body: ''}).then(response => str = response.body);
 
 got('todomvc.com', {encoding: null, hostname: 'todomvc'}).then(response => buf = response.body);
diff --git a/types/got/index.d.ts b/types/got/index.d.ts
index 30a5b2c0be..5872b4f993 100644
--- a/types/got/index.d.ts
+++ b/types/got/index.d.ts
@@ -98,7 +98,11 @@ declare namespace got {
         json?: boolean;
     }
 
-    type GotOptions<E extends string | null> = http.RequestOptions & {
+    interface TimoutRequestOptions extends http.RequestOptions {
+        timeout?: any;
+    }
+
+    interface GotOptions<E extends string | null> extends TimoutRequestOptions {
         encoding?: E;
         query?: string | object;
         timeout?: number | TimeoutOptions;
@@ -106,7 +110,7 @@ declare namespace got {
         followRedirect?: boolean;
         decompress?: boolean;
         useElectronNet?: boolean;
-    };
+    }
 
     interface TimeoutOptions {
         connect?: number;
diff --git a/types/graphql-list-fields/graphql-list-fields-tests.ts b/types/graphql-list-fields/graphql-list-fields-tests.ts
new file mode 100644
index 0000000000..7624a3cbd8
--- /dev/null
+++ b/types/graphql-list-fields/graphql-list-fields-tests.ts
@@ -0,0 +1,42 @@
+import getFieldNames = require("graphql-list-fields");
+
+import {
+    GraphQLID,
+    GraphQLInterfaceType,
+    GraphQLObjectType,
+    GraphQLResolveInfo,
+    GraphQLSchema,
+    GraphQLString
+} from "graphql";
+
+const sampleGraphQLResolveInfo: GraphQLResolveInfo = {
+    fieldName: "",
+    fieldNodes: [],
+    returnType: GraphQLString,
+    parentType: new GraphQLInterfaceType({
+        name: "Sample",
+        fields: {
+            name: { type: GraphQLString }
+        }
+    }),
+    path: undefined,
+    schema: new GraphQLSchema({
+        query: new GraphQLObjectType({
+            name: "SampleType",
+            fields: {}
+        })
+    }),
+    fragments: {},
+    rootValue: null,
+    operation: {
+        kind: "OperationDefinition",
+        operation: "query",
+        selectionSet: {
+            kind: "SelectionSet",
+            selections: []
+        }
+    },
+    variableValues: {}
+};
+
+const fieldNames: string[] = getFieldNames(sampleGraphQLResolveInfo);
diff --git a/types/graphql-list-fields/index.d.ts b/types/graphql-list-fields/index.d.ts
new file mode 100644
index 0000000000..362658deb9
--- /dev/null
+++ b/types/graphql-list-fields/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for graphql-list-fields 2.0
+// Project: https://github.com/jakepusateri/graphql-list-fields#readme
+// Definitions by: Chris Filipowski <https://github.com/filipows>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { GraphQLResolveInfo } from "graphql";
+
+declare function getFieldList(info: GraphQLResolveInfo): string[];
+
+export = getFieldList;
diff --git a/types/graphql-list-fields/tsconfig.json b/types/graphql-list-fields/tsconfig.json
new file mode 100644
index 0000000000..6f53c2c900
--- /dev/null
+++ b/types/graphql-list-fields/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "graphql-list-fields-tests.ts"
+    ]
+}
diff --git a/types/graphql-list-fields/tslint.json b/types/graphql-list-fields/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/graphql-list-fields/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
index 1e9a2395a4..519a3a4088 100644
--- a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
+++ b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
@@ -16,6 +16,17 @@ interface SomeTestResult {
     someTestResultProp: string;
 }
 
+const asyncBatchFunction = async (sources: ReadonlyArray<SomeTestSource>) => {
+    return new Promise<SomeTestResult[]>(resolve => {
+        const res = [
+            {
+                someTestResultProp: ""
+            }
+        ];
+        resolve(res);
+    });
+};
+
 const withSourceAndResultTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult
@@ -32,40 +43,25 @@ const withSourceAndResultTyped = createBatchResolver<
 const withSourceAndResultTypedAsPromise = createBatchResolver<
     SomeTestSource,
     SomeTestResult
->((sources, _, __) => {
+>(async (sources, _, __) => {
     // $ExpectType ReadonlyArray<SomeTestSource>
     const verifySources = sources;
-
-    return sources.map(source => {
-        return new Promise<SomeTestResult>(resolve => {
-            const res: SomeTestResult = {
-                someTestResultProp: ""
-            };
-
-            resolve(res);
-        });
-    });
+    const result = await asyncBatchFunction(sources);
+    return result;
 });
 
 const withSourceAndArgsAndResultTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult,
     SomeTestArgs
->((sources, args, _) => {
+>(async (sources, args, _) => {
     // $ExpectType ReadonlyArray<SomeTestSource>
     const verifySources = sources;
     // $ExpectType string
     const verifyArgs = args.someArg;
 
-    return sources.map(source => {
-        return new Promise<SomeTestResult>(resolve => {
-            const res: SomeTestResult = {
-                someTestResultProp: ""
-            };
-
-            resolve(res);
-        });
-    });
+    const result = await asyncBatchFunction(sources);
+    return result;
 });
 
 const withSourceAndArgsAndContextTyped = createBatchResolver<
@@ -73,7 +69,7 @@ const withSourceAndArgsAndContextTyped = createBatchResolver<
     SomeTestResult,
     SomeTestArgs,
     SomeTestContext
->((sources, args, context) => {
+>(async (sources, args, context) => {
     // $ExpectType ReadonlyArray<SomeTestSource>
     const verifySources = sources;
     // $ExpectType string
@@ -81,13 +77,6 @@ const withSourceAndArgsAndContextTyped = createBatchResolver<
     // $ExpectType string
     const verifyContext = context.someContextProp;
 
-    return sources.map(source => {
-        return new Promise<SomeTestResult>(resolve => {
-            const res: SomeTestResult = {
-                someTestResultProp: ""
-            };
-
-            resolve(res);
-        });
-    });
+    const result = await asyncBatchFunction(sources);
+    return result;
 });
diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index 46f354f7b7..e78ddafb37 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for graphql-resolve-batch 1.0
+// Type definitions for graphql-resolve-batch 1.1
 // Project: https://github.com/calebmer/graphql-resolve-batch#readme
 // Definitions by: Rutger Hendrickx <https://github.com/nayni>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -17,10 +17,10 @@ export type ResolverFunction<TSource, TArgs, TContext, TReturn> = (
     source: TSource,
     args: TArgs,
     context: TContext
-) => Promise<TReturn>;
+) => Promise<TReturn> | Promise<TReturn[]>;
 
 export type BatchResolveFunction<TSource, TArgs, TContext, TReturn> = (
     sources: ReadonlyArray<TSource>,
     args: TArgs,
     context: TContext
-) => TReturn[] | Array<Promise<TReturn>>;
+) => TReturn[] | Promise<TReturn[]>;
diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index a8bead58fd..49185e11a1 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -12,6 +12,7 @@
 //                 Tim Griesser <https://github.com/tgriesser>
 //                 Dylan Stewart <https://github.com/dyst5422>
 //                 Alessio Dionisi <https://github.com/adnsio>
+//                 Divyendu Singh <https://github.com/divyenduz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -100,6 +101,9 @@ export {
     // Build a GraphQLSchema from a GraphQL schema language document.
     buildSchema,
 
+    // Get the description of an AST node
+    getDescription,
+
     // Extends an existing GraphQLSchema from a parsed GraphQL Schema
     // language AST.
     extendSchema,
diff --git a/types/graphql/type/schema.d.ts b/types/graphql/type/schema.d.ts
index 3263274dd9..26500c6ed3 100644
--- a/types/graphql/type/schema.d.ts
+++ b/types/graphql/type/schema.d.ts
@@ -61,6 +61,27 @@ export class GraphQLSchema {
   getDirective(name: string): GraphQLDirective;
 }
 
+export type GraphQLSchemaValidationOptions = {
+  /**
+   * When building a schema from a GraphQL service's introspection result, it
+   * might be safe to assume the schema is valid. Set to true to assume the
+   * produced schema is valid.
+   *
+   * Default: false
+   */
+  assumeValid?: boolean;
+
+  /**
+   * If provided, the schema will consider fields or types with names included
+   * in this list valid, even if they do not adhere to the specification's
+   * schema validation rules.
+   *
+   * This option is provided to ease adoption and may be removed in a future
+   * major release.
+   */
+  allowedLegacyNames?: ReadonlyArray<string>;
+};
+
 export interface GraphQLSchemaConfig {
   query: GraphQLObjectType;
   mutation?: GraphQLObjectType;
diff --git a/types/graphql/utilities/buildASTSchema.d.ts b/types/graphql/utilities/buildASTSchema.d.ts
index b20c8fc856..6b8aa56327 100644
--- a/types/graphql/utilities/buildASTSchema.d.ts
+++ b/types/graphql/utilities/buildASTSchema.d.ts
@@ -1,6 +1,17 @@
-import { DocumentNode, Location } from '../language/ast';
+import { DocumentNode, Location, StringValueNode } from '../language/ast';
 import { Source } from '../language/source';
-import { GraphQLSchema } from '../type/schema';
+import { GraphQLSchema, GraphQLSchemaValidationOptions } from '../type/schema';
+
+interface BuildSchemaOptions extends GraphQLSchemaValidationOptions {
+  /**
+   * Descriptions are defined as preceding string literals, however an older
+   * experimental version of the SDL supported preceding comments as
+   * descriptions. Set to true to enable this deprecated behavior.
+   *
+   * Default: false
+   */
+  commentDescriptions?: boolean;
+}
 
 /**
  * This takes the ast of a schema document produced by the parse function in
@@ -15,10 +26,18 @@ import { GraphQLSchema } from '../type/schema';
 export function buildASTSchema(ast: DocumentNode): GraphQLSchema;
 
 /**
- * Given an ast node, returns its string description based on a contiguous
- * block full-line of comments preceding it.
+ * Given an ast node, returns its string description.
+ *
+ * Accepts options as a second argument:
+ *
+ *    - commentDescriptions:
+ *        Provide true to use preceding comments as the description.
+ *
  */
-export function getDescription(node: { loc?: Location }): string;
+export function getDescription(
+  node: { description?: StringValueNode; loc?: Location },
+  options: BuildSchemaOptions
+): string;
 
 /**
  * A helper function to build a GraphQLSchema directly from a source
diff --git a/types/graphql/utilities/index.d.ts b/types/graphql/utilities/index.d.ts
index cd0e23948f..c2b2c182ff 100644
--- a/types/graphql/utilities/index.d.ts
+++ b/types/graphql/utilities/index.d.ts
@@ -27,7 +27,7 @@ export { getOperationAST } from './getOperationAST';
 export { buildClientSchema } from './buildClientSchema';
 
 // Build a GraphQLSchema from GraphQL Schema language.
-export { buildASTSchema, buildSchema } from './buildASTSchema';
+export { buildASTSchema, buildSchema, getDescription } from './buildASTSchema';
 
 // Extends an existing GraphQLSchema from a parsed GraphQL Schema language AST.
 export { extendSchema } from './extendSchema';
diff --git a/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts b/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
index fa28253a88..cf51162eb4 100644
--- a/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
+++ b/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
@@ -1,8 +1,7 @@
-import Hapi = require('hapi');
-import hapiAuthJwt2 = require('hapi-auth-jwt2');
+import { Server } from 'hapi';
+import * as hapiAuthJwt2 from 'hapi-auth-jwt2';
 
-const server = new Hapi.Server();
-server.connection({port: 8000});
+const server = new Server({port: 8000});
 
 interface User {
   id: number;
@@ -20,19 +19,28 @@ const users: Users = {
   }
 };
 
-function validate(decoded: User, request: Hapi.Request, callback: hapiAuthJwt2.ValidateCallback) {
-  callback(null, !!users[decoded.id]);
-}
-
-server.register(hapiAuthJwt2, err => {
-  const options: hapiAuthJwt2.Options = {
-    key: 'NeverShareYourSecret',
-    validateFunc: validate,
-    verifyOptions: {
-      algorithms: ['HS256']
+server.register({
+    plugin: hapiAuthJwt2,
+    options: {
+        async verify() {
+            return {
+                isValid: true,
+            };
+        }
     }
-  };
-  server.auth.strategy('jwt', 'jwt', options);
+})
+.then(() => {
+    const opts: hapiAuthJwt2.Options = {
+        key: 'NeverShareYourSecret',
+        async validate(decoded: { id: number }, request) {
+            return {
+                isValid: !!users[decoded.id],
+            };
+        },
+        verifyOptions: {
+            algorithms: ['HS256'],
+            issuer: 'test',
+        }
+    };
+    server.auth.strategy('jwt', 'jwt', opts);
 });
-
-server.start();
diff --git a/types/hapi-auth-jwt2/index.d.ts b/types/hapi-auth-jwt2/index.d.ts
index 91e8ef931e..a93f740bfc 100644
--- a/types/hapi-auth-jwt2/index.d.ts
+++ b/types/hapi-auth-jwt2/index.d.ts
@@ -1,39 +1,43 @@
-// Type definitions for hapi-auth-jwt2 7.0
+// Type definitions for hapi-auth-jwt2 8.0
 // Project: https://github.com/dwyl/hapi-auth-jwt2
 // Definitions by: Warren Seymour <https://github.com/warrenseymour>
+//                 Simon Schick <https://github.com/SimonSchick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import { Request, Response, PluginFunction } from 'hapi';
+import { Request, ResponseObject, Plugin, ResponseToolkit } from 'hapi';
+import { VerifyOptions } from 'jsonwebtoken';
+
+declare module 'hapi' {
+    interface ServerAuth {
+        strategy(name: string, scheme: 'jwt', options?: hapiAuthJwt2.Options): void;
+    }
+}
 
 declare namespace hapiAuthJwt2 {
-    /**
-     * A key lookup function
-     *
-     * @param decoded the *decoded* but *unverified* JWT received from client
-     * @param callback the key lookup callback
-     */
-    type KeyLookup = (decoded: any, callback: KeyLookupCallback) => void;
+    interface ExtraInfo {
+    }
 
-    /**
-     * Called when key lookup function has completed
-     *
-     * @param err an internal error
-     * @param key the secret key
-     * @param extraInfo any additional information that you would like
-     * to use in `validateFunc` which can be accessed via
-     * `request.plugins['hapi-auth-jwt2'].extraInfo`
-     */
-    type KeyLookupCallback = (err: any, key: string, extraInfo?: any) => void;
-
-    /**
-     * Called when Validation has completed
-     *
-     * @param err an internal error
-     * @param valid `true` if the JWT was valid, otherwise `false`
-     * @param credentials alternative credentials to be set instead of `decoded`
-     */
-    type ValidateCallback = (err: any, valid: boolean, credentials?: any) => void;
+    interface ErrorContext {
+        /**
+         * Boom method to call (eg. unauthorized)
+         */
+        errorType: string;
+        /**
+         * message passed into the Boom method call
+         */
+        message?: string;
+        /**
+         * schema passed into the Boom method call
+         */
+        schema: string;
+        /**
+         * attributes passed into the Boom method call
+         */
+        attributes?: {
+            [key: string]: string;
+        };
+    }
 
     /**
      * Options passed to `hapi.auth.strategy` when this plugin is used
@@ -42,41 +46,24 @@ declare namespace hapiAuthJwt2 {
         /**
          * The secret key used to check the signature of the token *or* a *key lookup function*
          */
-        key?: string | KeyLookup;
+        key?: string | string[] | Promise<{ isValid: boolean; key: string; extraInfo?: ExtraInfo }>;
 
         /**
          * The function which is run once the Token has been decoded
          *
          * @param decoded the *decoded* and *verified* JWT received from the client in *request.headers.authorization*
          * @param request the original *request* received from the client
-         * @param callback the validation callback
          */
-        validateFunc(decoded: {}, request: Request, callback: ValidateCallback): void;
+        validate(decoded: {}, request: Request, tk: ResponseToolkit): Promise<{
+            isValid: boolean;
+            credentials?: any;
+            response?: ResponseObject
+        }>;
 
         /**
          * Settings to define how tokens are verified by the jsonwebtoken library
          */
-        verifyOptions?: {
-            /**
-             * Ignore expired tokens
-             */
-            ignoreExpiration?: boolean;
-
-            /**
-             * Do not enforce token audience
-             */
-            audience?: boolean;
-
-            /**
-             * Do not require the issuer to be valid
-             */
-            issuer?: boolean;
-
-            /**
-             * List of allowed algorithms
-             */
-            algorithms?: string[];
-        };
+        verifyOptions?: VerifyOptions;
 
         /**
          * function called to decorate the response with authentication headers
@@ -85,7 +72,14 @@ declare namespace hapiAuthJwt2 {
          * @param request the Request object
          * @param reply is called if an error occurred
          */
-        responseFunc?(request: Request, reply: (err: any, response: Response) => void): void;
+        responseFunc?(request: Request, reply: (err: any, response: ResponseObject) => void): void;
+
+        /**
+         *
+         * @param ctx called when an error has been raised.
+         * It provides an extension point to allow the host the ability to customise the error messages returned.
+         */
+        errorFunc?(ctx: ErrorContext): ErrorContext;
 
         /**
          * If you prefer to pass your token via url, simply add a token url
@@ -125,8 +119,18 @@ declare namespace hapiAuthJwt2 {
          */
         complete?: boolean;
     }
+
+    interface RegisterOptions {
+        /**
+         * function which is run once the Token has been decoded (instead of a validate) with signature async function(decoded, request) where:
+         */
+        verify?(decoded: any, request: Request): Promise<{
+            isValid: boolean;
+            credentials?: any;
+        }>;
+    }
 }
 
-declare var hapiAuthJwt2: PluginFunction<{}>;
+declare const hapiAuthJwt2: Plugin<hapiAuthJwt2.RegisterOptions>;
 
 export = hapiAuthJwt2;
diff --git a/types/hapi-auth-jwt2/tsconfig.json b/types/hapi-auth-jwt2/tsconfig.json
index 19a6e785ac..0d58c0f507 100644
--- a/types/hapi-auth-jwt2/tsconfig.json
+++ b/types/hapi-auth-jwt2/tsconfig.json
@@ -13,20 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ],
-            "catbox": [
-                "catbox/v7"
-            ],
-            "hapi": [
-                "hapi/v16"
-            ],
-            "inert": [
-                "inert/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/hapi-auth-jwt2/tslint.json b/types/hapi-auth-jwt2/tslint.json
index 3db14f85ea..4f44991c3c 100644
--- a/types/hapi-auth-jwt2/tslint.json
+++ b/types/hapi-auth-jwt2/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}
diff --git a/types/hapi-auth-jwt2/v7/hapi-auth-jwt2-tests.ts b/types/hapi-auth-jwt2/v7/hapi-auth-jwt2-tests.ts
new file mode 100644
index 0000000000..fa28253a88
--- /dev/null
+++ b/types/hapi-auth-jwt2/v7/hapi-auth-jwt2-tests.ts
@@ -0,0 +1,38 @@
+import Hapi = require('hapi');
+import hapiAuthJwt2 = require('hapi-auth-jwt2');
+
+const server = new Hapi.Server();
+server.connection({port: 8000});
+
+interface User {
+  id: number;
+  name: string;
+}
+
+interface Users {
+  [id: number]: User;
+}
+
+const users: Users = {
+  1: {
+    id: 1,
+    name: 'Test User'
+  }
+};
+
+function validate(decoded: User, request: Hapi.Request, callback: hapiAuthJwt2.ValidateCallback) {
+  callback(null, !!users[decoded.id]);
+}
+
+server.register(hapiAuthJwt2, err => {
+  const options: hapiAuthJwt2.Options = {
+    key: 'NeverShareYourSecret',
+    validateFunc: validate,
+    verifyOptions: {
+      algorithms: ['HS256']
+    }
+  };
+  server.auth.strategy('jwt', 'jwt', options);
+});
+
+server.start();
diff --git a/types/hapi-auth-jwt2/v7/index.d.ts b/types/hapi-auth-jwt2/v7/index.d.ts
new file mode 100644
index 0000000000..91e8ef931e
--- /dev/null
+++ b/types/hapi-auth-jwt2/v7/index.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for hapi-auth-jwt2 7.0
+// Project: https://github.com/dwyl/hapi-auth-jwt2
+// Definitions by: Warren Seymour <https://github.com/warrenseymour>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Request, Response, PluginFunction } from 'hapi';
+
+declare namespace hapiAuthJwt2 {
+    /**
+     * A key lookup function
+     *
+     * @param decoded the *decoded* but *unverified* JWT received from client
+     * @param callback the key lookup callback
+     */
+    type KeyLookup = (decoded: any, callback: KeyLookupCallback) => void;
+
+    /**
+     * Called when key lookup function has completed
+     *
+     * @param err an internal error
+     * @param key the secret key
+     * @param extraInfo any additional information that you would like
+     * to use in `validateFunc` which can be accessed via
+     * `request.plugins['hapi-auth-jwt2'].extraInfo`
+     */
+    type KeyLookupCallback = (err: any, key: string, extraInfo?: any) => void;
+
+    /**
+     * Called when Validation has completed
+     *
+     * @param err an internal error
+     * @param valid `true` if the JWT was valid, otherwise `false`
+     * @param credentials alternative credentials to be set instead of `decoded`
+     */
+    type ValidateCallback = (err: any, valid: boolean, credentials?: any) => void;
+
+    /**
+     * Options passed to `hapi.auth.strategy` when this plugin is used
+     */
+    interface Options {
+        /**
+         * The secret key used to check the signature of the token *or* a *key lookup function*
+         */
+        key?: string | KeyLookup;
+
+        /**
+         * The function which is run once the Token has been decoded
+         *
+         * @param decoded the *decoded* and *verified* JWT received from the client in *request.headers.authorization*
+         * @param request the original *request* received from the client
+         * @param callback the validation callback
+         */
+        validateFunc(decoded: {}, request: Request, callback: ValidateCallback): void;
+
+        /**
+         * Settings to define how tokens are verified by the jsonwebtoken library
+         */
+        verifyOptions?: {
+            /**
+             * Ignore expired tokens
+             */
+            ignoreExpiration?: boolean;
+
+            /**
+             * Do not enforce token audience
+             */
+            audience?: boolean;
+
+            /**
+             * Do not require the issuer to be valid
+             */
+            issuer?: boolean;
+
+            /**
+             * List of allowed algorithms
+             */
+            algorithms?: string[];
+        };
+
+        /**
+         * function called to decorate the response with authentication headers
+         * before the response headers or payload is written
+         *
+         * @param request the Request object
+         * @param reply is called if an error occurred
+         */
+        responseFunc?(request: Request, reply: (err: any, response: Response) => void): void;
+
+        /**
+         * If you prefer to pass your token via url, simply add a token url
+         * parameter to your request or use a custom parameter by setting `urlKey.
+         * To disable the url parameter set urlKey to `false` or ''.
+         * @default 'token'
+         */
+        urlKey?: string | boolean;
+
+        /**
+         * If you prefer to set your own cookie key or your project has a cookie
+         * called 'token' for another purpose, you can set a custom key for your
+         * cookie by setting `options.cookieKey='yourkeyhere'`. To disable cookies
+         * set cookieKey to `false` or ''.
+         * @default 'token'
+         */
+        cookieKey?: string | boolean;
+
+        /**
+         * If you want to set a custom key for your header token use the
+         * `headerKey` option. To disable header token set headerKey to `false` or
+         * ''.
+         * @default 'authorization'
+         */
+        headerKey?: string | boolean;
+
+        /**
+         * Allow custom token type, e.g. `Authorization: <tokenType> 12345678`
+         */
+        tokenType?: string;
+
+        /**
+         * Set to `true` to receive the complete token (`decoded.header`,
+         * `decoded.payload` and `decoded.signature`) as decoded argument to key
+         * lookup and `verifyFunc` callbacks (*not `validateFunc`*)
+         * @default false
+         */
+        complete?: boolean;
+    }
+}
+
+declare var hapiAuthJwt2: PluginFunction<{}>;
+
+export = hapiAuthJwt2;
diff --git a/types/hapi-auth-jwt2/v7/tsconfig.json b/types/hapi-auth-jwt2/v7/tsconfig.json
new file mode 100644
index 0000000000..45c3371617
--- /dev/null
+++ b/types/hapi-auth-jwt2/v7/tsconfig.json
@@ -0,0 +1,40 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "hapi-auth-jwt2": [
+                "hapi-auth-jwt2/v7"
+            ],
+            "boom": [
+                "boom/v4"
+            ],
+            "catbox": [
+                "catbox/v7"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "hapi-auth-jwt2-tests.ts"
+    ]
+}
diff --git a/types/hapi-auth-jwt2/v7/tslint.json b/types/hapi-auth-jwt2/v7/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hapi-auth-jwt2/v7/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index de1542f33f..220a96868f 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -120,7 +120,7 @@ export interface PluginBase<T> {
      * * server - the server object with a plugin-specific server.realm.
      * * options - any options passed to the plugin during registration via server.register().
      */
-    register: (server: Server, options: T) => Promise<void>;
+    register: (server: Server, options: T) => void | Promise<void>;
 
     /** (optional) if true, allows the plugin to be registered multiple times with the same server. Defaults to false. */
     multiple?: boolean;
@@ -457,7 +457,7 @@ export interface Request extends Podium {
      * The response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to
      * override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).
      */
-    response: ResponseObject | Boom.Boom | null;
+    response: ResponseObject | Boom | null;
 
     /**
      * Same as pre but represented as the response object created by the pre method.
@@ -3873,7 +3873,7 @@ export namespace Lifecycle {
     type ReturnValueTypes =
         (null | string | number | boolean) |
         (Buffer) |
-        (Error | Boom.Boom) |
+        (Error | Boom) |
         (stream.Stream) |
         (object | object[]) |
         symbol |
diff --git a/types/hapi/test/server/server-plugins.ts b/types/hapi/test/server/server-plugins.ts
index 7f3d194f84..8de3fdc24f 100644
--- a/types/hapi/test/server/server-plugins.ts
+++ b/types/hapi/test/server/server-plugins.ts
@@ -13,6 +13,10 @@ interface Plugin3 {
 	three: 3;
 }
 
+interface Plugin4 {
+	four: 4;
+}
+
 declare module 'hapi' {
 	interface PluginProperties {
 		example: {
@@ -42,6 +46,11 @@ const plugin3: Plugin<Plugin3> = {
 	register: async (server: Server, options: Plugin3) => {}
 };
 
+const plugin4: Plugin<Plugin4> = {
+	name: 'plugin4',
+	register: (server: Server, options: Plugin4) => {}
+};
+
 const server = new Server({
     port: 8000,
 });
@@ -90,5 +99,9 @@ server.register([
 	{
 		plugin: plugin1,
 		options: {one: 1}
+	},
+	{
+		plugin: plugin4,
+		options: {four: 4}
 	}
 ]);
diff --git a/types/heremaps/heremaps-tests.ts b/types/heremaps/heremaps-tests.ts
index 9e92b92d72..40c0e92c5c 100644
--- a/types/heremaps/heremaps-tests.ts
+++ b/types/heremaps/heremaps-tests.ts
@@ -86,6 +86,21 @@ let polyline = new H.map.Polyline(new H.geo.Strip());
 let clipArr: Array<Array<number>>;
 clipArr = polyline.clip(new H.geo.Rect(5, 5, 5, 5));
 
+let lineString = new H.geo.LineString();
+lineString.pushPoint({ lat: 53.3477, lng: -6.2597 });
+lineString.pushPoint({ lat: 51.5008, lng: -0.1224 });
+lineString.pushPoint({ lat: 48.8567, lng: 2.3508 });
+lineString.pushPoint({ lat: 52.5166, lng: 13.3833 });
+lineString.eachLatLngAlt((lat: number, lng: number, alt: number, i: number) => {
+    console.log(lat, lng, alt, i);
+});
+lineString.getBounds();
+lineString.getPointCount();
+lineString.insertPoint(2, { lat: 53.3477, lng: -6.2597 });
+lineString.removePoint(2);
+
+let polyline2 = new H.map.Polyline(lineString);
+
 let router = platform.getRoutingService();
 let calculateRouteParams = {
     waypoint0: 'geo!52.5,13.4',
diff --git a/types/heremaps/index.d.ts b/types/heremaps/index.d.ts
index 8b68f11278..1fd1f3da29 100644
--- a/types/heremaps/index.d.ts
+++ b/types/heremaps/index.d.ts
@@ -756,6 +756,31 @@ declare namespace H {
 
     /***** geo *****/
     namespace geo {
+        /**
+         * The base class for all geometry types.
+         */
+        class AbstractGeometry {
+            /**
+             * Returns the bounding rectangle of the geometry.
+             * @return {H.geo.Rect} - the bounding rectangle of the geometry or null if the bounding rectangle can't be computed (e.g. for a geometry without coordinates)
+             */
+            getBounds(): H.geo.Rect;
+
+            /**
+             * Checks whether the geometry is equal to the geometry supplied by the caller.
+             * Two geometries are considered as equal if they represent the same geometry type and have equal coordinate values.
+             * @param other {any} - The geometry to check against
+             * @return {boolean} - true if the two geometries are equal, otherwise false
+             */
+            equals(other: any): boolean;
+
+            /**
+             * To obtain a Well-Known-Text (WKT) representation of the geometry.
+             * @return {string} - the resulting WKT string
+             */
+            toString(): string;
+        }
+
         /**
          * A Geographic coordinate that specifies the height of a point in meters. A value of undefined is treated as 0.
          */
@@ -812,6 +837,277 @@ declare namespace H {
          */
         type Longitude = number;
 
+        class LineString {
+            /**
+             * Constructor
+             * @param opt_latLngAlts {number[]=} - An optional array of latitude, longitude and altitude triples to initialize the LineString with.
+             * @param opt_ctx {H.geo.AltitudeContext=} - An optional altitude context for all altitudes contained in this LineString.
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid lat, lng, alt values
+             */
+            constructor(opt_latLngAlts?: number[], opt_ctx?: H.geo.AltitudeContext);
+
+            /**
+             * This method pushes a lat, lng, alt to the end of this LineString.
+             * @param lat {H.geo.Latitude}
+             * @param lng {H.geo.Longitude}
+             * @param alt {H.geo.Altitude}
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid lat, lng, alt value
+             */
+            pushLatLngAlt(lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude): void;
+
+            /**
+             * This method splices the LineString at the provided index, removing the specified number of items at that index and inserting the lat, lng, alt array.
+             * @param index {number} - The index at which to splice
+             * @param opt_nRemove {number=} - The number of lat, lng, alt values to remove
+             * @param opt_latLngAlts {number[]=} - The lat, lng, alt values to add
+             * @return {number[]} - An array of removed elements
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid opt_latLngAlts argument
+             */
+            spliceLatLngAlts(index: number, opt_nRemove?: number, opt_latLngAlts?: number[]): number[];
+
+            /**
+             * This method inserts one set of lat, lng, alt values into the LineString at the specified index.
+             * @param index {number} - the index at which to add the element
+             * @param lat {H.geo.Latitude} - the latitude to insert
+             * @param lng {H.geo.Longitude} - the longitude to insert
+             * @param alt {H.geo.Altitude} - the altitude to insert
+             */
+            insertLatLngAlt(index: number, lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude): void;
+
+            /**
+             * This method removes one set of lat, lng, alt values from the LineString at the specified index
+             * @param index {number}
+             */
+            removeLatLngAlt(index: number): void;
+
+            /**
+             * This method pushes the lat, lng, alt values of a {H.geo.Point} to the end of this LineString.
+             * @param geoPoint {H.geo.IPoint}
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid geoPoint argument
+             */
+            pushPoint(geoPoint: H.geo.IPoint): void;
+
+            /**
+             * This method inserts the lat, lng, alt values of a H.geo.Point into the list at the specified index.
+             * @param pointIndex {number}
+             * @param geoPoint {H.geo.IPoint}
+             */
+            insertPoint(pointIndex: number, geoPoint: H.geo.IPoint): void;
+
+            /**
+             * This method removes one set of lat, lng, alt values from this LineString at the virtual point index specified.
+             * @param pointIndex {number} - the virtual point index
+             */
+            removePoint(pointIndex: number): void;
+
+            /**
+             * This method extracts a H.geo.Point from this LineString at the virtual point index.
+             * If the extracted point has an alt value, the LineString's altitude context will be supplied to the point.
+             * @param pointIndex {number} - the virtual point index in the LineString
+             * @param opt_out {H.geo.Point=} - an optional point object to store the lat, lng, alt values
+             * @return {H.geo.Point} - Returns either the 'opt_out' point object or a new point object.
+             */
+            extractPoint(pointIndex: number, opt_out?: H.geo.Point): H.geo.Point;
+
+            /**
+             * A utility method to iterate over the points of a line string.
+             * @param eachFn {function(lat, lng, alt, index)} - The function to invoke for every point. It gets the point's latitude, longitude, altitude and index as arguments.
+             * @param opt_start {number=} - The point's start index (inclusive) to iterate from, defaults to 0.
+             * @param opt_end {number=} - The point's end index (exclusive) to iterate to, defaults to Infinity.
+             */
+            eachLatLngAlt(eachFn: (lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude, index: number) => void, opt_start?: number, opt_end?: number): void;
+
+            /**
+             * To obtain whether a leg (formed by the given two longitudes) crosses the International Date Line.
+             * @param lng1 {H.geo.Longitude} - The start longitude of the leg
+             * @param lng2 {H.geo.Longitude} - The end longitude of the leg
+             * @return {boolean}
+             */
+            static isDBC(lng1: H.geo.Longitude, lng2: H.geo.Longitude): boolean;
+
+            /**
+             * To obtain the number of times that this LineString cross the International Date Line.
+             * @param opt_asClosed {boolean=} - Indicates whether the LineString is treated as closed (the LineString's last and first coordinates form the closing leg of a polygon).
+             * It defaults to false.
+             * @return {number}
+             */
+            getDBCs(opt_asClosed?: boolean): number;
+
+            /**
+             * This method return the number of points stored in this LineString.
+             * @return {number} - The number of points in this LineString
+             */
+            getPointCount(): number;
+
+            /**
+             * Returns the vertices of the line segments as an array of alternating latitude, longitude and altitude coordinates.
+             * The returned array must be treated as read-only to not violate the integrity of the line-string.
+             * @return {number[]} - Returns the raw lat, lng, alt values of this LineString
+             */
+            getLatLngAltArray(): number[];
+
+            /**
+             * This method returns the bounding box of this LineString.
+             * Note: The LineString is treated as an open path. If the bounding rectangle for a closed shape is required, the closing leg must be merged in an extra step.
+             * @return {H.geo.Rect} - This LineString's bounding rectangle
+             */
+            getBounds(): H.geo.Rect;
+
+            /**
+             * This method initializes a new LineString with an array of lat, lng values. Arrays are expected to have an even length with the format [lat, lng, lat, lng, ...].
+             * @param latLngs {number[]} - the array of lat, lng value.
+             * @return {H.geo.LineString} - The LineString containing the lat, lng values
+             * @throws {H.lang.InvalidArgumentError} - throws an error in case the latLngs array has an odd length
+             */
+            static fromLatLngArray(latLngs: number[]): H.geo.LineString;
+
+            /**
+             * Checks whether the geometry is equal to the geometry supplied by the caller.
+             * Two geometries are considered as equal if they represent the same geometry type and have equal coordinate values.
+             * @param other {any} - The geometry to check against
+             * @return {boolean} - true if the two geometries are equal, otherwise false
+             */
+            equals(other: any): boolean;
+
+            /**
+             * To obtain a Well-Known-Text (WKT) representation of the geometry.
+             * @return {string} - the resulting WKT string
+             */
+            toString(): string;
+        }
+
+        class MultiGeometry<T> extends H.geo.AbstractGeometry {
+            /**
+             * The base class for a geometry that is a container for multiple geometries of a generic type. The type of the contained geometries is specified by the generic type parameter T
+             * @param geometries {T[]} - The list of geometries which are initially aggregated.
+             * @throws {H.lang.InvalidArgumentError} - if geometries parameter is not valid
+             */
+            constructor(geometries: T[]);
+
+            /**
+             * This method splices the specified MultiGeometry at the provided index, removing the specified number of items at that index and inserting new items.
+             * @param index {number} - The index at which to start changing the list.
+             * @param opt_deleteCount {number=} - The number of geometries to remove.
+             * @param opt_items {T[]=} - The geometries to add.
+             * @return {T[]} - the removed geometries.
+             */
+            splice(index: number, opt_deleteCount?: number, opt_items?: T[]): T[];
+
+            /**
+             * Removes a contained geometry at the given index.
+             * @param index {number} - The index of the geometry to remove.
+             * @return {T} - the removed geometry.
+             * @throws {H.lang.OutOfRangeError} - if no geometry exists at the given index.
+             */
+            removeAt(index: number): T;
+
+            /**
+             * Removes the specified geometry from the multi-geometry
+             * @param geometry {T} - The geometry (by reference) to remove from this multi-geometry.
+             * @return {T} - the removed geometry or null if the geometry was not found
+             */
+            remove(geometry: T): T;
+
+            /**
+             * Returns the aggregated geometries of the multi-geometry. The returned geometries must be treated as read-only to not violate the integrity of the multi-geometry.
+             * @return {T[]} - An array of geometries
+             */
+            getGeometries(): T[];
+
+            /**
+             * Adds the specified geometry to the current multi-geometry.
+             * @param geometry {T} - A geometry which will be added to the current multi-geometry
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid geometry argument
+             */
+            push(geometry: T): void;
+
+            /**
+             * Returns the bounding rectangle of the geometry.
+             * @return {H.geo.Rect} - the bounding rectangle of the geometry or null if the bounding rectangle can't be computed (e.g. for a geometry without coordinates)
+             */
+            getBounds(): H.geo.Rect;
+
+            /**
+             * Checks whether the geometry is equal to the geometry supplied by the caller.
+             * Two geometries are considered as equal if they represent the same geometry type and have equal coordinate values.
+             * @param other {any} - The geometry to check against
+             * @return {boolean} - true if the two geometries are equal, otherwise false
+             */
+            equals(other: any): boolean;
+
+            /**
+             * To obtain a Well-Known-Text (WKT) representation of the geometry.
+             * @return {string} - the resulting WKT string
+             */
+            toString(): string;
+        }
+
+        class MultiLineString extends H.geo.MultiGeometry<H.geo.LineString> {
+            /**
+             * A MultiLineString is a collection of line strings represented as a H.geo.MultiGeometry with a H.geo.LineString as generic type parameter T.
+             * @param lineStrings {H.geo.LineString[]} - The list of line-strings which are initially represented by the MultiLineString.
+             * @throws {H.lang.InvalidArgumentError} - if the lineStrings argument is not valid
+             */
+            constructor(lineStrings: H.geo.LineString[]);
+
+            /**
+             * This method splices the specified MultiGeometry at the provided index, removing the specified number of items at that index and inserting new items.
+             * @param index {number} - The index at which to start changing the list.
+             * @param opt_deleteCount {number?} - The number of geometries to remove.
+             * @param opt_items {H.geo.LineString[]?} - The geometries to add.
+             * @return {H.geo.LineString[]} - the removed geometries
+             */
+            splice(index: number, opt_deleteCount?: number, opt_items?: H.geo.LineString[]): H.geo.LineString[];
+
+            /**
+             * Removes a contained geometry at the given index.
+             * @param index {number} - The index of the geometry to remove.
+             * @return {H.geo.LineString} - the removed geometry.
+             * @throws {H.lang.OutOfRangeError} - if no geometry exists at the given index.
+             */
+            removeAt(index: number): H.geo.LineString;
+
+            /**
+             * Removes the specified geometry from the multi-geometry
+             * @param geometry {H.geo.LineString} -The geometry (by reference) to remove from this multi-geometry
+             * @return {H.geo.LineString} -the removed geometry or null if the geometry was not found
+             */
+            remove(geometry: H.geo.LineString): H.geo.LineString;
+
+            /**
+             * Returns the aggregated geometries of the multi-geometry. The returned geometries must be treated as read-only to not violate the integrity of the multi-geometry.
+             * @return {H.geo.LineString[]} - An array of geometries
+             */
+            getGeometries(): H.geo.LineString[];
+
+            /**
+             * Adds the specified geometry to the current multi-geometry.
+             * @param geometry {H.geo.LineString} - A geometry which will be added to the current multi-geometry
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid geometry argument
+             */
+            push(geometry: H.geo.LineString): void;
+
+            /**
+             * Returns the bounding rectangle of the geometry.
+             * @return {H.geo.Rect} - the bounding rectangle of the geometry or null if the bounding rectangle can't be computed (e.g. for a geometry without coordinates)
+             */
+            getBounds(): H.geo.Rect;
+
+            /**
+             * Checks whether the geometry is equal to the geometry supplied by the caller.
+             * Two geometries are considered as equal if they represent the same geometry type and have equal coordinate values.
+             * @param other {any} - The geometry to check against
+             * @return {boolean} - true if the two geometries are equal, otherwise false
+             */
+            equals(other: any): boolean;
+
+            /**
+             * To obtain a Well-Known-Text (WKT) representation of the geometry.
+             * @return {string} - the resulting WKT string
+             */
+            toString(): string;
+        }
+
         /**
          * PixelProjection transforms pixel world coordinates at a certain scale (zoom level) to geographical coordinates and vice versa.
          * By default, it uses the Mercator projection to transform geographic points into the 2d plane map points, which are adjusted to the current scale.
@@ -2240,17 +2536,216 @@ declare namespace H {
         class Polyline extends H.map.GeoShape {
           /**
            * Constructor
-           * @param strip {H.geo.Strip} - the strip describing this polygon's vertices
+           * @param geometry {H.geo.Strip | H.geo.LineString | H.geo.MultiLineString} - The geometry that defines the line segments of the polyline
            * @param opt_options {H.map.Polyline.Options=} - optional initialization parameters
            */
-          constructor(strip: H.geo.Strip, opt_options?: H.map.Polyline.Options);
+          constructor(geometry: H.geo.Strip | H.geo.LineString | H.geo.MultiLineString, opt_options?: H.map.Polyline.Options);
 
           /**
-           * This method clips this polyline against a rectangular area and returns the intersecting sub-lines.
-           * @param geoRect {H.geo.Rect}
-           * @returns {Array<Array<number>>}
+           * To set the polyline's geometry. If the given geometry is modified afterwards, it must be set again via setGeometry(geometry) to not violate the integrity of the polyline.
+           * @param geometry {H.geo.LineString | H.geo.MultiLineString} - the geometry to set.
+           * @return {H.map.Polyline} - The polyline instance itself.
+           */
+          setGeometry(geometry: H.geo.LineString | H.geo.MultiLineString): H.map.Polyline;
+
+          /**
+           * To obtain the polyline's geometry. If you modify the obtained geometry, you must call setGeometry(geometry) afterwards to not violate the integrity of the polyline.
+           * @return {H.geo.LineString | H.geo.MultiLineString}
+           */
+          getGeometry(): H.geo.LineString | H.geo.MultiLineString;
+
+          /**
+           * Clips the geometry of the Polyline to a rectangular area
+           * @param geoRect {H.geo.Rect} - The rectangle to clip against.
+           * @returns {Array<Array<number>>} - a list of geometry segments that intersecting the given rectangle.
+           * Each segment is represented as a list of alternating latitude and longitude coordinates that describes a line string.
            */
           clip(geoRect: H.geo.Rect): number[][];
+
+          /**
+           * Returns the geometry.
+           * @deprecated since 3.0.15.0
+           * @return {H.geo.Strip} - spatial object.
+           */
+          getStrip(): H.geo.Strip;
+
+          /**
+           * Sets the geometry.
+           * @deprecated since 3.0.15.0
+           * @param strip {H.geo.Strip} - The strip which represents geometry.
+           * @return {H.map.GeoShape} - The given spatial object
+           */
+          setStrip(strip: H.geo.Strip): H.map.GeoShape;
+
+          /**
+           * Returns the smallest rectangle which encloses the whole geometry of the GeoShape.
+           * @return {H.geo.Rect}
+           */
+          getBounds(): H.geo.Rect;
+
+          /**
+           * This method retrieves the drawing style of the given spatial object. The returned style is treated as immutable and must not be modified afterwards to prevent inconsistencies!
+           * @return {H.map.SpatialStyle} - The given spatial object
+           */
+          getStyle(): H.map.SpatialStyle;
+
+          /**
+           * This method sets the drawing style of the given spatial object. If the argument opt_style is an instance of H.map.SpatialStyle,
+           * it is treated as immutable and must not be modified afterwards to prevent inconsistencies!
+           * @param opt_style {(H.map.SpatialStyle | H.map.SpatialStyle.Options)=} - The style to set. If it evaluates to a false, the H.map.SpatialStyle.DEFAULT_STYLE is used.
+           * @return {H.map.Spatial} - The given spatial object
+           */
+          setStyle(opt_style?: H.map.SpatialStyle | H.map.SpatialStyle.Options): H.map.Spatial;
+
+          /**
+           * This method retrieves the arrow style of the given spatial object or undefined if the style is not defined.
+           * The returned arrow style is treated as immutable and must not be modified afterwards to prevent inconsistencies!
+           * @return {H.map.ArrowStyle} - An object encapsulating information about the arrow style or undefined if the arrow style is not defined.
+           */
+          getArrows(): H.map.ArrowStyle | undefined;
+
+          /**
+           * This method sets the arrow style of the given spatial object.
+           * @param opt_arrows {(H.map.ArrowStyle | H.map.ArrowStyle.Options)=} - The arrow style to be applied
+           * @return {H.map.Spatial} - The given spatial object
+           */
+          setArrows(opt_arrows?: H.map.ArrowStyle | H.map.ArrowStyle.Options): H.map.Spatial;
+
+          /**
+           * This method indicates whether this spatial object represents a closed shape
+           * @return {boolean} - true if the given spatial object is a closed shape, false otherwise
+           */
+          isClosed(): boolean;
+
+          /**
+           * This method retrieves the ID of the given object.
+           * @return {any} The identifier of the given object.
+           */
+          getId(): any;
+
+          /**
+           * This method sets the visibility of the given object.
+           * @param opt_visibility {boolean=} - Indicates whether the map object should be visible.
+           * @return {H.map.Object} - The given object
+           */
+          setVisibility(opt_visibility?: boolean): H.map.Object;
+
+          /**
+           * This method retrieves a value indicating the visibility of the given object.
+           * @param opt_effective {boolean} - Indicates that the effective visibility is requested. In this case the visibility of all possible ancestor groups is also taken into account
+           * @return {boolean} - A value indicating if the object is visible (true) or not false
+           */
+          getVisibility(opt_effective?: boolean): boolean;
+
+          /**
+           * This method retrieves the z-index of the given object.
+           * @return {number} - A value reflecting the z-index of the given object.
+           */
+          getZIndex(): number | undefined;
+
+          /**
+           * This method sets the z-index of the given object.
+           * @param zIndex {number | undefined} - A value indicating the new z-index
+           * @return {H.map.Object} - The given object
+           */
+          setZIndex(zIndex: number | undefined): H.map.Object;
+
+          /**
+           * This method compares the rendering z-order of the given object with another object. (The 'given object' mean the object on which the method has been invoke.)
+           * @param other {H.map.Object} -The map object with which to compare the given object.
+           * @return {number} - A value lower than 0 indicates that the given object has a lower z-order. 0 indicates that both objects have the same z-order.
+           * A value greater than 0, indicates that the given object has a higher z-order.
+           */
+          compareZOrder(other: H.map.Object): number;
+
+          /**
+           * This method retrieves the parent group which contains the given object or null if the object is not contained in any group.
+           * @return {H.map.Group} - An object representing the containing group object or null if the given object is not contained in any group.
+           */
+          getParentGroup(): H.map.Group;
+
+          /**
+           * The root object to which the given object is attached or the object itself if it is not attached to another.
+           * @return {H.map.Object} - An object representing the root group for the given object or the given object if it is not part of a group.
+           */
+          getRootGroup(): H.map.Object;
+
+          /**
+           * This method checks whether the received object is an inclusive descendant of the given object.
+           * @param object {any} - The object to check.
+           * @return {boolean} - true if the given object is contained in the given object, otherwise false
+           */
+          contains(object: any): boolean;
+
+          /**
+           * This method obtains the current provider of the given object
+           * @return {H.map.provider.ObjectProvider} - An object representing the provider
+           */
+          getProvider(): H.map.provider.ObjectProvider;
+
+          /**
+           * This method retrieves the invalidation states for the given object.
+           * @return {H.map.provider.Invalidations} - An object containing the invalidation states
+           */
+          getInvalidations(): H.map.provider.Invalidations;
+
+          /**
+           * This method invalidates the given map object.
+           * @param flags {H.math.BitMask} - The flags indicating the types of changes to the given object
+           * @return {boolean} - Indicates whether a validation was executed (only if the object has a provider)
+           */
+          invalidate(flags: H.math.BitMask): boolean;
+
+          /**
+           * This method retrieves previously stored arbitrary data from the given object.
+           * @return {any} - The previously stored data or undefined if no data was stored.
+           */
+          getData(): any;
+
+          /**
+           * This method stores arbitrary data with the given map object.
+           * @param data {any} - The data to be stored
+           * @return {H.map.Object} - The given map object
+           */
+          setData(data: any): H.map.Object;
+
+          /**
+           * This method adds a listener for a specific event.
+           * Note that to prevent potential memory leaks, you must either call removeEventListener or dispose on the given object when you no longer need it.
+           * @param type {string} - The name of the event
+           * @param handler {function()} - An event handler function
+           * @param opt_capture {boolean=} - true indicates that the method should listen in the capture phase (bubble otherwise)
+           * @param opt_scope {{}=} - An object defining the scope for the handler function
+           */
+          addEventListener(type: string, handler: () => void, opt_capture?: boolean, opt_scope?: {}): void;
+
+          /**
+           * This method removes a previously added listener from the EventTarget instance.
+           * @param type {string} - The name of the event
+           * @param handler {function()} - An event handler function
+           * @param opt_capture {boolean=} - true indicates that the method should listen in the capture phase (bubble otherwise)
+           * @param opt_scope {{}=} - An object defining the scope for the handler function
+           */
+          removeEventListener(type: string, handler: () => void, opt_capture?: boolean, opt_scope?: {}): void;
+
+          /**
+           * This method dispatches an event on the EventTarget object.
+           * @param evt {H.util.Event | string} - An object representing the event or a string with the event name
+           */
+          dispatchEvent(evt: H.util.Event | string): void;
+
+          /**
+           * This method removes listeners from the given object.
+           * Classes that extend EventTarget may need to override this method in order to remove references to DOM Elements and additional listeners.
+           */
+          dispose(): void;
+
+          /**
+           * This method adds a callback which is triggered when the EventTarget object is being disposed.
+           * @param callback {function()} - The callback function.
+           * @param opt_scope {{}=} - An optional scope for the callback function
+           */
+          addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
         }
 
         namespace Polyline {
@@ -3164,7 +3659,7 @@ declare namespace H {
                  * sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
-                 * @property getCopyrights {(function(H.geo.Rect, number) : ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
+                 * @property getCopyrights {(function(H.geo.Rect, number): ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
                  * @property tileSize {number=} - The size of a tile as edge length in pixels. It must be 2^n where n is in range [0 ... 30], default is 256
                  * @property getURL {function(number, number, number)} - The function to create an URL for the specified tile. If it returns a falsy the tile is not requested.
                  * @property crossOrigin {(string | boolean=)} - The CORS settings to use for the crossOrigin attribute for the image, if omitted or if the value evaluates to false no CORS settings
@@ -3299,7 +3794,7 @@ declare namespace H {
                  * Options which are used to initialize the MarkerTileProvider object.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
-                 * @property requestData {function(number, number, number, function(Array<H.map.AbstractMarker>), Function) : H.util.ICancelable} - function that fetches marker data and creates array
+                 * @property requestData {function(number, number, number, function(Array<H.map.AbstractMarker>), Function): H.util.ICancelable} - function that fetches marker data and creates array
                  * of H.map.AbstractMarker that is passed success callback, if function fails to fetch data onError callback must be called
                  * @property providesDomMarkers {boolean=} - indicates if markers provided are of type H.map.DomMarker or H.map.Marker, default is H.map.Marker
                  */
@@ -3463,7 +3958,7 @@ declare namespace H {
                  * sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
-                 * @property getCopyrights {(function(H.geo.Rect, number) : ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
+                 * @property getCopyrights {(function(H.geo.Rect, number): ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
                  */
                 interface Options {
                     uri?: string;
@@ -6137,7 +6632,7 @@ declare namespace H {
         namespace ZoomRectangle {
             /**
              * @property alignment {H.ui.LayoutAlignment=} - the layout alignment which should be applied to this control, default is H.ui.LayoutAlignment.BOTTOM_RIGHT
-             * @property adjustZoom {function(number, H.Map) : number=} - optional function that defines how zoom level should be changed, by default zoom level is picked to fit the
+             * @property adjustZoom {function(number, H.Map): number=} - optional function that defines how zoom level should be changed, by default zoom level is picked to fit the
              * bounding rectangle into the view port.
              */
             interface Options {
@@ -6381,7 +6876,7 @@ declare namespace H {
              * Constructor
              * @param maxSize {number} - the maximum size of the cache
              * @param opt_onDrop {function(string, ?, number)=} - A callback to be invoked when a data element is dropped from the cache
-             * @param opt_filter {(function(string, ?, number) : boolean)=} - A function to filter data elements that are not to be cached
+             * @param opt_filter {(function(string, ?, number): boolean)=} - A function to filter data elements that are not to be cached
              */
             constructor(maxSize: number, opt_onDrop?: (s: string, i: any, n: number) => void, opt_filter?: (s: string, i: any, n: number) => boolean);
 
@@ -6432,14 +6927,14 @@ declare namespace H {
              * on those entries for which the predicated returns true.
              * @param callback {function(string, ?, number)} - the callback to be invoked for each entry
              * @param opt_ctx {Object=} - an optional context object to be used as this within the callback
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional match predicate to customize on which entries the callback will be called
+             * @param opt_matcher {(function(string, ?, number): boolean)=} - an optional match predicate to customize on which entries the callback will be called
              */
             forEach(callback: (s: string, i: any, n: number) => void, opt_ctx?: any, opt_matcher?: (s: string, i: any, n: number) => boolean): void;
 
             /**
              * This method removes all data elements from the cache. If the optional match predicate is passed to this method only those data elements will be removed for which the predicate
              * return true.
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
+             * @param opt_matcher {(function(string, ?, number): boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
              * leave the entry in the cache respectively
              */
             removeAll(opt_matcher?: (s: string, i: any, n: number) => boolean): void;
@@ -6683,14 +7178,14 @@ declare namespace H {
              * those entries for which the predicated returns true.
              * @param callback {function(string, ?, number)} - the callback to be invoked for each entry
              * @param opt_ctx {Object=} - an optional context object to be used as this within the callback
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional match predicate to customize on which entries the callback will be called
+             * @param opt_matcher {(function(string, ?, number): boolean)=} - an optional match predicate to customize on which entries the callback will be called
              */
             forEach(callback: (s: string, t: any, n: number) => void, opt_ctx?: {}, opt_matcher?: ((s: string, t: any, n: number) => boolean)): void;
 
             /**
              * This method removes all data elements from the cache. If the optional match predicate is passed to this method only those data elements will be removed for which the predicate
              * return true.
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
+             * @param opt_matcher {(function(string, ?, number): boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
              * leave the entry in the cache respectively
              */
             removeAll(opt_matcher?: ((s: string, t: any, n: number) => boolean)): void;
diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 347c82576d..cf73a08e68 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -961,7 +961,7 @@ declare namespace Highcharts {
          * Use this in cases where a linear gradient between a minColor and maxColor is not sufficient.
          * The stops is an array of tuples, where the first item is a float between 0 and 1 assigning the relative position in the gradient, and the second item is the color.
          */
-        stops?: Array<[number, string]>;
+        stops?: Array<Array<number|string>>;
         /**
          * The amount of ticks to draw on the axis. This opens up for aligning the ticks of multiple charts or panes within
          * a chart. This option overrides the tickPixelInterval option.
@@ -1995,6 +1995,7 @@ declare namespace Highcharts {
         fontWeight?: string;
         left?: string;
         opacity?: number;
+		overflow?: string;
         padding?: string | number;
         position?: string;
         top?: string;
@@ -3076,7 +3077,7 @@ declare namespace Highcharts {
          * @default ['50%', '50%']
          * @since 2.3.0
          */
-        center?: [number | string, number | string];
+        center?: Array<number|string>;
         /**
          * The end angle of the polar X axis or gauge value axis, given in degrees where 0 is north.
          * @default startAngle + 360
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index ad026a1e52..c4ea1bd7a8 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -1631,12 +1631,18 @@ function test_Gauge() {
             type: 'gauge'
         },
         pane: {
+            center: ['50%', '85%'],
             startAngle: -150,
             endAngle: 150
         },
         yAxis: {
             min: 0,
-            max: 100
+            max: 100,
+            stops: [
+                [0.1, '#DF5353'],
+                [0.5, '#DDDF0D'],
+                [0.9, '#55BF3B'],
+            ],
         },
         plotOptions: {
             gauge: {
diff --git a/types/highland/highland-tests.ts b/types/highland/highland-tests.ts
index e97c5c9416..5f1c734395 100644
--- a/types/highland/highland-tests.ts
+++ b/types/highland/highland-tests.ts
@@ -1,5 +1,3 @@
-
-
 // Note: try to maintain the ordering and separators
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -49,18 +47,18 @@ var anyArrStream: Highland.Stream<any[]>;
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 interface Foo {
-	foo(): string;
+  foo(): string;
 }
 interface Bar {
-	bar(): string;
+  bar(): string;
 }
 
 interface StrFooArrMap {
-	[key:string]: Foo[];
+  [key: string]: Foo[];
 }
 
 interface StrBarArrMap {
-	[key:string]: Bar[];
+  [key: string]: Bar[];
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -128,9 +126,9 @@ fooStream = streamRedirect.to;
 fooStream = _<Foo>();
 fooStream = _(fooArr);
 fooStream = _<Foo>((push, next) => {
-	push(null, foo);
-	push(err);
-	next();
+  push(null, foo);
+  push(err);
+  next();
 });
 
 fooStream = _(fooStream);
@@ -173,16 +171,23 @@ fooArrStream = fooStream.collect();
 
 fooStream = fooStream.compact();
 
-barStream = fooStream.consume((err: Error, x: Foo, push: (err: Error, value?: Bar) => void, next: () => void) => {
-	push(err);
-	push(null, bar);
-	next();
-});
+barStream = fooStream.consume(
+  (
+    err: Error,
+    x: Foo | Highland.Nil,
+    push: (err: Error, value?: Bar | Highland.Nil) => void,
+    next: () => void
+  ) => {
+    push(err);
+    push(null, bar);
+    next();
+  }
+);
 
 barStream = fooStream.consume<Bar>((err, x, push, next) => {
-	push(err);
-	push(null, bar);
-	next();
+  push(err);
+  push(null, bar);
+  next();
 });
 
 fooStream = fooStream.debounce(num);
@@ -191,30 +196,32 @@ fooStream = fooStream.doto((x: Foo) => {});
 
 fooStream = fooStream.drop(2);
 
-fooStream = fooStream.errors((err: Error, push: (e: Error, x?: Foo) => void) => {
-	push(err);
-	push(null, x);
-	push(null, foo);
-});
+fooStream = fooStream.errors(
+  (err: Error, push: (e: Error, x?: Foo) => void) => {
+    push(err);
+    push(null, x);
+    push(null, foo);
+  }
+);
 
 fooStream = fooStream.errors((err, push) => {
-	push(err);
-	push(null, x);
-	push(null, foo);
+  push(err);
+  push(null, x);
+  push(null, foo);
 });
 
 fooStream = fooStream.filter((x: Foo) => {
-	return bool;
+  return bool;
 });
 
 fooStream = fooStream.find((x: Foo) => {
-	return bool;
+  return bool;
 });
 
 fooStream = fooStream.findWhere(obj);
 
 strFooArrMapStream = fooStream.group((x: Foo) => {
-	return str;
+  return str;
 });
 strFooArrMapStream = fooStream.group(str);
 
@@ -227,7 +234,7 @@ fooStream = fooStream.last();
 fooStream = fooStream.latest();
 
 barStream = fooStream.map((x: Foo) => {
-	return bar;
+  return bar;
 });
 
 barStream = fooStream.pluck<Bar>(str);
@@ -235,26 +242,24 @@ barStream = fooStream.pluck<Bar>(str);
 fooStream = fooStream.ratelimit(3, 1000);
 
 barStream = fooStream.reduce(bar, (memo: Bar, x: Foo) => {
-	return memo;
+  return memo;
 });
 
 barStream = fooStream.reduce1(bar, (memo: Bar, x: Foo) => {
-	return memo;
+  return memo;
 });
 
 fooStream = fooStream.reject((x: Foo) => {
-	return bool;
+  return bool;
 });
 
 barStream = fooStream.scan(bar, (memo: Bar, x: Foo) => {
-	return memo;
+  return memo;
 });
 
 //missing scan1
 
-fooStream = fooStream.stopOnError((e: Error) => {
-
-});
+fooStream = fooStream.stopOnError((e: Error) => {});
 
 fooStream = fooStream.take(num);
 
@@ -264,7 +269,6 @@ fooStream = fooStream.throttle(num);
 
 fooStream = fooStream.where(obj);
 
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // HIGHER-ORDER STREAMS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -274,15 +278,15 @@ fooStream = fooStream.concat(fooStream);
 fooStream = fooStream.concat(fooArr);
 
 fooStream = fooStream.flatFilter((x: Foo) => {
-	return boolStream;
+  return boolStream;
 });
 
 barStream = fooStream.flatMap((x: Foo) => {
-	return barStream;
+  return barStream;
 });
 
 barStream = fooStream.flatMap((x: Foo) => {
-	return bar;
+  return bar;
 });
 
 barStream = fooStream.flatten<Bar>();
@@ -315,24 +319,16 @@ fooStream.apply(func);
 
 fooStream.done(() => {});
 
-fooStream.each((x: Foo) => {
-
-});
+fooStream.each((x: Foo) => {});
 
 fooStream = fooStream.pipe(fooStream);
 barStream = fooStream.pipe(barStream);
 
-fooStream.pull((err: Error, x: Foo) => {
+fooStream.pull((err: Error, x: Foo) => {});
 
-});
+fooStream.pull((err, x) => {});
 
-fooStream.pull((err, x) => {
-
-});
-
-fooStream.toArray((arr: Foo[]) => {
-
-});
+fooStream.toArray((arr: Foo[]) => {});
 
 fooStream.toCallback((err: Error, x: Foo) => {});
 fooStream.toCallback((err: Error) => {});
@@ -360,7 +356,6 @@ f = _.wrapCallback(func, num);
 f = _.wrapCallback(func, strArr);
 f = _.wrapCallback(func, fn);
 
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // OBJECTS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/types/highland/index.d.ts b/types/highland/index.d.ts
index 3a2116a4d8..eff8fb2769 100644
--- a/types/highland/index.d.ts
+++ b/types/highland/index.d.ts
@@ -75,7 +75,7 @@ interface HighlandStatic {
 	<R>(): Highland.Stream<R>;
   <R>(xs: Highland.Stream<R>[]): Highland.Stream<R>;
 	<R>(xs: R[]): Highland.Stream<R>;
-	<R>(xs: (push: (err: Error | null, x?: R) => void, next: () => void) => void): Highland.Stream<R>;
+	<R>(xs: (push: (err: Error | null, x?: R | Highland.Nil) => void, next: () => void) => void): Highland.Stream<R>;
 
 	<R>(xs: Highland.Stream<R>): Highland.Stream<R>;
 	<R>(xs: NodeJS.ReadableStream): Highland.Stream<R>;
@@ -563,7 +563,7 @@ declare namespace Highland {
 		 * @param {Function} f - the function to handle errors and values
 		 * @api public
 		 */
-		consume<U>(f: (err: Error, x: R, push: (err: Error | null, value?: U) => void, next: () => void) => void): Stream<U>;
+		consume<U>(f: (err: Error, x: R | Highland.Nil, push: (err: Error | null, value?: U | Highland.Nil) => void, next: () => void) => void): Stream<U>;
 
 		/**
 		 * Holds off pushing data events downstream until there has been no more
@@ -614,9 +614,9 @@ declare namespace Highland {
 		 *
 		 * _([1, 2, 3, 4]).drop(2) // => 3, 4
 		 */
-		 drop(n: number): Stream<R>;
+        drop(n: number): Stream<R>;
 
-		 /**
+		/**
 		 * Extracts errors from a Stream and applies them to an error handler
 		 * function. Returns a new Stream with the errors removed (unless the error
 		 * handler chooses to rethrow them using `push`). Errors can also be
@@ -653,7 +653,7 @@ declare namespace Highland {
 		 */
 		find(f: (x: R) => boolean): Stream<R>;
 
-		 /**
+		/**
 		 * A convenient form of [where](#where), which returns the first object from a
 		 * Stream that matches a set of property values. findWhere is to [where](#where) as [find](#find) is to [filter](#filter).
 		 *
diff --git a/types/html-webpack-plugin/index.d.ts b/types/html-webpack-plugin/index.d.ts
index 35774c1ac6..c3db12f4e7 100644
--- a/types/html-webpack-plugin/index.d.ts
+++ b/types/html-webpack-plugin/index.d.ts
@@ -4,7 +4,7 @@
 //                 Benjamin Lim <https://github.com/bumbleblym>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 import { Options as HtmlMinifierOptions } from 'html-minifier';
diff --git a/types/html-webpack-template/index.d.ts b/types/html-webpack-template/index.d.ts
index b02be3c463..1436728a72 100644
--- a/types/html-webpack-template/index.d.ts
+++ b/types/html-webpack-template/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jaketrent/html-webpack-template
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Options as HtmlWebpackPluginOptions } from 'html-webpack-plugin';
 
diff --git a/types/iban/iban-tests.ts b/types/iban/iban-tests.ts
index ac79e97a99..574769c461 100644
--- a/types/iban/iban-tests.ts
+++ b/types/iban/iban-tests.ts
@@ -39,7 +39,7 @@ function testIsValidBBAN() {
  */
 function testPrintFormat() {
     var iban: string = 'BE68539007547034';
-    var separator: string[] = ['fr'];
+    var separator: string = ' ';
     var format: string = IBAN.printFormat(iban, separator);
 }
 
@@ -48,6 +48,6 @@ function testPrintFormat() {
  */
 function testToBBAN() {
     var iban: string = 'BE68539007547034';
-    var separator: string[] = ['-'];
+    var separator: string = '-';
     var bban: string = IBAN.toBBAN(iban, separator);
-}
\ No newline at end of file
+}
diff --git a/types/iban/index.d.ts b/types/iban/index.d.ts
index a47cfa618f..2b14d73954 100644
--- a/types/iban/index.d.ts
+++ b/types/iban/index.d.ts
@@ -42,17 +42,17 @@ interface IBANStatic {
     /** 
      * @summary Returns the IBAN in a print format.
      * @param {string} iban The IBAN to convert.
-     * @param {string} The IBAN in print format.
+     * @param {string} separator The separator to use between IBAN blocks, defaults to ' '.
      */
-    printFormat(iban: string, separator: string[]): string;
+    printFormat(iban: string, separator?: string): string;
 
     /**
      * @summary Convert the passed IBAN to a country-specific BBAN.
      * @param {string} iban The IBAN to convert.
-     * @param {string[]} Separator the separator to use between BBAN blocks.
+     * @param {string} separator The separator to use between BBAN blocks, defaults to ' '.
      * @returns {string} The BBAN
      */
-    toBBAN(iban: string, separator: string[]): string;
+    toBBAN(iban: string, separator?: string): string;
 }
 
 declare var IBAN: IBANStatic;
diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 32c54fa99e..67d8fd29ac 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -3,16 +3,21 @@
 // Definitions by: Qubo <https://github.com/tkQubo>
 //                 Parvez <https://github.com/ppathan>
 //                 Jouderian <https://github.com/jouderianjr>
+//                 Qibang <https://github.com/bang88>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// TypeScript Version: 2.3
 /// <reference types="rx" />
 
-import through = require('through');
+import through = require("through");
 
 declare namespace inquirer {
     type Prompts = { [name: string]: PromptModule };
     type ChoiceType = string | objects.ChoiceOption | objects.Separator;
-    type Questions = Question | Question[] | Rx.Observable<Question>;
+    type Questions<T> =
+        | Question<T>
+        | Question<T>[]
+        | Rx.Observable<Question<T>>;
 
     interface Inquirer {
         restoreDefaultPrompts(): void;
@@ -32,19 +37,19 @@ declare namespace inquirer {
          * @param cb Callback being passed the user answers
          * @return
          */
-        prompt(questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
-        prompt(questions: Questions): Promise<Answers>;
+        prompt<T>(questions: Questions<T>, cb: (answers: T) => any): ui.Prompt;
+        prompt<T>(questions: Questions<T>): Promise<T>;
         prompts: Prompts;
         Separator: objects.SeparatorStatic;
         ui: {
             BottomBar: ui.BottomBar;
             Prompt: ui.Prompt;
-        }
+        };
     }
 
     interface PromptModule {
-        (questions: Questions): Promise<Answers>;
-        (questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
+        <T>(questions: Questions<T>): Promise<T>;
+        <T>(questions: Questions<T>, cb: (answers: T) => any): ui.Prompt;
         /**
          * Register a prompt type
          * @param name Prompt type name
@@ -57,7 +62,7 @@ declare namespace inquirer {
         restoreDefaultPrompts(): void;
     }
 
-    interface Question {
+    interface Question<T = Answers> {
         /**
          * Type of the prompt.
          * Possible values:
@@ -79,24 +84,24 @@ declare namespace inquirer {
          * The question to print. If defined as a function,
          * the first parameter will be the current inquirer session answers.
          */
-        message?: string | ((answers: Answers) => string);
+        message?: string | ((answers: T) => string);
         /**
          * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
          * If defined as a function, the first parameter will be the current inquirer session answers.
          */
-        default?: any | ((answers: Answers) => any);
+        default?: any | ((answers: T) => any);
         /**
          * Choices array or a function returning a choices array. If defined as a function,
          * the first parameter will be the current inquirer session answers.
          * Array values can be simple strings, or objects containing a name (to display) and a value properties
          * (to save in the answers hash). Values can also be a Separator.
          */
-        choices?: ChoiceType[] | ((answers: Answers) => ChoiceType[]);
+        choices?: ChoiceType[] | ((answers: T) => ChoiceType[]);
         /**
          * Receive the user input and should return true if the value is valid, and an error message (String)
          * otherwise. If false is returned, a default error message is provided.
          */
-        validate?(input: string, answers?: Answers): boolean | string;
+        validate?(input: string, answers?: T): boolean | string;
         /**
          * Receive the user input and return the filtered value to be used inside the program.
          * The value returned will be added to the Answers hash.
@@ -106,7 +111,7 @@ declare namespace inquirer {
          * Receive the current user answers hash and should return true or false depending on whether or
          * not this question should be asked. The value can also be a simple boolean.
          */
-        when?: boolean | ((answers: Answers) => boolean);
+        when?: boolean | ((answers: T) => boolean);
         paginated?: boolean;
         /**
          * Change the number of lines that will be rendered when using list, rawList, expand or checkbox.
@@ -143,10 +148,10 @@ declare namespace inquirer {
              * Once all prompt are over
              */
             onCompletion(): void;
-            processQuestion(question: Question): any;
-            fetchAnswer(question: Question): any;
-            setDefaultType(question: Question): any;
-            filterIfRunnable(question: Question): any;
+            processQuestion<T>(question: Question<T>): any;
+            fetchAnswer<T>(question: Question<T>): any;
+            setDefaultType<T>(question: Question<T>): any;
+            filterIfRunnable<T>(question: Question<T>): any;
         }
 
         /**
@@ -237,7 +242,7 @@ declare namespace inquirer {
             extra?: any;
             key?: string;
             checked?: boolean;
-            disabled?: string | ((answers: Answers) => any);
+            disabled?: string | (<T = Answers>(answers: T) => any);
         }
 
         /**
@@ -247,7 +252,10 @@ declare namespace inquirer {
          * @param choices  All `choice` to keep in the collection
          */
         interface Choices {
-            new (choices: (string | Separator | ChoiceOption)[], answers?: Answers): Choices;
+            new <T = Answers>(
+                choices: (string | Separator | ChoiceOption)[],
+                answers?: T
+            ): Choices;
             choices: Choice[];
             realChoices: Choice[];
             length: number;
diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index 4a43dcc98e..bd1d6a5ac4 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -1,9 +1,13 @@
-import inquirer = require('inquirer');
+import inquirer = require("inquirer");
 
-
-inquirer.prompt([/* Pass your questions in here */], function( answers: inquirer.Answers ) {
-    // Use user feedback for... whatever!!
-});
+inquirer.prompt(
+    [
+        /* Pass your questions in here */
+    ],
+    function(answers: inquirer.Answers) {
+        // Use user feedback for... whatever!!
+    }
+);
 
 //
 // examples/bottom-bar.js
@@ -13,29 +17,25 @@ inquirer.prompt([/* Pass your questions in here */], function( answers: inquirer
 var BottomBar = inquirer.ui.BottomBar;
 declare var cmdify: any;
 
-var loader = [
-    "/ Installing",
-    "| Installing",
-    "\\ Installing",
-    "- Installing"
-];
+var loader = ["/ Installing", "| Installing", "\\ Installing", "- Installing"];
 var i = 4;
 var ui = new BottomBar({ bottomBar: loader[i % 4] });
 
 setInterval(function() {
-    ui.updateBottomBar( loader[i++ % 4] );
-}, 300 );
+    ui.updateBottomBar(loader[i++ % 4]);
+}, 300);
 
 var spawn = require("child_process").spawn;
 
-var cmd = spawn(cmdify("npm"), [ "-g", "install", "inquirer" ], { stdio: "pipe" });
-cmd.stdout.pipe( ui.log );
-cmd.on( "close", function() {
+var cmd = spawn(cmdify("npm"), ["-g", "install", "inquirer"], {
+    stdio: "pipe"
+});
+cmd.stdout.pipe(ui.log);
+cmd.on("close", function() {
     ui.updateBottomBar("Installation done!\n");
     process.exit();
 });
 
-
 //
 // examples/checkbox.js
 //
@@ -47,49 +47,51 @@ cmd.on( "close", function() {
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "checkbox",
-        message: "Select toppings",
-        name: "toppings",
-        choices: [
-            new inquirer.Separator("The usual:"),
-            {
-                name: "Pepperoni"
-            },
-            {
-                name: "Cheese",
-                checked: true
-            },
-            {
-                name: "Mushroom"
-            },
-            new inquirer.Separator("The extras:"),
-            {
-                name: "Pineapple",
-            },
-            {
-                name: "Bacon"
-            },
-            {
-                name: "Olives",
-                disabled: "out of stock"
-            },
-            {
-                name: "Extra cheese"
+inquirer.prompt<{ toppings: string }>(
+    [
+        {
+            type: "checkbox",
+            message: "Select toppings",
+            name: "toppings",
+            choices: [
+                new inquirer.Separator("The usual:"),
+                {
+                    name: "Pepperoni"
+                },
+                {
+                    name: "Cheese",
+                    checked: true
+                },
+                {
+                    name: "Mushroom"
+                },
+                new inquirer.Separator("The extras:"),
+                {
+                    name: "Pineapple"
+                },
+                {
+                    name: "Bacon"
+                },
+                {
+                    name: "Olives",
+                    disabled: "out of stock"
+                },
+                {
+                    name: "Extra cheese"
+                }
+            ],
+            validate: function(answer) {
+                if (answer.length < 1) {
+                    return "You must choose at least one topping.";
+                }
+                return true;
             }
-        ],
-        validate: function( answer ) {
-            if ( answer.length < 1 ) {
-                return "You must choose at least one topping.";
-            }
-            return true;
         }
+    ],
+    function(answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
-
+);
 
 //
 // examples/expand.js
@@ -102,39 +104,41 @@ inquirer.prompt([
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "expand",
-        message: "Conflict on `file.js`: ",
-        name: "overwrite",
-        choices: [
-            {
-                key: "y",
-                name: "Overwrite",
-                value: "overwrite"
-            },
-            {
-                key: "a",
-                name: "Overwrite this one and all next",
-                value: "overwrite_all"
-            },
-            {
-                key: "d",
-                name: "Show diff",
-                value: "diff"
-            },
-            new inquirer.Separator(),
-            {
-                key: "x",
-                name: "Abort",
-                value: "abort"
-            }
-        ]
+inquirer.prompt(
+    [
+        {
+            type: "expand",
+            message: "Conflict on `file.js`: ",
+            name: "overwrite",
+            choices: [
+                {
+                    key: "y",
+                    name: "Overwrite",
+                    value: "overwrite"
+                },
+                {
+                    key: "a",
+                    name: "Overwrite this one and all next",
+                    value: "overwrite_all"
+                },
+                {
+                    key: "d",
+                    name: "Show diff",
+                    value: "diff"
+                },
+                new inquirer.Separator(),
+                {
+                    key: "x",
+                    name: "Abort",
+                    value: "abort"
+                }
+            ]
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
-
+);
 
 //
 // examples/input.js
@@ -152,21 +156,25 @@ var questions = [
         type: "input",
         name: "first_name",
         message: "What's your first name",
-        prefix: "1 - ",
+        prefix: "1 - "
     },
     {
         type: "input",
         name: "last_name",
         message: "What's your last name",
-        default: function () { return "Doe"; },
+        default: function() {
+            return "Doe";
+        },
         suffix: "!!"
     },
     {
         type: "input",
         name: "phone",
         message: "What's your phone number",
-        validate: function( value: string ): string|boolean {
-            var pass = value.match(/^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i);
+        validate: function(value: string): string | boolean {
+            var pass = value.match(
+                /^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i
+            );
             if (pass) {
                 return true;
             } else {
@@ -176,15 +184,14 @@ var questions = [
     }
 ];
 
-inquirer.prompt( questions, function( answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
+inquirer.prompt(questions, function(answers) {
+    console.log(JSON.stringify(answers, null, "  "));
 });
 
 //
 // examples/list.js
 //
 
-
 /**
  * List prompt example
  */
@@ -192,29 +199,34 @@ inquirer.prompt( questions, function( answers ) {
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "list",
-        name: "theme",
-        message: "What do you want to do?",
-        choices: [
-            "Order a pizza",
-            "Make a reservation",
-            new inquirer.Separator(),
-            "Ask opening hours",
-            "Talk to the receptionist"
-        ]
-    },
-    {
-        type: "list",
-        name: "size",
-        message: "What size do you need",
-        choices: [ "Jumbo", "Large", "Standard", "Medium", "Small", "Micro" ],
-        filter: function( val: string ) { return val.toLowerCase(); }
+inquirer.prompt(
+    [
+        {
+            type: "list",
+            name: "theme",
+            message: "What do you want to do?",
+            choices: [
+                "Order a pizza",
+                "Make a reservation",
+                new inquirer.Separator(),
+                "Ask opening hours",
+                "Talk to the receptionist"
+            ]
+        },
+        {
+            type: "list",
+            name: "size",
+            message: "What size do you need",
+            choices: ["Jumbo", "Large", "Standard", "Medium", "Small", "Micro"],
+            filter: function(val: string) {
+                return val.toLowerCase();
+            }
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
+);
 
 //
 // examples/long-list.js
@@ -227,30 +239,35 @@ inquirer.prompt([
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-var choices = Array.apply(0, new Array(26)).map(function(x: number,y: number) {
+var choices = Array.apply(0, new Array(26)).map(function(x: number, y: number) {
     return String.fromCharCode(y + 65);
 });
 choices.push("Multiline option \n  super cool feature");
-choices.push("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.");
+choices.push(
+    "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium."
+);
 
-inquirer.prompt([
-    {
-        type      : "list",
-        name      : "letter",
-        message   : "What's your favorite letter?",
-        paginated : true,
-        choices   : choices
-    },
-    {
-        type      : "checkbox",
-        name      : "name",
-        message   : "Select the letter contained in your name:",
-        paginated : true,
-        choices   : choices
+inquirer.prompt(
+    [
+        {
+            type: "list",
+            name: "letter",
+            message: "What's your favorite letter?",
+            paginated: true,
+            choices: choices
+        },
+        {
+            type: "checkbox",
+            name: "name",
+            message: "Select the letter contained in your name:",
+            paginated: true,
+            choices: choices
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
+);
 
 //
 // examples/nested-call.js
@@ -263,19 +280,22 @@ inquirer.prompt([
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt({
-    type: "list",
-    name: "chocolate",
-    message: "What's your favorite chocolate?",
-    choices: [ "Mars", "Oh Henry", "Hershey" ]
-}, function( answers: inquirer.Answers ) {
-    inquirer.prompt({
+inquirer.prompt(
+    {
         type: "list",
-        name: "beverage",
-        message: "And your favorite beverage?",
-        choices: [ "Pepsi", "Coke", "7up", "Mountain Dew", "Red Bull" ]
-    });
-});
+        name: "chocolate",
+        message: "What's your favorite chocolate?",
+        choices: ["Mars", "Oh Henry", "Hershey"]
+    },
+    function(answers: inquirer.Answers) {
+        inquirer.prompt({
+            type: "list",
+            name: "beverage",
+            message: "And your favorite beverage?",
+            choices: ["Pepsi", "Coke", "7up", "Mountain Dew", "Red Bull"]
+        });
+    }
+);
 
 //
 // examples/password.js
@@ -288,15 +308,18 @@ inquirer.prompt({
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "password",
-        message: "Enter your git password",
-        name: "password"
+inquirer.prompt(
+    [
+        {
+            type: "password",
+            message: "Enter your git password",
+            name: "password"
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
+);
 
 //
 // examples/pizza.js
@@ -323,8 +346,10 @@ var questions2 = [
         type: "input",
         name: "phone",
         message: "What's your phone number",
-        validate: function( value: string ): string|boolean {
-            var pass = value.match(/^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i);
+        validate: function(value: string): string | boolean {
+            var pass = value.match(
+                /^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i
+            );
             if (pass) {
                 return true;
             } else {
@@ -336,14 +361,16 @@ var questions2 = [
         type: "list",
         name: "size",
         message: "What size do you need",
-        choices: [ "Large", "Medium", "Small" ],
-        filter: function( val: string ) { return val.toLowerCase(); }
+        choices: ["Large", "Medium", "Small"],
+        filter: function(val: string) {
+            return val.toLowerCase();
+        }
     },
     {
         type: "input",
         name: "quantity",
         message: "How many do you need",
-        validate: function( value: string ) {
+        validate: function(value: string) {
             var valid = !isNaN(parseFloat(value));
             return valid || "Please enter a number";
         },
@@ -375,7 +402,7 @@ var questions2 = [
         type: "rawlist",
         name: "beverage",
         message: "You also get a free 2L beverage",
-        choices: [ "Pepsi", "7up", "Coke" ]
+        choices: ["Pepsi", "7up", "Coke"]
     },
     {
         type: "input",
@@ -387,16 +414,16 @@ var questions2 = [
         type: "list",
         name: "prize",
         message: "For leaving a comments, you get a freebie",
-        choices: [ "cake", "fries" ],
-        when: function( answers: inquirer.Answers ) {
-            return answers['comments'] !== "Nope, all good!";
+        choices: ["cake", "fries"],
+        when: function(answers: inquirer.Answers) {
+            return answers["comments"] !== "Nope, all good!";
         }
     }
 ];
 
-inquirer.prompt( questions, function( answers ) {
+inquirer.prompt(questions, function(answers) {
     console.log("\nOrder receipt:");
-    console.log( JSON.stringify(answers, null, "  ") );
+    console.log(JSON.stringify(answers, null, "  "));
 });
 
 //
@@ -410,29 +437,34 @@ inquirer.prompt( questions, function( answers ) {
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "rawlist",
-        name: "theme",
-        message: "What do you want to do?",
-        choices: [
-            "Order a pizza",
-            "Make a reservation",
-            new inquirer.Separator(),
-            "Ask opening hours",
-            "Talk to the receptionist"
-        ]
-    },
-    {
-        type: "rawlist",
-        name: "size",
-        message: "What size do you need",
-        choices: [ "Jumbo", "Large", "Standard", "Medium", "Small", "Micro" ],
-        filter: function( val: string ) { return val.toLowerCase(); }
+inquirer.prompt(
+    [
+        {
+            type: "rawlist",
+            name: "theme",
+            message: "What do you want to do?",
+            choices: [
+                "Order a pizza",
+                "Make a reservation",
+                new inquirer.Separator(),
+                "Ask opening hours",
+                "Talk to the receptionist"
+            ]
+        },
+        {
+            type: "rawlist",
+            name: "size",
+            message: "What size do you need",
+            choices: ["Jumbo", "Large", "Standard", "Medium", "Small", "Micro"],
+            filter: function(val: string) {
+                return val.toLowerCase();
+            }
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
+);
 
 //
 // examples/recursive.js
@@ -445,7 +477,7 @@ inquirer.prompt([
 
 "use strict";
 //var inquirer = require("../lib/inquirer");
-var output2: (string|boolean)[] = [];
+var output2: (string | boolean)[] = [];
 
 var questions3 = [
     {
@@ -456,18 +488,21 @@ var questions3 = [
     {
         type: "confirm",
         name: "askAgain",
-        message: "Want to enter another TV show favorite (just hit enter for YES)?",
+        message:
+            "Want to enter another TV show favorite (just hit enter for YES)?",
         default: true
     }
 ];
 
 function ask() {
-    inquirer.prompt( questions3, function( answers: inquirer.Answers ) {
-        output2.push( answers['tvShow'] );
-        if ( answers['askAgain'] ) {
+    inquirer.prompt<{ tvShow: string; askAgain: boolean }>(questions3, function(
+        answers
+    ) {
+        output2.push(answers.tvShow);
+        if (answers.askAgain) {
             ask();
         } else {
-            console.log( "Your favorite TV Shows:", output2.join(", ") );
+            console.log("Your favorite TV Shows:", output2.join(", "));
         }
     });
 }
@@ -478,14 +513,17 @@ ask();
 // examples/when.js
 //
 
-
 /**
  * When example
  */
 
 "use strict";
 //var inquirer = require("../lib/inquirer");
-
+interface Answers4 {
+    bacon: boolean;
+    favorite: string;
+    pizza: boolean;
+}
 var questions4 = [
     {
         type: "confirm",
@@ -496,32 +534,32 @@ var questions4 = [
         type: "input",
         name: "favorite",
         message: "Bacon lover, what is your favorite type of bacon?",
-        when: function ( answers: inquirer.Answers ) {
-            return answers['bacon'];
+        when: function(answers: Answers4) {
+            return answers.bacon;
         }
     },
     {
         type: "confirm",
         name: "pizza",
         message: "Ok... Do you like pizza?",
-        when: function (answers: inquirer.Answers) {
-            return !likesFood( "bacon" )(answers);
+        when: function(answers: Answers4) {
+            return !likesFood("bacon")(answers);
         }
     },
     {
         type: "input",
         name: "favorite",
         message: "Whew! What is your favorite type of pizza?",
-        when: likesFood( "pizza" )
+        when: likesFood("pizza")
     }
 ];
 
-function likesFood ( aFood: string ) {
-    return function ( answers: inquirer.Answers ) {
-        return answers[ aFood ];
-    }
+function likesFood(aFood: string) {
+    return function(answers: inquirer.Answers) {
+        return answers[aFood];
+    };
 }
 
-inquirer.prompt(questions, function (answers) {
-    console.log( JSON.stringify(answers, null, "  ") );
+inquirer.prompt<Answers4>(questions, function(answers) {
+    console.log(JSON.stringify(answers, null, "  "));
 });
diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index de71a9f083..d072e003a8 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -595,6 +595,7 @@ declare namespace IORedis {
         hget(key: string, field: string, callback?: (err: Error, res: string) => void): Pipeline;
 
         hmset(key: string, field: string, value: any, ...args: string[]): Pipeline;
+        hmset(key: string, data: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
         hmget(key: string, ...fields: string[]): Pipeline;
 
diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index b8c108f63b..297069f0f1 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -597,12 +597,12 @@ export declare class Pin {
     mode: number;
 
     static write(pin: number, value: number): void;
-    static read(pin: number, cb: (data: number) => void): void;
+    static read(pin: number, cb: (error: Error, data: number) => void): void;
     query(cb: (pin: PinState) => void): void;
     high(): void;
     low(): void;
     write(value: number): void;
-    read(cb: (value: number) => void): void;
+    read(cb: (error: Error, value: number) => void): void;
     on(event: string, cb: () => void): this;
     on(event: "high", cb: () => void): this;
     on(event: "low", cb: () => void): this;
diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 94ffd188cf..6e2b7be6c7 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -10,6 +10,7 @@
 //                 Youngrok Kim <https://github.com/rokoroku>
 //                 Dan Kraus <https://github.com/dankraus>
 //                 Anjun Wang <https://github.com/wanganjun>
+//                 Rafael Kallis <https://github.com/rafaelkallis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -376,7 +377,7 @@ export interface AnySchema extends JoiObject {
      * override, that error will be returned and the override will be ignored (unless the `abortEarly`
      * option has been set to `false`).
      */
-    error?(err: Error | ValidationErrorFunction): this;
+    error(err: Error | ValidationErrorFunction): this;
 
     /**
      * Returns a plain object representing the schema's rules and properties
diff --git a/types/jquery.browser/index.d.ts b/types/jquery.browser/index.d.ts
new file mode 100644
index 0000000000..01141b67db
--- /dev/null
+++ b/types/jquery.browser/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for jQuery Browser Plugin 0.1
+// Project: https://github.com/gabceb/jquery-browser-plugin
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export interface Matchs {
+    version?: string;
+    versionNumber?: number;
+    platform?: string;
+    mobile?: boolean;
+    desktop?: boolean;
+    webkit?: boolean;
+    name?: string;
+    android?: boolean;
+    bb?: boolean;
+    blackberry?: boolean;
+    ipad?: boolean;
+    iphone?: boolean;
+    ipod?: boolean;
+    kindle?: boolean;
+    playbook?: boolean;
+    silk?: boolean;
+    ['windows phone']?: boolean;
+    cros?: boolean;
+    mac?: boolean;
+    linux?: boolean;
+    win?: boolean;
+    chrome?: boolean;
+    opr?: boolean;
+    safari?: boolean;
+    rv?: boolean;
+    iemobile?: boolean;
+    msie?: boolean;
+    msedge?: boolean;
+    uaMatch: ((ua?: string) => Matchs);
+}
+declare global {
+    interface Window {
+        jQBrowser: Matchs;
+    }
+    interface JQueryStatic {
+        browser: Matchs;
+    }
+}
diff --git a/types/jquery.browser/jquery.browser-tests.ts b/types/jquery.browser/jquery.browser-tests.ts
new file mode 100644
index 0000000000..aacc014524
--- /dev/null
+++ b/types/jquery.browser/jquery.browser-tests.ts
@@ -0,0 +1,7 @@
+// basic usage
+$.browser;
+$.browser.android;
+$.browser.uaMatch();
+window.jQBrowser;
+window.jQBrowser.android;
+window.jQBrowser.uaMatch();
diff --git a/types/jquery.browser/tsconfig.json b/types/jquery.browser/tsconfig.json
new file mode 100644
index 0000000000..89c26d12bb
--- /dev/null
+++ b/types/jquery.browser/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.browser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery.browser/tslint.json b/types/jquery.browser/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery.browser/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file
diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 90f6ffbd03..8422f3ec5c 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -152,7 +152,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @since 1.4
      */
     (selector_object_callback?: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery |
-        JQuery.PlainObject |
+        JQuery.PlainObject | Window |
         ((this: Document, $: JQueryStatic<TElement>) => void)): JQuery<TElement>;
     /**
      * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
diff --git a/types/jquery/test/jquery-slim-window-module-tests.ts b/types/jquery/test/jquery-slim-window-module-tests.ts
index 76870e7a04..b47707cb23 100644
--- a/types/jquery/test/jquery-slim-window-module-tests.ts
+++ b/types/jquery/test/jquery-slim-window-module-tests.ts
@@ -1,4 +1,4 @@
-import * as jq from 'jquery/dist/jquery.slim';
+import jq = require('jquery/dist/jquery.slim');
 
 const $window = jq(window);
 // $ExpectType JQuery<HTMLElement>
diff --git a/types/jquery/test/jquery-window-module-tests.ts b/types/jquery/test/jquery-window-module-tests.ts
index 71e20bc4a0..6bc5486fb9 100644
--- a/types/jquery/test/jquery-window-module-tests.ts
+++ b/types/jquery/test/jquery-window-module-tests.ts
@@ -1,4 +1,4 @@
-import * as jq from 'jquery';
+import jq = require('jquery');
 
 const $window = jq(window);
 // $ExpectType JQuery<HTMLElement>
diff --git a/types/js-money/index.d.ts b/types/js-money/index.d.ts
new file mode 100644
index 0000000000..e778cf1fdb
--- /dev/null
+++ b/types/js-money/index.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for js-money 0.6
+// Project: https://github.com/davidkalosi/js-money
+// Definitions by: Kanat Kubash <https://github.com/kanatkubash>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Currency } from './lib/currency';
+
+interface MoneyObjectOut {
+	amount: number;
+	currency: string;
+}
+
+type Rounders = 'round' | 'floor' | 'ceil';
+
+type RoundFunction = (num: number) => number;
+
+declare class Money {
+	constructor(amount: number, currency: string | Currency);
+	amount: number;
+	currency: string;
+	static fromInteger(amount: number, currency: string | Currency): Money;
+	static fromDecimal(amount: number, currency: string | Currency, rounder?: Rounders | RoundFunction): Money;
+	equals(other: Money): boolean;
+	add(other: Money): Money;
+	subtract(other: Money): Money;
+	multiply(multiplier: number, rounder?: RoundFunction): Money;
+	divide(divisor: number, rounder?: RoundFunction): Money;
+	allocate(ratios: number[]): Money[];
+	compare(other: Money): number;
+	greaterThan(other: Money): boolean;
+	greaterThanOrEqual(other: Money): boolean;
+	lessThan(other: Money): boolean;
+	lessThanOrEqual(other: Money): boolean;
+	isZero(): boolean;
+	isPositive(): boolean;
+	isNegative(): boolean;
+	toDecimal(): number;
+	toString(): string;
+	toJSON(): MoneyObjectOut;
+	getAmount(): number;
+	getCurrency(): string;
+	//#region Currencies
+	static USD: Currency;
+	static CAD: Currency;
+	static EUR: Currency;
+	static BTC: Currency;
+	static AED: Currency;
+	static AFN: Currency;
+	static ALL: Currency;
+	static AMD: Currency;
+	static ARS: Currency;
+	static AUD: Currency;
+	static AZN: Currency;
+	static BAM: Currency;
+	static BDT: Currency;
+	static BGN: Currency;
+	static BHD: Currency;
+	static BIF: Currency;
+	static BND: Currency;
+	static BOB: Currency;
+	static BRL: Currency;
+	static BWP: Currency;
+	static BYR: Currency;
+	static BZD: Currency;
+	static CDF: Currency;
+	static CHF: Currency;
+	static CLP: Currency;
+	static CNY: Currency;
+	static COP: Currency;
+	static CRC: Currency;
+	static CVE: Currency;
+	static CZK: Currency;
+	static DJF: Currency;
+	static DKK: Currency;
+	static DOP: Currency;
+	static DZD: Currency;
+	static EEK: Currency;
+	static EGP: Currency;
+	static ERN: Currency;
+	static ETB: Currency;
+	static GBP: Currency;
+	static GEL: Currency;
+	static GHS: Currency;
+	static GNF: Currency;
+	static GTQ: Currency;
+	static HKD: Currency;
+	static HNL: Currency;
+	static HRK: Currency;
+	static HUF: Currency;
+	static IDR: Currency;
+	static ILS: Currency;
+	static INR: Currency;
+	static IQD: Currency;
+	static IRR: Currency;
+	static ISK: Currency;
+	static JMD: Currency;
+	static JOD: Currency;
+	static JPY: Currency;
+	static KES: Currency;
+	static KHR: Currency;
+	static KMF: Currency;
+	static KRW: Currency;
+	static KWD: Currency;
+	static KZT: Currency;
+	static LAK: Currency;
+	static LBP: Currency;
+	static LKR: Currency;
+	static LTL: Currency;
+	static LVL: Currency;
+	static LYD: Currency;
+	static MAD: Currency;
+	static MDL: Currency;
+	static MGA: Currency;
+	static MKD: Currency;
+	static MMK: Currency;
+	static MOP: Currency;
+	static MUR: Currency;
+	static MXN: Currency;
+	static MYR: Currency;
+	static MZN: Currency;
+	static NAD: Currency;
+	static NGN: Currency;
+	static NIO: Currency;
+	static NOK: Currency;
+	static NPR: Currency;
+	static NZD: Currency;
+	static OMR: Currency;
+	static PAB: Currency;
+	static PEN: Currency;
+	static PHP: Currency;
+	static PKR: Currency;
+	static PLN: Currency;
+	static PYG: Currency;
+	static QAR: Currency;
+	static RON: Currency;
+	static RSD: Currency;
+	static RUB: Currency;
+	static RWF: Currency;
+	static SAR: Currency;
+	static SDG: Currency;
+	static SEK: Currency;
+	static SGD: Currency;
+	static SOS: Currency;
+	static SYP: Currency;
+	static THB: Currency;
+	static TND: Currency;
+	static TOP: Currency;
+	static TRY: Currency;
+	static TTD: Currency;
+	static TWD: Currency;
+	static TZS: Currency;
+	static UAH: Currency;
+	static UGX: Currency;
+	static UYU: Currency;
+	static UZS: Currency;
+	static VEF: Currency;
+	static VND: Currency;
+	static XAF: Currency;
+	static XOF: Currency;
+	static YER: Currency;
+	static ZAR: Currency;
+	static ZMK: Currency;
+	//#endregion
+}
+
+export = Money;
diff --git a/types/js-money/js-money-tests.ts b/types/js-money/js-money-tests.ts
new file mode 100644
index 0000000000..a75d41ac53
--- /dev/null
+++ b/types/js-money/js-money-tests.ts
@@ -0,0 +1,63 @@
+import Money = require('js-money');
+import * as CurrencyObjects from 'js-money/lib/currency';
+
+const money = new Money(1500, 'USD');
+const other = new Money(100, Money.THB);
+
+// instance method checks
+new Money(123, Money.TRY); // $ExpectType Money
+new Money(1500, 'USD'); // $ExpectType Money
+money.amount; // $ExpectType number
+money.currency; // $ExpectType string
+money.equals(other); // $ExpectType boolean
+money.add(other); // $ExpectType Money
+money.subtract(other); // $ExpectType Money
+money.multiply(1); // $ExpectType Money
+money.multiply(2, Math.round); // $ExpectType Money
+money.divide(1); // $ExpectType Money
+money.divide(1, Math.ceil); // $ExpectType Money
+money.allocate([1, 2, 3]); // $ExpectType Money[]
+money.compare(other); // $ExpectType number
+money.greaterThan(other); // $ExpectType boolean
+money.greaterThanOrEqual(other); // $ExpectType boolean
+money.lessThan(other); // $ExpectType boolean
+money.lessThanOrEqual(other); // $ExpectType boolean
+money.isZero(); // $ExpectType boolean
+money.isPositive(); // $ExpectType boolean
+money.isNegative(); // $ExpectType boolean
+money.toDecimal(); // $ExpectType number
+money.toString(); // $ExpectType string
+money.toJSON(); // $ExpectType MoneyObjectOut
+money.toJSON().amount; // $ExpectType number
+money.toJSON().currency; // $ExpectType string
+money.getAmount(); // $ExpectType number
+money.getCurrency(); // $ExpectType string
+
+// static method checks
+Money.fromInteger(100, 'USD'); // $ExpectType Money
+Money.fromDecimal(100, Money.KZT, 'ceil'); // $ExpectType Money
+Money.fromDecimal(100, Money.KZT); // $ExpectType Money
+Money.fromDecimal(100, Money.KZT, Math.ceil); // $ExpectType Money
+
+// static properties (currency) check
+Money.KZT; // $ExpectType Currency
+Money.RUB; // $ExpectType Currency
+Money.BLABLA; // $ExpectError
+// currency object check
+Money.RUB.code; // $ExpectType string
+Money.RUB.decimal_digits; // $ExpectType number
+Money.RUB.name; // $ExpectType string
+Money.RUB.name_plural; // $ExpectType string
+Money.RUB.rounding; // $ExpectType number
+Money.RUB.symbol; // $ExpectType string
+Money.RUB.symbol_native; // $ExpectType string
+
+// Currency module check
+CurrencyObjects.NIO.code; // $ExpectType string
+CurrencyObjects.NIO.decimal_digits; // $ExpectType number
+CurrencyObjects.NIO.name; // $ExpectType string
+CurrencyObjects.NIO.name_plural; // $ExpectType string
+CurrencyObjects.NIO.rounding; // $ExpectType number
+CurrencyObjects.NIO.symbol; // $ExpectType string
+CurrencyObjects.NIO.symbol_native; // $ExpectType string
+CurrencyObjects['UAH'].code;  // $ExpectType string
diff --git a/types/js-money/lib/currency.d.ts b/types/js-money/lib/currency.d.ts
new file mode 100644
index 0000000000..20be23cc7e
--- /dev/null
+++ b/types/js-money/lib/currency.d.ts
@@ -0,0 +1,142 @@
+// Type definitions for js-money 0.6
+// Project: https://github.com/davidkalosi/js-money#readme
+// Definitions by: Kanat Kubash <https://github.com/kanatkubash>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Currencies {
+	interface Currency {
+		symbol: string;
+		name: string;
+		symbol_native: string;
+		decimal_digits: number;
+		rounding: number;
+		code: string;
+		name_plural: string;
+	}
+	interface Currencies {
+		[key: string]: Currencies.Currency;
+		USD: Currencies.Currency;
+		CAD: Currencies.Currency;
+		EUR: Currencies.Currency;
+		BTC: Currencies.Currency;
+		AED: Currencies.Currency;
+		AFN: Currencies.Currency;
+		ALL: Currencies.Currency;
+		AMD: Currencies.Currency;
+		ARS: Currencies.Currency;
+		AUD: Currencies.Currency;
+		AZN: Currencies.Currency;
+		BAM: Currencies.Currency;
+		BDT: Currencies.Currency;
+		BGN: Currencies.Currency;
+		BHD: Currencies.Currency;
+		BIF: Currencies.Currency;
+		BND: Currencies.Currency;
+		BOB: Currencies.Currency;
+		BRL: Currencies.Currency;
+		BWP: Currencies.Currency;
+		BYR: Currencies.Currency;
+		BZD: Currencies.Currency;
+		CDF: Currencies.Currency;
+		CHF: Currencies.Currency;
+		CLP: Currencies.Currency;
+		CNY: Currencies.Currency;
+		COP: Currencies.Currency;
+		CRC: Currencies.Currency;
+		CVE: Currencies.Currency;
+		CZK: Currencies.Currency;
+		DJF: Currencies.Currency;
+		DKK: Currencies.Currency;
+		DOP: Currencies.Currency;
+		DZD: Currencies.Currency;
+		EEK: Currencies.Currency;
+		EGP: Currencies.Currency;
+		ERN: Currencies.Currency;
+		ETB: Currencies.Currency;
+		GBP: Currencies.Currency;
+		GEL: Currencies.Currency;
+		GHS: Currencies.Currency;
+		GNF: Currencies.Currency;
+		GTQ: Currencies.Currency;
+		HKD: Currencies.Currency;
+		HNL: Currencies.Currency;
+		HRK: Currencies.Currency;
+		HUF: Currencies.Currency;
+		IDR: Currencies.Currency;
+		ILS: Currencies.Currency;
+		INR: Currencies.Currency;
+		IQD: Currencies.Currency;
+		IRR: Currencies.Currency;
+		ISK: Currencies.Currency;
+		JMD: Currencies.Currency;
+		JOD: Currencies.Currency;
+		JPY: Currencies.Currency;
+		KES: Currencies.Currency;
+		KHR: Currencies.Currency;
+		KMF: Currencies.Currency;
+		KRW: Currencies.Currency;
+		KWD: Currencies.Currency;
+		KZT: Currencies.Currency;
+		LAK: Currencies.Currency;
+		LBP: Currencies.Currency;
+		LKR: Currencies.Currency;
+		LTL: Currencies.Currency;
+		LVL: Currencies.Currency;
+		LYD: Currencies.Currency;
+		MAD: Currencies.Currency;
+		MDL: Currencies.Currency;
+		MGA: Currencies.Currency;
+		MKD: Currencies.Currency;
+		MMK: Currencies.Currency;
+		MOP: Currencies.Currency;
+		MUR: Currencies.Currency;
+		MXN: Currencies.Currency;
+		MYR: Currencies.Currency;
+		MZN: Currencies.Currency;
+		NAD: Currencies.Currency;
+		NGN: Currencies.Currency;
+		NIO: Currencies.Currency;
+		NOK: Currencies.Currency;
+		NPR: Currencies.Currency;
+		NZD: Currencies.Currency;
+		OMR: Currencies.Currency;
+		PAB: Currencies.Currency;
+		PEN: Currencies.Currency;
+		PHP: Currencies.Currency;
+		PKR: Currencies.Currency;
+		PLN: Currencies.Currency;
+		PYG: Currencies.Currency;
+		QAR: Currencies.Currency;
+		RON: Currencies.Currency;
+		RSD: Currencies.Currency;
+		RUB: Currencies.Currency;
+		RWF: Currencies.Currency;
+		SAR: Currencies.Currency;
+		SDG: Currencies.Currency;
+		SEK: Currencies.Currency;
+		SGD: Currencies.Currency;
+		SOS: Currencies.Currency;
+		SYP: Currencies.Currency;
+		THB: Currencies.Currency;
+		TND: Currencies.Currency;
+		TOP: Currencies.Currency;
+		TRY: Currencies.Currency;
+		TTD: Currencies.Currency;
+		TWD: Currencies.Currency;
+		TZS: Currencies.Currency;
+		UAH: Currencies.Currency;
+		UGX: Currencies.Currency;
+		UYU: Currencies.Currency;
+		UZS: Currencies.Currency;
+		VEF: Currencies.Currency;
+		VND: Currencies.Currency;
+		XAF: Currencies.Currency;
+		XOF: Currencies.Currency;
+		YER: Currencies.Currency;
+		ZAR: Currencies.Currency;
+		ZMK: Currencies.Currency;
+	}
+}
+
+declare var Currencies: Currencies.Currencies;
+export = Currencies;
\ No newline at end of file
diff --git a/types/js-money/tsconfig.json b/types/js-money/tsconfig.json
new file mode 100644
index 0000000000..9277913003
--- /dev/null
+++ b/types/js-money/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-money-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/js-money/tslint.json b/types/js-money/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/js-money/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/js-string-escape/index.d.ts b/types/js-string-escape/index.d.ts
new file mode 100644
index 0000000000..e9f888e6d0
--- /dev/null
+++ b/types/js-string-escape/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for js-string-escape 1.0
+// Project: https://github.com/joliss/js-string-escape
+// Definitions by: Jamie Davies <https://github.com/viralpickaxe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function jsStringEscape(str: string): string;
+
+export = jsStringEscape;
diff --git a/types/js-string-escape/js-string-escape-tests.ts b/types/js-string-escape/js-string-escape-tests.ts
new file mode 100644
index 0000000000..88d691beeb
--- /dev/null
+++ b/types/js-string-escape/js-string-escape-tests.ts
@@ -0,0 +1,3 @@
+import jsStringEscape = require('js-string-escape');
+
+jsStringEscape('hello world');
diff --git a/types/js-string-escape/tsconfig.json b/types/js-string-escape/tsconfig.json
new file mode 100644
index 0000000000..b119a31f6e
--- /dev/null
+++ b/types/js-string-escape/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-string-escape-tests.ts"
+    ]
+}
diff --git a/types/js-string-escape/tslint.json b/types/js-string-escape/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/js-string-escape/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/json2csv/JSON2CSVBase.d.ts b/types/json2csv/JSON2CSVBase.d.ts
new file mode 100644
index 0000000000..165497b4c8
--- /dev/null
+++ b/types/json2csv/JSON2CSVBase.d.ts
@@ -0,0 +1,108 @@
+export declare namespace json2csv {
+    export interface FieldValueCallback<T> {
+        (row: T, field: string): string;
+    }
+
+    export interface FieldInfo<T> {
+        label: string;
+        default?: string;
+        value?: string | FieldValueCallback<T>;
+    }
+
+    export interface Options<T> {
+        fields?: (string | FieldInfo<T>);
+        ndjson?: boolean;
+        unwind?: string | string[];
+        flatten?: boolean;
+        defaultValue?: string;
+        quote?: string;
+        doubleQuote?: string;
+        delimiter?: string;
+        eol?: string;
+        excelStrings?: boolean;
+        header?: boolean;
+        includeEmptyRows?: boolean;
+        withBOM?: boolean;
+    }
+}
+
+declare abstract class JSON2CSVBase<T> {
+    constructor(opts?: json2csv.Options<T>);
+
+    /**
+     * Check passing opts and set defaults.
+     *
+     * @param {json2csv.Options} opts Options object containing fields,
+     * delimiter, default value, quote mark, header, etc.
+     * @returns {json2csv.Options} preprocessed Options object
+     */
+    protected preprocessOpts(opts?: json2csv.Options<T>) : json2csv.Options<T>;
+
+    /**
+     * Create the title row with all the provided fields as column headings
+     *
+     * @returns {string} titles as a string
+     */
+    protected getHeader(): string;
+
+    /**
+     * Preprocess each object according to the give opts (unwind, flatten, etc.).
+     *
+     * @param {object} row JSON object to be converted in a CSV row
+     */
+    protected preprocessRow(row: T): object;
+
+    /**
+     * Create the content of a specific CSV row
+     *
+     * @param {object} row JSON object to be converted in a CSV row
+     * @returns {string} CSV string (row)
+     */
+    protected processRow(row: T): string;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {object} row JSON object representing the  CSV row that the cell belongs to
+     * @param {object} fieldInfo Details of the field to process to be a CSV cell
+     * @returns {string} CSV string (cell)
+     */
+    protected processCell(row: T, fieldInfo: json2csv.FieldInfo<T>) : string;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {object} row JSON object representing the  CSV row that the cell belongs to
+     * @param {json2csv.FieldInfo} fieldInfo Details of the field to process to be a CSV cell
+     * @returns {any} Field value
+     */
+    protected getValue(row: T, fieldInfo: json2csv.FieldInfo<T>): any;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {any} value Value to be included in a CSV cell
+     * @param {Boolean} stringify Details of the field to process to be a CSV cell
+     * @returns {string} Value stringified and processed
+     */
+    protected processValue(value: any, stringify: Boolean): string;
+
+    /**
+     * Performs the flattening of a data row recursively
+     *
+     * @param {object} dataRow Original JSON object
+     * @returns {object} Flattened object
+     */
+    protected flatten(dataRow: T): object;
+
+    /**
+     * Performs the unwind recursively in specified sequence
+     *
+     * @param {object[]} dataRow Original JSON object
+     * @param {string[]} unwindPaths The paths as strings to be used to deconstruct the array
+     * @returns {Array} Array of objects containing all rows after unwind of chosen paths
+     */
+    protected unwindData(dataRow: Array<T>, unwindPaths: Array<string>): Array<object>;
+}
+
+export default JSON2CSVBase;
diff --git a/types/json2csv/JSON2CSVParser.d.ts b/types/json2csv/JSON2CSVParser.d.ts
new file mode 100644
index 0000000000..1f134f874c
--- /dev/null
+++ b/types/json2csv/JSON2CSVParser.d.ts
@@ -0,0 +1,30 @@
+import JSON2CSVBase from './JSON2CSVBase';
+
+declare class JSON2CSVParser<T> extends JSON2CSVBase<T> {
+    /**
+     * Main function that converts json to csv.
+     *
+     * @param {object|object[]} data Array of JSON objects to be converted to CSV
+     * @returns {string} The CSV formated data as a string
+     */
+    public parse(data: Readonly<T> | ReadonlyArray<T>): string;
+
+    /**
+     * Preprocess the data according to the give opts (unwind, flatten, etc.)
+        and calculate the fields and field names if they are not provided.
+     *
+     * @param {object|object[]} data Array or object to be converted to CSV
+     * @returns {object[]} Preprocessed data ready to be processed
+     */
+    protected preprocessData(data: T | Array<T>): Array<T>;
+
+    /**
+     * Create the content row by row below the header
+     *
+     * @param {object[]} data Array of JSON objects to be converted to CSV
+     * @returns {string} CSV string (body)
+     */
+    protected processData(data: Array<T>): string;
+}
+
+export default JSON2CSVParser;
diff --git a/types/json2csv/JSON2CSVTransform.d.ts b/types/json2csv/JSON2CSVTransform.d.ts
new file mode 100644
index 0000000000..1785e09214
--- /dev/null
+++ b/types/json2csv/JSON2CSVTransform.d.ts
@@ -0,0 +1,97 @@
+/// <reference types="node" />
+
+import { json2csv } from './JSON2CSVBase';
+import JSON2CSVBase from './JSON2CSVBase';
+import { Transform, TransformOptions } from 'stream';
+
+declare class JSON2CSVTransform<T> extends Transform { // implements JSON2CSVBase<T>
+    constructor(opts?: json2csv.Options<T>, transformOpts?: TransformOptions);
+
+    /**
+     * Transforms an incoming json data to csv and pushes it downstream.
+     *
+     * @param {object} data JSON object to be converted in a CSV row
+     */
+    protected pushLine(data: T): void;
+
+    /*******************************************************************************
+    * Everything below is copy-pasted from JSON2CSVBase and should be keep in sync *
+    ********************************************************************************/
+
+    /**
+     * Check passing opts and set defaults.
+     *
+     * @param {json2csv.Options} opts Options object containing fields,
+     * delimiter, default value, quote mark, header, etc.
+     * @returns {json2csv.Options} preprocessed Options object
+     */
+    protected preprocessOpts(opts?: json2csv.Options<T>) : json2csv.Options<T>;
+
+    /**
+     * Create the title row with all the provided fields as column headings
+     *
+     * @returns {string} titles as a string
+     */
+    protected getHeader(): string;
+
+    /**
+     * Preprocess each object according to the give opts (unwind, flatten, etc.).
+     *
+     * @param {object} row JSON object to be converted in a CSV row
+     */
+    protected preprocessRow(row: T): object;
+
+    /**
+     * Create the content of a specific CSV row
+     *
+     * @param {object} row JSON object to be converted in a CSV row
+     * @returns {string} CSV string (row)
+     */
+    protected processRow(row: T): string;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {object} row JSON object representing the  CSV row that the cell belongs to
+     * @param {object} fieldInfo Details of the field to process to be a CSV cell
+     * @returns {string} CSV string (cell)
+     */
+    protected processCell(row: T, fieldInfo: json2csv.FieldInfo<T>) : string;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {object} row JSON object representing the  CSV row that the cell belongs to
+     * @param {json2csv.FieldInfo} fieldInfo Details of the field to process to be a CSV cell
+     * @returns {any} Field value
+     */
+    protected getValue(row: T, fieldInfo: json2csv.FieldInfo<T>): any;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {any} value Value to be included in a CSV cell
+     * @param {Boolean} stringify Details of the field to process to be a CSV cell
+     * @returns {string} Value stringified and processed
+     */
+    protected processValue(value: any, stringify: Boolean): string;
+
+    /**
+     * Performs the flattening of a data row recursively
+     *
+     * @param {object} dataRow Original JSON object
+     * @returns {object} Flattened object
+     */
+    protected flatten(dataRow: T): object;
+
+    /**
+     * Performs the unwind recursively in specified sequence
+     *
+     * @param {object[]} dataRow Original JSON object
+     * @param {string[]} unwindPaths The paths as strings to be used to deconstruct the array
+     * @returns {Array} Array of objects containing all rows after unwind of chosen paths
+     */
+    protected unwindData(dataRow: Array<T>, unwindPaths: Array<string>): Array<object>;
+}
+
+export default JSON2CSVTransform;
diff --git a/types/json2csv/index.d.ts b/types/json2csv/index.d.ts
new file mode 100644
index 0000000000..159dec6eb1
--- /dev/null
+++ b/types/json2csv/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for json2csv 4.0
+// Project: https://github.com/zemirco/json2csv
+// Definitions by: Juanjo Diaz <https://github.com/juanjoDiaz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { json2csv } from './JSON2CSVBase';
+import JSON2CSVParser from './JSON2CSVParser';
+import JSON2CSVTransform from './JSON2CSVTransform';
+
+export {
+	json2csv,
+	JSON2CSVParser as Parser,
+	JSON2CSVTransform as Transform
+};
+
+// Convenience method to keep the API similar to version 3.X
+export function parse<T>(data: Readonly<T> | ReadonlyArray<T>, opts?: json2csv.Options<T>): string;
diff --git a/types/json2csv/json2csv-tests.ts b/types/json2csv/json2csv-tests.ts
new file mode 100644
index 0000000000..566cc06cee
--- /dev/null
+++ b/types/json2csv/json2csv-tests.ts
@@ -0,0 +1,98 @@
+import { json2csv, parse, Parser, Transform } from 'json2csv';
+import { Transform as NodeTransform } from 'stream';
+
+let s: string;
+let obj: object;
+
+interface ExampleObj {
+    str?: string;
+    num?: number;
+    obj?: object;
+}
+
+/**************
+ * Public API *
+ **************/
+parse({});
+parse([]);
+parse({}, {});
+
+new Parser();
+const parser: Parser<ExampleObj> = new Parser({});
+s = parser.parse({ str: '', num: 1, obj: {} });
+parser.parse([]);
+const transform: Transform<ExampleObj> = new Transform<ExampleObj>({ quote: '' });
+const nodeTransform: NodeTransform = transform;
+
+/********************
+ * Internal Methods *
+ ********************/
+class ParserExt extends Parser<ExampleObj> {
+    constructor() {
+        super();
+        // Parser methods
+        obj = this.preprocessData({});
+        obj = this.preprocessData({ str: '', num: 1, obj: {} });
+        obj = this.preprocessData([]);
+        s = this.processData([]);
+
+        // JSON2CSVBase methods
+        let opts: json2csv.Options<ExampleObj>;
+        opts = this.preprocessOpts();
+        opts = this.preprocessOpts(opts);
+        s = this.getHeader();
+        obj = this.preprocessRow({});
+        obj = this.preprocessRow({ str: '', num: 1, obj: {} });
+        s = this.processRow({});
+        s = this.processRow({ str: '', num: 1, obj: {} });
+        s = this.processCell({}, { label: 'test', default: 'test2', value: 'field' });
+        s = this.processCell({ str: '', num: 1, obj: {} }, { label: 'test', default: 'test2', value: 'field' });
+        s = this.processCell({}, { label: 'test', default: 'test2', value: (row: object, field: string) => 'string' });
+        s = this.processCell({ str: '', num: 1, obj: {} }, { label: 'test', default: 'test2', value: (row: object, field: string) => 'string' });
+        this.getValue({}, { label: 'test' });
+        this.getValue({ str: '', num: 1, obj: {} }, { label: 'test' });
+        s = this.processValue(undefined, true);
+        s = this.processValue(null, true);
+        s = this.processValue(1, true);
+        s = this.processValue('test', true);
+        s = this.processValue(new Date(), true);
+        s = this.processValue({}, true);
+        s = this.processValue([], true);
+        const flattenedData: object = this.flatten({});
+        const unwindedData: object[] = this.unwindData([], []);
+    }
+}
+
+class TransformExt extends Transform<ExampleObj> {
+    constructor() {
+        super();
+        // Transform methods
+        this.pushLine({});
+        this.pushLine({ str: '', num: 1, obj: {} });
+
+        // JSON2CSVBase methods
+        let opts: json2csv.Options<ExampleObj>;
+        opts = this.preprocessOpts();
+        opts = this.preprocessOpts(opts);
+        s = this.getHeader();
+        obj = this.preprocessRow({});
+        obj = this.preprocessRow({ str: '', num: 1, obj: {} });
+        s = this.processRow({});
+        s = this.processRow({ str: '', num: 1, obj: {} });
+        s = this.processCell({}, { label: 'test', default: 'test2', value: 'field' });
+        s = this.processCell({ str: '', num: 1, obj: {} }, { label: 'test', default: 'test2', value: 'field' });
+        s = this.processCell({}, { label: 'test', default: 'test2', value: (row: object, field: string) => 'string' });
+        s = this.processCell({ str: '', num: 1, obj: {} }, { label: 'test', default: 'test2', value: (row: object, field: string) => 'string' });
+        this.getValue({}, { label: 'test' });
+        this.getValue({ str: '', num: 1, obj: {} }, { label: 'test' });
+        s = this.processValue(undefined, true);
+        s = this.processValue(null, true);
+        s = this.processValue(1, true);
+        s = this.processValue('test', true);
+        s = this.processValue(new Date(), true);
+        s = this.processValue({}, true);
+        s = this.processValue([], true);
+        const flattenedData: object = this.flatten({});
+        const unwindedData: object[] = this.unwindData([], []);
+    }
+}
diff --git a/types/json2csv/tsconfig.json b/types/json2csv/tsconfig.json
new file mode 100644
index 0000000000..23d379918c
--- /dev/null
+++ b/types/json2csv/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "json2csv-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/json2csv/tslint.json b/types/json2csv/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/json2csv/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/kcors/index.d.ts b/types/kcors/index.d.ts
index 04c45d365a..c4c33bbb4f 100644
--- a/types/kcors/index.d.ts
+++ b/types/kcors/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/koajs/cors
 // Definitions by: Xavier Stouder <https://github.com/Xstoudi>, Izayoi Ko <https://github.com/izayoiko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as Koa from "koa";
 
@@ -11,7 +11,7 @@ export = cors;
 
 declare namespace cors {
     interface Options {
-        origin?: ((req: Koa.Request) => string) | string;
+        origin?: ((ctx: Koa.Context) => string) | string;
         allowMethods?: string[] | string;
         exposeHeaders?: string[] | string;
         allowHeaders?: string[] | string;
diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index 6ea7fea725..b854d92b29 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -18894,6 +18894,7 @@ declare namespace kendo.ooxml {
         cells?: WorkbookSheetRowCell[];
         index?: number;
         height?: number;
+        type?: "header" | "footer" | "groupHeader" | "groupFooter" | "data";
     }
 
     interface WorkbookSheet {
diff --git a/types/kurento-utils/index.d.ts b/types/kurento-utils/index.d.ts
index 8074661881..a8a30005b6 100644
--- a/types/kurento-utils/index.d.ts
+++ b/types/kurento-utils/index.d.ts
@@ -1,10 +1,13 @@
-// Type definitions for kurento-utils 6.6
+// Type definitions for kurento-utils 6.7
 // Project: https://github.com/Kurento/kurento-utils-js
 // Definitions by: Miloslav Nenadál <https://github.com/nenadalm>
+//                 Benjamin Riggs <https://github.com/riggs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export class WebRtcPeer {
+import { EventEmitter } from 'events';
+
+export class WebRtcPeer extends EventEmitter {
     /**
      * Using this property the user can get the peerConnection and use it directly.
      */
@@ -60,7 +63,7 @@ export class WebRtcPeer {
      */
     addIceCandidate: (
         iceCandidate: RTCIceCandidate,
-        callback?: () => void
+        callback?: (error: string | undefined) => void
     ) => void;
     /**
      * Using this method the user can get peerconnection’s local session descriptor.
@@ -73,8 +76,9 @@ export class WebRtcPeer {
     /**
      * Creates an offer that is a request to find a remote peer with a specific configuration.
      */
-    generateOffer: (error: string | undefined, sdp: string) => void;
-
+    generateOffer: (
+        callback: (error: string | undefined, sdp: string) => void
+    ) => void;
     /**
      * Create a WebRtcPeer as receive only.
      */
diff --git a/types/kurento-utils/kurento-utils-tests.ts b/types/kurento-utils/kurento-utils-tests.ts
index 5866a2e157..380b1b1019 100644
--- a/types/kurento-utils/kurento-utils-tests.ts
+++ b/types/kurento-utils/kurento-utils-tests.ts
@@ -4,6 +4,10 @@ import * as kurentoUtils from 'kurento-utils';
     const peer = kurentoUtils.WebRtcPeer.WebRtcPeerSendrecv({}, error => {});
     peer.showLocalVideo();
     peer.getLocalStream().getAudioTracks();
+    peer.generateOffer((error, sdp) => {});
+    peer.on('icecandidate', (candidate: any) => {
+        peer.addIceCandidate(candidate, error => {});
+    });
     peer.getRemoteStream().getAudioTracks();
     peer.processAnswer('answer', error => {});
     peer.processOffer('offer', (error, {}) => {});
diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index eabb98c710..41b4fbd84c 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -182,6 +182,10 @@ export class Point {
     y: number;
 }
 
+export interface Coords extends Point {
+    z: number;
+}
+
 export type PointExpression = Point | PointTuple;
 
 export function point(x: number, y: number, round?: boolean): Point;
@@ -420,6 +424,8 @@ export class Layer extends Evented {
     getEvents?(): {[name: string]: (event: LeafletEvent) => void};
     getAttribution?(): string | null;
     beforeAdd?(map: Map): this;
+
+    protected _map: Map;
 }
 
 export interface GridLayerOptions {
@@ -439,6 +445,19 @@ export interface GridLayerOptions {
     keepBuffer?: number;
 }
 
+export type DoneCallback = (error?: Error, tile?: HTMLElement) => void;
+
+export interface InternalTiles {
+    [key: string]: {
+        active?: boolean,
+        coords: Coords,
+        current: boolean,
+        el: HTMLElement,
+        loaded?: Date,
+        retain?: boolean,
+    };
+}
+
 export class GridLayer extends Layer {
     constructor(options?: GridLayerOptions);
     bringToFront(): this;
@@ -449,6 +468,12 @@ export class GridLayer extends Layer {
     isLoading(): boolean;
     redraw(): this;
     getTileSize(): Point;
+
+    protected createTile(coords: Coords, done: DoneCallback): HTMLElement;
+    protected _tileCoordsToKey(coords: Coords): string;
+
+    protected _tiles: InternalTiles;
+    protected _tileZoom?: number;
 }
 
 export function gridLayer(options?: GridLayerOptions): GridLayer;
@@ -472,6 +497,9 @@ export class TileLayer extends GridLayer {
     constructor(urlTemplate: string, options?: TileLayerOptions);
     setUrl(url: string, noRedraw?: boolean): this;
 
+    protected _abortLoading(): void;
+    protected _getZoomForUrl(): number;
+
     options: TileLayerOptions;
 }
 
diff --git a/types/leaflet/leaflet-tests.ts b/types/leaflet/leaflet-tests.ts
index c4f73e5b84..a22ab91248 100644
--- a/types/leaflet/leaflet-tests.ts
+++ b/types/leaflet/leaflet-tests.ts
@@ -510,3 +510,50 @@ lg = new L.LayerGroup([new L.Layer(), new L.Layer()], {
 	pane: 'overlayPane',
 	attribution: 'test'
 });
+
+// adapted from GridLayer documentation
+const CanvasLayer = L.GridLayer.extend({
+	createTile(coords: L.Coords, done: L.DoneCallback) {
+		const tile = (L.DomUtil.create('canvas', 'leaflet-tile') as HTMLCanvasElement);
+		const size = this.getTileSize();
+		tile.width = size.x;
+		tile.height = size.y;
+		return tile;
+	}
+});
+
+// adapted from GridLayer documentation
+const AsyncCanvasLayer = L.GridLayer.extend({
+	createTile(coords: L.Coords, done: L.DoneCallback) {
+		const tile = (L.DomUtil.create('canvas', 'leaflet-tile') as HTMLCanvasElement);
+		const size = this.getTileSize();
+		tile.width = size.x;
+		tile.height = size.y;
+		setTimeout(() => done(undefined, tile), 1000);
+		return tile;
+	}
+});
+
+export class ExtendedTileLayer extends L.TileLayer {
+	options: L.TileLayerOptions;
+	createTile(coords: L.Coords, done: L.DoneCallback) {
+		const newCoords: L.Coords = (new L.Point(coords.x, coords.y) as L.Coords);
+		newCoords.z = coords.z;
+		return super.createTile(newCoords, done);
+	}
+	_abortLoading() {
+		// adapted from TileLayer's implementation
+		for (const i in this._tiles) {
+			if (this._tiles[i].coords.z !== this._tileZoom) {
+				const tile = this._tiles[i].el;
+				tile.onload = L.Util.falseFn;
+				tile.onerror = L.Util.falseFn;
+				if (tile instanceof HTMLImageElement && !tile.complete) {
+					tile.src = L.Util.emptyImageUrl;
+					L.DomUtil.remove(tile);
+					this._tiles[i] = undefined;
+				}
+			}
+		}
+	}
+}
diff --git a/types/listr/index.d.ts b/types/listr/index.d.ts
new file mode 100644
index 0000000000..303c1d4a07
--- /dev/null
+++ b/types/listr/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for listr 0.13
+// Project: https://github.com/samverschueren/listr#readme
+// Definitions by: Dusan Radovanovic <https://github.com/durad>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+
+declare namespace Listr {
+    interface ListrRenderer {
+        nonTTY: boolean;
+        render(): void;
+        end(): void;
+    }
+
+    interface ListrOptions {
+        concurrent?: boolean | number;
+        exitOnError?: boolean;
+        renderer?: "silent" | "default" | "verbose" | ListrRenderer;
+        nonTTYRenderer?: "silent" | "default" | "verbose" | ListrRenderer;
+    }
+
+    interface ListrTask {
+        title: string;
+        output?: string;
+        task: (ctx: any, task: ListrTaskWrapper) => void | string | Promise<any> | stream.Readable | Listr;
+        skip?: (ctx: any, task: ListrTaskWrapper) => boolean | Promise<boolean> | string | void;
+        enabled?: (ctx: any, task: ListrTaskWrapper) => boolean | Promise<boolean>;
+    }
+
+    interface ListrTaskWrapper {
+        title: string;
+        output: any;
+        report(error: Error): void;
+        skip(message: string): void;
+        run(ctx?: any): Promise<any>;
+    }
+}
+
+declare class Listr {
+    constructor(tasks?: ReadonlyArray<Listr.ListrTask>, options?: Listr.ListrOptions);
+    constructor(options?: Listr.ListrOptions);
+    add(tasks: Listr.ListrTask | ReadonlyArray<Listr.ListrTask>): void;
+    run(ctx?: any): Promise<any>;
+}
+
+export = Listr;
diff --git a/types/listr/listr-tests.ts b/types/listr/listr-tests.ts
new file mode 100644
index 0000000000..e9ac72b5dc
--- /dev/null
+++ b/types/listr/listr-tests.ts
@@ -0,0 +1,167 @@
+import Listr = require("listr");
+import * as fs from "fs";
+
+const tasks = new Listr([
+    {
+        title: 'Git',
+        task: () => {
+            return new Listr([
+                {
+                    title: 'Checking git status',
+                    task: () => new Promise(resolve => resolve())
+                        .then(result => {
+                        if (result !== '') {
+                            throw new Error('Unclean working tree. Commit or stash changes first.');
+                        }
+                    })
+                },
+                {
+                    title: 'Checking remote history',
+                    task: () => new Promise(resolve => resolve())
+                        .then(result => {
+                        if (result !== '0') {
+                            throw new Error('Remote history differ. Please pull changes.');
+                        }
+                    })
+                }
+            ],
+            { concurrent: true });
+        }
+    },
+    {
+        title: 'Install package dependencies with Yarn',
+        task: (ctx, task) => new Promise(resolve => resolve())
+            .catch(() => {
+                ctx.yarn = false;
+
+                task.skip('Yarn not available, install it via `npm install -g yarn`');
+            })
+    },
+    {
+        title: 'Install package dependencies with npm',
+        enabled: ctx => ctx.yarn === false,
+        task: () => new Promise(resolve => resolve())
+    },
+    {
+        title: 'Run tests',
+        task: () => new Promise(resolve => resolve())
+    },
+    {
+        title: 'Publish package',
+        task: () => new Promise(resolve => resolve())
+    }
+]);
+
+tasks.run().catch(err => {
+});
+
+const tasks21 = new Listr([
+    {
+        title: 'Success',
+        task: () => 'Foo'
+    },
+    {
+        title: 'Failure',
+        task: () => {
+            throw new Error('Bar');
+        }
+    }
+]);
+
+const taskA: Listr.ListrTask = {
+    title: 'Success',
+    task: () => 'Foo'
+};
+
+const taskB: Listr.ListrTask = {
+    title: 'Failure',
+    task: () => {
+        throw new Error('Bar');
+    }
+};
+
+const tasks22 = new Listr([taskA, taskB]);
+
+const tasks3 = new Listr([
+    {
+        title: 'Success',
+        task: () => Promise.resolve('Foo')
+    },
+    {
+        title: 'Failure',
+        task: () => Promise.reject(new Error('Bar'))
+    }
+]);
+
+const tasks4 = new Listr([
+    {
+        title: 'File',
+        task: () => fs.createReadStream('data.txt', 'utf8')
+    }
+]);
+
+const tasks5 = new Listr([
+    {
+        title: 'Task 1',
+        task: () => Promise.resolve('Foo')
+    },
+    {
+        title: 'Can be skipped',
+        skip: () => {
+            if (Math.random() > 0.5) {
+                return 'Reason for skipping';
+            }
+        },
+        task: () => 'Bar'
+    },
+    {
+        title: 'Task 3',
+        task: () => Promise.resolve('Bar')
+    }
+]);
+
+const tasks6 = new Listr([
+    {
+        title: 'Install package dependencies with Yarn',
+        task: (ctx, task) => new Promise(resolve => resolve())
+            .catch(() => {
+                ctx.yarn = false;
+
+                task.skip('Yarn not available, install it via `npm install -g yarn`');
+            })
+    },
+    {
+        title: 'Install package dependencies with npm',
+        enabled: ctx => ctx.yarn === false,
+        task: () => new Promise(resolve => resolve())
+    }
+]);
+
+const tasks7 = new Listr([
+    {
+        title: 'Task 1',
+        skip: ctx => ctx.foo === 'bar',
+        task: () => Promise.resolve('Foo')
+    },
+    {
+        title: 'Can be skipped',
+        skip: () => {
+            if (Math.random() > 0.5) {
+                return 'Reason for skipping';
+            }
+        },
+        task: ctx => {
+            ctx.unicorn = 'rainbow';
+        }
+    },
+    {
+        title: 'Task 3',
+        task: ctx => Promise.resolve(`${ctx.foo} ${ctx.bar}`)
+    }
+]);
+
+tasks.run({
+    foo: 'bar'
+}).then(ctx => {
+    console.log(ctx);
+});
diff --git a/types/bingmaps/tsconfig.json b/types/listr/tsconfig.json
similarity index 51%
rename from types/bingmaps/tsconfig.json
rename to types/listr/tsconfig.json
index 421876221b..cae79d1480 100644
--- a/types/bingmaps/tsconfig.json
+++ b/types/listr/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -19,19 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "Autosuggest.d.ts",
-        "Clustering.d.ts",
-        "Contour.d.ts",
-        "DataBinning.d.ts",
-        "Directions.d.ts",
-        "DrawingTools.d.ts",
-        "GeoJson.d.ts",
-        "HeatMapLayer.d.ts",
-        "Search.d.ts",
-        "SpatialDataService.d.ts",
-        "SpatialMath.d.ts",
-        "Traffic.d.ts",
-        "WellKnownText.d.ts",
-        "bingmaps-tests.ts"
+        "listr-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/listr/tslint.json b/types/listr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/listr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/loader-utils/index.d.ts b/types/loader-utils/index.d.ts
index 37ce2e461f..18aa16d7e4 100644
--- a/types/loader-utils/index.d.ts
+++ b/types/loader-utils/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Gyusun Yeom <https://github.com/Perlmint>
 //                 Totooria Hyperion <https://github.com/TotooriaHyperion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/lodash-webpack-plugin/index.d.ts b/types/lodash-webpack-plugin/index.d.ts
index e7e2dfd4db..505c54b5c4 100644
--- a/types/lodash-webpack-plugin/index.d.ts
+++ b/types/lodash-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/lodash/lodash-webpack-plugin#readme
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/lodash/common/collection.d.ts b/types/lodash/common/collection.d.ts
index 31e5b1c212..c8b2770610 100644
--- a/types/lodash/common/collection.d.ts
+++ b/types/lodash/common/collection.d.ts
@@ -36,14 +36,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): Dictionary<number>;
 
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): Dictionary<number>;
-
         /**
          * @see _.countBy
          */
@@ -77,14 +69,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashImplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<number>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -111,14 +95,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashExplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<number>>;
     }
 
     // each
@@ -217,14 +193,6 @@ declare module "../index" {
             predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
-        /**
-         * @see _.every
-         */
-        every<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
-
         /**
          * @see _.every
          */
@@ -250,14 +218,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -276,14 +236,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
     }
 
     // filter
@@ -712,14 +664,6 @@ declare module "../index" {
             iteratee: ListIterator<T, Many<TResult>>
         ): TResult[];
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): TResult[];
-
         /**
          * @see _.flatMap
          */
@@ -772,14 +716,6 @@ declare module "../index" {
             iteratee: ObjectIterator<T, Many<TResult>>
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMap
          */
@@ -814,14 +750,6 @@ declare module "../index" {
             iteratee: ListIterator<T, Many<TResult>>
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMap
          */
@@ -878,14 +806,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): TResult[];
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): TResult[];
-
         /**
          * @see _.flatMapDeep
          */
@@ -927,14 +847,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDeep
          */
@@ -976,14 +888,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDeep
          */
@@ -1044,15 +948,6 @@ declare module "../index" {
             depth?: number
         ): TResult[];
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): TResult[];
-
         /**
          * @see _.flatMapDepth
          */
@@ -1098,15 +993,6 @@ declare module "../index" {
             depth?: number
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDepth
          */
@@ -1152,15 +1038,6 @@ declare module "../index" {
             depth?: number
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDepth
          */
@@ -1446,14 +1323,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): Dictionary<T[]>;
 
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): Dictionary<T[]>;
-
         /**
          * @see _.groupBy
          */
@@ -1487,14 +1356,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashImplicitWrapper<Dictionary<Array<T[keyof T]>>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T[]>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -1514,14 +1375,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): LoDashExplicitWrapper<Dictionary<T[]>>;
 
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T[]>>;
-
         /**
          * @see _.groupBy
          */
@@ -1544,7 +1397,7 @@ declare module "../index" {
          * @return True if the target element is found, else false.
          */
         includes<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             target: T,
             fromIndex?: number
         ): boolean;
@@ -1555,7 +1408,7 @@ declare module "../index" {
          * @see _.includes
          */
         includes<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             target: T,
             fromIndex?: number
         ): boolean;
@@ -1566,7 +1419,7 @@ declare module "../index" {
          * @see _.includes
          */
         includes<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             target: T,
             fromIndex?: number
         ): LoDashExplicitWrapper<boolean>;
@@ -1673,14 +1526,6 @@ declare module "../index" {
             collection: T | null | undefined,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): Dictionary<T[keyof T]>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): Dictionary<T>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -1707,14 +1552,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -1741,14 +1578,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
     }
 
     // map
@@ -1780,6 +1609,14 @@ declare module "../index" {
          * @param thisArg The this binding of iteratee.
          * @return Returns the new mapped array.
          */
+        map<T, TResult>(
+            collection: T[] | null | undefined,
+            iteratee: ArrayIterator<T, TResult>
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
         map<T, TResult>(
             collection: List<T> | null | undefined,
             iteratee: ListIterator<T, TResult>
@@ -1788,46 +1625,48 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(collection: List<T> | Dictionary<T> | null | undefined): T[];
+        map<T>(collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined): T[];
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, TResult>
         ): TResult[];
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            collection: List<T> | Dictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             iteratee: K
         ): Array<T[K]>;
 
-        /** @see _.map */
-        map<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: string
-        ): TResult[];
-
         /**
          * @see _.map
          */
         map<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
+            iteratee?: string
+        ): any[];
+
+        /**
+         * @see _.map
+         */
+        map<T>(
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             iteratee?: object
         ): boolean[];
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            iteratee: ArrayIterator<T, TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
         /**
          * @see _.map
          */
@@ -1839,35 +1678,29 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, TResult>
         ): LoDashImplicitWrapper<TResult[]>;
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: K
         ): LoDashImplicitWrapper<Array<T[K]>>;
 
-        /** @see _.map */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.map
          */
-        map<T, TResult>(
+        map<T>(
             this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee?: string
-        ): LoDashImplicitWrapper<TResult[]>;
+        ): LoDashImplicitWrapper<any[]>;
 
         /**
          * @see _.map
@@ -1879,6 +1712,14 @@ declare module "../index" {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            iteratee: ArrayIterator<T, TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
         /**
          * @see _.map
          */
@@ -1890,37 +1731,29 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, TResult>
         ): LoDashExplicitWrapper<TResult[]>;
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: K
         ): LoDashExplicitWrapper<Array<T[K]>>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
+        map<T>(
             this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee?: string
-        ): LoDashExplicitWrapper<TResult[]>;
+        ): LoDashExplicitWrapper<any[]>;
 
         /**
          * @see _.map
@@ -1991,24 +1824,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): Array<T[keyof T]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): T[];
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2047,24 +1862,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2103,24 +1900,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
     }
 
     // partition
@@ -2233,15 +2012,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduce
         **/
@@ -2265,14 +2035,6 @@ declare module "../index" {
             collection: T | null | undefined,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2303,15 +2065,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduce
         **/
@@ -2335,14 +2088,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2373,15 +2118,6 @@ declare module "../index" {
             accumulator: TResult
         ): LoDashExplicitWrapper<TResult>;
 
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
         /**
         * @see _.reduce
         **/
@@ -2405,14 +2141,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
     }
 
     // reduceRight
@@ -2450,15 +2178,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduceRight
         **/
@@ -2482,14 +2201,6 @@ declare module "../index" {
             collection: T | null | undefined,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2520,15 +2231,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduceRight
         **/
@@ -2552,14 +2254,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2590,15 +2284,6 @@ declare module "../index" {
             accumulator: TResult
         ): LoDashExplicitWrapper<TResult>;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
         /**
         * @see _.reduceRight
         **/
@@ -2622,14 +2307,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-         * @see _.reduceRight
-         **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
     }
 
     // reject
@@ -2731,13 +2408,6 @@ declare module "../index" {
             collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined
         ): T | undefined;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            collection: T
-        ): T[keyof T];
-
         /**
          * @see _.sample
          */
@@ -2754,13 +2424,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
         ): T | undefined;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashImplicitWrapper<T>,
-        ): T[keyof T];
-
         /**
          * @see _.sample
          */
@@ -2777,13 +2440,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
         ): LoDashExplicitWrapper<T | undefined>;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashExplicitWrapper<T>,
-        ): LoDashExplicitWrapper<T[keyof T]>;
-
         /**
          * @see _.sample
          */
@@ -2803,7 +2459,7 @@ declare module "../index" {
          * @return Returns the random elements.
          */
         sampleSize<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             n?: number
         ): T[];
 
@@ -2821,7 +2477,7 @@ declare module "../index" {
          * @see _.sampleSize
          */
         sampleSize<T>(
-            this: LoDashImplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             n?: number
         ): LoDashImplicitWrapper<T[]>;
 
@@ -2839,7 +2495,7 @@ declare module "../index" {
          * @see _.sampleSize
          */
         sampleSize<T>(
-            this: LoDashExplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             n?: number
         ): LoDashExplicitWrapper<T[]>;
 
@@ -2943,14 +2599,6 @@ declare module "../index" {
             collection: T | null | undefined,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2969,14 +2617,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2995,14 +2635,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
     }
 
     // sortBy
diff --git a/types/lodash/common/common.d.ts b/types/lodash/common/common.d.ts
index ac3e137b12..468019ea53 100644
--- a/types/lodash/common/common.d.ts
+++ b/types/lodash/common/common.d.ts
@@ -188,17 +188,9 @@ declare module "../index" {
     // Note: key should be string, not keyof T, because the actual object may contain extra properties that were not specified in the type.
     type ObjectIterator<TObject, TResult> = (value: TObject[keyof TObject], key: string, collection: TObject) => TResult;
     type ObjectIteratee<TObject> = ObjectIterator<TObject, NotVoid> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
-    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | string | object | [string, any] | PartialDeep<TObject[keyof TObject]>;
+    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
     type ObjectIteratorTypeGuard<TObject, S extends TObject[keyof TObject]> = (value: TObject[keyof TObject], key: string, collection: TObject) => value is S;
 
-    type DictionaryIterator<T, TResult> = ObjectIterator<Dictionary<T>, TResult>;
-    type DictionaryIteratee<T> = ObjectIteratee<Dictionary<T>>;
-    type DictionaryIteratorTypeGuard<T, S extends T> = ObjectIteratorTypeGuard<Dictionary<T>, S>;
-
-    type NumericDictionaryIterator<T, TResult> = (value: T, key: number, collection: NumericDictionary<T>) => TResult;
-    type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
-    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
-
     type StringIterator<TResult> = (char: string, index: number, string: string) => TResult;
 
     type MemoVoidIterator<T, TResult> = (prev: TResult, curr: T, indexOrKey: any, list: T[]) => void;
@@ -230,6 +222,11 @@ declare module "../index" {
         [index: number]: T;
     }
 
+    // Crazy typedef needed get _.omit to work properly with Dictionary and NumericDictionary
+    type AnyKindOfDictionary =
+        | Dictionary<{} | null | undefined>
+        | NumericDictionary<{} | null | undefined>;
+
     interface Cancelable {
         cancel(): void;
         flush(): void;
@@ -252,4 +249,12 @@ declare module "../index" {
     type LoDashExplicitNillableObjectWrapper<T> = LoDashExplicitWrapper<T | null | undefined>;
     type LoDashExplicitNumberArrayWrapper = LoDashExplicitWrapper<number[]>;
     type LoDashExplicitStringWrapper = LoDashExplicitWrapper<string>;
+
+    type DictionaryIterator<T, TResult> = ObjectIterator<Dictionary<T>, TResult>;
+    type DictionaryIteratee<T> = ObjectIteratee<Dictionary<T>>;
+    type DictionaryIteratorTypeGuard<T, S extends T> = ObjectIteratorTypeGuard<Dictionary<T>, S>;
+    // NOTE: keys of objects at run time are always strings, even when a NumericDictionary is being iterated.
+    type NumericDictionaryIterator<T, TResult> = (value: T, key: string, collection: NumericDictionary<T>) => TResult;
+    type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
+    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
 }
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index 6100e25c43..3063072b17 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -718,7 +718,7 @@ declare module "../index" {
          * @return Returns the new array of picked elements.
          */
         at<T>(
-            object: List<T> | Dictionary<T> | null | undefined,
+            object: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             ...props: PropertyPath[]
         ): T[];
 
@@ -736,7 +736,7 @@ declare module "../index" {
          * @see _.at
          */
         at<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             ...props: PropertyPath[]
         ): LoDashImplicitWrapper<T[]>;
 
@@ -754,7 +754,7 @@ declare module "../index" {
          * @see _.at
          */
         at<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             ...props: PropertyPath[]
         ): LoDashExplicitWrapper<T[]>;
 
@@ -987,7 +987,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(object?: Dictionary<T>): Array<[string, T]>;
+        entries<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairs
@@ -999,7 +999,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        entries<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -1011,7 +1011,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        entries<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -1025,7 +1025,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(object?: Dictionary<T>): Array<[string, T]>;
+        entriesIn<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.entriesIn
@@ -1037,7 +1037,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.entriesIn
@@ -1049,7 +1049,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.entriesIn
@@ -2210,18 +2210,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIteratee<T>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            object: object | null | undefined,
-            iteratee?: ObjectIteratee<any>
-        ): Dictionary<any>;
+        mapKeys<T extends object>(
+            object: T | null | undefined,
+            iteratee?: ObjectIteratee<T>
+        ): Dictionary<T[keyof T]>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2236,18 +2228,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee?: DictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            this: LoDashImplicitWrapper<object | null | undefined>,
-            iteratee?: ObjectIteratee<any>
-        ): LoDashImplicitWrapper<Dictionary<any>>;
+        mapKeys<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2262,18 +2246,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee?: DictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            this: LoDashExplicitWrapper<object | null | undefined>,
-            iteratee?: ObjectIteratee<any>
-        ): LoDashExplicitWrapper<Dictionary<any>>;
+        mapKeys<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
     }
 
     // mapValues
@@ -2298,8 +2274,27 @@ declare module "../index" {
         * @param [thisArg] The `this` binding of `iteratee`.
         * @return Returns the new mapped object.
         */
+        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, callback: ObjectIterator<Dictionary<T>, TResult>): Dictionary<TResult>;
+
+        /**
+         * @see _.mapValues
+         */
         mapValues<T extends object, TResult>(obj: T | null | undefined, callback: ObjectIterator<T, TResult>): { [P in keyof T]: TResult };
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: object): Dictionary<boolean>;
+
         /**
          * @see _.mapValues
          */
@@ -2307,23 +2302,34 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
+        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: string): Dictionary<any>;
 
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object, TKey extends keyof T>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
+        mapValues<T extends object>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
 
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
+        mapValues(obj: string | null | undefined): NumericDictionary<string>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(obj: Dictionary<T> | null | undefined): Dictionary<T>;
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined): Dictionary<T>;
 
         /**
          * @see _.mapValues
@@ -2333,15 +2339,28 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(obj: T | null | undefined): T | {};
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(obj: string | null | undefined): NumericDictionary<string>;
+        mapValues<T extends object>(obj: T | null | undefined): PartialObject<T>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            callback: ObjectIterator<Dictionary<T>, TResult>
+        ): LoDashImplicitWrapper<Dictionary<TResult>>;
+
         /**
          * @see _.mapValues
          */
@@ -2350,6 +2369,16 @@ declare module "../index" {
             callback: ObjectIterator<T, TResult>
         ): LoDashImplicitWrapper<{ [P in keyof T]: TResult }>;
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: object
+        ): LoDashImplicitWrapper<Dictionary<boolean>>;
+
         /**
          * @see _.mapValues
          */
@@ -2360,16 +2389,28 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
         mapValues<T, TKey extends keyof T>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: TKey
         ): LoDashImplicitWrapper<Dictionary<T[TKey]>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T extends object, TKey extends keyof T>(
+        mapValues<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: string
+        ): LoDashImplicitWrapper<Dictionary<any>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee: string
         ): LoDashImplicitWrapper<{ [P in keyof T]: any }>;
@@ -2377,15 +2418,14 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            callback: StringIterator<TResult>
-        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
+        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
+        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapValues
@@ -2395,15 +2435,28 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<T | {}>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
+        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<PartialObject<T>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            callback: ObjectIterator<Dictionary<T>, TResult>
+        ): LoDashExplicitWrapper<Dictionary<TResult>>;
+
         /**
          * @see _.mapValues
          */
@@ -2412,6 +2465,16 @@ declare module "../index" {
             callback: ObjectIterator<T, TResult>
         ): LoDashExplicitWrapper<{ [P in keyof T]: TResult }>;
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: object
+        ): LoDashExplicitWrapper<Dictionary<boolean>>;
+
         /**
          * @see _.mapValues
          */
@@ -2422,16 +2485,28 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
         mapValues<T, TKey extends keyof T>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: TKey
         ): LoDashExplicitWrapper<Dictionary<T[TKey]>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T extends object, TKey extends keyof T>(
+        mapValues<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: string
+        ): LoDashExplicitWrapper<Dictionary<any>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee: string
         ): LoDashExplicitWrapper<{ [P in keyof T]: any }>;
@@ -2439,15 +2514,14 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            callback: StringIterator<TResult>
-        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
+        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
+        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapValues
@@ -2457,12 +2531,7 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<T | {}>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
+        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<PartialObject<T>>;
     }
 
     // merge
@@ -2773,10 +2842,10 @@ declare module "../index" {
          * _.omit(object, ['a', 'c']);
          * // => { 'b': '2' }
          */
-        omit<T>(
-            object: Dictionary<T>,
+        omit<T extends AnyKindOfDictionary>(
+            object: T | null | undefined,
             ...paths: PropertyPath[]
-        ): Dictionary<T>;
+        ): T;
 
         /**
          * @see _.omit
@@ -2791,10 +2860,10 @@ declare module "../index" {
         /**
          * @see _.omit
          */
-        omit<T>(
-            this: LoDashImplicitWrapper<Dictionary<T>>,
+        omit<T extends AnyKindOfDictionary>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
             ...paths: PropertyPath[]
-        ): LoDashImplicitWrapper<Dictionary<T>>;
+        ): LoDashImplicitWrapper<T>;
 
         /**
          * @see _.omit
@@ -2809,10 +2878,10 @@ declare module "../index" {
         /**
          * @see _.omit
          */
-        omit<T>(
-            this: LoDashExplicitWrapper<Dictionary<T>>,
+        omit<T extends AnyKindOfDictionary>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
             ...paths: PropertyPath[]
-        ): LoDashExplicitWrapper<Dictionary<T>>;
+        ): LoDashExplicitWrapper<T>;
 
         /**
          * @see _.omit
@@ -3164,7 +3233,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns the new array of key-value pairs.
          */
-        toPairs<T>(object?: Dictionary<T>): Array<[string, T]>;
+        toPairs<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairs
@@ -3176,7 +3245,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -3188,7 +3257,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -3205,7 +3274,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns the new array of key-value pairs.
          */
-        toPairsIn<T>(object?: Dictionary<T>): Array<[string, T]>;
+        toPairsIn<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairsIn
@@ -3217,7 +3286,7 @@ declare module "../index" {
         /**
          * @see _.toPairsIn
          */
-        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairsIn
@@ -3229,7 +3298,7 @@ declare module "../index" {
         /**
          * @see _.toPairsIn
          */
-        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairsIn
@@ -3563,7 +3632,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns an array of property values.
          */
-        values<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
+        values<T>(object: Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined): T[];
 
         /**
          * @see _.values
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 7646cd02a6..20bde973aa 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -109,11 +109,11 @@ namespace TestChunk {
     {
         let result: AbcObject[][];
 
-        result = _.chunk<AbcObject>(array);
-        result = _.chunk<AbcObject>(array, 42);
+        result = _.chunk(array);
+        result = _.chunk(array, 42);
 
-        result = _.chunk<AbcObject>(list);
-        result = _.chunk<AbcObject>(list, 42);
+        result = _.chunk(list);
+        result = _.chunk(list, 42);
     }
 
     {
@@ -122,8 +122,8 @@ namespace TestChunk {
         result = _(array).chunk();
         result = _(array).chunk(42);
 
-        result = _(list).chunk<AbcObject>();
-        result = _(list).chunk<AbcObject>(42);
+        result = _(list).chunk();
+        result = _(list).chunk(42);
     }
 
     {
@@ -133,8 +133,8 @@ namespace TestChunk {
         result = _(array).chain().chunk();
         result = _(array).chain().chunk(42);
 
-        result = _(list).chain().chunk<AbcObject>();
-        result = _(list).chain().chunk<AbcObject>(42);
+        result = _(list).chain().chunk();
+        result = _(list).chain().chunk(42);
     }
 }
 
@@ -148,8 +148,8 @@ namespace TestCompact {
     {
         let result: AbcObject[];
 
-        result = _.compact<AbcObject>(array);
-        result = _.compact<AbcObject>(list);
+        result = _.compact(array);
+        result = _.compact(list);
         result = _.compact(array2);
         result = _.compact(list2);
     }
@@ -158,14 +158,14 @@ namespace TestCompact {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).compact();
-        result = _(list).compact<AbcObject>();
+        result = _(list).compact();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().compact();
-        result = _(list).chain().compact<AbcObject>();
+        result = _(list).chain().compact();
     }
 }
 
@@ -198,10 +198,10 @@ namespace TestDifference {
         result = _(array).difference(listParam, arrayParam);
         result = _(array).difference(arrayParam, listParam, arrayParam);
 
-        result = _(list).difference<AbcObject>();
-        result = _(list).difference<AbcObject>(listParam);
-        result = _(list).difference<AbcObject>(arrayParam, listParam);
-        result = _(list).difference<AbcObject>(listParam, arrayParam, listParam);
+        result = _(list).difference();
+        result = _(list).difference(listParam);
+        result = _(list).difference(arrayParam, listParam);
+        result = _(list).difference(listParam, arrayParam, listParam);
     }
 
     {
@@ -212,10 +212,10 @@ namespace TestDifference {
         result = _(array).chain().difference(listParam, arrayParam);
         result = _(array).chain().difference(arrayParam, listParam, arrayParam);
 
-        result = _(list).chain().difference<AbcObject>();
-        result = _(list).chain().difference<AbcObject>(listParam);
-        result = _(list).chain().difference<AbcObject>(arrayParam, listParam);
-        result = _(list).chain().difference<AbcObject>(listParam, arrayParam, listParam);
+        result = _(list).chain().difference();
+        result = _(list).chain().difference(listParam);
+        result = _(list).chain().difference(arrayParam, listParam);
+        result = _(list).chain().difference(listParam, arrayParam, listParam);
     }
 }
 
@@ -231,12 +231,12 @@ namespace TestDifferenceBy {
         let result: AbcObject[];
 
         result = _.differenceBy(array);
-        result = _.differenceBy<AbcObject>(array, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _.differenceBy(array, arrayParam, iteratee);
         result = _.differenceBy(array, listParam, arrayParam, iteratee);
@@ -260,12 +260,12 @@ namespace TestDifferenceBy {
         result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
         result = _.differenceBy(list);
-        result = _.differenceBy<AbcObject>(list, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, listParam);
+        result = _.differenceBy(list, arrayParam, listParam);
+        result = _.differenceBy(list, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _.differenceBy(list, listParam, iteratee);
         result = _.differenceBy(list, arrayParam, listParam, iteratee);
@@ -292,12 +292,12 @@ namespace TestDifferenceBy {
     {
         let result: _.LoDashImplicitWrapper<AbcObject[]>;
 
-        result = _(array).differenceBy<AbcObject>(arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _(array).differenceBy(arrayParam, iteratee);
         result = _(array).differenceBy(listParam, arrayParam, iteratee);
@@ -320,12 +320,12 @@ namespace TestDifferenceBy {
         result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _(array).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(list).differenceBy<AbcObject>(listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(listParam);
+        result = _(list).differenceBy(arrayParam, listParam);
+        result = _(list).differenceBy(listParam, arrayParam, listParam);
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _(list).differenceBy(listParam, iteratee);
         result = _(list).differenceBy(arrayParam, listParam, iteratee);
@@ -352,12 +352,12 @@ namespace TestDifferenceBy {
     {
         let result: _.LoDashExplicitWrapper<AbcObject[]>;
 
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _(array).chain().differenceBy(arrayParam, iteratee);
         result = _(array).chain().differenceBy(listParam, arrayParam, iteratee);
@@ -380,12 +380,12 @@ namespace TestDifferenceBy {
         result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _(array).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(list).chain().differenceBy<AbcObject>(listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _(list).chain().differenceBy(listParam, iteratee);
         result = _(list).chain().differenceBy(arrayParam, listParam, iteratee);
@@ -653,11 +653,11 @@ namespace TestDifferenceBy {
 
     {
         let result: AbcObject[];
-        result = _.drop<AbcObject>(array);
-        result = _.drop<AbcObject>(array, 42);
+        result = _.drop(array);
+        result = _.drop(array, 42);
 
-        result = _.drop<AbcObject>(list);
-        result = _.drop<AbcObject>(list, 42);
+        result = _.drop(list);
+        result = _.drop(list, 42);
     }
 
     {
@@ -666,8 +666,8 @@ namespace TestDifferenceBy {
         result = _(array).drop();
         result = _(array).drop(42);
 
-        result = _(list).drop<AbcObject>();
-        result = _(list).drop<AbcObject>(42);
+        result = _(list).drop();
+        result = _(list).drop(42);
     }
 
     {
@@ -676,8 +676,8 @@ namespace TestDifferenceBy {
         result = _(array).chain().drop();
         result = _(array).chain().drop(42);
 
-        result = _(list).chain().drop<AbcObject>();
-        result = _(list).chain().drop<AbcObject>(42);
+        result = _(list).chain().drop();
+        result = _(list).chain().drop(42);
     }
 }
 
@@ -689,11 +689,11 @@ namespace TestDropRight {
     {
         let result: AbcObject[];
 
-        result = _.dropRight<AbcObject>(array);
-        result = _.dropRight<AbcObject>(array, 42);
+        result = _.dropRight(array);
+        result = _.dropRight(array, 42);
 
-        result = _.dropRight<AbcObject>(list);
-        result = _.dropRight<AbcObject>(list, 42);
+        result = _.dropRight(list);
+        result = _.dropRight(list, 42);
     }
 
     {
@@ -702,8 +702,8 @@ namespace TestDropRight {
         result = _(array).dropRight();
         result = _(array).dropRight(42);
 
-        result = _(list).dropRight<AbcObject>();
-        result = _(list).dropRight<AbcObject>(42);
+        result = _(list).dropRight();
+        result = _(list).dropRight(42);
     }
 
     {
@@ -712,8 +712,8 @@ namespace TestDropRight {
         result = _(array).chain().dropRight();
         result = _(array).chain().dropRight(42);
 
-        result = _(list).chain().dropRight<AbcObject>();
-        result = _(list).chain().dropRight<AbcObject>(42);
+        result = _(list).chain().dropRight();
+        result = _(list).chain().dropRight(42);
     }
 }
 
@@ -726,14 +726,14 @@ namespace TestDropRightWhile {
     {
         let result: AbcObject[];
 
-        result = _.dropRightWhile<AbcObject>(array);
-        result = _.dropRightWhile<AbcObject>(array, predicateFn);
-        result = _.dropRightWhile<AbcObject>(array, '');
+        result = _.dropRightWhile(array);
+        result = _.dropRightWhile(array, predicateFn);
+        result = _.dropRightWhile(array, '');
         result = _.dropRightWhile(array, {a: 42});
 
-        result = _.dropRightWhile<AbcObject>(list);
-        result = _.dropRightWhile<AbcObject>(list, predicateFn);
-        result = _.dropRightWhile<AbcObject>(list, '');
+        result = _.dropRightWhile(list);
+        result = _.dropRightWhile(list, predicateFn);
+        result = _.dropRightWhile(list, '');
         result = _.dropRightWhile(list, {a: 42});
     }
 
@@ -745,9 +745,9 @@ namespace TestDropRightWhile {
         result = _(array).dropRightWhile('');
         result = _(array).dropRightWhile({a: 42});
 
-        result = _(list).dropRightWhile<AbcObject>();
-        result = _(list).dropRightWhile<AbcObject>(predicateFn);
-        result = _(list).dropRightWhile<AbcObject>('');
+        result = _(list).dropRightWhile();
+        result = _(list).dropRightWhile(predicateFn);
+        result = _(list).dropRightWhile('');
         result = _(list).dropRightWhile({a: 42});
     }
 
@@ -759,9 +759,9 @@ namespace TestDropRightWhile {
         result = _(array).chain().dropRightWhile('');
         result = _(array).chain().dropRightWhile({a: 42});
 
-        result = _(list).chain().dropRightWhile<AbcObject>();
-        result = _(list).chain().dropRightWhile<AbcObject>(predicateFn);
-        result = _(list).chain().dropRightWhile<AbcObject>('');
+        result = _(list).chain().dropRightWhile();
+        result = _(list).chain().dropRightWhile(predicateFn);
+        result = _(list).chain().dropRightWhile('');
         result = _(list).chain().dropRightWhile({a: 42});
     }
 }
@@ -775,14 +775,14 @@ namespace TestDropWhile {
     {
         let result: AbcObject[];
 
-        result = _.dropWhile<AbcObject>(array);
-        result = _.dropWhile<AbcObject>(array, predicateFn);
-        result = _.dropWhile<AbcObject>(array, '');
+        result = _.dropWhile(array);
+        result = _.dropWhile(array, predicateFn);
+        result = _.dropWhile(array, '');
         result = _.dropWhile(array, {a: 42});
 
-        result = _.dropWhile<AbcObject>(list);
-        result = _.dropWhile<AbcObject>(list, predicateFn);
-        result = _.dropWhile<AbcObject>(list, '');
+        result = _.dropWhile(list);
+        result = _.dropWhile(list, predicateFn);
+        result = _.dropWhile(list, '');
         result = _.dropWhile(list, {a: 42});
     }
 
@@ -794,9 +794,9 @@ namespace TestDropWhile {
         result = _(array).dropWhile('');
         result = _(array).dropWhile({a: 42});
 
-        result = _(list).dropWhile<AbcObject>();
-        result = _(list).dropWhile<AbcObject>(predicateFn);
-        result = _(list).dropWhile<AbcObject>('');
+        result = _(list).dropWhile();
+        result = _(list).dropWhile(predicateFn);
+        result = _(list).dropWhile('');
         result = _(list).dropWhile({a: 42});
     }
 
@@ -808,9 +808,9 @@ namespace TestDropWhile {
         result = _(array).chain().dropWhile('');
         result = _(array).chain().dropWhile({a: 42});
 
-        result = _(list).chain().dropWhile<AbcObject>();
-        result = _(list).chain().dropWhile<AbcObject>(predicateFn);
-        result = _(list).chain().dropWhile<AbcObject>('');
+        result = _(list).chain().dropWhile();
+        result = _(list).chain().dropWhile(predicateFn);
+        result = _(list).chain().dropWhile('');
         result = _(list).chain().dropWhile({a: 42});
     }
 }
@@ -879,17 +879,17 @@ namespace TestFindIndex {
     {
         let result: number;
 
-        result = _.findIndex<AbcObject>(array);
-        result = _.findIndex<AbcObject>(array, predicateFn);
-        result = _.findIndex<AbcObject>(array, '');
+        result = _.findIndex(array);
+        result = _.findIndex(array, predicateFn);
+        result = _.findIndex(array, '');
         result = _.findIndex(array, {a: 42});
-        result = _.findIndex<AbcObject>(array, predicateFn, fromIndex);
+        result = _.findIndex(array, predicateFn, fromIndex);
 
-        result = _.findIndex<AbcObject>(list);
-        result = _.findIndex<AbcObject>(list, predicateFn);
-        result = _.findIndex<AbcObject>(list, '');
+        result = _.findIndex(list);
+        result = _.findIndex(list, predicateFn);
+        result = _.findIndex(list, '');
         result = _.findIndex(list, {a: 42});
-        result = _.findIndex<AbcObject>(list, predicateFn, fromIndex);
+        result = _.findIndex(list, predicateFn, fromIndex);
         result = _.findIndex([{ b: 5 }], ['b', 5]);
 
         result = _(array).findIndex();
@@ -899,10 +899,10 @@ namespace TestFindIndex {
         result = _(array).findIndex(predicateFn, fromIndex);
 
         result = _(list).findIndex();
-        result = _(list).findIndex<AbcObject>(predicateFn);
+        result = _(list).findIndex(predicateFn);
         result = _(list).findIndex('');
         result = _(list).findIndex<{a: number}>({a: 42});
-        result = _(list).findIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).findIndex(predicateFn, fromIndex);
     }
 
     {
@@ -915,10 +915,10 @@ namespace TestFindIndex {
         result = _(array).chain().findIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findIndex();
-        result = _(list).chain().findIndex<AbcObject>(predicateFn);
+        result = _(list).chain().findIndex(predicateFn);
         result = _(list).chain().findIndex('');
         result = _(list).chain().findIndex<{a: number}>({a: 42});
-        result = _(list).chain().findIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).chain().findIndex(predicateFn, fromIndex);
     }
 }
 
@@ -933,17 +933,17 @@ namespace TestFindLastIndex {
     {
         let result: number;
 
-        result = _.findLastIndex<AbcObject>(array);
-        result = _.findLastIndex<AbcObject>(array, predicateFn);
-        result = _.findLastIndex<AbcObject>(array, '');
+        result = _.findLastIndex(array);
+        result = _.findLastIndex(array, predicateFn);
+        result = _.findLastIndex(array, '');
         result = _.findLastIndex(array, {a: 42});
-        result = _.findLastIndex<AbcObject>(array, predicateFn, fromIndex);
+        result = _.findLastIndex(array, predicateFn, fromIndex);
 
-        result = _.findLastIndex<AbcObject>(list);
-        result = _.findLastIndex<AbcObject>(list, predicateFn);
-        result = _.findLastIndex<AbcObject>(list, '');
+        result = _.findLastIndex(list);
+        result = _.findLastIndex(list, predicateFn);
+        result = _.findLastIndex(list, '');
         result = _.findLastIndex(list, {a: 42});
-        result = _.findLastIndex<AbcObject>(list, predicateFn, fromIndex);
+        result = _.findLastIndex(list, predicateFn, fromIndex);
         result = _.findLastIndex([{ b: 5 }], ['b', 5]);
 
         result = _(array).findLastIndex();
@@ -953,10 +953,10 @@ namespace TestFindLastIndex {
         result = _(array).findLastIndex(predicateFn, fromIndex);
 
         result = _(list).findLastIndex();
-        result = _(list).findLastIndex<AbcObject>(predicateFn);
+        result = _(list).findLastIndex(predicateFn);
         result = _(list).findLastIndex('');
         result = _(list).findLastIndex<{a: number}>({a: 42});
-        result = _(list).findLastIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).findLastIndex(predicateFn, fromIndex);
     }
 
     {
@@ -969,10 +969,10 @@ namespace TestFindLastIndex {
         result = _(array).chain().findLastIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findLastIndex();
-        result = _(list).chain().findLastIndex<AbcObject>(predicateFn);
+        result = _(list).chain().findLastIndex(predicateFn);
         result = _(list).chain().findLastIndex('');
         result = _(list).chain().findLastIndex<{a: number}>({a: 42});
-        result = _(list).chain().findLastIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).chain().findLastIndex(predicateFn, fromIndex);
     }
 }
 
@@ -991,11 +991,11 @@ namespace TestFirst {
     {
         let result: AbcObject | undefined;
 
-        result = _.first<AbcObject>(array);
-        result = _.first<AbcObject>(list);
+        result = _.first(array);
+        result = _.first(list);
 
         result = _(array).first();
-        result = _(list).first<AbcObject>();
+        result = _(list).first();
     }
 
     {
@@ -1240,11 +1240,11 @@ namespace TestHead {
     {
         let result: AbcObject | undefined;
 
-        result = _.head<AbcObject>(array);
-        result = _.head<AbcObject>(list);
+        result = _.head(array);
+        result = _.head(list);
 
         result = _(array).head();
-        result = _(list).head<AbcObject>();
+        result = _(list).head();
     }
 
     {
@@ -1270,21 +1270,21 @@ namespace TestIndexOf {
     {
         let result: number;
 
-        result = _.indexOf<AbcObject>(array, value);
-        result = _.indexOf<AbcObject>(array, value, true);
-        result = _.indexOf<AbcObject>(array, value, 42);
+        result = _.indexOf(array, value);
+        result = _.indexOf(array, value, true);
+        result = _.indexOf(array, value, 42);
 
-        result = _.indexOf<AbcObject>(list, value);
-        result = _.indexOf<AbcObject>(list, value, true);
-        result = _.indexOf<AbcObject>(list, value, 42);
+        result = _.indexOf(list, value);
+        result = _.indexOf(list, value, true);
+        result = _.indexOf(list, value, 42);
 
         result = _(array).indexOf(value);
         result = _(array).indexOf(value, true);
         result = _(array).indexOf(value, 42);
 
-        result = _(list).indexOf<AbcObject>(value);
-        result = _(list).indexOf<AbcObject>(value, true);
-        result = _(list).indexOf<AbcObject>(value, 42);
+        result = _(list).indexOf(value);
+        result = _(list).indexOf(value, true);
+        result = _(list).indexOf(value, 42);
     }
 
     {
@@ -1294,9 +1294,9 @@ namespace TestIndexOf {
         result = _(array).chain().indexOf(value, true);
         result = _(array).chain().indexOf(value, 42);
 
-        result = _(list).chain().indexOf<AbcObject>(value);
-        result = _(list).chain().indexOf<AbcObject>(value, true);
-        result = _(list).chain().indexOf<AbcObject>(value, 42);
+        result = _(list).chain().indexOf(value);
+        result = _(list).chain().indexOf(value, true);
+        result = _(list).chain().indexOf(value, 42);
     }
 }
 
@@ -1309,17 +1309,17 @@ namespace TestIndexOf {
     {
         let result: number;
 
-        result = _.sortedIndexOf<AbcObject>(array, value);
-        result = _.sortedIndexOf<AbcObject>(list, value);
+        result = _.sortedIndexOf(array, value);
+        result = _.sortedIndexOf(list, value);
         result = _(array).sortedIndexOf(value);
-        result = _(list).sortedIndexOf<AbcObject>(value);
+        result = _(list).sortedIndexOf(value);
     }
 
     {
         let result: _.LoDashExplicitWrapper<number>;
 
         result = _(array).chain().sortedIndexOf(value);
-        result = _(list).chain().sortedIndexOf<AbcObject>(value);
+        result = _(list).chain().sortedIndexOf(value);
     }
 }
 
@@ -1331,22 +1331,22 @@ namespace TestInitial {
     {
         let result: AbcObject[];
 
-        result = _.initial<AbcObject>(array);
-        result = _.initial<AbcObject>(list);
+        result = _.initial(array);
+        result = _.initial(list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).initial();
-        result = _(list).initial<AbcObject>();
+        result = _(list).initial();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().initial();
-        result = _(list).chain().initial<AbcObject>();
+        result = _(list).chain().initial();
     }
 }
 
@@ -1360,28 +1360,28 @@ namespace TestIntersection {
     {
         let result: AbcObject[];
 
-        result = _.intersection<AbcObject>(array, list);
-        result = _.intersection<AbcObject>(list, array, list);
+        result = _.intersection(array, list);
+        result = _.intersection(list, array, list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(array).intersection<AbcObject>(arrayParam);
-        result = _(array).intersection<AbcObject>(listParam, arrayParam);
+        result = _(array).intersection(arrayParam);
+        result = _(array).intersection(listParam, arrayParam);
 
-        result = _(list).intersection<AbcObject>(arrayParam);
-        result = _(list).intersection<AbcObject>(listParam, arrayParam);
+        result = _(list).intersection(arrayParam);
+        result = _(list).intersection(listParam, arrayParam);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(array).chain().intersection<AbcObject>(arrayParam);
-        result = _(array).chain().intersection<AbcObject>(listParam, arrayParam);
+        result = _(array).chain().intersection(arrayParam);
+        result = _(array).chain().intersection(listParam, arrayParam);
 
-        result = _(list).chain().intersection<AbcObject>(arrayParam);
-        result = _(list).chain().intersection<AbcObject>(listParam, arrayParam);
+        result = _(list).chain().intersection(arrayParam);
+        result = _(list).chain().intersection(listParam, arrayParam);
     }
 }
 
@@ -1632,11 +1632,11 @@ namespace TestLast {
     {
         let result: AbcObject | undefined;
 
-        result = _.last<AbcObject>(array);
-        result = _.last<AbcObject>(list);
+        result = _.last(array);
+        result = _.last(list);
 
         result = _(array).last();
-        result = _(list).last<AbcObject>();
+        result = _(list).last();
     }
 
     {
@@ -1667,21 +1667,21 @@ namespace TestLastIndexOf {
     {
         let result: number;
 
-        result = _.lastIndexOf<AbcObject>(array, value);
-        result = _.lastIndexOf<AbcObject>(array, value, true);
-        result = _.lastIndexOf<AbcObject>(array, value, 42);
+        result = _.lastIndexOf(array, value);
+        result = _.lastIndexOf(array, value, true);
+        result = _.lastIndexOf(array, value, 42);
 
-        result = _.lastIndexOf<AbcObject>(list, value);
-        result = _.lastIndexOf<AbcObject>(list, value, true);
-        result = _.lastIndexOf<AbcObject>(list, value, 42);
+        result = _.lastIndexOf(list, value);
+        result = _.lastIndexOf(list, value, true);
+        result = _.lastIndexOf(list, value, 42);
 
         result = _(array).lastIndexOf(value);
         result = _(array).lastIndexOf(value, true);
         result = _(array).lastIndexOf(value, 42);
 
-        result = _(list).lastIndexOf<AbcObject>(value);
-        result = _(list).lastIndexOf<AbcObject>(value, true);
-        result = _(list).lastIndexOf<AbcObject>(value, 42);
+        result = _(list).lastIndexOf(value);
+        result = _(list).lastIndexOf(value, true);
+        result = _(list).lastIndexOf(value, 42);
     }
 
     {
@@ -1691,9 +1691,9 @@ namespace TestLastIndexOf {
         result = _(array).chain().lastIndexOf(value, true);
         result = _(array).chain().lastIndexOf(value, 42);
 
-        result = _(list).chain().lastIndexOf<AbcObject>(value);
-        result = _(list).chain().lastIndexOf<AbcObject>(value, true);
-        result = _(list).chain().lastIndexOf<AbcObject>(value, 42);
+        result = _(list).chain().lastIndexOf(value);
+        result = _(list).chain().lastIndexOf(value, true);
+        result = _(list).chain().lastIndexOf(value, 42);
     }
 }
 
@@ -1706,15 +1706,15 @@ namespace TestNth {
     {
         let result: AbcObject | undefined;
 
-        result = _.nth<AbcObject>(array);
+        result = _.nth(array);
 
-        result = _.nth<AbcObject>(array, 42);
+        result = _.nth(array, 42);
 
         result = _(array).nth();
         result = _(array).nth(42);
 
-        result = _(list).nth<AbcObject>();
-        result = _(list).nth<AbcObject>(42);
+        result = _(list).nth();
+        result = _(list).nth(42);
     }
 
     {
@@ -1723,8 +1723,8 @@ namespace TestNth {
         result = _(array).chain().nth();
         result = _(array).chain().nth(42);
 
-        result = _(list).chain().nth<AbcObject>();
-        result = _(list).chain().nth<AbcObject>(42);
+        result = _(list).chain().nth();
+        result = _(list).chain().nth(42);
     }
 }
 
@@ -1737,19 +1737,19 @@ namespace TestPull {
     {
         let result: AbcObject[];
 
-        result = _.pull<AbcObject>(array);
-        result = _.pull<AbcObject>(array, value);
-        result = _.pull<AbcObject>(array, value, value);
-        result = _.pull<AbcObject>(array, value, value, value);
+        result = _.pull(array);
+        result = _.pull(array, value);
+        result = _.pull(array, value, value);
+        result = _.pull(array, value, value, value);
     }
 
     {
         let result: _.List<AbcObject>;
 
-        result = _.pull<AbcObject>(list);
-        result = _.pull<AbcObject>(list, value);
-        result = _.pull<AbcObject>(list, value, value);
-        result = _.pull<AbcObject>(list, value, value, value);
+        result = _.pull(list);
+        result = _.pull(list, value);
+        result = _.pull(list, value, value);
+        result = _.pull(list, value, value, value);
     }
 
     {
@@ -1764,10 +1764,10 @@ namespace TestPull {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).pull<AbcObject>();
-        result = _(list).pull<AbcObject>(value);
-        result = _(list).pull<AbcObject>(value, value);
-        result = _(list).pull<AbcObject>(value, value, value);
+        result = _(list).pull();
+        result = _(list).pull(value);
+        result = _(list).pull(value, value);
+        result = _(list).pull(value, value, value);
     }
 
     {
@@ -1782,10 +1782,10 @@ namespace TestPull {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().pull<AbcObject>();
-        result = _(list).chain().pull<AbcObject>(value);
-        result = _(list).chain().pull<AbcObject>(value, value);
-        result = _(list).chain().pull<AbcObject>(value, value, value);
+        result = _(list).chain().pull();
+        result = _(list).chain().pull(value);
+        result = _(list).chain().pull(value, value);
+        result = _(list).chain().pull(value, value, value);
     }
 }
 
@@ -1797,19 +1797,19 @@ namespace TestPullAt {
     {
         let result: AbcObject[];
 
-        result = _.pullAt<AbcObject>(array);
-        result = _.pullAt<AbcObject>(array, 1);
-        result = _.pullAt<AbcObject>(array, [2, 3], 1);
-        result = _.pullAt<AbcObject>(array, 4, [2, 3], 1);
+        result = _.pullAt(array);
+        result = _.pullAt(array, 1);
+        result = _.pullAt(array, [2, 3], 1);
+        result = _.pullAt(array, 4, [2, 3], 1);
     }
 
     {
         let result: ArrayLike<AbcObject>;
 
-        result = _.pullAt<AbcObject>(list);
-        result = _.pullAt<AbcObject>(list, 1);
-        result = _.pullAt<AbcObject>(list, [2, 3], 1);
-        result = _.pullAt<AbcObject>(list, 4, [2, 3], 1);
+        result = _.pullAt(list);
+        result = _.pullAt(list, 1);
+        result = _.pullAt(list, [2, 3], 1);
+        result = _.pullAt(list, 4, [2, 3], 1);
     }
 
     {
@@ -2117,14 +2117,14 @@ namespace TestRemove {
     {
         let result: AbcObject[];
 
-        result = _.remove<AbcObject>(array);
-        result = _.remove<AbcObject>(array, predicateFn);
-        result = _.remove<AbcObject>(array, '');
+        result = _.remove(array);
+        result = _.remove(array, predicateFn);
+        result = _.remove(array, '');
         result = _.remove(array, {a: 42});
 
-        result = _.remove<AbcObject>(list);
-        result = _.remove<AbcObject>(list, predicateFn);
-        result = _.remove<AbcObject>(list, '');
+        result = _.remove(list);
+        result = _.remove(list, predicateFn);
+        result = _.remove(list, '');
         result = _.remove(list, {a: 42});
     }
 
@@ -2136,9 +2136,9 @@ namespace TestRemove {
         result = _(array).remove('');
         result = _(array).remove({a: 42});
 
-        result = _(list).remove<AbcObject>();
-        result = _(list).remove<AbcObject>(predicateFn);
-        result = _(list).remove<AbcObject>('');
+        result = _(list).remove();
+        result = _(list).remove(predicateFn);
+        result = _(list).remove('');
         result = _(list).remove({a: 42});
     }
 
@@ -2150,9 +2150,9 @@ namespace TestRemove {
         result = _(array).chain().remove('');
         result = _(array).chain().remove({a: 42});
 
-        result = _(list).chain().remove<AbcObject>();
-        result = _(list).chain().remove<AbcObject>(predicateFn);
-        result = _(list).chain().remove<AbcObject>('');
+        result = _(list).chain().remove();
+        result = _(list).chain().remove(predicateFn);
+        result = _(list).chain().remove('');
         result = _(list).chain().remove({a: 42});
     }
 }
@@ -2165,22 +2165,22 @@ namespace TestTail {
     {
         let result: AbcObject[];
 
-        result = _.tail<AbcObject>(array);
-        result = _.tail<AbcObject>(list);
+        result = _.tail(array);
+        result = _.tail(list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).tail();
-        result = _(list).tail<AbcObject>();
+        result = _(list).tail();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().tail();
-        result = _(list).chain().tail<AbcObject>();
+        result = _(list).chain().tail();
     }
 }
 
@@ -2191,7 +2191,7 @@ namespace TestSlice {
     {
         let result: AbcObject[];
 
-        result = _.slice<AbcObject>(array);
+        result = _.slice(array);
         result = _.slice(array, 42);
         result = _.slice(array, 42, 42);
     }
@@ -2405,11 +2405,11 @@ namespace TestTake {
     {
         let result: AbcObject[];
 
-        result = _.take<AbcObject>(array);
-        result = _.take<AbcObject>(array, 42);
+        result = _.take(array);
+        result = _.take(array, 42);
 
-        result = _.take<AbcObject>(list);
-        result = _.take<AbcObject>(list, 42);
+        result = _.take(list);
+        result = _.take(list, 42);
     }
 
     {
@@ -2418,8 +2418,8 @@ namespace TestTake {
         result = _(array).take();
         result = _(array).take(42);
 
-        result = _(list).take<AbcObject>();
-        result = _(list).take<AbcObject>(42);
+        result = _(list).take();
+        result = _(list).take(42);
     }
 
     {
@@ -2428,8 +2428,8 @@ namespace TestTake {
         result = _(array).chain().take();
         result = _(array).chain().take(42);
 
-        result = _(list).chain().take<AbcObject>();
-        result = _(list).chain().take<AbcObject>(42);
+        result = _(list).chain().take();
+        result = _(list).chain().take(42);
     }
 }
 
@@ -2441,11 +2441,11 @@ namespace TestTakeRight {
     {
         let result: AbcObject[];
 
-        result = _.takeRight<AbcObject>(array);
-        result = _.takeRight<AbcObject>(array, 42);
+        result = _.takeRight(array);
+        result = _.takeRight(array, 42);
 
-        result = _.takeRight<AbcObject>(list);
-        result = _.takeRight<AbcObject>(list, 42);
+        result = _.takeRight(list);
+        result = _.takeRight(list, 42);
     }
 
     {
@@ -2454,8 +2454,8 @@ namespace TestTakeRight {
         result = _(array).takeRight();
         result = _(array).takeRight(42);
 
-        result = _(list).takeRight<AbcObject>();
-        result = _(list).takeRight<AbcObject>(42);
+        result = _(list).takeRight();
+        result = _(list).takeRight(42);
     }
 
     {
@@ -2464,8 +2464,8 @@ namespace TestTakeRight {
         result = _(array).chain().takeRight();
         result = _(array).chain().takeRight(42);
 
-        result = _(list).chain().takeRight<AbcObject>();
-        result = _(list).chain().takeRight<AbcObject>(42);
+        result = _(list).chain().takeRight();
+        result = _(list).chain().takeRight(42);
     }
 }
 
@@ -2478,14 +2478,14 @@ namespace TestTakeRightWhile {
     {
         let result: AbcObject[];
 
-        result = _.takeRightWhile<AbcObject>(array);
-        result = _.takeRightWhile<AbcObject>(array, predicateFn);
-        result = _.takeRightWhile<AbcObject>(array, '');
+        result = _.takeRightWhile(array);
+        result = _.takeRightWhile(array, predicateFn);
+        result = _.takeRightWhile(array, '');
         result = _.takeRightWhile(array, {a: 42});
 
-        result = _.takeRightWhile<AbcObject>(list);
-        result = _.takeRightWhile<AbcObject>(list, predicateFn);
-        result = _.takeRightWhile<AbcObject>(list, '');
+        result = _.takeRightWhile(list);
+        result = _.takeRightWhile(list, predicateFn);
+        result = _.takeRightWhile(list, '');
         result = _.takeRightWhile(list, {a: 42});
     }
 
@@ -2497,9 +2497,9 @@ namespace TestTakeRightWhile {
         result = _(array).takeRightWhile('');
         result = _(array).takeRightWhile({a: 42});
 
-        result = _(list).takeRightWhile<AbcObject>();
-        result = _(list).takeRightWhile<AbcObject>(predicateFn);
-        result = _(list).takeRightWhile<AbcObject>('');
+        result = _(list).takeRightWhile();
+        result = _(list).takeRightWhile(predicateFn);
+        result = _(list).takeRightWhile('');
         result = _(list).takeRightWhile({a: 42});
     }
 
@@ -2511,9 +2511,9 @@ namespace TestTakeRightWhile {
         result = _(array).chain().takeRightWhile('');
         result = _(array).chain().takeRightWhile({a: 42});
 
-        result = _(list).chain().takeRightWhile<AbcObject>();
-        result = _(list).chain().takeRightWhile<AbcObject>(predicateFn);
-        result = _(list).chain().takeRightWhile<AbcObject>('');
+        result = _(list).chain().takeRightWhile();
+        result = _(list).chain().takeRightWhile(predicateFn);
+        result = _(list).chain().takeRightWhile('');
         result = _(list).chain().takeRightWhile({a: 42});
     }
 }
@@ -2527,14 +2527,14 @@ namespace TestTakeWhile {
     {
         let result: AbcObject[];
 
-        result = _.takeWhile<AbcObject>(array);
-        result = _.takeWhile<AbcObject>(array, predicateFn);
-        result = _.takeWhile<AbcObject>(array, '');
+        result = _.takeWhile(array);
+        result = _.takeWhile(array, predicateFn);
+        result = _.takeWhile(array, '');
         result = _.takeWhile(array, {a: 42});
 
-        result = _.takeWhile<AbcObject>(list);
-        result = _.takeWhile<AbcObject>(list, predicateFn);
-        result = _.takeWhile<AbcObject>(list, '');
+        result = _.takeWhile(list);
+        result = _.takeWhile(list, predicateFn);
+        result = _.takeWhile(list, '');
         result = _.takeWhile(list, {a: 42});
     }
 
@@ -2546,9 +2546,9 @@ namespace TestTakeWhile {
         result = _(array).takeWhile('');
         result = _(array).takeWhile({a: 42});
 
-        result = _(list).takeWhile<AbcObject>();
-        result = _(list).takeWhile<AbcObject>(predicateFn);
-        result = _(list).takeWhile<AbcObject>('');
+        result = _(list).takeWhile();
+        result = _(list).takeWhile(predicateFn);
+        result = _(list).takeWhile('');
         result = _(list).takeWhile({a: 42});
     }
 
@@ -2560,9 +2560,9 @@ namespace TestTakeWhile {
         result = _(array).chain().takeWhile('');
         result = _(array).chain().takeWhile({a: 42});
 
-        result = _(list).chain().takeWhile<AbcObject>();
-        result = _(list).chain().takeWhile<AbcObject>(predicateFn);
-        result = _(list).chain().takeWhile<AbcObject>('');
+        result = _(list).chain().takeWhile();
+        result = _(list).chain().takeWhile(predicateFn);
+        result = _(list).chain().takeWhile('');
         result = _(list).chain().takeWhile({a: 42});
     }
 }
@@ -2575,15 +2575,16 @@ namespace TestUnion {
     {
         let result: AbcObject[];
 
-        result = _.union<AbcObject>();
+        // $ExpectType {}[]
+        _.union();
 
-        result = _.union<AbcObject>(array);
-        result = _.union<AbcObject>(array, list);
-        result = _.union<AbcObject>(array, list, array);
+        result = _.union(array);
+        result = _.union(array, list);
+        result = _.union(array, list, array);
 
-        result = _.union<AbcObject>(list);
-        result = _.union<AbcObject>(list, array);
-        result = _.union<AbcObject>(list, array, list);
+        result = _.union(list);
+        result = _.union(list, array);
+        result = _.union(list, array, list);
     }
 
     {
@@ -2593,13 +2594,13 @@ namespace TestUnion {
         result = _(array).union(list);
         result = _(array).union(list, array);
 
-        result = _(array).union<AbcObject>();
-        result = _(array).union<AbcObject>(list);
-        result = _(array).union<AbcObject>(list, array);
+        result = _(array).union();
+        result = _(array).union(list);
+        result = _(array).union(list, array);
 
-        result = _(list).union<AbcObject>();
-        result = _(list).union<AbcObject>(array);
-        result = _(list).union<AbcObject>(array, list);
+        result = _(list).union();
+        result = _(list).union(array);
+        result = _(list).union(array, list);
     }
 
     {
@@ -2609,13 +2610,13 @@ namespace TestUnion {
         result = _(array).chain().union(list);
         result = _(array).chain().union(list, array);
 
-        result = _(array).chain().union<AbcObject>();
-        result = _(array).chain().union<AbcObject>(list);
-        result = _(array).chain().union<AbcObject>(list, array);
+        result = _(array).chain().union();
+        result = _(array).chain().union(list);
+        result = _(array).chain().union(list, array);
 
-        result = _(list).chain().union<AbcObject>();
-        result = _(list).chain().union<AbcObject>(array);
-        result = _(list).chain().union<AbcObject>(array, list);
+        result = _(list).chain().union();
+        result = _(list).chain().union(array);
+        result = _(list).chain().union(array, list);
     }
 }
 
@@ -2628,20 +2629,21 @@ namespace TestUnionBy {
     {
         let result: AbcObject[];
 
-        result = _.unionBy<AbcObject>(array, array);
-        result = _.unionBy<AbcObject>(array, list, array);
-        result = _.unionBy<AbcObject>(array, array, list, array);
-        result = _.unionBy<AbcObject>(array, list, array, list, array);
-        result = _.unionBy<AbcObject>(array, array, list, array, list, array);
+        result = _.unionBy(array, array);
+        result = _.unionBy(array, list, array);
+        result = _.unionBy(array, array, list, array);
+        result = _.unionBy(array, list, array, list, array);
+        result = _.unionBy(array, array, list, array, list, array);
 
-        result = _.unionBy<AbcObject>(array, array, iteratee);
-        result = _.unionBy<AbcObject>(array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, list, array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, array, list, array, list, array, iteratee);
+        result = _.unionBy(array, array, iteratee);
+        result = _.unionBy(array, list, array, iteratee);
+        result = _.unionBy(array, array, list, array, iteratee);
+        result = _.unionBy(array, list, array, list, array, iteratee);
+        result = _.unionBy(array, array, list, array, list, array, iteratee);
 
-        result = _.unionBy<AbcObject>(array, array, 'a');
-        result = _.unionBy<AbcObject>(array, list, array, 'a');
+        result = _.unionBy(array, array, 'a');
+        result = _.unionBy(array, list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _.unionBy<AbcObject>(array, array, list, array, 'a');
         result = _.unionBy<AbcObject>(array, list, array, list, array, 'a');
         result = _.unionBy<AbcObject>(array, array, list, array, list, array, 'a');
@@ -2650,22 +2652,23 @@ namespace TestUnionBy {
         result = _.unionBy(array, list, array, {a: 1});
         result = _.unionBy(array, array, list, array, {a: 1});
         result = _.unionBy(array, list, array, list, array, {a: 1});
-        result = _.unionBy<AbcObject>(array, list, array, list, array, list, {a: 1});
+        result = _.unionBy(array, list, array, list, array, list, {a: 1});
 
-        result = _.unionBy<AbcObject>(list, list);
-        result = _.unionBy<AbcObject>(list, array, list);
-        result = _.unionBy<AbcObject>(list, list, array, list);
-        result = _.unionBy<AbcObject>(list, array, list, array, list);
-        result = _.unionBy<AbcObject>(list, list, array, list, array, list);
+        result = _.unionBy(list, list);
+        result = _.unionBy(list, array, list);
+        result = _.unionBy(list, list, array, list);
+        result = _.unionBy(list, array, list, array, list);
+        result = _.unionBy(list, list, array, list, array, list);
 
-        result = _.unionBy<AbcObject>(list, list, iteratee);
-        result = _.unionBy<AbcObject>(list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, array, list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, list, array, list, array, list, iteratee);
+        result = _.unionBy(list, list, iteratee);
+        result = _.unionBy(list, array, list, iteratee);
+        result = _.unionBy(list, list, array, list, iteratee);
+        result = _.unionBy(list, array, list, array, list, iteratee);
+        result = _.unionBy(list, list, array, list, array, list, iteratee);
 
-        result = _.unionBy<AbcObject>(list, list, 'a');
-        result = _.unionBy<AbcObject>(list, array, list, 'a');
+        result = _.unionBy(list, list, 'a');
+        result = _.unionBy(list, array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _.unionBy<AbcObject>(list, list, array, list, 'a');
         result = _.unionBy<AbcObject>(list, array, list, array, list, 'a');
         result = _.unionBy<AbcObject>(list, list, array, list, array, list, 'a');
@@ -2674,26 +2677,27 @@ namespace TestUnionBy {
         result = _.unionBy(list, array, list, {a: 1});
         result = _.unionBy(list, list, array, list, {a: 1});
         result = _.unionBy(list, array, list, array, list, {a: 1});
-        result = _.unionBy<AbcObject>(list, array, list, array, list, array, {a: 1});
+        result = _.unionBy(list, array, list, array, list, array, {a: 1});
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(array).unionBy<AbcObject>(array);
-        result = _(array).unionBy<AbcObject>(list, array);
-        result = _(array).unionBy<AbcObject>(array, list, array);
-        result = _(array).unionBy<AbcObject>(list, array, list, array);
-        result = _(array).unionBy<AbcObject>(array, list, array, list, array);
+        result = _(array).unionBy(array);
+        result = _(array).unionBy(list, array);
+        result = _(array).unionBy(array, list, array);
+        result = _(array).unionBy(list, array, list, array);
+        result = _(array).unionBy(array, list, array, list, array);
 
-        result = _(array).unionBy<AbcObject>(array, iteratee);
-        result = _(array).unionBy<AbcObject>(list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(array, list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(list, array, list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(array, list, array, list, array, iteratee);
+        result = _(array).unionBy(array, iteratee);
+        result = _(array).unionBy(list, array, iteratee);
+        result = _(array).unionBy(array, list, array, iteratee);
+        result = _(array).unionBy(list, array, list, array, iteratee);
+        result = _(array).unionBy(array, list, array, list, array, iteratee);
 
-        result = _(array).unionBy<AbcObject>(array, 'a');
-        result = _(array).unionBy<AbcObject>(list, array, 'a');
+        result = _(array).unionBy(array, 'a');
+        result = _(array).unionBy(list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(array).unionBy<AbcObject>(array, list, array, 'a');
         result = _(array).unionBy<AbcObject>(list, array, list, array, 'a');
         result = _(array).unionBy<AbcObject>(array, list, array, list, array, 'a');
@@ -2702,22 +2706,23 @@ namespace TestUnionBy {
         result = _(array).unionBy(list, array, {a: 1});
         result = _(array).unionBy(array, list, array, {a: 1});
         result = _(array).unionBy(list, array, list, array, {a: 1});
-        result = _(array).unionBy<AbcObject>(list, array, list, array, list, {a: 1});
+        result = _(array).unionBy(list, array, list, array, list, {a: 1});
 
-        result = _(list).unionBy<AbcObject>(list);
-        result = _(list).unionBy<AbcObject>(array, list);
-        result = _(list).unionBy<AbcObject>(list, array, list);
-        result = _(list).unionBy<AbcObject>(array, list, array, list);
-        result = _(list).unionBy<AbcObject>(list, array, list, array, list);
+        result = _(list).unionBy(list);
+        result = _(list).unionBy(array, list);
+        result = _(list).unionBy(list, array, list);
+        result = _(list).unionBy(array, list, array, list);
+        result = _(list).unionBy(list, array, list, array, list);
 
-        result = _(list).unionBy<AbcObject>(list, iteratee);
-        result = _(list).unionBy<AbcObject>(array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(list, array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(array, list, array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(list, array, list, array, list, iteratee);
+        result = _(list).unionBy(list, iteratee);
+        result = _(list).unionBy(array, list, iteratee);
+        result = _(list).unionBy(list, array, list, iteratee);
+        result = _(list).unionBy(array, list, array, list, iteratee);
+        result = _(list).unionBy(list, array, list, array, list, iteratee);
 
-        result = _(list).unionBy<AbcObject>(list, 'a');
-        result = _(list).unionBy<AbcObject>(array, list, 'a');
+        result = _(list).unionBy(list, 'a');
+        result = _(list).unionBy(array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(list).unionBy<AbcObject>(list, array, list, 'a');
         result = _(list).unionBy<AbcObject>(array, list, array, list, 'a');
         result = _(list).unionBy<AbcObject>(list, array, list, array, list, 'a');
@@ -2726,27 +2731,28 @@ namespace TestUnionBy {
         result = _(list).unionBy(array, list, {a: 1});
         result = _(list).unionBy(list, array, list, {a: 1});
         result = _(list).unionBy(array, list, array, list, {a: 1});
-        result = _(list).unionBy<AbcObject>(array, list, array, list, array, {a: 1});
+        result = _(list).unionBy(array, list, array, list, array, {a: 1});
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(array).chain().unionBy<AbcObject>(array);
-        result = _(array).chain().unionBy<AbcObject>(list, array);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array);
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array);
+        result = _(array).chain().unionBy(array);
+        result = _(array).chain().unionBy(list, array);
+        result = _(array).chain().unionBy(array, list, array);
+        result = _(array).chain().unionBy(list, array, list, array);
+        result = _(array).chain().unionBy(array, list, array, list, array);
 
-        result = _(array).chain().unionBy<AbcObject>(array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array, iteratee);
+        result = _(array).chain().unionBy(array, iteratee);
+        result = _(array).chain().unionBy(list, array, iteratee);
+        result = _(array).chain().unionBy(array, list, array, iteratee);
+        result = _(array).chain().unionBy(list, array, list, array, iteratee);
+        result = _(array).chain().unionBy(array, list, array, list, array, iteratee);
 
-        result = _(array).chain().unionBy<AbcObject>(array, 'a');
-        result = _(array).chain().unionBy<AbcObject>(list, array, 'a');
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, 'a');
+        result = _(array).chain().unionBy(array, 'a');
+        result = _(array).chain().unionBy(list, array, 'a');
+        result = _(array).chain().unionBy(array, list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(array).chain().unionBy<AbcObject>(list, array, list, array, 'a');
         result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array, 'a');
 
@@ -2754,23 +2760,24 @@ namespace TestUnionBy {
         result = _(array).chain().unionBy(list, array, {a: 1});
         result = _(array).chain().unionBy(array, list, array, {a: 1});
         result = _(array).chain().unionBy(list, array, list, array, {a: 1});
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array, list, {a: 1});
+        result = _(array).chain().unionBy(list, array, list, array, list, {a: 1});
 
-        result = _(list).chain().unionBy<AbcObject>(list);
-        result = _(list).chain().unionBy<AbcObject>(array, list);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list);
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list);
+        result = _(list).chain().unionBy(list);
+        result = _(list).chain().unionBy(array, list);
+        result = _(list).chain().unionBy(list, array, list);
+        result = _(list).chain().unionBy(array, list, array, list);
+        result = _(list).chain().unionBy(list, array, list, array, list);
 
-        result = _(list).chain().unionBy<AbcObject>(list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list, iteratee);
+        result = _(list).chain().unionBy(list, iteratee);
+        result = _(list).chain().unionBy(array, list, iteratee);
+        result = _(list).chain().unionBy(list, array, list, iteratee);
+        result = _(list).chain().unionBy(array, list, array, list, iteratee);
+        result = _(list).chain().unionBy(list, array, list, array, list, iteratee);
 
-        result = _(list).chain().unionBy<AbcObject>(list, 'a');
-        result = _(list).chain().unionBy<AbcObject>(array, list, 'a');
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, 'a');
+        result = _(list).chain().unionBy(list, 'a');
+        result = _(list).chain().unionBy(array, list, 'a');
+        result = _(list).chain().unionBy(list, array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(list).chain().unionBy<AbcObject>(array, list, array, list, 'a');
         result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list, 'a');
 
@@ -2778,7 +2785,7 @@ namespace TestUnionBy {
         result = _(list).chain().unionBy(array, list, {a: 1});
         result = _(list).chain().unionBy(list, array, list, {a: 1});
         result = _(list).chain().unionBy(array, list, array, list, {a: 1});
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list, array, {a: 1});
+        result = _(list).chain().unionBy(array, list, array, list, array, {a: 1});
     }
 }
 
@@ -3155,15 +3162,16 @@ namespace TestXor {
     {
         let result: AbcObject[];
 
-        result = _.xor<AbcObject>();
+        // $ExpectType {}[]
+        _.xor();
 
-        result = _.xor<AbcObject>(array);
-        result = _.xor<AbcObject>(array, list);
-        result = _.xor<AbcObject>(array, list, array);
+        result = _.xor(array);
+        result = _.xor(array, list);
+        result = _.xor(array, list, array);
 
-        result = _.xor<AbcObject>(list);
-        result = _.xor<AbcObject>(list, array);
-        result = _.xor<AbcObject>(list, array, list);
+        result = _.xor(list);
+        result = _.xor(list, array);
+        result = _.xor(list, array, list);
     }
 
     {
@@ -3173,9 +3181,9 @@ namespace TestXor {
         result = _(array).xor(list);
         result = _(array).xor(list, array);
 
-        result = _(list).xor<AbcObject>();
-        result = _(list).xor<AbcObject>(array);
-        result = _(list).xor<AbcObject>(array, list);
+        result = _(list).xor();
+        result = _(list).xor(array);
+        result = _(list).xor(array, list);
     }
 
     {
@@ -3185,9 +3193,9 @@ namespace TestXor {
         result = _(array).chain().xor(list);
         result = _(array).chain().xor(list, array);
 
-        result = _(list).chain().xor<AbcObject>();
-        result = _(list).chain().xor<AbcObject>(array);
-        result = _(list).chain().xor<AbcObject>(array, list);
+        result = _(list).chain().xor();
+        result = _(list).chain().xor(array);
+        result = _(list).chain().xor(array, list);
     }
 }
 
@@ -3198,18 +3206,18 @@ namespace TestXor {
 
     {
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array);
+        _.zip(array);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array, list);
+        _.zip(array, list);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array, list, array);
+        _.zip(array, list, array);
 
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list);
+        _.zip(list);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list, array);
+        _.zip(list, array);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list, array, list);
+        _.zip(list, array, list);
 
         // $ExpectType (AbcObject | undefined)[][]
         _.zip(list, array, list, array, list, array);
@@ -3217,26 +3225,26 @@ namespace TestXor {
 
     {
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).zip<AbcObject>(list);
+        _(array).zip(list);
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).zip<AbcObject>(list, array);
+        _(array).zip(list, array);
 
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).zip<AbcObject>(array);
+        _(list).zip(array);
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).zip<AbcObject>(array, list);
+        _(list).zip(array, list);
     }
 
     {
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).chain().zip<AbcObject>(list);
+        _(array).chain().zip(list);
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).chain().zip<AbcObject>(list, array);
+        _(array).chain().zip(list, array);
 
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).chain().zip<AbcObject>(array);
+        _(list).chain().zip(array);
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).chain().zip<AbcObject>(array, list);
+        _(list).chain().zip(array, list);
     }
 
     {
@@ -4062,29 +4070,52 @@ namespace TestAt {
     let array: AbcObject[] | null | undefined = [] as any;
     let list: _.List<AbcObject> | null | undefined = [] as any;
     let dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    let abcObject: AbcObject | null | undefined = anything;
 
     {
         let result: AbcObject[];
 
-        result = _.at<AbcObject>(array, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at<AbcObject>(list, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at<AbcObject>(dictionary, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(array, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(list, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(dictionary, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(numericDictionary, 0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: Array<AbcObject[keyof AbcObject]>;
+
+        result = _.at(abcObject, 'a', ['b'], ['a', 'b']);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).at(0, '1', [2], ['3'], [4, '5']);
-        result = _(list).at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
-        result = _(dictionary).at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
+        result = _(list).at(0, '1', [2], ['3'], [4, '5']);
+        result = _(dictionary).at(0, '1', [2], ['3'], [4, '5']);
+        result = _(numericDictionary).at(0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<AbcObject[keyof AbcObject]>;
+
+        result = _(abcObject).at('a', ['b'], ['a', 'b']);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().at(0, '1', [2], ['3'], [4, '5']);
-        result = _(list).chain().at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
-        result = _(dictionary).chain().at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
+        result = _(list).chain().at(0, '1', [2], ['3'], [4, '5']);
+        result = _(dictionary).chain().at(0, '1', [2], ['3'], [4, '5']);
+        result = _(numericDictionary).chain().at(0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<AbcObject[keyof AbcObject]>;
+
+        result = _(abcObject).chain().at('a', ['b'], ['a', 'b']);
     }
 }
 
@@ -4099,37 +4130,34 @@ namespace TestCountBy {
     let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
     let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
     let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 1;
-    let numericDictionaryIterator: (value: AbcObject, key: number, collection: _.NumericDictionary<AbcObject>) => any = (value: AbcObject, key: number, collection: _.NumericDictionary<AbcObject>) => 1;
+    let numericDictionaryIterator: (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => 1;
 
     {
         let result: _.Dictionary<number>;
 
-        result = _.countBy<string>('');
-        result = _.countBy<string>('', stringIterator);
+        result = _.countBy('');
+        result = _.countBy('', stringIterator);
 
-        result = _.countBy<AbcObject>(array);
-        result = _.countBy<AbcObject>(array, listIterator);
-        result = _.countBy<AbcObject>(array, '');
+        result = _.countBy(array);
+        result = _.countBy(array, listIterator);
+        result = _.countBy(array, '');
+        result = _.countBy(array, {a: 42});
         result = _.countBy(array, {a: 42});
-        result = _.countBy<AbcObject>(array, {a: 42});
 
-        result = _.countBy<AbcObject>(list);
-        result = _.countBy<AbcObject>(list, listIterator);
-        result = _.countBy<AbcObject>(list, '');
+        result = _.countBy(list);
+        result = _.countBy(list, listIterator);
+        result = _.countBy(list, '');
         result = _.countBy(list, {a: 42});
-        result = _.countBy<AbcObject>(list, {a: 42});
 
-        result = _.countBy<AbcObject>(dictionary);
+        result = _.countBy(dictionary);
         result = _.countBy(dictionary, dictionaryIterator);
-        result = _.countBy<AbcObject>(dictionary, '');
+        result = _.countBy(dictionary, '');
         result = _.countBy(dictionary, {a: 42});
-        result = _.countBy<AbcObject>(dictionary, {a: 42});
 
-        result = _.countBy<AbcObject>(numericDictionary);
-        result = _.countBy<AbcObject>(numericDictionary, numericDictionaryIterator);
-        result = _.countBy<AbcObject>(numericDictionary, '');
+        result = _.countBy(numericDictionary);
+        result = _.countBy(numericDictionary, numericDictionaryIterator);
+        result = _.countBy(numericDictionary, '');
         result = _.countBy(numericDictionary, {a: 42});
-        result = _.countBy<AbcObject>(numericDictionary, {a: 42});
     }
 
     {
@@ -4145,7 +4173,7 @@ namespace TestCountBy {
         result = _(array).countBy({a: 42});
 
         result = _(list).countBy();
-        result = _(list).countBy<AbcObject>(listIterator);
+        result = _(list).countBy(listIterator);
         result = _(list).countBy('');
         result = _(list).countBy<{a: number}>({a: 42});
         result = _(list).countBy({a: 42});
@@ -4153,13 +4181,11 @@ namespace TestCountBy {
         result = _(dictionary).countBy();
         result = _(dictionary).countBy(dictionaryIterator);
         result = _(dictionary).countBy('');
-        result = _(dictionary).countBy<{a: number}>({a: 42});
         result = _(dictionary).countBy({a: 42});
 
         result = _(numericDictionary).countBy();
-        result = _(numericDictionary).countBy<AbcObject>(numericDictionaryIterator);
+        result = _(numericDictionary).countBy(numericDictionaryIterator);
         result = _(numericDictionary).countBy('');
-        result = _(numericDictionary).countBy<{a: number}>({a: 42});
         result = _(numericDictionary).countBy({a: 42});
     }
 
@@ -4172,25 +4198,21 @@ namespace TestCountBy {
         result = _(array).chain().countBy();
         result = _(array).chain().countBy(listIterator);
         result = _(array).chain().countBy('');
-        result = _(array).chain().countBy<{a: number}>({a: 42});
         result = _(array).chain().countBy({a: 42});
 
         result = _(list).chain().countBy();
-        result = _(list).chain().countBy<AbcObject>(listIterator);
+        result = _(list).chain().countBy(listIterator);
         result = _(list).chain().countBy('');
-        result = _(list).chain().countBy<{a: number}>({a: 42});
         result = _(list).chain().countBy({a: 42});
 
         result = _(dictionary).chain().countBy();
         result = _(dictionary).chain().countBy(dictionaryIterator);
         result = _(dictionary).chain().countBy('');
-        result = _(dictionary).chain().countBy<{a: number}>({a: 42});
         result = _(dictionary).chain().countBy({a: 42});
 
         result = _(numericDictionary).chain().countBy();
-        result = _(numericDictionary).chain().countBy<AbcObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().countBy(numericDictionaryIterator);
         result = _(numericDictionary).chain().countBy('');
-        result = _(numericDictionary).chain().countBy<{a: number}>({a: 42});
         result = _(numericDictionary).chain().countBy({a: 42});
     }
 }
@@ -4271,7 +4293,7 @@ namespace TestEach {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).each<AbcObject>(listIterator);
+        result = _(list).each(listIterator);
     }
 
     {
@@ -4295,7 +4317,7 @@ namespace TestEach {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().each<AbcObject>(listIterator);
+        result = _(list).chain().each(listIterator);
     }
 
     {
@@ -4381,7 +4403,7 @@ namespace TestEachRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).eachRight<AbcObject>(listIterator);
+        result = _(list).eachRight(listIterator);
     }
 
     {
@@ -4405,7 +4427,7 @@ namespace TestEachRight {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().eachRight<AbcObject>(listIterator);
+        result = _(list).chain().eachRight(listIterator);
     }
 
     {
@@ -4427,34 +4449,34 @@ namespace TestEvery {
 
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => true;
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => true;
 
     {
         let result: boolean;
 
-        result = _.every<SampleObject>(array);
-        result = _.every<SampleObject>(array, listIterator);
-        result = _.every<SampleObject>(array, 'a');
-        result = _.every<SampleObject>(array, ['a', 42]);
-        result = _.every<SampleObject>(array, {a: 42});
+        result = _.every(array);
+        result = _.every(array, listIterator);
+        result = _.every(array, 'a');
+        result = _.every(array, ['a', 42]);
+        result = _.every(array, {a: 42});
 
-        result = _.every<SampleObject>(list);
-        result = _.every<SampleObject>(list, listIterator);
-        result = _.every<SampleObject>(list, 'a');
-        result = _.every<SampleObject>(list, ['a', 42]);
-        result = _.every<SampleObject>(list, {a: 42});
+        result = _.every(list);
+        result = _.every(list, listIterator);
+        result = _.every(list, 'a');
+        result = _.every(list, ['a', 42]);
+        result = _.every(list, {a: 42});
 
-        result = _.every<SampleObject>(dictionary);
+        result = _.every(dictionary);
         result = _.every(dictionary, dictionaryIterator);
-        result = _.every<SampleObject>(dictionary, 'a');
-        result = _.every<SampleObject>(dictionary, ['a', 42]);
-        result = _.every<SampleObject>(dictionary, {a: 42});
+        result = _.every(dictionary, 'a');
+        result = _.every(dictionary, ['a', 42]);
+        result = _.every(dictionary, {a: 42});
 
-        result = _.every<SampleObject>(numericDictionary);
-        result = _.every<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.every<SampleObject>(numericDictionary, 'a');
-        result = _.every<SampleObject>(numericDictionary, ['a', 42]);
-        result = _.every<SampleObject>(numericDictionary, {a: 42});
+        result = _.every(numericDictionary);
+        result = _.every(numericDictionary, numericDictionaryIterator);
+        result = _.every(numericDictionary, 'a');
+        result = _.every(numericDictionary, ['a', 42]);
+        result = _.every(numericDictionary, {a: 42});
 
         result = _(array).every();
         result = _(array).every(listIterator);
@@ -4462,20 +4484,20 @@ namespace TestEvery {
         result = _(array).every(['a', 42]);
         result = _(array).every({a: 42});
 
-        result = _(list).every<SampleObject>();
-        result = _(list).every<SampleObject>(listIterator);
+        result = _(list).every();
+        result = _(list).every(listIterator);
         result = _(list).every('a');
         result = _(list).every(['a', 42]);
         result = _(list).every({a: 42});
 
-        result = _(dictionary).every<SampleObject>();
+        result = _(dictionary).every();
         result = _(dictionary).every(dictionaryIterator);
         result = _(dictionary).every('a');
         result = _(dictionary).every(['a', 42]);
         result = _(dictionary).every({a: 42});
 
-        result = _(numericDictionary).every<SampleObject>();
-        result = _(numericDictionary).every<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).every();
+        result = _(numericDictionary).every(numericDictionaryIterator);
         result = _(numericDictionary).every('a');
         result = _(numericDictionary).every(['a', 42]);
         result = _(numericDictionary).every({a: 42});
@@ -4490,23 +4512,23 @@ namespace TestEvery {
         result = _(array).chain().every(['a', 42]);
         result = _(array).chain().every({a: 42});
 
-        result = _(list).chain().every<SampleObject>();
-        result = _(list).chain().every<SampleObject>(listIterator);
+        result = _(list).chain().every();
+        result = _(list).chain().every(listIterator);
         result = _(list).chain().every('a');
         result = _(list).chain().every(['a', 42]);
-        result = _(list).chain().every<SampleObject>({a: 42});
+        result = _(list).chain().every({a: 42});
 
-        result = _(dictionary).chain().every<SampleObject>();
+        result = _(dictionary).chain().every();
         result = _(dictionary).chain().every(dictionaryIterator);
         result = _(dictionary).chain().every('a');
         result = _(dictionary).chain().every(['a', 42]);
-        result = _(dictionary).chain().every<SampleObject>({a: 42});
+        result = _(dictionary).chain().every({a: 42});
 
-        result = _(numericDictionary).chain().every<SampleObject>();
-        result = _(numericDictionary).chain().every<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().every();
+        result = _(numericDictionary).chain().every(numericDictionaryIterator);
         result = _(numericDictionary).chain().every('a');
         result = _(numericDictionary).chain().every(['a', 42]);
-        result = _(numericDictionary).chain().every<{a: number}>({a: 42});
+        result = _(numericDictionary).chain().every({a: 42});
     }
 }
 
@@ -4530,15 +4552,15 @@ namespace TestFilter {
     {
         let result: AbcObject[];
 
-        result = _.filter<AbcObject>(array, listIterator);
-        result = _.filter<AbcObject>(array, '');
-        result = _.filter<AbcObject>(array, {a: 42});
-        result = _.filter<AbcObject>(array, ["a", 42]);
+        result = _.filter(array, listIterator);
+        result = _.filter(array, '');
+        result = _.filter(array, {a: 42});
+        result = _.filter(array, ["a", 42]);
 
-        result = _.filter<AbcObject>(list, listIterator);
-        result = _.filter<AbcObject>(list, '');
-        result = _.filter<AbcObject>(list, {a: 42});
-        result = _.filter<AbcObject>(list, ["a", 42]);
+        result = _.filter(list, listIterator);
+        result = _.filter(list, '');
+        result = _.filter(list, {a: 42});
+        result = _.filter(list, ["a", 42]);
 
         result = _.filter(dictionary, dictionaryIterator);
         result = _.filter(dictionary, '');
@@ -4560,10 +4582,10 @@ namespace TestFilter {
         result = _(array).filter({a: 42});
         result = _(array).filter(["a", 42]);
 
-        result = _(list).filter<AbcObject>(listIterator);
-        result = _(list).filter<AbcObject>('');
-        result = _(list).filter<AbcObject>({a: 42});
-        result = _(list).filter<AbcObject>(["a", 42]);
+        result = _(list).filter(listIterator);
+        result = _(list).filter('');
+        result = _(list).filter({a: 42});
+        result = _(list).filter(["a", 42]);
 
         result = _(dictionary).filter(dictionaryIterator);
         result = _(dictionary).filter('');
@@ -4585,10 +4607,10 @@ namespace TestFilter {
         result = _(array).chain().filter({a: 42});
         result = _(array).chain().filter(["a", 42]);
 
-        result = _(list).chain().filter<AbcObject>(listIterator);
-        result = _(list).chain().filter<AbcObject>('');
-        result = _(list).chain().filter<AbcObject>({a: 42});
-        result = _(list).chain().filter<AbcObject>(["a", 42]);
+        result = _(list).chain().filter(listIterator);
+        result = _(list).chain().filter('');
+        result = _(list).chain().filter({a: 42});
+        result = _(list).chain().filter(["a", 42]);
 
         result = _(dictionary).chain().filter(dictionaryIterator);
         result = _(dictionary).chain().filter('');
@@ -4623,28 +4645,25 @@ namespace TestFind {
     let result: AbcObject | undefined;
 
     result = _.find(array);
-    result = _.find<AbcObject>(array);
-    result = _.find<AbcObject>(array, listIterator);
-    result = _.find<AbcObject>(array, listIterator, 1);
-    result = _.find<AbcObject>(array, '');
-    result = _.find<AbcObject>(array, '', 1);
-    result = _.find<AbcObject>(array, {a: 42});
-    result = _.find<AbcObject>(array, {a: 42}, 1);
+    result = _.find(array, listIterator);
+    result = _.find(array, listIterator, 1);
+    result = _.find(array, '');
+    result = _.find(array, '', 1);
+    result = _.find(array, {a: 42});
+    result = _.find(array, {a: 42}, 1);
     result = _.find(array, ['a', 5]);
     result = _.find(array, ['a', 5], 1);
 
     result = _.find(list);
-    result = _.find<AbcObject>(list);
-    result = _.find<AbcObject>(list, listIterator);
-    result = _.find<AbcObject>(list, listIterator, 1);
-    result = _.find<AbcObject>(list, '');
-    result = _.find<AbcObject>(list, '', 1);
-    result = _.find<AbcObject>(list, {a: 42});
-    result = _.find<AbcObject>(list, {a: 42}, 1);
+    result = _.find(list, listIterator);
+    result = _.find(list, listIterator, 1);
+    result = _.find(list, '');
+    result = _.find(list, '', 1);
+    result = _.find(list, {a: 42});
+    result = _.find(list, {a: 42}, 1);
     result = _.find(list, ['a', 5]);
     result = _.find(list, ['a', 5], 1);
 
-    result = _.find(dictionary);
     result = _.find(dictionary);
     result = _.find(dictionary, dictionaryIterator);
     result = _.find(dictionary, dictionaryIterator, 1);
@@ -4665,15 +4684,15 @@ namespace TestFind {
     result = _(array).find(['a', 5]);
     result = _(array).find(['a', 5], 1);
 
-    result = _(list).find<AbcObject>();
-    result = _(list).find<AbcObject>(listIterator);
-    result = _(list).find<AbcObject>(listIterator, 1);
-    result = _(list).find<AbcObject>('');
-    result = _(list).find<AbcObject>('', 1);
-    result = _(list).find<AbcObject>({a: 42});
-    result = _(list).find<AbcObject>({a: 42}, 1);
-    result = _(list).find<AbcObject>(['a', 5]);
-    result = _(list).find<AbcObject>(['a', 5], 1);
+    result = _(list).find();
+    result = _(list).find(listIterator);
+    result = _(list).find(listIterator, 1);
+    result = _(list).find('');
+    result = _(list).find('', 1);
+    result = _(list).find({a: 42});
+    result = _(list).find({a: 42}, 1);
+    result = _(list).find(['a', 5]);
+    result = _(list).find(['a', 5], 1);
 
     result = _(dictionary).find();
     result = _(dictionary).find(dictionaryIterator);
@@ -4702,24 +4721,23 @@ namespace TestFindLast {
     let result: AbcObject | undefined;
 
     result = _.findLast(array);
-    result = _.findLast<AbcObject>(array);
-    result = _.findLast<AbcObject>(array, listIterator);
-    result = _.findLast<AbcObject>(array, listIterator, 1);
-    result = _.findLast<AbcObject>(array, '');
-    result = _.findLast<AbcObject>(array, '', 1);
-    result = _.findLast<AbcObject>(array, {a: 42});
-    result = _.findLast<AbcObject>(array, {a: 42}, 1);
+    result = _.findLast(array, listIterator);
+    result = _.findLast(array, listIterator, 1);
+    result = _.findLast(array, '');
+    result = _.findLast(array, '', 1);
+    result = _.findLast(array, {a: 42});
+    result = _.findLast(array, {a: 42}, 1);
     result = _.findLast(array, ['a', 5]);
     result = _.findLast(array, ['a', 5], 1);
 
     result = _.findLast(list);
-    result = _.findLast<AbcObject>(list);
-    result = _.findLast<AbcObject>(list, listIterator);
-    result = _.findLast<AbcObject>(list, listIterator, 1);
-    result = _.findLast<AbcObject>(list, '');
-    result = _.findLast<AbcObject>(list, '', 1);
-    result = _.findLast<AbcObject>(list, {a: 42});
-    result = _.findLast<AbcObject>(list, {a: 42}, 1);
+    result = _.findLast(list);
+    result = _.findLast(list, listIterator);
+    result = _.findLast(list, listIterator, 1);
+    result = _.findLast(list, '');
+    result = _.findLast(list, '', 1);
+    result = _.findLast(list, {a: 42});
+    result = _.findLast(list, {a: 42}, 1);
     result = _.findLast(list, ['a', 5]);
     result = _.findLast(list, ['a', 5], 1);
 
@@ -4744,15 +4762,15 @@ namespace TestFindLast {
     result = _(array).findLast(['a', 5]);
     result = _(array).findLast(['a', 5], 1);
 
-    result = _(list).findLast<AbcObject>();
-    result = _(list).findLast<AbcObject>(listIterator);
-    result = _(list).findLast<AbcObject>(listIterator, 1);
-    result = _(list).findLast<AbcObject>('');
-    result = _(list).findLast<AbcObject>('', 1);
-    result = _(list).findLast<AbcObject>({a: 42});
-    result = _(list).findLast<AbcObject>({a: 42}, 1);
-    result = _(list).findLast<AbcObject>(['a', 5]);
-    result = _(list).findLast<AbcObject>(['a', 5], 1);
+    result = _(list).findLast();
+    result = _(list).findLast(listIterator);
+    result = _(list).findLast(listIterator, 1);
+    result = _(list).findLast('');
+    result = _(list).findLast('', 1);
+    result = _(list).findLast({a: 42});
+    result = _(list).findLast({a: 42}, 1);
+    result = _(list).findLast(['a', 5]);
+    result = _(list).findLast(['a', 5], 1);
 
     result = _(dictionary).findLast();
     result = _(dictionary).findLast(dictionaryIterator);
@@ -4789,7 +4807,7 @@ namespace TestFlatMap {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
 
     {
         let result: string[];
@@ -4831,7 +4849,6 @@ namespace TestFlatMap {
         result = _.flatMap<number>(numNumericDictionary);
 
         result = _.flatMap(numNumericDictionary, numericDictionaryIterator);
-        result = _.flatMap<number|number[], number>(numNumericDictionary, numericDictionaryIterator);
 
         result = _.flatMap(objNumericDictionary, 'a');
     }
@@ -4861,20 +4878,20 @@ namespace TestFlatMap {
     {
         let result: _.LoDashImplicitArrayWrapper<number>;
 
-        result = _(numArray).flatMap<number>();
+        result = _(numArray).flatMap();
         result = _(numArray).flatMap(listIterator);
         result = _(objArray).flatMap('a');
 
-        result = _(numList).flatMap<number>();
-        result = _(numList).flatMap<number|number[], number>(listIterator);
+        result = _(numList).flatMap();
+        result = _(numList).flatMap(listIterator);
         result = _(objList).flatMap('a');
 
-        result = _(numDictionary).flatMap<number>();
+        result = _(numDictionary).flatMap();
         result = _(numDictionary).flatMap(dictionaryIterator);
         result = _(objDictionary).flatMap('a');
 
-        result = _(numNumericDictionary).flatMap<number>();
-        result = _(numNumericDictionary).flatMap<number|number[], number>(numericDictionaryIterator);
+        result = _(numNumericDictionary).flatMap();
+        result = _(numNumericDictionary).flatMap(numericDictionaryIterator);
         result = _(objNumericDictionary).flatMap('a');
     }
 
@@ -4903,20 +4920,20 @@ namespace TestFlatMap {
     {
         let result: _.LoDashExplicitArrayWrapper<number>;
 
-        result = _(numArray).chain().flatMap<number>();
+        result = _(numArray).chain().flatMap();
         result = _(numArray).chain().flatMap(listIterator);
         result = _(objArray).chain().flatMap('a');
 
-        result = _(numList).chain().flatMap<number>();
-        result = _(numList).chain().flatMap<number|number[], number>(listIterator);
+        result = _(numList).chain().flatMap();
+        result = _(numList).chain().flatMap(listIterator);
         result = _(objList).chain().flatMap('a');
 
-        result = _(numDictionary).chain().flatMap<number>();
+        result = _(numDictionary).chain().flatMap();
         result = _(numDictionary).chain().flatMap(dictionaryIterator);
         result = _(objDictionary).chain().flatMap('a');
 
-        result = _(numNumericDictionary).chain().flatMap<number>();
-        result = _(numNumericDictionary).chain().flatMap<number|number[], number>(numericDictionaryIterator);
+        result = _(numNumericDictionary).chain().flatMap();
+        result = _(numNumericDictionary).chain().flatMap(numericDictionaryIterator);
         result = _(objNumericDictionary).chain().flatMap('a');
     }
 
@@ -4972,7 +4989,7 @@ namespace TestFlatMapDeep {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) =>_.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
     {
         let result: string[];
@@ -5133,7 +5150,7 @@ namespace TestFlatMapDepth {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
     {
         let result: string[];
@@ -5276,219 +5293,242 @@ namespace TestFlatMapDepth {
 
 // _.forEach
 namespace TestForEach {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let dictionary: _.Dictionary<AbcObject> = {};
-    let nilArray: AbcObject[] | null | undefined = [] as any;
-    let nilList: _.List<AbcObject> | null | undefined = [] as any;
-    let nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const str: string = anything;
+    const nilStr: string | null | undefined = anything;
+    const array: AbcObject[] = anything;
+    const list: _.List<AbcObject> = anything;
+    const dictionary: _.Dictionary<AbcObject> = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> = anything;
+    const nilArray: AbcObject[] | null | undefined = anything;
+    const nilList: _.List<AbcObject> | null | undefined = anything;
+    const nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const nilNumericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
+    const nilAbcObject: AbcObject | null | undefined = anything;
 
-    let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value, index, collection) => 1;
-    let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value, key, collection) => 1;
-    let objectIterator: (value: number | string | boolean, key: string, collection: AbcObject) => any = (value, key, collection) => 1;
+    // $ExpectType string
+    _.forEach(str, (value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: string;
+    // $ExpectType string | null | undefined
+    _.forEach(nilStr, (value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _.forEach('', (value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType AbcObject[]
+    _.forEach(array, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let result: string | null | undefined;
+    // $ExpectType AbcObject[] | null | undefined
+    _.forEach(nilArray, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _.forEach('' as (string | null | undefined), (value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType ArrayLike<AbcObject>
+    _.forEach(list, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: AbcObject[];
-        result = _.forEach(array, (value, index, collection: ArrayLike<AbcObject>) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-        });
-        result = _.forEach(array, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType ArrayLike<AbcObject> | null | undefined
+    _.forEach(nilList, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: AbcObject[] | null | undefined;
+    // $ExpectType Dictionary<AbcObject>
+    _.forEach(dictionary, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _.forEach(array, (value, index, collection: ArrayLike<AbcObject>) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-        });
-        result = _.forEach(nilArray, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType Dictionary<AbcObject> | null | undefined
+    _.forEach(nilDictionary, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.List<AbcObject>;
+    // $ExpectType NumericDictionary<AbcObject>
+    _.forEach(numericDictionary, (value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _.forEach(list, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-        });
-    }
+    // $ExpectType NumericDictionary<AbcObject> | null | undefined
+    _.forEach(nilNumericDictionary, (value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-    {
-        let result: _.List<AbcObject> | null | undefined;
+    // $ExpectType AbcObject
+    _.forEach(abcObject, (value, index, collection) => {
+        value; // $ExpectType string | number | boolean
+        index; // $ExpectType string
+        collection; // $ExpectType AbcObject
+    });
 
-        result = _.forEach(nilList, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-        });
-    }
+    // $ExpectType AbcObject | null | undefined
+    _.forEach(nilAbcObject, (value, index, collection) => {
+        value; // $ExpectType string | number | boolean
+        index; // $ExpectType string
+        collection; // $ExpectType AbcObject
+    });
 
-    {
-        let result: _.Dictionary<AbcObject>;
+    // $ExpectType LoDashImplicitWrapper<string>
+    _(str).forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _.forEach(dictionary, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<string | null | undefined>
+    _(nilStr).forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: _.Dictionary<AbcObject> | null | undefined;
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _.forEach(nilDictionary, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<AbcObject[] | null | undefined>
+    _(nilArray).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let sample1: AbcObject = anything;
-        sample1 = _.forEach(sample1, objectIterator);
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-        let sample2: AbcObject | null | undefined = anything;
-        sample2 = _.forEach(sample2, objectIterator);
-    }
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitWrapper<string>;
+    // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _('').forEach((value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject> | null | undefined>
+    _(nilDictionary).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
+    // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+    _(numericDictionary).forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _(array).forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
+    _(nilNumericDictionary).forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitNillableArrayWrapper<AbcObject>;
+    // $ExpectType LoDashExplicitWrapper<string>
+    _(str).chain().forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _(nilArray).forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType LoDashExplicitWrapper<string | null | undefined>
+    _(nilStr).chain().forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _(array).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _(list).forEach<AbcObject>(listIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<AbcObject[] | null | undefined>
+    _(nilArray).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.List<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _(list).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-        result = _(nilList).forEach<AbcObject>(listIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _(dictionary).forEach(dictionaryIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject> | null | undefined>
+    _(nilDictionary).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+    _(numericDictionary).chain().forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _(nilDictionary).forEach(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('').chain().forEach((value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitNillableArrayWrapper<AbcObject>;
-
-        result = _(nilArray).chain().forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).chain().forEach<AbcObject>(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.List<AbcObject>>;
-
-        result = _(nilList).chain().forEach<AbcObject>(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).chain().forEach(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(nilDictionary).chain().forEach(dictionaryIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
+    _(nilNumericDictionary).chain().forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 }
 
 // _.forEachRight
@@ -5608,13 +5648,13 @@ namespace TestForEachRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).forEachRight<AbcObject>(listIterator);
+        result = _(list).forEachRight(listIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.List<AbcObject>>;
 
-        result = _(nilList).forEachRight<AbcObject>(listIterator);
+        result = _(nilList).forEachRight(listIterator);
     }
 
     {
@@ -5668,7 +5708,7 @@ namespace TestForEachRight {
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.List<AbcObject>>;
 
-        result = _(nilList).chain().forEachRight<AbcObject>(listIterator);
+        result = _(nilList).chain().forEachRight(listIterator);
     }
 
     {
@@ -5690,8 +5730,7 @@ namespace TestGroupBy {
 
     let array: SampleType[] | null | undefined = [] as any;
     let list: _.List<SampleType> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<SampleType> | null | undefined = obj;
+    let dictionary: _.Dictionary<SampleType> | null | undefined = anything;
 
     let stringIterator = (char: string, index: number, string: string) => 0;
     let listIterator = (value: SampleType, index: number, collection: _.List<SampleType>) => 0;
@@ -5738,15 +5777,15 @@ namespace TestGroupBy {
         result = _(array).groupBy('');
         result = _(array).groupBy({a: 42});
 
-        result = _(list).groupBy<SampleType>();
-        result = _(list).groupBy<SampleType>(listIterator);
-        result = _(list).groupBy<SampleType>('');
-        result = _(list).groupBy<SampleType>({a: 42});
+        result = _(list).groupBy();
+        result = _(list).groupBy(listIterator);
+        result = _(list).groupBy('');
+        result = _(list).groupBy({a: 42});
 
-        result = _(dictionary).groupBy<SampleType>();
+        result = _(dictionary).groupBy();
         result = _(dictionary).groupBy(dictionaryIterator);
-        result = _(dictionary).groupBy<SampleType>('');
-        result = _(dictionary).groupBy<SampleType>({a: 42});
+        result = _(dictionary).groupBy('');
+        result = _(dictionary).groupBy({a: 42});
     }
 
     {
@@ -5764,15 +5803,15 @@ namespace TestGroupBy {
         result = _(array).chain().groupBy('');
         result = _(array).chain().groupBy({a: 42});
 
-        result = _(list).chain().groupBy<SampleType>();
-        result = _(list).chain().groupBy<SampleType>(listIterator);
-        result = _(list).chain().groupBy<SampleType>('');
-        result = _(list).chain().groupBy<SampleType>({a: 42});
+        result = _(list).chain().groupBy();
+        result = _(list).chain().groupBy(listIterator);
+        result = _(list).chain().groupBy('');
+        result = _(list).chain().groupBy({a: 42});
 
-        result = _(dictionary).chain().groupBy<SampleType>();
+        result = _(dictionary).chain().groupBy();
         result = _(dictionary).chain().groupBy(dictionaryIterator);
-        result = _(dictionary).chain().groupBy<SampleType>('');
-        result = _(dictionary).chain().groupBy<SampleType>({a: 42});
+        result = _(dictionary).chain().groupBy('');
+        result = _(dictionary).chain().groupBy({a: 42});
     }
 }
 
@@ -5836,7 +5875,7 @@ namespace TestKeyBy {
     let stringIterator = (value: string, index: number, collection: string) => "a";
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => Symbol.name;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => "a";
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => "a";
 
     {
         let result: _.Dictionary<string>;
@@ -5848,20 +5887,20 @@ namespace TestKeyBy {
     {
         let result: _.Dictionary<SampleObject>;
 
-        result = _.keyBy<SampleObject>(array);
-        result = _.keyBy<SampleObject>(array, listIterator);
-        result = _.keyBy<SampleObject>(array, 'a');
-        result = _.keyBy<SampleObject>(array, {a: 42});
+        result = _.keyBy(array);
+        result = _.keyBy(array, listIterator);
+        result = _.keyBy(array, 'a');
+        result = _.keyBy(array, {a: 42});
 
-        result = _.keyBy<SampleObject>(list);
-        result = _.keyBy<SampleObject>(list, listIterator);
-        result = _.keyBy<SampleObject>(list, 'a');
-        result = _.keyBy<SampleObject>(list, {a: 42});
+        result = _.keyBy(list);
+        result = _.keyBy(list, listIterator);
+        result = _.keyBy(list, 'a');
+        result = _.keyBy(list, {a: 42});
 
-        result = _.keyBy<SampleObject>(numericDictionary);
-        result = _.keyBy<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.keyBy<SampleObject>(numericDictionary, 'a');
-        result = _.keyBy<SampleObject>(numericDictionary, {a: 42});
+        result = _.keyBy(numericDictionary);
+        result = _.keyBy(numericDictionary, numericDictionaryIterator);
+        result = _.keyBy(numericDictionary, 'a');
+        result = _.keyBy(numericDictionary, {a: 42});
 
         result = _.keyBy(dictionary);
         result = _.keyBy(dictionary, dictionaryIterator);
@@ -5884,15 +5923,15 @@ namespace TestKeyBy {
         result = _(array).keyBy('a');
         result = _(array).keyBy({a: 42});
 
-        result = _(list).keyBy<SampleObject>();
-        result = _(list).keyBy<SampleObject>(listIterator);
-        result = _(list).keyBy<SampleObject>('a');
-        result = _(list).keyBy<SampleObject>({a: 42});
+        result = _(list).keyBy();
+        result = _(list).keyBy(listIterator);
+        result = _(list).keyBy('a');
+        result = _(list).keyBy({a: 42});
 
-        result = _(numericDictionary).keyBy<SampleObject>();
-        result = _(numericDictionary).keyBy<SampleObject>(numericDictionaryIterator);
-        result = _(numericDictionary).keyBy<SampleObject>('a');
-        result = _(numericDictionary).keyBy<SampleObject>({a: 42});
+        result = _(numericDictionary).keyBy();
+        result = _(numericDictionary).keyBy(numericDictionaryIterator);
+        result = _(numericDictionary).keyBy('a');
+        result = _(numericDictionary).keyBy({a: 42});
 
         result = _(dictionary).keyBy();
         result = _(dictionary).keyBy(dictionaryIterator);
@@ -5915,15 +5954,15 @@ namespace TestKeyBy {
         result = _(array).chain().keyBy('a');
         result = _(array).chain().keyBy({a: 42});
 
-        result = _(list).chain().keyBy<SampleObject>();
-        result = _(list).chain().keyBy<SampleObject>(listIterator);
-        result = _(list).chain().keyBy<SampleObject>('a');
-        result = _(list).chain().keyBy<SampleObject>({a: 42});
+        result = _(list).chain().keyBy();
+        result = _(list).chain().keyBy(listIterator);
+        result = _(list).chain().keyBy('a');
+        result = _(list).chain().keyBy({a: 42});
 
-        result = _(numericDictionary).chain().keyBy<SampleObject>();
-        result = _(numericDictionary).chain().keyBy<SampleObject>(numericDictionaryIterator);
-        result = _(numericDictionary).chain().keyBy<SampleObject>('a');
-        result = _(numericDictionary).chain().keyBy<SampleObject>({a: 42});
+        result = _(numericDictionary).chain().keyBy();
+        result = _(numericDictionary).chain().keyBy(numericDictionaryIterator);
+        result = _(numericDictionary).chain().keyBy('a');
+        result = _(numericDictionary).chain().keyBy({a: 42});
 
         result = _(dictionary).chain().keyBy();
         result = _(dictionary).chain().keyBy(dictionaryIterator);
@@ -6065,66 +6104,170 @@ namespace TestInvokeMap {
 
 // _.map
 namespace TestMap {
-    let array: number[] | null | undefined = [] as any;
-    let list: _.List<number> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<number> | null | undefined = obj;
-
-    let listIterator: (value: number, index: number, collection: _.List<number>) => AbcObject = (value: number, index: number, collection: _.List<number>) => ({ a: 1, b: "", c: true });
-    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => AbcObject = (value: number, key: string, collection: _.Dictionary<number>) => ({ a: 1, b: "", c: true });
+    const array: AbcObject[] | null | undefined = anything;
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        _.map(array);  // $ExpectType number[]
-        _.map(array, listIterator);  // $ExpectType AbcObject[]
+        _.map(array);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(array, (value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-        _.map(list);  // $ExpectType number[]
-        _.map(list, listIterator);  // $ExpectType AbcObject[]
+        _.map(list);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(list, (value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _.map(dictionary);  // $ExpectType number[]
-        _.map(dictionary, dictionaryIterator);  // $ExpectType AbcObject[]
-    }
+        _.map(dictionary);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(dictionary, (value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
+
+        _.map(numericDictionary);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(numericDictionary, (value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
+
+        _.map(array, 'a'); // $ExpectType number[]
+        _.map(list, 'a'); // $ExpectType number[]
+        _.map(dictionary, 'a'); // $ExpectType number[]
+        _.map(numericDictionary, 'a'); // $ExpectType number[]
+
+        _.map(array, 'd.0.b'); // $ExpectType any[]
+        _.map(list, 'd.0.b'); // $ExpectType any[]
+        _.map(dictionary, 'd.0.b'); // $ExpectType any[]
+        _.map(numericDictionary, 'd.0.b'); // $ExpectType any[]
 
-    {
         // _.matches iteratee shorthand.
         _.map(array, {});  // $ExpectType boolean[]
         _.map(list, {});  // $ExpectType boolean[]
         _.map(dictionary, {});  // $ExpectType boolean[]
+        _.map(numericDictionary, {});  // $ExpectType boolean[]
     }
 
     {
-        _(array).map().value();  // $ExpectType number[]
-        _(array).map(listIterator).value();  // $ExpectType AbcObject[]
+        _(array).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(array).map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-        _(list).map().value();  // $ExpectType number[]
-        _(list).map(listIterator).value();  // $ExpectType AbcObject[]
+        _(list).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(list).map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _(dictionary).map().value();  // $ExpectType number[]
-        _(dictionary).map(dictionaryIterator).value();  // $ExpectType AbcObject[]
+        _(dictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(dictionary).map((value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
+
+        _(numericDictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(numericDictionary).map((value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
+
+        _(array).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(list).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(dictionary).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(numericDictionary).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+
+        _(array).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(list).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(dictionary).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(numericDictionary).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+
+        _(array).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(list).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(dictionary).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(numericDictionary).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
     }
 
     {
-        _(array).map({}).value();  // $ExpectType boolean[]
-        _(list).map({}).value();  // $ExpectType boolean[]
-        _(dictionary).map({}).value();  // $ExpectType boolean[]
-    }
+        _(array).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(array).chain().map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-    {
-        _(array).chain().map().value();  // $ExpectType number[]
-        _(array).chain().map(listIterator).value();  // $ExpectType AbcObject[]
+        _(list).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(list).chain().map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _(list).chain().map().value();  // $ExpectType number[]
-        _(list).chain().map(listIterator).value();  // $ExpectType AbcObject[]
+        _(dictionary).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(dictionary).chain().map((value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
 
-        _(dictionary).chain().map().value();  // $ExpectType number[]
-        _(dictionary).chain().map(dictionaryIterator).value();  // $ExpectType AbcObject[]
-    }
+        _(numericDictionary).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(numericDictionary).chain().map((value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<boolean>;
+        _(array).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(list).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(dictionary).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(numericDictionary).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
 
-        result = _(array).chain().map({});
-        result = _(list).chain().map({});
-        result = _(dictionary).chain().map({});
+        _(array).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(list).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(dictionary).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(numericDictionary).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+
+        _(array).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(list).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(dictionary).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(numericDictionary).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
     }
 
     {
@@ -6290,69 +6433,6 @@ namespace TestPartition {
     }
 }
 
-// TODO
-// _.map with iteratee shorthand
-// module TestMapInsteadOfPluck {
-//     interface SampleObject {
-//         d: {b: AbcObject}[];
-//     }
-//
-//     let array: SampleObject[] = [];
-//     let list: _.List<SampleObject> = [];
-//     let dictionary: _.Dictionary<SampleObject> = {};
-//
-//     {
-//         let result: any[];
-//
-//         result = _.map<SampleObject>(array, 'd.0.b');
-//         result = _.map<SampleObject>(array, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject>(list, 'd.0.b');
-//         result = _.map<SampleObject>(list, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject>(dictionary, 'd.0.b');
-//         result = _.map<SampleObject>(dictionary, ['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: AbcObject[];
-//
-//         result = _.map<SampleObject, AbcObject>(array, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(array, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject, AbcObject>(list, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(list, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject, AbcObject>(dictionary, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(dictionary, ['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-//
-//         result = _(array).map<AbcObject>('d.0.b');
-//         result = _(array).map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(list).map<AbcObject>('d.0.b');
-//         result = _(list).map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(dictionary).map<AbcObject>('d.0.b');
-//         result = _(dictionary).map<AbcObject>(['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-//
-//         result = _(array).chain().map<AbcObject>('d.0.b');
-//         result = _(array).chain().map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(list).chain().map<AbcObject>('d.0.b');
-//         result = _(list).chain().map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(dictionary).chain().map<AbcObject>('d.0.b');
-//         result = _(dictionary).chain().map<AbcObject>(['d', 0, 'b']);
-//     }
-// }
 namespace TestReduce {
     interface ABC {
         [key: string]: number;
@@ -6412,12 +6492,12 @@ namespace TestReject {
     {
         let result: AbcObject[];
 
-        result = _.reject<AbcObject>(array, listIterator);
-        result = _.reject<AbcObject>(array, '');
+        result = _.reject(array, listIterator);
+        result = _.reject(array, '');
         result = _.reject(array, {a: 42});
 
-        result = _.reject<AbcObject>(list, listIterator);
-        result = _.reject<AbcObject>(list, '');
+        result = _.reject(list, listIterator);
+        result = _.reject(list, '');
         result = _.reject(list, {a: 42});
 
         result = _.reject(dictionary, dictionaryIterator);
@@ -6438,8 +6518,8 @@ namespace TestReject {
         result = _(array).reject('');
         result = _(array).reject({a: 42});
 
-        result = _(list).reject<AbcObject>(listIterator);
-        result = _(list).reject<AbcObject>('');
+        result = _(list).reject(listIterator);
+        result = _(list).reject('');
         result = _(list).reject({a: 42});
 
         result = _(dictionary).reject(dictionaryIterator);
@@ -6460,8 +6540,8 @@ namespace TestReject {
         result = _(array).chain().reject('');
         result = _(array).chain().reject({a: 42});
 
-        result = _(list).chain().reject<AbcObject>(listIterator);
-        result = _(list).chain().reject<AbcObject>('');
+        result = _(list).chain().reject(listIterator);
+        result = _(list).chain().reject('');
         result = _(list).chain().reject({a: 42});
 
         result = _(dictionary).chain().reject(dictionaryIterator);
@@ -6587,8 +6667,8 @@ namespace TestShuffle {
     {
         let result: AbcObject[];
 
-        result = _.shuffle<AbcObject>(array);
-        result = _.shuffle<AbcObject>(list);
+        result = _.shuffle(array);
+        result = _.shuffle(list);
         result = _.shuffle(dictionary);
     }
 
@@ -6602,7 +6682,7 @@ namespace TestShuffle {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).shuffle();
-        result = _(list).shuffle<AbcObject>();
+        result = _(list).shuffle();
         result = _(dictionary).shuffle();
     }
 
@@ -6616,7 +6696,7 @@ namespace TestShuffle {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().shuffle();
-        result = _(list).chain().shuffle<AbcObject>();
+        result = _(list).chain().shuffle();
         result = _(dictionary).chain().shuffle();
     }
 }
@@ -6667,47 +6747,46 @@ namespace TestSome {
 
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => true;
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => true;
     let objectIterator = (value: any, key: string, collection: any) => true;
 
     {
         let result: boolean;
 
-        result = _.some<SampleObject>(array);
-        result = _.some<SampleObject>(array, listIterator);
-        result = _.some<SampleObject>(array, 'a');
-        result = _.some<SampleObject>(array, ['a', 42]);
-        result = _.some<SampleObject>(array, {a: 42});
+        result = _.some(array);
+        result = _.some(array, listIterator);
+        result = _.some(array, 'a');
+        result = _.some(array, ['a', 42]);
+        result = _.some(array, {a: 42});
 
-        result = _.some<SampleObject>(list);
-        result = _.some<SampleObject>(list, listIterator);
-        result = _.some<SampleObject>(list, 'a');
-        result = _.some<SampleObject>(list, ['a', 42]);
-        result = _.some<SampleObject>(list, {a: 42});
+        result = _.some(list);
+        result = _.some(list, listIterator);
+        result = _.some(list, 'a');
+        result = _.some(list, ['a', 42]);
+        result = _.some(list, {a: 42});
 
-        result = _.some<SampleObject>(dictionary);
-        result = _.some<SampleObject>(numericDictionary, numericDictionaryIterator);
+        result = _.some(dictionary);
+        result = _.some(numericDictionary, numericDictionaryIterator);
         result = _.some(dictionary, (value, key, collection) => {
             value; // $ExpectType SampleObject
             key; // $ExpectType string
             collection; // $ExpectType Dictionary<SampleObject>
             return true;
         });
-        result = _.some<SampleObject>(dictionary, 'a');
-        result = _.some<SampleObject>(dictionary, ['a', 42]);
-        result = _.some<SampleObject>(dictionary, {a: 42});
+        result = _.some(dictionary, 'a');
+        result = _.some(dictionary, ['a', 42]);
+        result = _.some(dictionary, {a: 42});
 
-        result = _.some<SampleObject>(numericDictionary);
-        result = _.some<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.some<SampleObject>(numericDictionary, 'a');
-        result = _.some<SampleObject>(numericDictionary, ['a', 42]);
-        result = _.some<SampleObject>(numericDictionary, {a: 42});
+        result = _.some(numericDictionary);
+        result = _.some(numericDictionary, numericDictionaryIterator);
+        result = _.some(numericDictionary, 'a');
+        result = _.some(numericDictionary, ['a', 42]);
+        result = _.some(numericDictionary, {a: 42});
 
         result = _.some(sampleObject);
         result = _.some(sampleObject, objectIterator);
         result = _.some(sampleObject, 'a');
         result = _.some(sampleObject, ['a', 42]);
-        result = _.some<{a: number}>(sampleObject, {a: 42});
 
         result = _(array).some();
         result = _(array).some(listIterator);
@@ -6715,29 +6794,28 @@ namespace TestSome {
         result = _(array).some(['a', 42]);
         result = _(array).some({a: 42});
 
-        result = _(list).some<SampleObject>();
-        result = _(list).some<SampleObject>(listIterator);
+        result = _(list).some();
+        result = _(list).some(listIterator);
         result = _(list).some('a');
         result = _(list).some(['a', 42]);
-        result = _(list).some<SampleObject>({a: 42});
+        result = _(list).some({a: 42});
 
-        result = _(dictionary).some<SampleObject>();
+        result = _(dictionary).some();
         result = _(dictionary).some(dictionaryIterator);
         result = _(dictionary).some('a');
         result = _(dictionary).some(['a', 42]);
-        result = _(dictionary).some<SampleObject>({a: 42});
+        result = _(dictionary).some({a: 42});
 
-        result = _(numericDictionary).some<SampleObject>();
-        result = _(numericDictionary).some<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).some();
+        result = _(numericDictionary).some(numericDictionaryIterator);
         result = _(numericDictionary).some('a');
         result = _(numericDictionary).some(['a', 42]);
-        result = _(numericDictionary).some<SampleObject>({a: 42});
+        result = _(numericDictionary).some({a: 42});
 
         result = _(sampleObject).some();
         result = _(sampleObject).some(objectIterator);
         result = _(sampleObject).some('a');
         result = _(sampleObject).some(['a', 42]);
-        result = _(sampleObject).some<SampleObject>({a: 42});
     }
 
     {
@@ -6749,29 +6827,28 @@ namespace TestSome {
         result = _(array).chain().some(['a', 42]);
         result = _(array).chain().some({a: 42});
 
-        result = _(list).chain().some<SampleObject>();
-        result = _(list).chain().some<SampleObject>(listIterator);
+        result = _(list).chain().some();
+        result = _(list).chain().some(listIterator);
         result = _(list).chain().some('a');
         result = _(list).chain().some(['a', 42]);
-        result = _(list).chain().some<SampleObject>({a: 42});
+        result = _(list).chain().some({a: 42});
 
-        result = _(dictionary).chain().some<SampleObject>();
+        result = _(dictionary).chain().some();
         result = _(dictionary).chain().some(dictionaryIterator);
         result = _(dictionary).chain().some('a');
         result = _(dictionary).chain().some(['a', 42]);
-        result = _(dictionary).chain().some<SampleObject>({a: 42});
+        result = _(dictionary).chain().some({a: 42});
 
-        result = _(numericDictionary).chain().some<SampleObject>();
-        result = _(numericDictionary).chain().some<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().some();
+        result = _(numericDictionary).chain().some(numericDictionaryIterator);
         result = _(numericDictionary).chain().some('a');
         result = _(numericDictionary).chain().some(['a', 42]);
-        result = _(numericDictionary).chain().some<SampleObject>({a: 42});
+        result = _(numericDictionary).chain().some({a: 42});
 
         result = _(sampleObject).chain().some();
         result = _(sampleObject).chain().some(objectIterator);
         result = _(sampleObject).chain().some('a');
         result = _(sampleObject).chain().some(['a', 42]);
-        result = _(sampleObject).chain().some<AbcObject>({a: 42});
     }
 }
 
@@ -6873,23 +6950,15 @@ namespace TestorderBy {
 
         result = _.orderBy(array, iteratees);
         result = _.orderBy(array, iteratees, orders);
-        result = _.orderBy<SampleObject>(array, iteratees);
-        result = _.orderBy<SampleObject>(array, iteratees, orders);
 
         result = _.orderBy(list, iteratees);
         result = _.orderBy(list, iteratees, orders);
-        result = _.orderBy<SampleObject>(list, iteratees);
-        result = _.orderBy<SampleObject>(list, iteratees, orders);
 
         result = _.orderBy(numericDictionary, iteratees);
         result = _.orderBy(numericDictionary, iteratees, orders);
-        result = _.orderBy<SampleObject>(numericDictionary, iteratees);
-        result = _.orderBy<SampleObject>(numericDictionary, iteratees, orders);
 
         result = _.orderBy(dictionary, iteratees);
         result = _.orderBy(dictionary, iteratees, orders);
-        result = _.orderBy<SampleObject>(dictionary, iteratees);
-        result = _.orderBy<SampleObject>(dictionary, iteratees, orders);
     }
 
     {
@@ -6901,18 +6970,12 @@ namespace TestorderBy {
 
         result = _(list).orderBy(iteratees);
         result = _(list).orderBy(iteratees, orders);
-        result = _(list).orderBy<SampleObject>(iteratees);
-        result = _(list).orderBy<SampleObject>(iteratees, orders);
 
         result = _(numericDictionary).orderBy(iteratees);
         result = _(numericDictionary).orderBy(iteratees, orders);
-        result = _(numericDictionary).orderBy<SampleObject>(iteratees);
-        result = _(numericDictionary).orderBy<SampleObject>(iteratees, orders);
 
         result = _(dictionary).orderBy(iteratees);
         result = _(dictionary).orderBy(iteratees, orders);
-        result = _(dictionary).orderBy<SampleObject>(iteratees);
-        result = _(dictionary).orderBy<SampleObject>(iteratees, orders);
     }
 
     {
@@ -6924,18 +6987,12 @@ namespace TestorderBy {
 
         result = _(list).chain().orderBy(iteratees);
         result = _(list).chain().orderBy(iteratees, orders);
-        result = _(list).chain().orderBy<SampleObject>(iteratees);
-        result = _(list).chain().orderBy<SampleObject>(iteratees, orders);
 
         result = _(numericDictionary).chain().orderBy(iteratees);
         result = _(numericDictionary).chain().orderBy(iteratees, orders);
-        result = _(numericDictionary).chain().orderBy<SampleObject>(iteratees);
-        result = _(numericDictionary).chain().orderBy<SampleObject>(iteratees, orders);
 
         result = _(dictionary).chain().orderBy(iteratees);
         result = _(dictionary).chain().orderBy(iteratees, orders);
-        result = _(dictionary).chain().orderBy<SampleObject>(iteratees);
-        result = _(dictionary).chain().orderBy<SampleObject>(iteratees, orders);
     }
 }
 
@@ -9261,10 +9318,10 @@ namespace TestToArray {
     {
         let result: AbcObject[];
 
-        result = _.toArray<AbcObject>(array);
-        result = _.toArray<AbcObject>(list);
-        result = _.toArray<AbcObject>(dictionary);
-        result = _.toArray<AbcObject>(numericDictionary);
+        result = _.toArray(array);
+        result = _.toArray(list);
+        result = _.toArray(dictionary);
+        result = _.toArray(numericDictionary);
 
         result = _.toArray(array);
         result = _.toArray(list);
@@ -9284,18 +9341,18 @@ namespace TestToArray {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).toArray();
-        result = _(list).toArray<AbcObject>();
-        result = _(dictionary).toArray<AbcObject>();
-        result = _(numericDictionary).toArray<AbcObject>();
+        result = _(list).toArray();
+        result = _(dictionary).toArray();
+        result = _(numericDictionary).toArray();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().toArray();
-        result = _(list).chain().toArray<AbcObject>();
-        result = _(dictionary).chain().toArray<AbcObject>();
-        result = _(numericDictionary).chain().toArray<AbcObject>();
+        result = _(list).chain().toArray();
+        result = _(dictionary).chain().toArray();
+        result = _(numericDictionary).chain().toArray();
     }
 }
 
@@ -10488,53 +10545,51 @@ result = <DefaultsDeepResult>_(TestDefaultsDeepObject).defaultsDeep(TestDefaults
 
 // _.entries
 namespace TestEntries {
-    let object: _.Dictionary<string> = {};
+    const dictionary: _.Dictionary<number> = anything;
+    const numericDictionary: _.NumericDictionary<number> = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.entries(object);
+        _.entries(dictionary); // $ExpectType [string, number][]
+        _.entries(numericDictionary); // $ExpectType [string, number][]
+        _.entries(abcObject); // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).entries();
+        _(dictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).entries(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().entries();
+        _(dictionary).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
 // _.entriesIn
 namespace TestEntriesIn {
-    let object: _.Dictionary<string> = {};
+    const dictionary: _.Dictionary<number> = anything;
+    const numericDictionary: _.NumericDictionary<number> = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.entriesIn(object);
+        _.entriesIn(dictionary); // $ExpectType [string, number][]
+        _.entriesIn(numericDictionary); // $ExpectType [string, number][]
+        _.entriesIn(abcObject); // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).entriesIn();
+        _(dictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().entriesIn<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<[string, any]>;
-
-        result = _(object).chain().entriesIn();
+        _(dictionary).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
@@ -11556,65 +11611,280 @@ namespace TestMapKeys {
     let array: AbcObject[] | null | undefined = [] as any;
     let list: _.List<AbcObject>| null | undefined = [] as any;
     let dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    let abcObject: AbcObject = anything;
 
     let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => "";
     let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => "";
+    let numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => "";
+    let abcObjectIterator = (value: AbcObject[keyof AbcObject], key: string, collection: AbcObject) => "";
 
     {
-        let result: _.Dictionary<AbcObject>;
+        _.mapKeys(array); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, listIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(array);
-        result = _.mapKeys(array, listIterator);
-        result = _.mapKeys(array, '');
-        result = _.mapKeys(array, {});
+        _.mapKeys(list); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, listIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(list);
-        result = _.mapKeys(list, listIterator);
-        result = _.mapKeys(list, '');
-        result = _.mapKeys(list, {});
+        _.mapKeys(dictionary); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, dictionaryIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(dictionary);
-        result = _.mapKeys(dictionary, dictionaryIterator);
-        result = _.mapKeys(dictionary, '');
-        result = _.mapKeys(dictionary, {});
+        /* Broken in TS 2.4
+        _.mapKeys(numericDictionary); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, numericDictionaryIterator); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, ''); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, {}); // Dictionary<AbcObject>
+        */
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(array).mapKeys();
-        result = _(array).mapKeys(listIterator);
-        result = _(array).mapKeys('');
-        result = _(array).mapKeys({});
-
-        result = _(list).mapKeys();
-        result = _(list).mapKeys(listIterator);
-        result = _(list).mapKeys('');
-        result = _(list).mapKeys({});
-
-        result = _(dictionary).mapKeys();
-        result = _(dictionary).mapKeys(dictionaryIterator);
-        result = _(dictionary).mapKeys('');
-        result = _(dictionary).mapKeys({});
+        _.mapKeys(abcObject); // $ExpectType Dictionary<string | number | boolean>
+        _.mapKeys(abcObject, abcObjectIterator); // $ExpectType Dictionary<string | number | boolean>
+        _.mapKeys(abcObject, ''); // $ExpectType Dictionary<string | number | boolean>
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
+        _(array).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(array).chain().mapKeys();
-        result = _(array).chain().mapKeys(listIterator);
-        result = _(array).chain().mapKeys('');
-        result = _(array).chain().mapKeys({});
+        _(list).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(list).chain().mapKeys();
-        result = _(list).chain().mapKeys(listIterator);
-        result = _(list).chain().mapKeys('');
-        result = _(list).chain().mapKeys({});
+        _(dictionary).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(dictionary).chain().mapKeys();
-        result = _(dictionary).chain().mapKeys(dictionaryIterator);
-        result = _(dictionary).chain().mapKeys('');
-        result = _(dictionary).chain().mapKeys({});
+        /* Broken in TS 2.4
+        _(numericDictionary).mapKeys(); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys(numericDictionaryIterator); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys(''); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys({}); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        */
+    }
+
+    {
+        _(abcObject).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).mapKeys(abcObjectIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+    }
+
+    {
+        _(array).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(list).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(dictionary).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        /* Broken in TS 2.4
+        _(numericDictionary).chain().mapKeys(); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys(numericDictionaryIterator); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys(''); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys({}); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        */
+    }
+
+    {
+        _(abcObject).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).chain().mapKeys(abcObjectIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+    }
+}
+
+// _.mapValues
+{
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
+    const abcObjectOrNull: AbcObject | null = anything;
+    const key: string = anything;
+
+    {
+        // $ExpectType NumericDictionary<AbcObject>
+        _.mapValues("foo", (char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType Dictionary<string>
+        _.mapValues(dictionary, (value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType Dictionary<string>
+        _.mapValues(numericDictionary, (value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType { a: string; b: string; c: string; }
+        _.mapValues(abcObject, (value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _.mapValues(dictionary, {}); // $ExpectType Dictionary<boolean>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, {}); // $ExpectType Dictionary<boolean>
+        _.mapValues(abcObject, {}); // $ExpectType { a: boolean; b: boolean; c: boolean; }
+
+        _.mapValues(dictionary, "a"); // $ExpectType Dictionary<number>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, "a"); // $ExpectType Dictionary<number>
+
+        _.mapValues(abcObject, key); // $ExpectType { a: any; b: any; c: any; }
+        _.mapValues(dictionary, key); // $ExpectType Dictionary<any>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, key); // $ExpectType Dictionary<any>
+
+        _.mapValues("a"); // $ExpectType NumericDictionary<string>
+        _.mapValues(dictionary); // $ExpectType Dictionary<AbcObject>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary); // $ExpectType Dictionary<AbcObject>
+        _.mapValues(abcObject); // $ExpectType AbcObject
+        _.mapValues(abcObjectOrNull); // $ExpectType Partial<AbcObject>
+    }
+
+    {
+        // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+        _("foo").mapValues((char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+        _(dictionary).mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+        _(numericDictionary).mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType LoDashImplicitWrapper<{ a: string; b: string; c: string; }>
+        _(abcObject).mapValues((value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _(dictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+        _(abcObject).mapValues({}); // $ExpectType LoDashImplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
+
+        _(dictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+
+        _(abcObject).mapValues(key); // $ExpectType LoDashImplicitWrapper<{ a: any; b: any; c: any; }>
+        _(dictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+
+        _("a").mapValues(); // $ExpectType LoDashImplicitWrapper<NumericDictionary<string>>
+        _(dictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(abcObject).mapValues(); // $ExpectType LoDashImplicitWrapper<AbcObject>
+        _(abcObjectOrNull).mapValues(); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    }
+
+    {
+        // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+        _("foo").chain().mapValues((char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+        _(dictionary).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+        _(numericDictionary).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType LoDashExplicitWrapper<{ a: string; b: string; c: string; }>
+        _(abcObject).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _(dictionary).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+        _(abcObject).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
+
+        _(dictionary).chain().mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+
+        _(abcObject).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<{ a: any; b: any; c: any; }>
+        _(dictionary).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+
+        _("a").chain().mapValues(); // $ExpectType LoDashExplicitWrapper<NumericDictionary<string>>
+        _(dictionary).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(abcObject).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<AbcObject>
+        _(abcObjectOrNull).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     }
 }
 
@@ -11741,36 +12011,55 @@ namespace TestMergeWith {
 // _.omit
 namespace TestOmit {
     let obj: AbcObject | null | undefined = anything;
-    let dict: { [key: string]: AbcObject } = { };
+    let dictionary:_.Dictionary<AbcObject> = anything;
+    let numericDictionary:_.NumericDictionary<AbcObject> = anything;
+    let dictionaryWithNull:_.Dictionary<AbcObject | null> = anything;
+    let numericDictionaryWithNull:_.NumericDictionary<AbcObject | null> = anything;
+    let dictionaryWithUndefined:_.Dictionary<AbcObject | undefined> = anything;
+    let numericDictionaryWithUndefined:_.NumericDictionary<AbcObject | undefined> = anything;
+    let dictionaryWithNullAndUndefined:_.Dictionary<AbcObject | null | undefined> = anything;
+    let numericDictionaryWithNullAndUndefined:_.NumericDictionary<AbcObject | null | undefined> = anything;
 
     {
-        let result: Partial<AbcObject>;
-
-        result = _.omit(obj, 'a');
-        result = _.omit(obj, 0, 'a');
-        result = _.omit(obj, ['b', 1], 0, 'a');
-
-        dict = _.omit(dict, 'a');
+        _.omit(obj, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(obj, 0, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(obj, ['b', 1], 0, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(dictionary, 'a'); // $ExpectType Dictionary<AbcObject>
+        _.omit(numericDictionary, 'a');  // $ExpectType NumericDictionary<AbcObject>
+        _.omit(dictionaryWithNull, 'a'); // $ExpectType Dictionary<AbcObject | null>
+        _.omit(numericDictionaryWithNull, 'a');  // $ExpectType NumericDictionary<AbcObject | null>
+        _.omit(dictionaryWithUndefined, 'a'); // $ExpectType Dictionary<AbcObject | undefined>
+        _.omit(numericDictionaryWithUndefined, 'a');  // $ExpectType NumericDictionary<AbcObject | undefined>
+        _.omit(dictionaryWithNullAndUndefined, 'a'); // $ExpectType Dictionary<AbcObject | null | undefined>
+        _.omit(numericDictionaryWithNullAndUndefined, 'a');  // $ExpectType NumericDictionary<AbcObject | null | undefined>
     }
 
     {
-        let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).omit('a');
-        result = _(obj).omit(0, 'a');
-        result = _(obj).omit(['b', 1], 0, 'a');
-
-        dict = _(dict).omit('a').value();
+        _(obj).omit('a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(obj).omit(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(obj).omit(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(dictionary).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+        _(dictionaryWithNull).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | null>>
+        _(numericDictionaryWithNull).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | null>>
+        _(dictionaryWithUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | undefined>>
+        _(numericDictionaryWithUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | undefined>>
+        _(dictionaryWithNullAndUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | null | undefined>>
+        _(numericDictionaryWithNullAndUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | null | undefined>>
     }
 
     {
-        let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).chain().omit('a');
-        result = _(obj).chain().omit(0, 'a');
-        result = _(obj).chain().omit(['b', 1], 0, 'a');
-
-        dict = _(dict).chain().omit('a').value();
+        _(obj).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(obj).chain().omit(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(obj).chain().omit(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(dictionary).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+        _(dictionaryWithNull).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | null>>
+        _(numericDictionaryWithNull).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | null>>
+        _(dictionaryWithUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | undefined>>
+        _(numericDictionaryWithUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | undefined>>
+        _(dictionaryWithNullAndUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | null | undefined>>
+        _(numericDictionaryWithNullAndUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | null | undefined>>
     }
 }
 
@@ -11788,13 +12077,13 @@ namespace TestOmitBy {
     {
         let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).omitBy<AbcObject>(predicate);
+        result = _(obj).omitBy(predicate);
     }
 
     {
         let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).chain().omitBy<AbcObject>(predicate);
+        result = _(obj).chain().omitBy(predicate);
     }
 }
 
@@ -11810,7 +12099,8 @@ namespace TestPick {
     _.pick(obj1, 0, 'a'); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, ['b', 1], 0, 'a'); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, readonlyArray); // $ExpectType PartialDeep<AbcObject>
-    _.pick(obj2, 'a', 'b'); // $ExpectType Pick<AbcObject, "a" | "b">
+    // Broken in TS 2.4
+    // _.pick(obj2, 'a', 'b'); // Pick<AbcObject, "a" | "b">
     _.pick(obj2, literalsArray); // $ExpectType Pick<AbcObject, "a" | "b">
     _.pick(obj2, roLiteralsArray); // $ExpectType Pick<AbcObject, "a" | "b">
 
@@ -11818,7 +12108,8 @@ namespace TestPick {
     _(obj1).pick(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(readonlyArray); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-    _(obj2).pick('a', 'b'); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
+    // Broken in TS 2.4
+    // _(obj2).pick('a', 'b'); // LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
     _(obj2).pick(literalsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
     _(obj2).pick(roLiteralsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
 
@@ -11826,7 +12117,8 @@ namespace TestPick {
     _.chain(obj1).pick(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(readonlyArray); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-    _.chain(obj2).pick('a', 'b'); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+    // Broken in TS 2.4
+    // _.chain(obj2).pick('a', 'b'); // LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
     _.chain(obj2).pick(literalsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
     _.chain(obj2).pick(roLiteralsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
 }
@@ -11845,13 +12137,13 @@ namespace TestPickBy {
     {
         let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).pickBy<AbcObject>(predicate);
+        result = _(obj).pickBy(predicate);
     }
 
     {
         let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).chain().pickBy<AbcObject>(predicate);
+        result = _(obj).chain().pickBy(predicate);
     }
 }
 
@@ -12013,53 +12305,51 @@ namespace TestSetWith {
 
 // _.toPairs
 namespace TestToPairs {
-    let object: _.Dictionary<string> = {};
+    let dictionary: _.Dictionary<number> = {};
+    let numericDictionary: _.NumericDictionary<number> = {};
+    let abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.toPairs(object);
+        _.toPairs(dictionary); // $ExpectType [string, number][]
+        _.toPairs(numericDictionary); // $ExpectType [string, number][]
+        _.toPairs(abcObject);  // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).toPairs();
+        _(dictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().toPairs();
+        _(dictionary).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
 // _.toPairsIn
 namespace TestToPairsIn {
-    let object: _.Dictionary<string> = {};
+    let dictionary: _.Dictionary<number> = {};
+    let numericDictionary: _.NumericDictionary<number> = {};
+    let abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.toPairsIn(object);
+        _.toPairsIn(dictionary); // $ExpectType [string, number][]
+        _.toPairsIn(numericDictionary); // $ExpectType [string, number][]
+        _.toPairsIn(abcObject);  // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).toPairsIn();
+        _(dictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().toPairsIn<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<[string, any]>;
-
-        result = _(object).chain().toPairsIn();
+        _(dictionary).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
@@ -12256,7 +12546,7 @@ namespace TestValues {
         result = _.values(dict);
         result = _.values(numDict);
         result = _.values(list);
-        result = _.values<SampleObject>(object);
+        result = _.values(object);
     }
 
     // Implicit wrapper
@@ -12295,10 +12585,10 @@ namespace TestValues {
         let object: {a: SampleObject} = { a: { a: {} } };
         let result: _.LoDashImplicitArrayWrapper<SampleObject>;
 
-        result = _(dict).values<SampleObject>();
-        result = _(numDict).values<SampleObject>();
-        result = _(list).values<SampleObject>();
-        result = _(object).values<SampleObject>();
+        result = _(dict).values();
+        result = _(numDict).values();
+        result = _(list).values();
+        result = _(object).values();
     }
 
     // Explicit wrapper
@@ -12337,10 +12627,10 @@ namespace TestValues {
         let object: {a: SampleObject} = { a: { a: {} } };
         let result: _.LoDashExplicitArrayWrapper<SampleObject>;
 
-        result = _(dict).chain().values<SampleObject>();
-        result = _(numDict).chain().values<SampleObject>();
-        result = _(list).chain().values<SampleObject>();
-        result = _(object).chain().values<SampleObject>();
+        result = _(dict).chain().values();
+        result = _(numDict).chain().values();
+        result = _(list).chain().values();
+        result = _(object).chain().values();
     }
 }
 
@@ -12364,19 +12654,19 @@ namespace TestValuesIn {
     {
         let result: AbcObject[];
 
-        result = _.values(object);
+        result = _.valuesIn(object);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(object).valuesIn<AbcObject>();
+        result = _(object).valuesIn();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(object).chain().valuesIn<AbcObject>();
+        result = _(object).chain().valuesIn();
     }
 }
 
@@ -13340,7 +13630,7 @@ namespace TestMatches {
 
     {
         let result: (value: any) => boolean;
-        result = _.matches<AbcObject>(source);
+        result = _.matches(source);
     }
 
     {
@@ -13350,12 +13640,12 @@ namespace TestMatches {
 
     {
         let result: _.LoDashImplicitObjectWrapper<(value: AbcObject) => boolean>;
-        result = _(source).matches<AbcObject>();
+        result = _(source).matches();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(value: AbcObject) => boolean>;
-        result = _(source).chain().matches<AbcObject>();
+        result = _(source).chain().matches();
     }
 }
 
@@ -13367,7 +13657,7 @@ namespace TestMatches {
     {
         let result: (value: any) => boolean;
 
-        result = _.matchesProperty<AbcObject>(path, source);
+        result = _.matchesProperty(path, source);
     }
 
     {
@@ -13379,7 +13669,7 @@ namespace TestMatches {
     {
         let result: _.LoDashImplicitObjectWrapper<(value: any) => boolean>;
 
-        result = _(path).matchesProperty<AbcObject>(source);
+        result = _(path).matchesProperty(source);
     }
 
     {
@@ -13391,7 +13681,7 @@ namespace TestMatches {
     {
         let result: _.LoDashExplicitObjectWrapper<(value: any) => boolean>;
 
-        result = _(path).chain().matchesProperty<AbcObject>(source);
+        result = _(path).chain().matchesProperty(source);
     }
 
     {
diff --git a/types/lory.js/index.d.ts b/types/lory.js/index.d.ts
index 37ff46d4be..dd37fb8efa 100644
--- a/types/lory.js/index.d.ts
+++ b/types/lory.js/index.d.ts
@@ -4,7 +4,7 @@
 //                 philip bulley <https://github.com/milkisevil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare var lory: LoryStatic;
+export declare var lory: LoryStatic;
 
 interface LoryStatic {
     (element: Element, options?: LoryOptions): LoryStatic;
diff --git a/types/lory.js/lory.js-tests.ts b/types/lory.js/lory.js-tests.ts
index bad97dadf3..616073f180 100644
--- a/types/lory.js/lory.js-tests.ts
+++ b/types/lory.js/lory.js-tests.ts
@@ -1,4 +1,4 @@
-
+import { lory } from 'lory.js';
 
 (function() {
     var elm = document.querySelector('.js-foo');
diff --git a/types/meow/index.d.ts b/types/meow/index.d.ts
index 20e40c63f7..db3d697691 100644
--- a/types/meow/index.d.ts
+++ b/types/meow/index.d.ts
@@ -1,20 +1,27 @@
 // Type definitions for meow 4.x
 // Project: https://github.com/sindresorhus/meow
-// Definitions by: KnisterPeter <https://github.com/KnisterPeter>, Lindsey Smith <https://github.com/praxxis>
+// Definitions by: KnisterPeter <https://github.com/KnisterPeter>
+//                 Lindsey Smith <https://github.com/praxxis>
+//                 Jason Dreyzehner <https://github.com/bitjson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-import * as buildOptions from "minimist-options";
+import * as buildOptions from 'minimist-options';
 
-declare function meow(helpMessage: string | string[], options: meow.Options): meow.Result;
-declare function meow(options: string | string[] | meow.Options): meow.Result;
+declare function meow(
+    helpMessage: string | ReadonlyArray<string>,
+    options: meow.Options
+): meow.Result;
+declare function meow(
+    options: string | ReadonlyArray<string> | meow.Options
+): meow.Result;
 declare namespace meow {
     interface Options {
         description?: string | boolean;
         help?: string | boolean;
         version?: string | boolean;
         pkg?: any;
-        argv?: string[];
+        argv?: ReadonlyArray<string>;
         inferType?: boolean;
         flags?: buildOptions.Options;
         autoHelp?: boolean;
@@ -24,7 +31,7 @@ declare namespace meow {
     interface Result {
         input: string[];
         flags: { [name: string]: any };
-        pkg: object;
+        pkg: any;
         help: string;
         showHelp(code?: number): void;
         showVersion(): void;
diff --git a/types/meow/meow-tests.ts b/types/meow/meow-tests.ts
index 8915603292..1b044881b5 100644
--- a/types/meow/meow-tests.ts
+++ b/types/meow/meow-tests.ts
@@ -1,28 +1,31 @@
 import meow = require('meow');
 
-const cli = meow("Help text",
-    {
-        flags: {
-            unicorn: {
-                type: 'boolean',
-                alias: 'u'
-            },
-            fooBar: {
-                type: 'string',
-                default: 'foo'
-            }
+const cli = meow('Help text', {
+    flags: {
+        unicorn: {
+            type: 'boolean',
+            alias: 'u'
+        },
+        fooBar: {
+            type: 'string',
+            default: 'foo'
         }
     }
-);
+});
 
-const cli2 = meow("Help text");
+const input: string = cli.input[0];
+const version: string = cli.pkg.version;
+
+const cli2 = meow('Help text');
+
+const args: ReadonlyArray<string> = ['foo', 'bar'];
 
 const cli3 = meow({
-    description: "version string",
-    help: "help string",
-    version: "1.0.0",
+    description: 'version string',
+    help: 'help string',
+    version: '1.0.0',
     pkg: {},
-    argv: ['foo', 'bar'],
+    argv: args,
     inferType: true,
     autoHelp: true,
     autoVersion: true,
diff --git a/types/microrouter/index.d.ts b/types/microrouter/index.d.ts
index 6d65adc8a1..934affd630 100644
--- a/types/microrouter/index.d.ts
+++ b/types/microrouter/index.d.ts
@@ -8,12 +8,13 @@
 
 import { IncomingMessage, ServerResponse, Server } from 'http';
 import { RequestHandler } from 'micro';
-
+export type ServerResponse = ServerResponse;
+export type ServerRequest = IncomingMessage & {
+    params: { [key: string]: string },
+    query: { [key: string]: string }
+};
 export type AugmentedRequestHandler = (
-    req: IncomingMessage & {
-        params: {[key: string]: string},
-        query: {[key: string]: string}
-    },
+    req: ServerRequest,
     res: ServerResponse
 ) => any;
 
diff --git a/types/mock-knex/index.d.ts b/types/mock-knex/index.d.ts
index a21ab2eb0a..bad0aadb01 100644
--- a/types/mock-knex/index.d.ts
+++ b/types/mock-knex/index.d.ts
@@ -48,7 +48,10 @@ export interface Tracker extends EventEmitter {
      *
      * @param callback A function that gets executed on 'query' event.
      */
-    on(event: 'query', callback: (query: QueryDetails, step: number) => void): this;
+    on(
+        event: "query",
+        callback: (query: QueryDetails, step: number) => void
+    ): this;
 }
 
 /**
@@ -56,6 +59,8 @@ export interface Tracker extends EventEmitter {
  * Object properties signature matches with knex toSQL() output with additional method returns(values).
  */
 export interface QueryDetails extends Knex.Sql {
+    transacting: boolean;
+
     /**
      * Function that needs to be called to mock database query result for knex.
      *
diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index b7c5e52792..ba27943739 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -43,7 +43,7 @@ export class MongoClient extends EventEmitter {
     close(force?: boolean): Promise<void>;
     close(force: boolean, callback: MongoCallback<void>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#db */
-    db(name: string, options?: MongoClientCommonOption): Db
+    db(dbName?: string, options?: MongoClientCommonOption): Db
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#isConnected */
     isConnected(name: string, options?: MongoClientCommonOption): boolean;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#logout */
diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index a6d8a7b822..50496fc9da 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1543,9 +1543,12 @@ declare module "mongoose" {
     findOneAndUpdate(callback?: (err: any, doc: DocType | null) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any,
+    findOneAndUpdate(query: any, update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any, options: QueryFindOneAndUpdateOptions,
+    findOneAndUpdate(query: any, update: any,
+      options: { upsert: true, new: true } & QueryFindOneAndUpdateOptions,
+      callback?: (err: any, doc: DocType, res: any) => void): DocumentQuery<DocType, DocType>;
+    findOneAndUpdate(query: any, update: any, options: QueryFindOneAndUpdateOptions,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
 
     /**
@@ -2520,6 +2523,9 @@ declare module "mongoose" {
     findByIdAndUpdate(): DocumentQuery<T | null, T>;
     findByIdAndUpdate(id: any | number | string, update: any,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
+    findByIdAndUpdate(id: any | number | string, update: any,
+      options: { upsert: true, new: true } & ModelFindByIdAndUpdateOptions,
+      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
     findByIdAndUpdate(id: any | number | string, update: any,
       options: ModelFindByIdAndUpdateOptions,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
@@ -2565,6 +2571,9 @@ declare module "mongoose" {
     findOneAndUpdate(): DocumentQuery<T | null, T>;
     findOneAndUpdate(conditions: any, update: any,
       callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
+    findOneAndUpdate(conditions: any, update: any,
+      options: { upsert: true, new: true } & ModelFindOneAndUpdateOptions,
+      callback?: (err: any, doc: T, res: any) => void): DocumentQuery<T, T>;
     findOneAndUpdate(conditions: any, update: any,
       options: ModelFindOneAndUpdateOptions,
       callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index bf2f61f4a3..fc43549f8e 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -758,6 +758,7 @@ query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, {
 }, cb);
 query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, cb);
 query.findOneAndUpdate({name: 'aa'}, {name: 'bb'});
+query.findOneAndUpdate({}, {}, { upsert: true, new: true });
 query.findOneAndUpdate({name: 'bb'}, cb);
 query.findOneAndUpdate({name: 'bb'});
 query.findOneAndUpdate(cb);
@@ -1387,6 +1388,7 @@ MongoModel.findByIdAndRemove(999);
 MongoModel.findByIdAndRemove();
 MongoModel.findByIdAndUpdate(999, {}, {}, cb);
 MongoModel.findByIdAndUpdate(999, {}, {});
+MongoModel.findByIdAndUpdate(999, {}, { upsert: true, new: true });
 MongoModel.findByIdAndUpdate(999, {}, cb);
 MongoModel.findByIdAndUpdate(999, {});
 MongoModel.findByIdAndUpdate();
@@ -1415,6 +1417,7 @@ MongoModel.findOneAndRemove({});
 MongoModel.findOneAndRemove();
 MongoModel.findOneAndUpdate({}, {}, {}, cb);
 MongoModel.findOneAndUpdate({}, {}, {});
+MongoModel.findOneAndUpdate({}, {}, { upsert: true, new: true });
 MongoModel.findOneAndUpdate({}, {}, cb);
 MongoModel.findOneAndUpdate({}, {});
 MongoModel.findOneAndUpdate();
diff --git a/types/mongoose/v4/index.d.ts b/types/mongoose/v4/index.d.ts
index 4a4b7d224e..c680f3c980 100644
--- a/types/mongoose/v4/index.d.ts
+++ b/types/mongoose/v4/index.d.ts
@@ -1600,9 +1600,12 @@ declare module "mongoose" {
     findOneAndUpdate(callback?: (err: any, doc: DocType | null) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any,
+    findOneAndUpdate(query: any, update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any, options: QueryFindOneAndUpdateOptions,
+    findOneAndUpdate(query: any, update: any,
+      options: { upsert: true, new: true } & QueryFindOneAndUpdateOptions,
+      callback?: (err: any, doc: DocType, res: any) => void): DocumentQuery<DocType, DocType>;
+    findOneAndUpdate(query: any, update: any, options: QueryFindOneAndUpdateOptions,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
 
     /**
@@ -2528,6 +2531,9 @@ declare module "mongoose" {
     findByIdAndUpdate(): DocumentQuery<T | null, T>;
     findByIdAndUpdate(id: any | number | string, update: any,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
+    findByIdAndUpdate(id: any | number | string, update: any,
+      options: { upsert: true, new: true } & ModelFindByIdAndUpdateOptions,
+      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
     findByIdAndUpdate(id: any | number | string, update: any,
       options: ModelFindByIdAndUpdateOptions,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
@@ -2573,6 +2579,9 @@ declare module "mongoose" {
     findOneAndUpdate(): DocumentQuery<T | null, T>;
     findOneAndUpdate(conditions: any, update: any,
       callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
+    findOneAndUpdate(conditions: any, update: any,
+      options: { upsert: true, new: true } & ModelFindOneAndUpdateOptions,
+      callback?: (err: any, doc: T, res: any) => void): DocumentQuery<T, T>;
     findOneAndUpdate(conditions: any, update: any,
       options: ModelFindOneAndUpdateOptions,
       callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
diff --git a/types/mongoose/v4/mongoose-tests.ts b/types/mongoose/v4/mongoose-tests.ts
index 64214fe983..170a005b49 100644
--- a/types/mongoose/v4/mongoose-tests.ts
+++ b/types/mongoose/v4/mongoose-tests.ts
@@ -743,6 +743,8 @@ query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, {
 }, cb);
 query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, cb);
 query.findOneAndUpdate({name: 'aa'}, {name: 'bb'});
+query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, { });
+query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, { upsert: true, new: true });
 query.findOneAndUpdate({name: 'bb'}, cb);
 query.findOneAndUpdate({name: 'bb'});
 query.findOneAndUpdate(cb);
@@ -1371,6 +1373,7 @@ MongoModel.findByIdAndRemove(999);
 MongoModel.findByIdAndRemove();
 MongoModel.findByIdAndUpdate(999, {}, {}, cb);
 MongoModel.findByIdAndUpdate(999, {}, {});
+MongoModel.findByIdAndUpdate(999, {}, { new: true, upsert: true }, cb);
 MongoModel.findByIdAndUpdate(999, {}, cb);
 MongoModel.findByIdAndUpdate(999, {});
 MongoModel.findByIdAndUpdate();
@@ -1399,6 +1402,7 @@ MongoModel.findOneAndRemove({});
 MongoModel.findOneAndRemove();
 MongoModel.findOneAndUpdate({}, {}, {}, cb);
 MongoModel.findOneAndUpdate({}, {}, {});
+MongoModel.findOneAndUpdate({}, {}, { upsert: true, new: true });
 MongoModel.findOneAndUpdate({}, {}, cb);
 MongoModel.findOneAndUpdate({}, {});
 MongoModel.findOneAndUpdate();
diff --git a/types/muicss/index.d.ts b/types/muicss/index.d.ts
new file mode 100644
index 0000000000..f195ae5d23
--- /dev/null
+++ b/types/muicss/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for muicss React bindings 0.9
+// Project: https://www.muicss.com/
+// Definitions by: Samuel Neff <https://github.com/samuelneff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+// all definitions in react.d.ts and subdirs
diff --git a/types/muicss/lib/react/appbar.d.ts b/types/muicss/lib/react/appbar.d.ts
new file mode 100644
index 0000000000..3da725be31
--- /dev/null
+++ b/types/muicss/lib/react/appbar.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Appbar extends React.Component<P.DivProps> {}
diff --git a/types/muicss/lib/react/button.d.ts b/types/muicss/lib/react/button.d.ts
new file mode 100644
index 0000000000..df641cf4c4
--- /dev/null
+++ b/types/muicss/lib/react/button.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Button extends React.Component<P.ButtonProps> {}
diff --git a/types/muicss/lib/react/checkbox.d.ts b/types/muicss/lib/react/checkbox.d.ts
new file mode 100644
index 0000000000..dda10e0ade
--- /dev/null
+++ b/types/muicss/lib/react/checkbox.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Checkbox extends React.Component<P.CheckboxProps> {}
diff --git a/types/muicss/lib/react/col.d.ts b/types/muicss/lib/react/col.d.ts
new file mode 100644
index 0000000000..a052122a04
--- /dev/null
+++ b/types/muicss/lib/react/col.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Col extends React.Component<P.ColProps> {}
diff --git a/types/muicss/lib/react/container.d.ts b/types/muicss/lib/react/container.d.ts
new file mode 100644
index 0000000000..6845cd981b
--- /dev/null
+++ b/types/muicss/lib/react/container.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Container extends React.Component<P.ContainerProps> {}
diff --git a/types/muicss/lib/react/divider.d.ts b/types/muicss/lib/react/divider.d.ts
new file mode 100644
index 0000000000..ce2ea1f3d6
--- /dev/null
+++ b/types/muicss/lib/react/divider.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Divider extends React.Component<P.DividerProps> {}
diff --git a/types/muicss/lib/react/dropdown-item.d.ts b/types/muicss/lib/react/dropdown-item.d.ts
new file mode 100644
index 0000000000..07dbcd77b9
--- /dev/null
+++ b/types/muicss/lib/react/dropdown-item.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class DropdownItem extends React.Component<P.DropdownItemProps> {}
diff --git a/types/muicss/lib/react/dropdown.d.ts b/types/muicss/lib/react/dropdown.d.ts
new file mode 100644
index 0000000000..c34154133e
--- /dev/null
+++ b/types/muicss/lib/react/dropdown.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Dropdown extends React.Component<P.DropdownProps> {}
diff --git a/types/muicss/lib/react/form.d.ts b/types/muicss/lib/react/form.d.ts
new file mode 100644
index 0000000000..ca09da6102
--- /dev/null
+++ b/types/muicss/lib/react/form.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Form extends React.Component<P.FormProps> {}
diff --git a/types/muicss/lib/react/input.d.ts b/types/muicss/lib/react/input.d.ts
new file mode 100644
index 0000000000..2e8edfd7f7
--- /dev/null
+++ b/types/muicss/lib/react/input.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Input extends React.Component<P.InputProps> {}
diff --git a/types/muicss/lib/react/option.d.ts b/types/muicss/lib/react/option.d.ts
new file mode 100644
index 0000000000..59514c5cbc
--- /dev/null
+++ b/types/muicss/lib/react/option.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Option extends React.Component<P.OptionProps> {}
diff --git a/types/muicss/lib/react/panel.d.ts b/types/muicss/lib/react/panel.d.ts
new file mode 100644
index 0000000000..b92359f19e
--- /dev/null
+++ b/types/muicss/lib/react/panel.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Panel extends React.Component<P.PanelProps> {}
diff --git a/types/muicss/lib/react/radio.d.ts b/types/muicss/lib/react/radio.d.ts
new file mode 100644
index 0000000000..ab8f20cb37
--- /dev/null
+++ b/types/muicss/lib/react/radio.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Radio extends React.Component<P.RadioProps> {}
diff --git a/types/muicss/lib/react/row.d.ts b/types/muicss/lib/react/row.d.ts
new file mode 100644
index 0000000000..6da3037efc
--- /dev/null
+++ b/types/muicss/lib/react/row.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Row extends React.Component<P.RowProps> {}
diff --git a/types/muicss/lib/react/select.d.ts b/types/muicss/lib/react/select.d.ts
new file mode 100644
index 0000000000..4a5cefc75a
--- /dev/null
+++ b/types/muicss/lib/react/select.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Select extends React.Component<P.SelectProps> {}
diff --git a/types/muicss/lib/react/tab.d.ts b/types/muicss/lib/react/tab.d.ts
new file mode 100644
index 0000000000..6c93a45b09
--- /dev/null
+++ b/types/muicss/lib/react/tab.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Tab extends React.Component<P.TabProps> {}
diff --git a/types/muicss/lib/react/tabs.d.ts b/types/muicss/lib/react/tabs.d.ts
new file mode 100644
index 0000000000..e33ca34333
--- /dev/null
+++ b/types/muicss/lib/react/tabs.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Tabs extends React.Component<P.TabsProps> {}
diff --git a/types/muicss/lib/react/textarea.d.ts b/types/muicss/lib/react/textarea.d.ts
new file mode 100644
index 0000000000..82acb645e0
--- /dev/null
+++ b/types/muicss/lib/react/textarea.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class TextArea extends React.Component<P.TextareaProps> {}
diff --git a/types/muicss/muicss-tests.tsx b/types/muicss/muicss-tests.tsx
new file mode 100644
index 0000000000..000310918b
--- /dev/null
+++ b/types/muicss/muicss-tests.tsx
@@ -0,0 +1,200 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+
+import {
+    Appbar,
+    Button,
+    Checkbox,
+    Col,
+    Container,
+    Divider,
+    Dropdown,
+    DropdownItem,
+    Form,
+    Input,
+    Option,
+    Panel,
+    Radio,
+    Row,
+    Select,
+    Tab,
+    Tabs,
+    Textarea
+} from 'muicss/react';
+
+import Appbar2 from 'muicss/lib/react/appbar';
+import Button2 from 'muicss/lib/react/button';
+import Checkbox2 from 'muicss/lib/react/checkbox';
+import Col2 from 'muicss/lib/react/col';
+import Container2 from 'muicss/lib/react/container';
+import Divider2 from 'muicss/lib/react/divider';
+import Dropdown2 from 'muicss/lib/react/dropdown';
+import DropdownItem2 from 'muicss/lib/react/dropdown-item';
+import Form2 from 'muicss/lib/react/form';
+import Input2 from 'muicss/lib/react/input';
+import Option2 from 'muicss/lib/react/option';
+import Panel2 from 'muicss/lib/react/panel';
+import Radio2 from 'muicss/lib/react/radio';
+import Row2 from 'muicss/lib/react/row';
+import Select2 from 'muicss/lib/react/select';
+import Tab2 from 'muicss/lib/react/tab';
+import Tabs2 from 'muicss/lib/react/tabs';
+import Textarea2 from 'muicss/lib/react/textarea';
+
+class Test extends React.Component {
+    render() {
+        return (
+            <div>
+                <Appbar>Test application</Appbar>
+                <Container fluid={true}>
+                    <Row>
+                        <Col md={3} xs={12}>
+                            Link
+                            <Divider/>
+                            Link
+                        </Col>
+                        <Col md={4} xs={12}>
+                            <Tabs defaultSelectedIndex={0}>
+                                <Tab label="One">
+                                    <Form>
+                                        <legend>Test form</legend>
+
+                                        <Input label="Text input"
+                                               hint="Type something"
+                                               />
+
+                                        <Textarea label="Text area"
+                                                  hint="Type lots of something"
+                                                  />
+
+                                        <Checkbox label="Check"
+                                                  value="whatever"
+                                                  defaultChecked={false}
+                                                  />
+
+                                        <Radio name="radios"
+                                               label="Radio 1"
+                                               value="r1"
+                                               />
+
+                                        <Radio name="radios"
+                                               label="Radio 2"
+                                               value="r2"
+                                               />
+
+                                        <Radio name="radios"
+                                               label="Radio 3"
+                                               value="r3"
+                                               />
+
+                                        <Dropdown label="dropdown">
+                                            <DropdownItem value={1}>One</DropdownItem>
+                                            <DropdownItem value={2}>Two</DropdownItem>
+                                            <DropdownItem value={3}>Three</DropdownItem>
+                                        </Dropdown>
+
+                                        <Select label="select">
+                                            <Option value={1} label="One" />
+                                            <Option value={2} label="Two" />
+                                            <Option value={3} label="Three" />
+                                        </Select>
+
+                                        <Button>Submit</Button>
+                                    </Form>
+                                </Tab>
+                                <Tab label="Two">
+
+                                    <Panel>
+                                        I'm inside a panel!
+                                    </Panel>
+
+                                </Tab>
+                            </Tabs>
+                        </Col>
+                    </Row>
+                    <Button color="primary">button</Button>
+                </Container>
+            </div>
+        );
+    }
+}
+
+class Test2 extends React.Component {
+    render() {
+        return (
+            <div>
+                <Appbar2>Test application</Appbar2>
+                <Container2 fluid={true}>
+                    <Row2>
+                        <Col2 md={3} xs={12}>
+                            Link
+                            <Divider2/>
+                            Link
+                        </Col2>
+                        <Col2 md={4} xs={12}>
+                            <Tabs2 defaultSelectedIndex={0}>
+                                <Tab2 label="One">
+                                    <Form2>
+                                        <legend>Test form</legend>
+
+                                        <Input2 label="Text input"
+                                               hint="Type something"
+                                        />
+
+                                        <Textarea2 label="Text area"
+                                                  hint="Type lots of something"
+                                        />
+
+                                        <Checkbox2 label="Check"
+                                                  value="whatever"
+                                                  defaultChecked={false}
+                                        />
+
+                                        <Radio2 name="radios"
+                                               label="Radio 1"
+                                               value="r1"
+                                        />
+
+                                        <Radio2 name="radios"
+                                               label="Radio 2"
+                                               value="r2"
+                                        />
+
+                                        <Radio2 name="radios"
+                                               label="Radio 3"
+                                               value="r3"
+                                        />
+
+                                        <Dropdown2 label="dropdown">
+                                            <DropdownItem2 value={1}>One</DropdownItem2>
+                                            <DropdownItem2 value={2}>Two</DropdownItem2>
+                                            <DropdownItem2 value={3}>Three</DropdownItem2>
+                                        </Dropdown2>
+
+                                        <Select2 label="select">
+                                            <Option2 value={1} label="One" />
+                                            <Option2 value={2} label="Two" />
+                                            <Option2 value={3} label="Three" />
+                                        </Select2>
+
+                                        <Button2>Submit</Button2>
+                                    </Form2>
+                                </Tab2>
+                                <Tab2 label="Two">
+
+                                    <Panel2>
+                                        I'm inside a panel!
+                                    </Panel2>
+
+                                </Tab2>
+                            </Tabs2>
+                        </Col2>
+                    </Row2>
+                    <Button2 color="primary">button</Button2>
+                </Container2>
+            </div>
+        );
+    }
+}
+
+ReactDOM.render(<Test />, document.getElementById('root'));
diff --git a/types/muicss/react.d.ts b/types/muicss/react.d.ts
new file mode 100644
index 0000000000..f8a28c5964
--- /dev/null
+++ b/types/muicss/react.d.ts
@@ -0,0 +1,143 @@
+import Appbar from './lib/react/appbar';
+import Button from './lib/react/button';
+import Checkbox from './lib/react/checkbox';
+import Col from './lib/react/col';
+import Container from './lib/react/container';
+import Divider from './lib/react/divider';
+import Dropdown from './lib/react/dropdown';
+import DropdownItem from './lib/react/dropdown-item';
+import Form from './lib/react/form';
+import Input from './lib/react/input';
+import Option from './lib/react/option';
+import Panel from './lib/react/panel';
+import Radio from './lib/react/radio';
+import Row from './lib/react/row';
+import Select from './lib/react/select';
+import Tab from './lib/react/tab';
+import Tabs from './lib/react/tabs';
+import Textarea from './lib/react/textarea';
+
+export {
+    Appbar,
+    Button,
+    Checkbox,
+    Col,
+    Container,
+    Divider,
+    Dropdown,
+    DropdownItem,
+    Form,
+    Input,
+    Option,
+    Panel,
+    Radio,
+    Row,
+    Select,
+    Tab,
+    Tabs,
+    Textarea
+};
+
+export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+    size?: string;
+    variant?: string;
+}
+
+export interface CheckboxProps extends React.HTMLAttributes<HTMLDivElement> {
+    name?: string;
+    label?: React.ReactNode;
+    autoFocus?: boolean;
+    checked?: boolean;
+    disabled?: boolean;
+    form?: string;
+    required?: boolean;
+    value?: string | string[] | number;
+}
+
+export interface ColProps extends DivProps {
+    xs?: number;
+    sm?: number;
+    md?: number;
+    lg?: number;
+    xl?: number;
+    'xs-offset'?: number;
+    'sm-offset'?: number;
+    'md-offset'?: number;
+    'lg-offset'?: number;
+    'xl-offset'?: number;
+}
+
+export interface ContainerProps extends DivProps {
+    fluid?: boolean;
+}
+
+export interface DivProps extends React.HTMLAttributes<HTMLDivElement> {}
+export type DividerProps = DivProps;
+
+export interface DropdownItemProps extends React.LiHTMLAttributes<HTMLLIElement> {
+    link?: string;
+    target?: string;
+}
+
+export interface DropdownProps extends React.HTMLAttributes<HTMLDivElement> {
+    onOutsideClick?: React.MouseEventHandler<HTMLDivElement>;
+
+    variant?: string;
+    size?: string;
+    label?: React.ReactNode;
+    alignMenu?: 'left' | 'right';
+    disabled?: boolean;
+}
+
+export interface FormProps extends React.FormHTMLAttributes<HTMLFormElement> {
+    inline?: boolean;
+}
+
+export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+    inputRef?: React.Ref<HTMLInputElement>;
+    onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
+    hint?: string;
+    invalid?: boolean;
+    label?: React.ReactNode;
+    floatingLabel?: boolean;
+}
+
+export interface OptionProps extends React.OptionHTMLAttributes<HTMLOptionElement> {
+}
+
+export type PanelProps = DivProps;
+export type RadioProps = CheckboxProps;
+
+export interface RowProps extends DivProps {
+    xs?: number;
+    sm?: number;
+    md?: number;
+    lg?: number;
+}
+
+export interface SelectProps extends DivProps {
+    label?: React.ReactNode;
+    readOnly?: boolean;
+    useDefault?: boolean;
+}
+
+export interface TabProps {
+    value?: any;
+    label?: React.ReactNode;
+    onActive?: (tab: Tab) => void;
+}
+
+export interface TabsProps extends DivProps {
+    defaultSelectedIndex?: number;
+    selectedIndex?: number;
+    justified?: boolean;
+}
+
+export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
+    inputRef?: React.Ref<HTMLTextAreaElement>;
+    onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
+    hint?: string;
+    invalid?: boolean;
+    label?: React.ReactNode;
+    floatingLabel?: boolean;
+}
diff --git a/types/muicss/tsconfig.json b/types/muicss/tsconfig.json
new file mode 100644
index 0000000000..a7b54e6b6a
--- /dev/null
+++ b/types/muicss/tsconfig.json
@@ -0,0 +1,46 @@
+{
+    "files": [
+        "index.d.ts",
+        "react.d.ts",
+        "muicss-tests.tsx",
+        "lib/react/appbar.d.ts",
+        "lib/react/button.d.ts",
+        "lib/react/checkbox.d.ts",
+        "lib/react/col.d.ts",
+        "lib/react/container.d.ts",
+        "lib/react/divider.d.ts",
+        "lib/react/dropdown.d.ts",
+        "lib/react/dropdown-item.d.ts",
+        "lib/react/form.d.ts",
+        "lib/react/input.d.ts",
+        "lib/react/option.d.ts",
+        "lib/react/panel.d.ts",
+        "lib/react/radio.d.ts",
+        "lib/react/row.d.ts",
+        "lib/react/select.d.ts",
+        "lib/react/tab.d.ts",
+        "lib/react/tabs.d.ts",
+        "lib/react/textarea.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    }
+}
diff --git a/types/muicss/tslint.json b/types/muicss/tslint.json
new file mode 100644
index 0000000000..946997cb87
--- /dev/null
+++ b/types/muicss/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-useless-files": false
+    }
+}
diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index 7d3281218f..1e827a7d37 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -521,6 +521,11 @@ export interface MysqlError extends Error {
      * SQL of failed query
      */
     sql?: string;
+
+    /**
+     * Error message from MySQL
+     */
+    sqlMessage?: string;
 }
 
 export const enum Types {
diff --git a/types/ndarray/index.d.ts b/types/ndarray/index.d.ts
index eb889d31af..039401b6e2 100644
--- a/types/ndarray/index.d.ts
+++ b/types/ndarray/index.d.ts
@@ -24,7 +24,7 @@ interface ndarray<T = number> {
 	hi(...args: number[]): ndarray<T>;
 	step(...args: number[]): ndarray<T>;
 	transpose(...args: number[]): ndarray<T>;
-	pick(...args: number[]): ndarray<T>;
+	pick(...args: Array<number | null>): ndarray<T>;
 	reshape(...shapes: number[]): ndarray<T>;
 	T: ndarray<T>;
 }
diff --git a/types/ndarray/ndarray-tests.ts b/types/ndarray/ndarray-tests.ts
index aa4f4fcefb..09bd7b2f00 100644
--- a/types/ndarray/ndarray-tests.ts
+++ b/types/ndarray/ndarray-tests.ts
@@ -22,3 +22,5 @@ console.log(a.get(0, 0, 0) === 1);
 console.log(a.index(1, 1, 1) === 12);
 
 const b = a.lo(0, 0, 0).hi(1, 1, 1);
+
+a.pick(null, null, 1);
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 717b906b28..b2e310cffa 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2104,6 +2104,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsHide?: boolean;
     }
 
     export interface ExecOptionsWithStringEncoding extends ExecOptions {
@@ -2150,6 +2151,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
@@ -2233,6 +2235,7 @@ declare module "child_process" {
         maxBuffer?: number;
         encoding?: string;
         shell?: boolean | string;
+        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
@@ -2270,6 +2273,7 @@ declare module "child_process" {
         killSignal?: string;
         maxBuffer?: number;
         encoding?: string;
+        windowsHide?: boolean;
     }
     export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
         encoding: BufferEncoding;
@@ -2293,6 +2297,7 @@ declare module "child_process" {
         killSignal?: string;
         maxBuffer?: number;
         encoding?: string;
+        windowsHide?: boolean;
     }
     export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
         encoding: BufferEncoding;
@@ -4895,6 +4900,14 @@ declare module "tls" {
         getPeerCertificate(detailed: true): DetailedPeerCertificate;
         getPeerCertificate(detailed?: false): PeerCertificate;
         getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 0572c58fea..1eb6539b09 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -2049,14 +2049,17 @@ namespace string_decoder_tests {
 namespace child_process_tests {
     {
         childProcess.exec("echo test");
+        childProcess.exec("echo test", {windowsHide: true});
         childProcess.spawnSync("echo test");
+        childProcess.spawnSync("echo test", {windowsVerbatimArguments: false});
     }
 
     {
         childProcess.execFile("npm", () => {});
+        childProcess.execFile("npm", { windowsHide: true }, () => {});
         childProcess.execFile("npm", ["-v"], () => {});
-        childProcess.execFile("npm", ["-v"], { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
-        childProcess.execFile("npm", ["-v"], { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+        childProcess.execFile("npm", ["-v"], { windowsHide: true, encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", ["-v"], { windowsHide: true, encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
         childProcess.execFile("npm", { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
         childProcess.execFile("npm", { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
     }
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 3c81e212b7..152507c3a8 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -3215,6 +3215,14 @@ declare module "tls" {
             fingerprint: string;
             serialNumber: string;
         };
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index de69dc94c3..bdcb47d2e1 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -3313,6 +3313,14 @@ declare module "tls" {
         getPeerCertificate(detailed: true): DetailedPeerCertificate;
         getPeerCertificate(detailed?: false): PeerCertificate;
         getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 5d672296f2..f28c0959a4 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -2093,6 +2093,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsHide?: boolean;
     }
 
     export interface ExecOptionsWithStringEncoding extends ExecOptions {
@@ -2139,6 +2140,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
@@ -2222,6 +2224,7 @@ declare module "child_process" {
         maxBuffer?: number;
         encoding?: string;
         shell?: boolean | string;
+        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
@@ -2259,6 +2262,7 @@ declare module "child_process" {
         killSignal?: string;
         maxBuffer?: number;
         encoding?: string;
+        windowsHide?: boolean;
     }
     export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
         encoding: BufferEncoding;
@@ -2282,6 +2286,7 @@ declare module "child_process" {
         killSignal?: string;
         maxBuffer?: number;
         encoding?: string;
+        windowsHide?: boolean;
     }
     export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
         encoding: BufferEncoding;
@@ -4873,6 +4878,14 @@ declare module "tls" {
         getPeerCertificate(detailed: true): DetailedPeerCertificate;
         getPeerCertificate(detailed?: false): PeerCertificate;
         getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
diff --git a/types/nodemailer/index.d.ts b/types/nodemailer/index.d.ts
index bee4649e94..0b46c67789 100644
--- a/types/nodemailer/index.d.ts
+++ b/types/nodemailer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Nodemailer 4.3
+// Type definitions for Nodemailer 4.6
 // Project: https://github.com/nodemailer/nodemailer
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 //                 Piotr Roszatycki <https://github.com/dex4er>
diff --git a/types/nodemailer/lib/fetch/index.d.ts b/types/nodemailer/lib/fetch/index.d.ts
index 8fc814c517..765debb179 100644
--- a/types/nodemailer/lib/fetch/index.d.ts
+++ b/types/nodemailer/lib/fetch/index.d.ts
@@ -4,12 +4,18 @@ type ms = number;
 
 import _Cookies = require('./cookies');
 
+import * as http from 'http';
 import { Writable } from 'stream';
 import * as tls from 'tls';
 
 declare namespace fetch {
     type Cookies = _Cookies;
 
+    interface WritableResponse extends Writable {
+        statusCode: number;
+        headers: http.IncomingHttpHeaders;
+    }
+
     interface Options {
         fetchRes?: Writable;
         cookies?: Cookies;
@@ -27,6 +33,6 @@ declare namespace fetch {
     }
 }
 
-declare function fetch(url: string, options?: fetch.Options): Writable;
+declare function fetch(url: string, options?: fetch.Options): fetch.WritableResponse;
 
 export = fetch;
diff --git a/types/nodemailer/lib/mailer/index.d.ts b/types/nodemailer/lib/mailer/index.d.ts
index bd9dd7ba8d..f9d36d7efb 100644
--- a/types/nodemailer/lib/mailer/index.d.ts
+++ b/types/nodemailer/lib/mailer/index.d.ts
@@ -46,7 +46,7 @@ declare namespace Mail {
         encoding?: string;
         /** optional content type for the attachment, if not set will be derived from the filename property */
         contentType?: string;
-        /** optional transfer encoding for the attachment, if not set it will be derived from the contentType property. Example values: quoted-printable, base64 */
+        /** optional transfer encoding for the attachment, if not set it will be derived from the contentType property. Example values: quoted-printable, base64. If it is unset then base64 encoding is used for the attachment. If it is set to false then previous default applies (base64 for most, 7bit for text). */
         contentTransferEncoding?: string;
         /** optional content disposition type for the attachment, defaults to ‘attachment’ */
         contentDisposition?: string;
@@ -135,6 +135,8 @@ declare namespace Mail {
         disableFileAccess?: boolean;
         /** is an object with DKIM options */
         dkim?: DKIM.Options;
+        /** method to normalize header keys for custom caseing */
+        normalizeHeaderKey?(key: string): string;
     }
 
     type PluginFunction = (mail: MailMessage, callback: (err?: Error | null) => void) => void;
diff --git a/types/nodemailer/lib/mime-node.d.ts b/types/nodemailer/lib/mime-node.d.ts
index 98eda91874..047770ce57 100644
--- a/types/nodemailer/lib/mime-node.d.ts
+++ b/types/nodemailer/lib/mime-node.d.ts
@@ -34,7 +34,9 @@ declare namespace MimeNode {
         /** If true, do not exclude Bcc from the generated headers */
         keepBcc?: boolean;
         /** either 'Q' (the default) or 'B' */
-        textEncoding: 'B' | 'Q';
+        textEncoding?: 'B' | 'Q';
+        /** method to normalize header keys for custom caseing */
+        normalizeHeaderKey?(key: string): string;
     }
 }
 
@@ -44,10 +46,10 @@ declare namespace MimeNode {
  * the options, assumes this is the root.
  */
 declare class MimeNode {
-    constructor(contentType: string, options: MimeNode.Options);
+    constructor(contentType: string, options?: MimeNode.Options);
 
     /** Creates and appends a child node.Arguments provided are passed to MimeNode constructor */
-    createChild(contentType: string, options: MimeNode.Options): MimeNode;
+    createChild(contentType: string, options?: MimeNode.Options): MimeNode;
 
     /** Appends an existing node to the mime tree. Removes the node from an existing tree if needed */
     appendChild(childNode: MimeNode): MimeNode;
@@ -63,7 +65,7 @@ declare class MimeNode {
      * You can set multiple values as well by using [{key:'', value:''}] or
      * {key: 'value'} as the first argument.
      */
-    setHeader(key: string, value: string): this;
+    setHeader(key: string, value: string | string[]): this;
     setHeader(headers: { [key: string]: string } | Array<{ key: string, value: string }>): this;
 
     /**
diff --git a/types/nodemailer/nodemailer-tests.ts b/types/nodemailer/nodemailer-tests.ts
index 9761cb73e4..0caa84b0e0 100644
--- a/types/nodemailer/nodemailer-tests.ts
+++ b/types/nodemailer/nodemailer-tests.ts
@@ -10,6 +10,7 @@ import MailComposer = require('nodemailer/lib/mail-composer');
 import MailMessage = require('nodemailer/lib/mailer/mail-message');
 import mimeFuncs = require('nodemailer/lib/mime-funcs');
 import mimeTypes = require('nodemailer/lib/mime-funcs/mime-types');
+import MimeNode = require('nodemailer/lib/mime-node');
 import qp = require('nodemailer/lib/qp');
 import SendmailTransport = require('nodemailer/lib/sendmail-transport');
 import SESTransport = require('nodemailer/lib/ses-transport');
@@ -790,7 +791,8 @@ function stream_buffer_unix_newlines_test() {
     const transporter = nodemailer.createTransport({
         streamTransport: true,
         newline: 'unix',
-        buffer: true
+        buffer: true,
+        normalizeHeaderKey: (key) => key.toUpperCase()
     });
     transporter.sendMail({
         from: 'sender@example.com',
@@ -1090,7 +1092,11 @@ function base64_test() {
 // fetch
 
 function fetch_test() {
-    fetch('http://localhost/');
+    const stream = fetch('http://localhost/');
+
+    const statusCode: number = stream.statusCode;
+    const headers = stream.headers;
+    const contentType: string | undefined = headers['content-type'];
 
     fetch('http://localhost:/', {
         allowErrorResponse: true,
@@ -1201,6 +1207,50 @@ function mime_funcs_test() {
     mimeFuncs.foldLines('Testin command line', 76);
 }
 
+// mime-node
+
+function mime_node_test() {
+    const mb = new MimeNode('text/plain', {
+        normalizeHeaderKey: (key) => key.toUpperCase()
+    });
+
+    const child = mb.createChild('multipart/mixed');
+    mb.appendChild(child);
+    child.replace(child);
+
+    mb.setHeader('key', 'value');
+    const value: string = mb.getHeader('key');
+
+    mb.addHeader({
+        key: 'value4',
+        key2: 'value5'
+    });
+
+    mb.setHeader([
+        {
+            key: 'key',
+            value: 'value2'
+        },
+        {
+            key: 'key2',
+            value: 'value3'
+        }
+    ]);
+
+    mb.setHeader('key', ['value1', 'value2', 'value3']);
+
+    mb.setContent('abc');
+
+    mb.build((err, msg) => {
+        const msgAsString: string = msg.toString();
+    });
+
+    mb.processFunc((input) => {
+        const isReadable: boolean = input.readable;
+        return input;
+    });
+}
+
 // mime-types
 
 function mime_types_test() {
diff --git a/types/nw.js/index.d.ts b/types/nw.js/index.d.ts
index b4e941b0a7..93307f9e87 100644
--- a/types/nw.js/index.d.ts
+++ b/types/nw.js/index.d.ts
@@ -372,7 +372,7 @@ declare module NWJS_Helpers {
          * The paper size spec
          * example: 'mediaSize':{'name': 'CUSTOM', 'width_microns': 279400, 'height_microns': 215900, 'custom_display_name':'Letter', 'is_default': true}
          */
-        mediaSize: JSON;
+        mediaSize: any;
 
         /**
          * Whether to print CSS backgrounds
@@ -1072,9 +1072,9 @@ declare module NWJS_Helpers {
          * Enumerate the printers in the system.
          *
          * @param callback {function(dev_win?)} callback with the native window of the DevTools window.
-         * - (optional) printers {JSON[]} An array of JSON objects for the printer information.
+         * - (optional) printers {any[]} An array of json objects for the printer information.
          */
-        getPrinters( callback: ( printers?: JSON[] ) => void ): void;
+        getPrinters( callback: ( printers?: any[] ) => void ): void;
 
         /**
          * Query the status of devtools window.
@@ -1084,9 +1084,9 @@ declare module NWJS_Helpers {
         /**
          * Print the web contents in the window without the need for user’s interaction.
          *
-         * @param options {Object} Specify whether to close the window forcely and bypass close event.
+         * @param options {any | PrintOption} Specify whether to close the window forcely and bypass close event.
          */
-        print( options: JSON | PrintOption ): void;
+        print( options: any | PrintOption ): void;
 
         /**
          * Set window's maximum size.
@@ -1381,9 +1381,9 @@ declare namespace nw {
         dataPath: string;
 
         /**
-         * Get the JSON object of the manifest file.
+         * Get the json object of the manifest file.
          */
-        manifest: JSON;
+        manifest: any;
 
         /**
          * Clear the HTTP cache in memory and the one on disk. This method call is synchronized.
diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index a01f6b25ad..0dfd1fe464 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -11,44 +11,56 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions partially generated using tsd-jsdoc (https://github.com/englercj/tsd-jsdoc)
 
-declare type GlobalObject = Object;
+export as namespace ol;
+
+interface GlobalObject { [key: string]: any; }
 
 /**
- * @namespace ol
+ * Error object thrown when an assertion failed. This is an ECMA-262 Error,
+ * extended with a `code` property.
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
+ * @param code Error code.
  */
-declare module ol {
+export class AssertionError extends Error {
     /**
      * Error object thrown when an assertion failed. This is an ECMA-262 Error,
      * extended with a `code` property.
      * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
-     * @constructor
-     * @extends {Error}
-     * @implements {oli.AssertionError}
-     * @param {number} code Error code.
+     * @param code Error code.
      */
-    class AssertionError extends Error {
-        /**
-         * Error object thrown when an assertion failed. This is an ECMA-262 Error,
-         * extended with a `code` property.
-         * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
-         * @constructor
-         * @extends {Error}
-         * @implements {oli.AssertionError}
-         * @param {number} code Error code.
-         */
-        constructor(code: number);
+    constructor(code: number);
 
-        /**
-         * Error code. The meaning of the code can be found on
-         * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
-         * the version found in the OpenLayers script's header comment if a version
-         * other than the latest is used).
-         * @type {number}
-         * @api
-         */
-        code: number;
-    }
+    /**
+     * Error code. The meaning of the code can be found on
+     * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
+     * the version found in the OpenLayers script's header comment if a version
+     * other than the latest is used).
+     * @api
+     */
+    code: number;
+}
 
+/**
+ * @classdesc
+ * An attribution for a layer source.
+ *
+ * Example:
+ *
+ *     source: new ol.source.OSM({
+ *       attributions: [
+ *         new ol.Attribution({
+ *           html: 'All maps &copy; ' +
+ *               '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
+ *         }),
+ *         ol.source.OSM.ATTRIBUTION
+ *       ],
+ *     ..
+ *
+ * @param options Attribution options.
+ * @struct
+ * @api stable
+ */
+export class Attribution {
     /**
      * @classdesc
      * An attribution for a layer source.
@@ -65,43 +77,34 @@ declare module ol {
      *       ],
      *     ..
      *
-     * @constructor
-     * @param {olx.AttributionOptions} options Attribution options.
+     * @param options Attribution options.
      * @struct
      * @api stable
      */
-    class Attribution {
-        /**
-         * @classdesc
-         * An attribution for a layer source.
-         *
-         * Example:
-         *
-         *     source: new ol.source.OSM({
-         *       attributions: [
-         *         new ol.Attribution({
-         *           html: 'All maps &copy; ' +
-         *               '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
-         *         }),
-         *         ol.source.OSM.ATTRIBUTION
-         *       ],
-         *     ..
-         *
-         * @constructor
-         * @param {olx.AttributionOptions} options Attribution options.
-         * @struct
-         * @api stable
-         */
-        constructor(options: olx.AttributionOptions);
+    constructor(options: olx.AttributionOptions);
 
-        /**
-         * Get the attribution markup.
-         * @return {string} The attribution HTML.
-         * @api stable
-         */
-        getHTML(): string;
-    }
+    /**
+     * Get the attribution markup.
+     * @return The attribution HTML.
+     * @api stable
+     */
+    getHTML(): string;
+}
 
+/**
+ * @classdesc
+ * An expanded version of standard JS Array, adding convenience methods for
+ * manipulation. Add and remove changes to the Collection trigger a Collection
+ * event. Note that this does not cover changes to the objects _within_ the
+ * Collection; they trigger events on the appropriate object, not on the
+ * Collection as a whole.
+ *
+ * @fires ol.Collection.Event
+ * @param opt_array Array.
+ * @template T
+ * @api stable
+ */
+export class Collection<T> extends Object {
     /**
      * @classdesc
      * An expanded version of standard JS Array, adding convenience methods for
@@ -110,215 +113,196 @@ declare module ol {
      * Collection; they trigger events on the appropriate object, not on the
      * Collection as a whole.
      *
-     * @constructor
-     * @extends {ol.Object}
      * @fires ol.Collection.Event
-     * @param {!Array.<T>=} opt_array Array.
+     * @param opt_array Array.
      * @template T
      * @api stable
      */
-    class Collection<T> extends ol.Object {
-        /**
-         * @classdesc
-         * An expanded version of standard JS Array, adding convenience methods for
-         * manipulation. Add and remove changes to the Collection trigger a Collection
-         * event. Note that this does not cover changes to the objects _within_ the
-         * Collection; they trigger events on the appropriate object, not on the
-         * Collection as a whole.
-         *
-         * @constructor
-         * @extends {ol.Object}
-         * @fires ol.Collection.Event
-         * @param {!Array.<T>=} opt_array Array.
-         * @template T
-         * @api stable
-         */
-        constructor(opt_array?: T[]);
+    constructor(opt_array?: T[]);
 
-        /**
-         * Remove all elements from the collection.
-         * @api stable
-         */
-        clear(): void;
+    /**
+     * Remove all elements from the collection.
+     * @api stable
+     */
+    clear(): void;
 
-        /**
-         * Add elements to the collection.  This pushes each item in the provided array
-         * to the end of the collection.
-         * @param {!Array.<T>} arr Array.
-         * @return {ol.Collection.<T>} This collection.
-         * @api stable
-         */
-        extend(arr: T[]): ol.Collection<T>;
+    /**
+     * Add elements to the collection.  This pushes each item in the provided array
+     * to the end of the collection.
+     * @param arr Array.
+     * @return This collection.
+     * @api stable
+     */
+    extend(arr: T[]): ol.Collection<T>;
 
-        /**
-         * Iterate over each element, calling the provided callback.
-         * @param {function(this: S, T, number, Array.<T>): *} f The function to call
-         *     for every element. This function takes 3 arguments (the element, the
-         *     index and the array). The return value is ignored.
-         * @param {S=} opt_this The object to use as `this` in `f`.
-         * @template S
-         * @api stable
-         */
-        forEach<S>(f: ((item: T, index: number, array: T[]) => any), opt_this?: S): void;
+    /**
+     * Iterate over each element, calling the provided callback.
+     * @param f The function to call
+     *     for every element. This function takes 3 arguments (the element, the
+     *     index and the array). The return value is ignored.
+     * @param opt_this The object to use as `this` in `f`.
+     * @template S
+     * @api stable
+     */
+    forEach<S>(f: ((item: T, index: number, array: T[]) => any), opt_this?: S): void;
 
-        /**
-         * Get a reference to the underlying Array object. Warning: if the array
-         * is mutated, no events will be dispatched by the collection, and the
-         * collection's "length" property won't be in sync with the actual length
-         * of the array.
-         * @return {!Array.<T>} Array.
-         * @api stable
-         */
-        getArray(): T[];
+    /**
+     * Get a reference to the underlying Array object. Warning: if the array
+     * is mutated, no events will be dispatched by the collection, and the
+     * collection's "length" property won't be in sync with the actual length
+     * of the array.
+     * @return Array.
+     * @api stable
+     */
+    getArray(): T[];
 
-        /**
-         * Get the element at the provided index.
-         * @param {number} index Index.
-         * @return {T} Element.
-         * @api stable
-         */
-        item(index: number): T;
+    /**
+     * Get the element at the provided index.
+     * @param index Index.
+     * @return Element.
+     * @api stable
+     */
+    item(index: number): T;
 
-        /**
-         * Get the length of this collection.
-         * @return {number} The length of the array.
-         * @observable
-         * @api stable
-         */
-        getLength(): number;
+    /**
+     * Get the length of this collection.
+     * @return The length of the array.
+     * @observable
+     * @api stable
+     */
+    getLength(): number;
 
-        /**
-         * Insert an element at the provided index.
-         * @param {number} index Index.
-         * @param {T} elem Element.
-         * @api stable
-         */
-        insertAt(index: number, elem: T): void;
+    /**
+     * Insert an element at the provided index.
+     * @param index Index.
+     * @param elem Element.
+     * @api stable
+     */
+    insertAt(index: number, elem: T): void;
 
-        /**
-         * Remove the last element of the collection and return it.
-         * Return `undefined` if the collection is empty.
-         * @return {T|undefined} Element.
-         * @api stable
-         */
-        pop(): (T);
+    /**
+     * Remove the last element of the collection and return it.
+     * Return `undefined` if the collection is empty.
+     * @return Element.
+     * @api stable
+     */
+    pop(): (T);
 
-        /**
-         * Insert the provided element at the end of the collection.
-         * @param {T} elem Element.
-         * @return {number} Length.
-         * @api stable
-         */
-        push(elem: T): number;
+    /**
+     * Insert the provided element at the end of the collection.
+     * @param elem Element.
+     * @return Length.
+     * @api stable
+     */
+    push(elem: T): number;
 
-        /**
-         * Remove the first occurrence of an element from the collection.
-         * @param {T} elem Element.
-         * @return {T|undefined} The removed element or undefined if none found.
-         * @api stable
-         */
-        remove(elem: T): (T);
+    /**
+     * Remove the first occurrence of an element from the collection.
+     * @param elem Element.
+     * @return The removed element or undefined if none found.
+     * @api stable
+     */
+    remove(elem: T): (T);
 
-        /**
-         * Remove the element at the provided index and return it.
-         * Return `undefined` if the collection does not contain this index.
-         * @param {number} index Index.
-         * @return {T|undefined} Value.
-         * @api stable
-         */
-        removeAt(index: number): (T);
+    /**
+     * Remove the element at the provided index and return it.
+     * Return `undefined` if the collection does not contain this index.
+     * @param index Index.
+     * @return Value.
+     * @api stable
+     */
+    removeAt(index: number): (T);
 
-        /**
-         * Set the element at the provided index.
-         * @param {number} index Index.
-         * @param {T} elem Element.
-         * @api stable
-         */
-        setAt(index: number, elem: T): void;
-    }
+    /**
+     * Set the element at the provided index.
+     * @param index Index.
+     * @param elem Element.
+     * @api stable
+     */
+    setAt(index: number, elem: T): void;
+}
 
-    module Collection {
-        type EventType = string;
+export namespace Collection {
+    type EventType = string;
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.Collection} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param opt_element Element.
+     */
+    class Event extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.Collection} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.Collection.Event}
-         * @param {ol.Collection.EventType} type Type.
-         * @param {*=} opt_element Element.
+         * @param type Type.
+         * @param opt_element Element.
          */
-        class Event extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.Collection} instances are instances of this
-             * type.
-             *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.Collection.Event}
-             * @param {ol.Collection.EventType} type Type.
-             * @param {*=} opt_element Element.
-             */
-            constructor(type: ol.Collection.EventType, opt_element?: any);
+        constructor(type: ol.Collection.EventType, opt_element?: any);
 
-            /**
-             * The element that is added to or removed from the collection.
-             * @type {*}
-             * @api stable
-             */
-            element: any;
-        }
+        /**
+         * The element that is added to or removed from the collection.
+         * @api stable
+         */
+        element: any;
     }
+}
+
+/**
+ * Colors can be defined as a {@link ol.Color} array, or as strings in
+ * `rgb(r,g,b)` or `rgba(r,g,b,a)` format, or in hex `#rrggbb` or `#rgb` format.
+ * Color names, like 'red', 'blue' or 'green', may also be used with the
+ * Canvas renderer.
+ *
+ */
+export namespace color {
+    /**
+     * Return the color as an array. This function maintains a cache of calculated
+     * arrays which means the result should not be modified.
+     * @param color Color.
+     * @return Color.
+     * @api
+     */
+    function asArray(color: (ol.Color | string)): ol.Color;
 
     /**
-     * Colors can be defined as a {@link ol.Color} array, or as strings in
-     * `rgb(r,g,b)` or `rgba(r,g,b,a)` format, or in hex `#rrggbb` or `#rgb` format.
-     * Color names, like 'red', 'blue' or 'green', may also be used with the
-     * Canvas renderer.
+     * Return the color as an rgba string.
+     * @param color Color.
+     * @return Rgba string.
+     * @api
+     */
+    function asString(color: (ol.Color | string)): string;
+}
+
+/**
+ * An {@link ol.ColorLike} can be a color, gradient or pattern accepted by
+ * [CanvasRenderingContext2D.fillStyle](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fillStyle).
+ */
+export namespace colorlike {
+    /**
+     * @param color Color.
+     * @return The color as an ol.ColorLike
+     * @api
+     */
+    function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
+}
+
+export namespace control {
+    /**
+     * @classdesc
+     * Control to show all the attributions associated with the layer sources
+     * in the map. This control is one of the default controls included in maps.
+     * By default it will show in the bottom right portion of the map, but this can
+     * be changed by using a css selector for `.ol-attribution`.
      *
-     * @namespace ol.color
+     * @param opt_options Attribution options.
+     * @api stable
      */
-    module color {
-        /**
-         * Return the color as an array. This function maintains a cache of calculated
-         * arrays which means the result should not be modified.
-         * @param {ol.Color|string} color Color.
-         * @return {ol.Color} Color.
-         * @api
-         */
-        function asArray(color: (ol.Color | string)): ol.Color;
-
-        /**
-         * Return the color as an rgba string.
-         * @param {ol.Color|string} color Color.
-         * @return {string} Rgba string.
-         * @api
-         */
-        function asString(color: (ol.Color | string)): string;
-    }
-
-    /**
-     * An {@link ol.ColorLike} can be a color, gradient or pattern accepted by
-     * [CanvasRenderingContext2D.fillStyle](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fillStyle).
-     * @namespace ol.colorlike
-     */
-    module colorlike {
-        /**
-         * @param {ol.Color|ol.ColorLike} color Color.
-         * @return {ol.ColorLike} The color as an ol.ColorLike
-         * @api
-         */
-        function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
-    }
-
-    /**
-     * @namespace ol.control
-     */
-    module control {
+    class Attribution extends control.Control {
         /**
          * @classdesc
          * Control to show all the attributions associated with the layer sources
@@ -326,66 +310,77 @@ declare module ol {
          * By default it will show in the bottom right portion of the map, but this can
          * be changed by using a css selector for `.ol-attribution`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.AttributionOptions=} opt_options Attribution options.
+         * @param opt_options Attribution options.
          * @api stable
          */
-        class Attribution extends ol.control.Control {
-            /**
-             * @classdesc
-             * Control to show all the attributions associated with the layer sources
-             * in the map. This control is one of the default controls included in maps.
-             * By default it will show in the bottom right portion of the map, but this can
-             * be changed by using a css selector for `.ol-attribution`.
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.AttributionOptions=} opt_options Attribution options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.AttributionOptions);
+        constructor(opt_options?: olx.control.AttributionOptions);
 
-            /**
-             * Update the attribution element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.Attribution}
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the attribution element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return `true` if the attribution is collapsible, `false` otherwise.
-             * @return {boolean} True if the widget is collapsible.
-             * @api stable
-             */
-            getCollapsible(): boolean;
+        /**
+         * Return `true` if the attribution is collapsible, `false` otherwise.
+         * @return True if the widget is collapsible.
+         * @api stable
+         */
+        getCollapsible(): boolean;
 
-            /**
-             * Set whether the attribution should be collapsible.
-             * @param {boolean} collapsible True if the widget is collapsible.
-             * @api stable
-             */
-            setCollapsible(collapsible: boolean): void;
+        /**
+         * Set whether the attribution should be collapsible.
+         * @param collapsible True if the widget is collapsible.
+         * @api stable
+         */
+        setCollapsible(collapsible: boolean): void;
 
-            /**
-             * Collapse or expand the attribution according to the passed parameter. Will
-             * not do anything if the attribution isn't collapsible or if the current
-             * collapsed state is already the one requested.
-             * @param {boolean} collapsed True if the widget is collapsed.
-             * @api stable
-             */
-            setCollapsed(collapsed: boolean): void;
+        /**
+         * Collapse or expand the attribution according to the passed parameter. Will
+         * not do anything if the attribution isn't collapsible or if the current
+         * collapsed state is already the one requested.
+         * @param collapsed True if the widget is collapsed.
+         * @api stable
+         */
+        setCollapsed(collapsed: boolean): void;
 
-            /**
-             * Return `true` when the attribution is currently collapsed or `false`
-             * otherwise.
-             * @return {boolean} True if the widget is collapsed.
-             * @api stable
-             */
-            getCollapsed(): boolean;
-        }
+        /**
+         * Return `true` when the attribution is currently collapsed or `false`
+         * otherwise.
+         * @return True if the widget is collapsed.
+         * @api stable
+         */
+        getCollapsed(): boolean;
+    }
 
+    /**
+     * @classdesc
+     * A control is a visible widget with a DOM element in a fixed position on the
+     * screen. They can involve user input (buttons), or be informational only;
+     * the position is determined using CSS. By default these are placed in the
+     * container with CSS class name `ol-overlaycontainer-stopevent`, but can use
+     * any outside DOM element.
+     *
+     * This is the base class for controls. You can use it for simple custom
+     * controls by creating the element with listeners, creating an instance:
+     * ```js
+     * var myControl = new ol.control.Control({element: myElement});
+     * ```
+     * and then adding this to the map.
+     *
+     * The main advantage of having this as a control rather than a simple separate
+     * DOM element is that preventing propagation is handled for you. Controls
+     * will also be `ol.Object`s in a `ol.Collection`, so you can use their
+     * methods.
+     *
+     * You can also extend this base for your own control class. See
+     * examples/custom-controls for an example of how to do this.
+     *
+     * @param options Control options.
+     * @api stable
+     */
+    class Control extends Object {
         /**
          * @classdesc
          * A control is a visible widget with a DOM element in a fixed position on the
@@ -409,72 +404,55 @@ declare module ol {
          * You can also extend this base for your own control class. See
          * examples/custom-controls for an example of how to do this.
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @implements {oli.control.Control}
-         * @param {olx.control.ControlOptions} options Control options.
+         * @param options Control options.
          * @api stable
          */
-        class Control extends ol.Object {
-            /**
-             * @classdesc
-             * A control is a visible widget with a DOM element in a fixed position on the
-             * screen. They can involve user input (buttons), or be informational only;
-             * the position is determined using CSS. By default these are placed in the
-             * container with CSS class name `ol-overlaycontainer-stopevent`, but can use
-             * any outside DOM element.
-             *
-             * This is the base class for controls. You can use it for simple custom
-             * controls by creating the element with listeners, creating an instance:
-             * ```js
-             * var myControl = new ol.control.Control({element: myElement});
-             * ```
-             * and then adding this to the map.
-             *
-             * The main advantage of having this as a control rather than a simple separate
-             * DOM element is that preventing propagation is handled for you. Controls
-             * will also be `ol.Object`s in a `ol.Collection`, so you can use their
-             * methods.
-             *
-             * You can also extend this base for your own control class. See
-             * examples/custom-controls for an example of how to do this.
-             *
-             * @constructor
-             * @extends {ol.Object}
-             * @implements {oli.control.Control}
-             * @param {olx.control.ControlOptions} options Control options.
-             * @api stable
-             */
-            constructor(options: olx.control.ControlOptions);
+        constructor(options: olx.control.ControlOptions);
 
-            /**
-             * Get the map associated with this control.
-             * @return {ol.Map} Map.
-             * @api stable
-             */
-            getMap(): ol.Map;
+        /**
+         * Get the map associated with this control.
+         * @return Map.
+         * @api stable
+         */
+        getMap(): ol.Map;
 
-            /**
-             * Remove the control from its current map and attach it to the new map.
-             * Subclasses may set up event handlers to get notified about changes to
-             * the map here.
-             * @param {ol.Map} map Map.
-             * @api stable
-             */
-            setMap(map: ol.Map): void;
+        /**
+         * Remove the control from its current map and attach it to the new map.
+         * Subclasses may set up event handlers to get notified about changes to
+         * the map here.
+         * @param map Map.
+         * @api stable
+         */
+        setMap(map: ol.Map): void;
 
-            /**
-             * This function is used to set a target element for the control. It has no
-             * effect if it is called after the control has been added to the map (i.e.
-             * after `setMap` is called on the control). If no `target` is set in the
-             * options passed to the control constructor and if `setTarget` is not called
-             * then the control is added to the map's overlay container.
-             * @param {Element|string} target Target.
-             * @api
-             */
-            setTarget(target: (Element | string)): void;
-        }
+        /**
+         * This function is used to set a target element for the control. It has no
+         * effect if it is called after the control has been added to the map (i.e.
+         * after `setMap` is called on the control). If no `target` is set in the
+         * options passed to the control constructor and if `setTarget` is not called
+         * then the control is added to the map's overlay container.
+         * @param target Target.
+         * @api
+         */
+        setTarget(target: (Element | string)): void;
+    }
 
+    /**
+     * @classdesc
+     * Provides a button that when clicked fills up the full screen with the map.
+     * The full screen source element is by default the element containing the map viewport unless
+     * overriden by providing the `source` option. In which case, the dom
+     * element introduced using this parameter will be displayed in full screen.
+     *
+     * When in full screen mode, a close button is shown to exit full screen mode.
+     * The [Fullscreen API](http://www.w3.org/TR/fullscreen/) is used to
+     * toggle the map in full screen mode.
+     *
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class FullScreen extends control.Control {
         /**
          * @classdesc
          * Provides a button that when clicked fills up the full screen with the map.
@@ -487,46 +465,38 @@ declare module ol {
          * toggle the map in full screen mode.
          *
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.FullScreenOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class FullScreen extends ol.control.Control {
-            /**
-             * @classdesc
-             * Provides a button that when clicked fills up the full screen with the map.
-             * The full screen source element is by default the element containing the map viewport unless
-             * overriden by providing the `source` option. In which case, the dom
-             * element introduced using this parameter will be displayed in full screen.
-             *
-             * When in full screen mode, a close button is shown to exit full screen mode.
-             * The [Fullscreen API](http://www.w3.org/TR/fullscreen/) is used to
-             * toggle the map in full screen mode.
-             *
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.FullScreenOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.FullScreenOptions);
-        }
+        constructor(opt_options?: olx.control.FullScreenOptions);
+    }
 
-        /**
-         * Set of controls included in maps by default. Unless configured otherwise,
-         * this returns a collection containing an instance of each of the following
-         * controls:
-         * * {@link ol.control.Zoom}
-         * * {@link ol.control.Rotate}
-         * * {@link ol.control.Attribution}
-         *
-         * @param {olx.control.DefaultsOptions=} opt_options Defaults options.
-         * @return {ol.Collection.<ol.control.Control>} Controls.
-         * @api stable
-         */
-        function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
+    /**
+     * Set of controls included in maps by default. Unless configured otherwise,
+     * this returns a collection containing an instance of each of the following
+     * controls:
+     * * {@link ol.control.Zoom}
+     * * {@link ol.control.Rotate}
+     * * {@link ol.control.Attribution}
+     *
+     * @param opt_options Defaults options.
+     * @return Controls.
+     * @api stable
+     */
+    function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
 
+    /**
+     * @classdesc
+     * A control to show the 2D coordinates of the mouse cursor. By default, these
+     * are in the view projection, but can be in any supported projection.
+     * By default the control is shown in the top right corner of the map, but this
+     * can be changed by using the css selector `.ol-mouse-position`.
+     *
+     * @param opt_options Mouse position
+     *     options.
+     * @api stable
+     */
+    class MousePosition extends control.Control {
         /**
          * @classdesc
          * A control to show the 2D coordinates of the mouse cursor. By default, these
@@ -534,173 +504,160 @@ declare module ol {
          * By default the control is shown in the top right corner of the map, but this
          * can be changed by using the css selector `.ol-mouse-position`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.MousePositionOptions=} opt_options Mouse position
+         * @param opt_options Mouse position
          *     options.
          * @api stable
          */
-        class MousePosition extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control to show the 2D coordinates of the mouse cursor. By default, these
-             * are in the view projection, but can be in any supported projection.
-             * By default the control is shown in the top right corner of the map, but this
-             * can be changed by using the css selector `.ol-mouse-position`.
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.MousePositionOptions=} opt_options Mouse position
-             *     options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.MousePositionOptions);
+        constructor(opt_options?: olx.control.MousePositionOptions);
 
-            /**
-             * Update the mouseposition element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.MousePosition}
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the mouseposition element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return the coordinate format type used to render the current position or
-             * undefined.
-             * @return {ol.CoordinateFormatType|undefined} The format to render the current
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            getCoordinateFormat(): (ol.CoordinateFormatType);
+        /**
+         * Return the coordinate format type used to render the current position or
+         * undefined.
+         * @return The format to render the current
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        getCoordinateFormat(): (ol.CoordinateFormatType);
 
-            /**
-             * Return the projection that is used to report the mouse position.
-             * @return {ol.proj.Projection|undefined} The projection to report mouse
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            getProjection(): (ol.proj.Projection);
+        /**
+         * Return the projection that is used to report the mouse position.
+         * @return The projection to report mouse
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        getProjection(): (ol.proj.Projection);
 
-            /**
-             * Set the coordinate format type used to render the current position.
-             * @param {ol.CoordinateFormatType} format The format to render the current
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            setCoordinateFormat(format: ol.CoordinateFormatType): void;
+        /**
+         * Set the coordinate format type used to render the current position.
+         * @param format The format to render the current
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        setCoordinateFormat(format: ol.CoordinateFormatType): void;
 
-            /**
-             * Set the projection that is used to report the mouse position.
-             * @param {ol.proj.Projection} projection The projection to report mouse
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            setProjection(projection: ol.proj.Projection): void;
-        }
+        /**
+         * Set the projection that is used to report the mouse position.
+         * @param projection The projection to report mouse
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        setProjection(projection: ol.proj.Projection): void;
+    }
 
+    /**
+     * Create a new control with a map acting as an overview map for an other
+     * defined map.
+     * @param opt_options OverviewMap options.
+     * @api
+     */
+    class OverviewMap extends control.Control {
         /**
          * Create a new control with a map acting as an overview map for an other
          * defined map.
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.OverviewMapOptions=} opt_options OverviewMap options.
+         * @param opt_options OverviewMap options.
          * @api
          */
-        class OverviewMap extends ol.control.Control {
-            /**
-             * Create a new control with a map acting as an overview map for an other
-             * defined map.
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.OverviewMapOptions=} opt_options OverviewMap options.
-             * @api
-             */
-            constructor(opt_options?: olx.control.OverviewMapOptions);
+        constructor(opt_options?: olx.control.OverviewMapOptions);
 
-            /**
-             * Update the overview map element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.OverviewMap}
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the overview map element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return `true` if the overview map is collapsible, `false` otherwise.
-             * @return {boolean} True if the widget is collapsible.
-             * @api stable
-             */
-            getCollapsible(): boolean;
+        /**
+         * Return `true` if the overview map is collapsible, `false` otherwise.
+         * @return True if the widget is collapsible.
+         * @api stable
+         */
+        getCollapsible(): boolean;
 
-            /**
-             * Set whether the overview map should be collapsible.
-             * @param {boolean} collapsible True if the widget is collapsible.
-             * @api stable
-             */
-            setCollapsible(collapsible: boolean): void;
+        /**
+         * Set whether the overview map should be collapsible.
+         * @param collapsible True if the widget is collapsible.
+         * @api stable
+         */
+        setCollapsible(collapsible: boolean): void;
 
-            /**
-             * Collapse or expand the overview map according to the passed parameter. Will
-             * not do anything if the overview map isn't collapsible or if the current
-             * collapsed state is already the one requested.
-             * @param {boolean} collapsed True if the widget is collapsed.
-             * @api stable
-             */
-            setCollapsed(collapsed: boolean): void;
+        /**
+         * Collapse or expand the overview map according to the passed parameter. Will
+         * not do anything if the overview map isn't collapsible or if the current
+         * collapsed state is already the one requested.
+         * @param collapsed True if the widget is collapsed.
+         * @api stable
+         */
+        setCollapsed(collapsed: boolean): void;
 
-            /**
-             * Determine if the overview map is collapsed.
-             * @return {boolean} The overview map is collapsed.
-             * @api stable
-             */
-            getCollapsed(): boolean;
+        /**
+         * Determine if the overview map is collapsed.
+         * @return The overview map is collapsed.
+         * @api stable
+         */
+        getCollapsed(): boolean;
 
-            /**
-             * Return the overview map.
-             * @return {ol.Map} Overview map.
-             * @api
-             */
-            getOverviewMap(): ol.Map;
-        }
+        /**
+         * Return the overview map.
+         * @return Overview map.
+         * @api
+         */
+        getOverviewMap(): ol.Map;
+    }
 
+    /**
+     * @classdesc
+     * A button control to reset rotation to 0.
+     * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
+     * selector is added to the button when the rotation is 0.
+     *
+     * @param opt_options Rotate options.
+     * @api stable
+     */
+    class Rotate extends control.Control {
         /**
          * @classdesc
          * A button control to reset rotation to 0.
          * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
          * selector is added to the button when the rotation is 0.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.RotateOptions=} opt_options Rotate options.
+         * @param opt_options Rotate options.
          * @api stable
          */
-        class Rotate extends ol.control.Control {
-            /**
-             * @classdesc
-             * A button control to reset rotation to 0.
-             * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
-             * selector is added to the button when the rotation is 0.
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.RotateOptions=} opt_options Rotate options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.RotateOptions);
+        constructor(opt_options?: olx.control.RotateOptions);
 
-            /**
-             * Update the rotate control element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.Rotate}
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
-        }
+        /**
+         * Update the rotate control element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
+    }
 
+    /**
+     * @classdesc
+     * A control displaying rough y-axis distances, calculated for the center of the
+     * viewport. For conformal projections (e.g. EPSG:3857, the default view
+     * projection in OpenLayers), the scale is valid for all directions.
+     * No scale line will be shown when the y-axis distance of a pixel at the
+     * viewport center cannot be calculated in the view projection.
+     * By default the scale line will show in the bottom left portion of the map,
+     * but this can be changed by using the css selector `.ol-scale-line`.
+     *
+     * @param opt_options Scale line options.
+     * @api stable
+     */
+    class ScaleLine extends control.Control {
         /**
          * @classdesc
          * A control displaying rough y-axis distances, calculated for the center of the
@@ -711,96 +668,83 @@ declare module ol {
          * By default the scale line will show in the bottom left portion of the map,
          * but this can be changed by using the css selector `.ol-scale-line`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.ScaleLineOptions=} opt_options Scale line options.
+         * @param opt_options Scale line options.
          * @api stable
          */
-        class ScaleLine extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control displaying rough y-axis distances, calculated for the center of the
-             * viewport. For conformal projections (e.g. EPSG:3857, the default view
-             * projection in OpenLayers), the scale is valid for all directions.
-             * No scale line will be shown when the y-axis distance of a pixel at the
-             * viewport center cannot be calculated in the view projection.
-             * By default the scale line will show in the bottom left portion of the map,
-             * but this can be changed by using the css selector `.ol-scale-line`.
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.ScaleLineOptions=} opt_options Scale line options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ScaleLineOptions);
+        constructor(opt_options?: olx.control.ScaleLineOptions);
 
-            /**
-             * Return the units to use in the scale line.
-             * @return {ol.control.ScaleLine.Units|undefined} The units to use in the scale
-             *     line.
-             * @observable
-             * @api stable
-             */
-            getUnits(): (ol.control.ScaleLine.Units);
+        /**
+         * Return the units to use in the scale line.
+         * @return The units to use in the scale
+         *     line.
+         * @observable
+         * @api stable
+         */
+        getUnits(): (ol.control.ScaleLine.Units);
 
-            /**
-             * Update the scale line element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.ScaleLine}
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the scale line element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Set the units to use in the scale line.
-             * @param {ol.control.ScaleLine.Units} units The units to use in the scale line.
-             * @observable
-             * @api stable
-             */
-            setUnits(units: ol.control.ScaleLine.Units): void;
-        }
+        /**
+         * Set the units to use in the scale line.
+         * @param units The units to use in the scale line.
+         * @observable
+         * @api stable
+         */
+        setUnits(units: ol.control.ScaleLine.Units): void;
+    }
 
-        module ScaleLine {
-            /**
-             * @enum {string}
-             * @api
-             */
-            type Property = string;
+    namespace ScaleLine {
+        /**
+         * @api
+         */
+        type Property = string;
 
-            /**
-             * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
-             * `'nautical'`, `'metric'`, `'us'`.
-             * @enum {string}
-             */
-            type Units = "degrees" | "imperial" | "nautical" | "metric" | "us";
-        }
+        /**
+         * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
+         * `'nautical'`, `'metric'`, `'us'`.
+         */
+        type Units = "degrees" | "imperial" | "nautical" | "metric" | "us";
+    }
 
+    /**
+     * @classdesc
+     * A control with 2 buttons, one for zoom in and one for zoom out.
+     * This control is one of the default controls of a map. To style this control
+     * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
+     *
+     * @param opt_options Zoom options.
+     * @api stable
+     */
+    class Zoom extends control.Control {
         /**
          * @classdesc
          * A control with 2 buttons, one for zoom in and one for zoom out.
          * This control is one of the default controls of a map. To style this control
          * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.ZoomOptions=} opt_options Zoom options.
+         * @param opt_options Zoom options.
          * @api stable
          */
-        class Zoom extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control with 2 buttons, one for zoom in and one for zoom out.
-             * This control is one of the default controls of a map. To style this control
-             * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.ZoomOptions=} opt_options Zoom options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomOptions);
-        }
+        constructor(opt_options?: olx.control.ZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * A slider type of control for zooming.
+     *
+     * Example:
+     *
+     *     map.addControl(new ol.control.ZoomSlider());
+     *
+     * @param opt_options Zoom slider options.
+     * @api stable
+     */
+    class ZoomSlider extends control.Control {
         /**
          * @classdesc
          * A slider type of control for zooming.
@@ -809,202 +753,232 @@ declare module ol {
          *
          *     map.addControl(new ol.control.ZoomSlider());
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.ZoomSliderOptions=} opt_options Zoom slider options.
+         * @param opt_options Zoom slider options.
          * @api stable
          */
-        class ZoomSlider extends ol.control.Control {
-            /**
-             * @classdesc
-             * A slider type of control for zooming.
-             *
-             * Example:
-             *
-             *     map.addControl(new ol.control.ZoomSlider());
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.ZoomSliderOptions=} opt_options Zoom slider options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomSliderOptions);
+        constructor(opt_options?: olx.control.ZoomSliderOptions);
 
-            /**
-             * Update the zoomslider element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.ZoomSlider}
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
-        }
+        /**
+         * Update the zoomslider element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
+    }
 
+    /**
+     * @classdesc
+     * A button control which, when pressed, changes the map view to a specific
+     * extent. To style this control use the css selector `.ol-zoom-extent`.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class ZoomToExtent extends control.Control {
         /**
          * @classdesc
          * A button control which, when pressed, changes the map view to a specific
          * extent. To style this control use the css selector `.ol-zoom-extent`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.ZoomToExtentOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class ZoomToExtent extends ol.control.Control {
-            /**
-             * @classdesc
-             * A button control which, when pressed, changes the map view to a specific
-             * extent. To style this control use the css selector `.ol-zoom-extent`.
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.ZoomToExtentOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomToExtentOptions);
-        }
+        constructor(opt_options?: olx.control.ZoomToExtentOptions);
     }
+}
+
+export namespace coordinate {
+    /**
+     * Add `delta` to `coordinate`. `coordinate` is modified in place and returned
+     * by the function.
+     *
+     * Example:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     ol.coordinate.add(coord, [-2, 4]);
+     *     // coord is now [5.85, 51.983333]
+     *
+     * @param coordinate Coordinate.
+     * @param delta Delta.
+     * @return The input coordinate adjusted by the given delta.
+     * @api stable
+     */
+    function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
 
     /**
-     * @namespace ol.coordinate
+     * Returns a {@link ol.CoordinateFormatType} function that can be used to format
+     * a {ol.Coordinate} to a string.
+     *
+     * Example without specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var stringifyFunc = ol.coordinate.createStringXY();
+     *     var out = stringifyFunc(coord);
+     *     // out is now '8, 48'
+     *
+     * Example with explicitly specifying 2 fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var stringifyFunc = ol.coordinate.createStringXY(2);
+     *     var out = stringifyFunc(coord);
+     *     // out is now '7.85, 47.98'
+     *
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Coordinate format.
+     * @api stable
      */
-    module coordinate {
-        /**
-         * Add `delta` to `coordinate`. `coordinate` is modified in place and returned
-         * by the function.
-         *
-         * Example:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     ol.coordinate.add(coord, [-2, 4]);
-         *     // coord is now [5.85, 51.983333]
-         *
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @param {ol.Coordinate} delta Delta.
-         * @return {ol.Coordinate} The input coordinate adjusted by the given delta.
-         * @api stable
-         */
-        function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
+    function createStringXY(opt_fractionDigits?: number): ol.CoordinateFormatType;
 
-        /**
-         * Returns a {@link ol.CoordinateFormatType} function that can be used to format
-         * a {ol.Coordinate} to a string.
-         *
-         * Example without specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var stringifyFunc = ol.coordinate.createStringXY();
-         *     var out = stringifyFunc(coord);
-         *     // out is now '8, 48'
-         *
-         * Example with explicitly specifying 2 fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var stringifyFunc = ol.coordinate.createStringXY(2);
-         *     var out = stringifyFunc(coord);
-         *     // out is now '7.85, 47.98'
-         *
-         * @param {number=} opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return {ol.CoordinateFormatType} Coordinate format.
-         * @api stable
-         */
-        function createStringXY(opt_fractionDigits?: number): ol.CoordinateFormatType;
+    /**
+     * Transforms the given {@link ol.Coordinate} to a string using the given string
+     * template. The strings `{x}` and `{y}` in the template will be replaced with
+     * the first and second coordinate values respectively.
+     *
+     * Example without specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var template = 'Coordinate is ({x}|{y}).';
+     *     var out = ol.coordinate.format(coord, template);
+     *     // out is now 'Coordinate is (8|48).'
+     *
+     * Example explicitly specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var template = 'Coordinate is ({x}|{y}).';
+     *     var out = ol.coordinate.format(coord, template, 2);
+     *     // out is now 'Coordinate is (7.85|47.98).'
+     *
+     * @param coordinate Coordinate.
+     * @param template A template string with `{x}` and `{y}` placeholders
+     *     that will be replaced by first and second coordinate values.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Formatted coordinate.
+     * @api stable
+     */
+    function format(coordinate: (ol.Coordinate), template: string, opt_fractionDigits?: number): string;
 
-        /**
-         * Transforms the given {@link ol.Coordinate} to a string using the given string
-         * template. The strings `{x}` and `{y}` in the template will be replaced with
-         * the first and second coordinate values respectively.
-         *
-         * Example without specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var template = 'Coordinate is ({x}|{y}).';
-         *     var out = ol.coordinate.format(coord, template);
-         *     // out is now 'Coordinate is (8|48).'
-         *
-         * Example explicitly specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var template = 'Coordinate is ({x}|{y}).';
-         *     var out = ol.coordinate.format(coord, template, 2);
-         *     // out is now 'Coordinate is (7.85|47.98).'
-         *
-         * @param {ol.Coordinate|undefined} coordinate Coordinate.
-         * @param {string} template A template string with `{x}` and `{y}` placeholders
-         *     that will be replaced by first and second coordinate values.
-         * @param {number=} opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return {string} Formatted coordinate.
-         * @api stable
-         */
-        function format(coordinate: (ol.Coordinate), template: string, opt_fractionDigits?: number): string;
+    /**
+     * Rotate `coordinate` by `angle`. `coordinate` is modified in place and
+     * returned by the function.
+     *
+     * Example:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var rotateRadians = Math.PI / 2; // 90 degrees
+     *     ol.coordinate.rotate(coord, rotateRadians);
+     *     // coord is now [-47.983333, 7.85]
+     *
+     * @param coordinate Coordinate.
+     * @param angle Angle in radian.
+     * @return Coordinate.
+     * @api stable
+     */
+    function rotate(coordinate: ol.Coordinate, angle: number): ol.Coordinate;
 
-        /**
-         * Rotate `coordinate` by `angle`. `coordinate` is modified in place and
-         * returned by the function.
-         *
-         * Example:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var rotateRadians = Math.PI / 2; // 90 degrees
-         *     ol.coordinate.rotate(coord, rotateRadians);
-         *     // coord is now [-47.983333, 7.85]
-         *
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @param {number} angle Angle in radian.
-         * @return {ol.Coordinate} Coordinate.
-         * @api stable
-         */
-        function rotate(coordinate: ol.Coordinate, angle: number): ol.Coordinate;
+    /**
+     * Format a geographic coordinate with the hemisphere, degrees, minutes, and
+     * seconds.
+     *
+     * Example without specifying fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringHDMS(coord);
+     *     // out is now '47° 58′ 60″ N 7° 50′ 60″ E'
+     *
+     * Example explicitly specifying 1 fractional digit:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringHDMS(coord, 1);
+     *     // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
+     *
+     * @param coordinate Coordinate.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Hemisphere, degrees, minutes and seconds.
+     * @api stable
+     */
+    function toStringHDMS(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
 
-        /**
-         * Format a geographic coordinate with the hemisphere, degrees, minutes, and
-         * seconds.
-         *
-         * Example without specifying fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringHDMS(coord);
-         *     // out is now '47° 58′ 60″ N 7° 50′ 60″ E'
-         *
-         * Example explicitly specifying 1 fractional digit:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringHDMS(coord, 1);
-         *     // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
-         *
-         * @param {ol.Coordinate|undefined} coordinate Coordinate.
-         * @param {number=} opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return {string} Hemisphere, degrees, minutes and seconds.
-         * @api stable
-         */
-        function toStringHDMS(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
-
-        /**
-         * Format a coordinate as a comma delimited string.
-         *
-         * Example without specifying fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringXY(coord);
-         *     // out is now '8, 48'
-         *
-         * Example explicitly specifying 1 fractional digit:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringXY(coord, 1);
-         *     // out is now '7.8, 48.0'
-         *
-         * @param {ol.Coordinate|undefined} coordinate Coordinate.
-         * @param {number=} opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return {string} XY.
-         * @api stable
-         */
-        function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
-    }
+    /**
+     * Format a coordinate as a comma delimited string.
+     *
+     * Example without specifying fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringXY(coord);
+     *     // out is now '8, 48'
+     *
+     * Example explicitly specifying 1 fractional digit:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringXY(coord, 1);
+     *     // out is now '7.8, 48.0'
+     *
+     * @param coordinate Coordinate.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return XY.
+     * @api stable
+     */
+    function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
+}
 
+/**
+ * @classdesc
+ * The ol.DeviceOrientation class provides access to information from
+ * DeviceOrientation events.  See the [HTML 5 DeviceOrientation Specification](
+ * http://www.w3.org/TR/orientation-event/) for more details.
+ *
+ * Many new computers, and especially mobile phones
+ * and tablets, provide hardware support for device orientation. Web
+ * developers targeting mobile devices will be especially interested in this
+ * class.
+ *
+ * Device orientation data are relative to a common starting point. For mobile
+ * devices, the starting point is to lay your phone face up on a table with the
+ * top of the phone pointing north. This represents the zero state. All
+ * angles are then relative to this state. For computers, it is the same except
+ * the screen is open at 90 degrees.
+ *
+ * Device orientation is reported as three angles - `alpha`, `beta`, and
+ * `gamma` - relative to the starting position along the three planar axes X, Y
+ * and Z. The X axis runs from the left edge to the right edge through the
+ * middle of the device. Similarly, the Y axis runs from the bottom to the top
+ * of the device through the middle. The Z axis runs from the back to the front
+ * through the middle. In the starting position, the X axis points to the
+ * right, the Y axis points away from you and the Z axis points straight up
+ * from the device lying flat.
+ *
+ * The three angles representing the device orientation are relative to the
+ * three axes. `alpha` indicates how much the device has been rotated around the
+ * Z axis, which is commonly interpreted as the compass heading (see note
+ * below). `beta` indicates how much the device has been rotated around the X
+ * axis, or how much it is tilted from front to back.  `gamma` indicates how
+ * much the device has been rotated around the Y axis, or how much it is tilted
+ * from left to right.
+ *
+ * For most browsers, the `alpha` value returns the compass heading so if the
+ * device points north, it will be 0.  With Safari on iOS, the 0 value of
+ * `alpha` is calculated from when device orientation was first requested.
+ * ol.DeviceOrientation provides the `heading` property which normalizes this
+ * behavior across all browsers for you.
+ *
+ * It is important to note that the HTML 5 DeviceOrientation specification
+ * indicates that `alpha`, `beta` and `gamma` are in degrees while the
+ * equivalent properties in ol.DeviceOrientation are in radians for consistency
+ * with all other uses of angles throughout OpenLayers.
+ *
+ * To get notified of device orientation changes, register a listener for the
+ * generic `change` event on your `ol.DeviceOrientation` instance.
+ *
+ * @see {@link http://www.w3.org/TR/orientation-event/}
+ *
+ * @param opt_options Options.
+ * @api
+ */
+export class DeviceOrientation extends Object {
     /**
      * @classdesc
      * The ol.DeviceOrientation class provides access to information from
@@ -1055,341 +1029,287 @@ declare module ol {
      *
      * @see {@link http://www.w3.org/TR/orientation-event/}
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.DeviceOrientationOptions=} opt_options Options.
+     * @param opt_options Options.
      * @api
      */
-    class DeviceOrientation extends ol.Object {
-        /**
-         * @classdesc
-         * The ol.DeviceOrientation class provides access to information from
-         * DeviceOrientation events.  See the [HTML 5 DeviceOrientation Specification](
-         * http://www.w3.org/TR/orientation-event/) for more details.
-         *
-         * Many new computers, and especially mobile phones
-         * and tablets, provide hardware support for device orientation. Web
-         * developers targeting mobile devices will be especially interested in this
-         * class.
-         *
-         * Device orientation data are relative to a common starting point. For mobile
-         * devices, the starting point is to lay your phone face up on a table with the
-         * top of the phone pointing north. This represents the zero state. All
-         * angles are then relative to this state. For computers, it is the same except
-         * the screen is open at 90 degrees.
-         *
-         * Device orientation is reported as three angles - `alpha`, `beta`, and
-         * `gamma` - relative to the starting position along the three planar axes X, Y
-         * and Z. The X axis runs from the left edge to the right edge through the
-         * middle of the device. Similarly, the Y axis runs from the bottom to the top
-         * of the device through the middle. The Z axis runs from the back to the front
-         * through the middle. In the starting position, the X axis points to the
-         * right, the Y axis points away from you and the Z axis points straight up
-         * from the device lying flat.
-         *
-         * The three angles representing the device orientation are relative to the
-         * three axes. `alpha` indicates how much the device has been rotated around the
-         * Z axis, which is commonly interpreted as the compass heading (see note
-         * below). `beta` indicates how much the device has been rotated around the X
-         * axis, or how much it is tilted from front to back.  `gamma` indicates how
-         * much the device has been rotated around the Y axis, or how much it is tilted
-         * from left to right.
-         *
-         * For most browsers, the `alpha` value returns the compass heading so if the
-         * device points north, it will be 0.  With Safari on iOS, the 0 value of
-         * `alpha` is calculated from when device orientation was first requested.
-         * ol.DeviceOrientation provides the `heading` property which normalizes this
-         * behavior across all browsers for you.
-         *
-         * It is important to note that the HTML 5 DeviceOrientation specification
-         * indicates that `alpha`, `beta` and `gamma` are in degrees while the
-         * equivalent properties in ol.DeviceOrientation are in radians for consistency
-         * with all other uses of angles throughout OpenLayers.
-         *
-         * To get notified of device orientation changes, register a listener for the
-         * generic `change` event on your `ol.DeviceOrientation` instance.
-         *
-         * @see {@link http://www.w3.org/TR/orientation-event/}
-         *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.DeviceOrientationOptions=} opt_options Options.
-         * @api
-         */
-        constructor(opt_options?: olx.DeviceOrientationOptions);
+    constructor(opt_options?: olx.DeviceOrientationOptions);
 
-        /**
-         * Rotation around the device z-axis (in radians).
-         * @return {number|undefined} The euler angle in radians of the device from the
-         *     standard Z axis.
-         * @observable
-         * @api
-         */
-        getAlpha(): (number);
+    /**
+     * Rotation around the device z-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     standard Z axis.
+     * @observable
+     * @api
+     */
+    getAlpha(): (number);
 
-        /**
-         * Rotation around the device x-axis (in radians).
-         * @return {number|undefined} The euler angle in radians of the device from the
-         *     planar X axis.
-         * @observable
-         * @api
-         */
-        getBeta(): (number);
+    /**
+     * Rotation around the device x-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     planar X axis.
+     * @observable
+     * @api
+     */
+    getBeta(): (number);
 
-        /**
-         * Rotation around the device y-axis (in radians).
-         * @return {number|undefined} The euler angle in radians of the device from the
-         *     planar Y axis.
-         * @observable
-         * @api
-         */
-        getGamma(): (number);
+    /**
+     * Rotation around the device y-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     planar Y axis.
+     * @observable
+     * @api
+     */
+    getGamma(): (number);
 
-        /**
-         * The heading of the device relative to north (in radians).
-         * @return {number|undefined} The heading of the device relative to north, in
-         *     radians, normalizing for different browser behavior.
-         * @observable
-         * @api
-         */
-        getHeading(): (number);
+    /**
+     * The heading of the device relative to north (in radians).
+     * @return The heading of the device relative to north, in
+     *     radians, normalizing for different browser behavior.
+     * @observable
+     * @api
+     */
+    getHeading(): (number);
 
-        /**
-         * Determine if orientation is being tracked.
-         * @return {boolean} Changes in device orientation are being tracked.
-         * @observable
-         * @api
-         */
-        getTracking(): boolean;
+    /**
+     * Determine if orientation is being tracked.
+     * @return Changes in device orientation are being tracked.
+     * @observable
+     * @api
+     */
+    getTracking(): boolean;
 
-        /**
-         * Enable or disable tracking of device orientation events.
-         * @param {boolean} tracking The status of tracking changes to alpha, beta and
-         *     gamma. If true, changes are tracked and reported immediately.
-         * @observable
-         * @api
-         */
-        setTracking(tracking: boolean): void;
-    }
+    /**
+     * Enable or disable tracking of device orientation events.
+     * @param tracking The status of tracking changes to alpha, beta and
+     *     gamma. If true, changes are tracked and reported immediately.
+     * @observable
+     * @api
+     */
+    setTracking(tracking: boolean): void;
+}
 
+/**
+ * Objects that need to clean up after themselves.
+ */
+export class Disposable {
     /**
      * Objects that need to clean up after themselves.
-     * @constructor
      */
-    class Disposable {
+    constructor();
+}
+
+/**
+ * Easing functions for {@link ol.animation}.
+ */
+export namespace easing {
+    /**
+     * Start slow and speed up.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function easeIn(t: number): number;
+
+    /**
+     * Start fast and slow down.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function easeOut(t: number): number;
+
+    /**
+     * Start slow, speed up, and then slow down again.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function inAndOut(t: number): number;
+
+    /**
+     * Maintain a constant speed over time.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function linear(t: number): number;
+
+    /**
+     * Start slow, speed up, and at the very end slow down again.  This has the
+     * same general behavior as {@link ol.easing.inAndOut}, but the final slowdown
+     * is delayed.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function upAndDown(t: number): number;
+}
+
+/**
+ * Applications do not normally create event instances. They register (and
+ * unregister) event listener functions, which, when called by the library as
+ * the result of an event being dispatched, are passed event instances as their
+ * first argument. Listeners can be registered and unregistered on all objects
+ * descending from {@link ol.Observable}. All event instances have a `target`
+ * property, which corresponds to the object on which the event was dispatched.
+ * By default, `this` within the listener also refers to the target, though
+ * this can be configured in the listener registration function.
+ * Some classes have their own event type, which return additional
+ * properties; see the specific event class page for details.
+ *
+ */
+export namespace events {
+    namespace condition {
         /**
-         * Objects that need to clean up after themselves.
-         * @constructor
+         * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
+         * additionally the shift-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the alt key is pressed.
+         * @api stable
          */
-        constructor();
+        function altKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if only the alt-key and shift-key is pressed, `false` otherwise
+         * (e.g. when additionally the platform-modifier-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the alt and shift keys are pressed.
+         * @api stable
+         */
+        function altShiftKeysOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return always true.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True.
+         * @api stable
+         */
+        function always(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event is a `click` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `click` event.
+         * @api stable
+         */
+        function click(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return always false.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return False.
+         * @api stable
+         */
+        function never(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the browser event is a `pointermove` event, `false`
+         * otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the browser event is a `pointermove` event.
+         * @api
+         */
+        function pointerMove(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event is a map `singleclick` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `singleclick` event.
+         * @api stable
+         */
+        function singleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event is a map `dblclick` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `dblclick` event.
+         * @api stable
+         */
+        function doubleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if no modifier key (alt-, shift- or platform-modifier-key) is
+         * pressed.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True only if there no modifier keys are pressed.
+         * @api stable
+         */
+        function noModifierKeys(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if only the platform-modifier-key (the meta-key on Mac,
+         * ctrl-key otherwise) is pressed, `false` otherwise (e.g. when additionally
+         * the shift-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the platform modifier key is pressed.
+         * @api stable
+         */
+        function platformModifierKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if only the shift-key is pressed, `false` otherwise (e.g. when
+         * additionally the alt-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the shift key is pressed.
+         * @api stable
+         */
+        function shiftKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the target element is not editable, i.e. not a `<input>`-,
+         * `<select>`- or `<textarea>`-element, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True only if the target element is not editable.
+         * @api
+         */
+        function targetNotEditable(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event originates from a mouse device.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event originates from a mouse device.
+         * @api stable
+         */
+        function mouseOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event originates from a primary pointer in
+         * contact with the surface or if the left mouse button is pressed.
+         * @see http://www.w3.org/TR/pointerevents/#button-states
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event originates from a primary pointer.
+         * @api
+         */
+        function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
     }
 
     /**
-     * Easing functions for {@link ol.animation}.
-     * @namespace ol.easing
-     */
-    module easing {
-        /**
-         * Start slow and speed up.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
-         * @api
-         */
-        function easeIn(t: number): number;
-
-        /**
-         * Start fast and slow down.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
-         * @api
-         */
-        function easeOut(t: number): number;
-
-        /**
-         * Start slow, speed up, and then slow down again.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
-         * @api
-         */
-        function inAndOut(t: number): number;
-
-        /**
-         * Maintain a constant speed over time.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
-         * @api
-         */
-        function linear(t: number): number;
-
-        /**
-         * Start slow, speed up, and at the very end slow down again.  This has the
-         * same general behavior as {@link ol.easing.inAndOut}, but the final slowdown
-         * is delayed.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
-         * @api
-         */
-        function upAndDown(t: number): number;
-    }
-
-    /**
-     * Applications do not normally create event instances. They register (and
-     * unregister) event listener functions, which, when called by the library as
-     * the result of an event being dispatched, are passed event instances as their
-     * first argument. Listeners can be registered and unregistered on all objects
-     * descending from {@link ol.Observable}. All event instances have a `target`
-     * property, which corresponds to the object on which the event was dispatched.
-     * By default, `this` within the listener also refers to the target, though
-     * this can be configured in the listener registration function.
-     * Some classes have their own event type, which return additional
-     * properties; see the specific event class page for details.
+     * @classdesc
+     * Stripped down implementation of the W3C DOM Level 2 Event interface.
+     * @see {@link https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-interface}
      *
-     * @namespace ol.events
+     * This implementation only provides `type` and `target` properties, and
+     * `stopPropagation` and `preventDefault` methods. It is meant as base class
+     * for higher level events defined in the library, and works with
+     * {@link ol.events.EventTarget}.
+     *
+     * @param type Type.
      */
-    module events {
-        /**
-         * @namespace ol.events.condition
-         */
-        module condition {
-            /**
-             * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
-             * additionally the shift-key is pressed).
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if only the alt key is pressed.
-             * @api stable
-             */
-            function altKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the alt-key and shift-key is pressed, `false` otherwise
-             * (e.g. when additionally the platform-modifier-key is pressed).
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if only the alt and shift keys are pressed.
-             * @api stable
-             */
-            function altShiftKeysOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return always true.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True.
-             * @function
-             * @api stable
-             */
-            function always(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a `click` event, `false` otherwise.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event is a map `click` event.
-             * @api stable
-             */
-            function click(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return always false.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} False.
-             * @function
-             * @api stable
-             */
-            function never(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the browser event is a `pointermove` event, `false`
-             * otherwise.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the browser event is a `pointermove` event.
-             * @api
-             */
-            function pointerMove(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a map `singleclick` event, `false` otherwise.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event is a map `singleclick` event.
-             * @api stable
-             */
-            function singleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a map `dblclick` event, `false` otherwise.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event is a map `dblclick` event.
-             * @api stable
-             */
-            function doubleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if no modifier key (alt-, shift- or platform-modifier-key) is
-             * pressed.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True only if there no modifier keys are pressed.
-             * @api stable
-             */
-            function noModifierKeys(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the platform-modifier-key (the meta-key on Mac,
-             * ctrl-key otherwise) is pressed, `false` otherwise (e.g. when additionally
-             * the shift-key is pressed).
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if only the platform modifier key is pressed.
-             * @api stable
-             */
-            function platformModifierKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the shift-key is pressed, `false` otherwise (e.g. when
-             * additionally the alt-key is pressed).
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if only the shift key is pressed.
-             * @api stable
-             */
-            function shiftKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the target element is not editable, i.e. not a `<input>`-,
-             * `<select>`- or `<textarea>`-element, `false` otherwise.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True only if the target element is not editable.
-             * @api
-             */
-            function targetNotEditable(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event originates from a mouse device.
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event originates from a mouse device.
-             * @api stable
-             */
-            function mouseOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event originates from a primary pointer in
-             * contact with the surface or if the left mouse button is pressed.
-             * @see http://www.w3.org/TR/pointerevents/#button-states
-             *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event originates from a primary pointer.
-             * @api
-             */
-            function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
-
+    class Event {
         /**
          * @classdesc
          * Stripped down implementation of the W3C DOM Level 2 Event interface.
@@ -1400,56 +1320,52 @@ declare module ol {
          * for higher level events defined in the library, and works with
          * {@link ol.events.EventTarget}.
          *
-         * @constructor
-         * @implements {oli.events.Event}
-         * @param {string} type Type.
+         * @param type Type.
          */
-        class Event {
-            /**
-             * @classdesc
-             * Stripped down implementation of the W3C DOM Level 2 Event interface.
-             * @see {@link https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-interface}
-             *
-             * This implementation only provides `type` and `target` properties, and
-             * `stopPropagation` and `preventDefault` methods. It is meant as base class
-             * for higher level events defined in the library, and works with
-             * {@link ol.events.EventTarget}.
-             *
-             * @constructor
-             * @implements {oli.events.Event}
-             * @param {string} type Type.
-             */
-            constructor(type: string);
+        constructor(type: string);
 
-            /**
-             * The event type.
-             * @type {string}
-             * @api stable
-             */
-            type: string;
+        /**
+         * The event type.
+         * @api stable
+         */
+        type: string;
 
-            /**
-             * The event target.
-             * @type {Object}
-             * @api stable
-             */
-            target: GlobalObject;
+        /**
+         * The event target.
+         * @api stable
+         */
+        target: GlobalObject;
 
-            /**
-             * Stop event propagation.
-             * @function
-             * @api stable
-             */
-            preventDefault(): void;
+        /**
+         * Stop event propagation.
+         * @api stable
+         */
+        preventDefault(): void;
 
-            /**
-             * Stop event propagation.
-             * @function
-             * @api stable
-             */
-            stopPropagation(): void;
-        }
+        /**
+         * Stop event propagation.
+         * @api stable
+         */
+        stopPropagation(): void;
+    }
 
+    /**
+     * @classdesc
+     * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
+     * @see {@link https://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/events.html#Events-EventTarget}
+     *
+     * There are two important simplifications compared to the specification:
+     *
+     * 1. The handling of `useCapture` in `addEventListener` and
+     *    `removeEventListener`. There is no real capture model.
+     * 2. The handling of `stopPropagation` and `preventDefault` on `dispatchEvent`.
+     *    There is no event target hierarchy. When a listener calls
+     *    `stopPropagation` or `preventDefault` on an event object, it means that no
+     *    more listeners after this one will be called. Same as when the listener
+     *    returns false.
+     *
+     */
+    class EventTarget extends Disposable {
         /**
          * @classdesc
          * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
@@ -1465,218 +1381,241 @@ declare module ol {
          *    more listeners after this one will be called. Same as when the listener
          *    returns false.
          *
-         * @constructor
-         * @extends {ol.Disposable}
          */
-        class EventTarget extends ol.Disposable {
-            /**
-             * @classdesc
-             * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
-             * @see {@link https://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/events.html#Events-EventTarget}
-             *
-             * There are two important simplifications compared to the specification:
-             *
-             * 1. The handling of `useCapture` in `addEventListener` and
-             *    `removeEventListener`. There is no real capture model.
-             * 2. The handling of `stopPropagation` and `preventDefault` on `dispatchEvent`.
-             *    There is no event target hierarchy. When a listener calls
-             *    `stopPropagation` or `preventDefault` on an event object, it means that no
-             *    more listeners after this one will be called. Same as when the listener
-             *    returns false.
-             *
-             * @constructor
-             * @extends {ol.Disposable}
-             */
-            constructor();
-        }
+        constructor();
     }
+}
+
+/* From ol/typedefs.js */
+type EventsListenerFunctionType = ((evt: ol.events.Event) => void) | ((evt: ol.events.Event) => boolean);
+
+export namespace extent {
+    /**
+     * Build an extent that includes all given coordinates.
+     *
+     * @param coordinates Coordinates.
+     * @return Bounding extent.
+     * @api stable
+     */
+    function boundingExtent(coordinates: ol.Coordinate[]): ol.Extent;
 
     /**
-     * @namespace ol.extent
+     * Return extent increased by the provided value.
+     * @param extent Extent.
+     * @param value The amount by which the extent should be buffered.
+     * @param opt_extent Extent.
+     * @return Extent.
+     * @api stable
      */
-    module extent {
-        /**
-         * Build an extent that includes all given coordinates.
-         *
-         * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-         * @return {ol.Extent} Bounding extent.
-         * @api stable
-         */
-        function boundingExtent(coordinates: ol.Coordinate[]): ol.Extent;
+    function buffer(extent: ol.Extent, value: number, opt_extent?: ol.Extent): ol.Extent;
 
-        /**
-         * Return extent increased by the provided value.
-         * @param {ol.Extent} extent Extent.
-         * @param {number} value The amount by which the extent should be buffered.
-         * @param {ol.Extent=} opt_extent Extent.
-         * @return {ol.Extent} Extent.
-         * @api stable
-         */
-        function buffer(extent: ol.Extent, value: number, opt_extent?: ol.Extent): ol.Extent;
+    /**
+     * Check if the passed coordinate is contained or on the edge of the extent.
+     *
+     * @param extent Extent.
+     * @param coordinate Coordinate.
+     * @return The coordinate is contained in the extent.
+     * @api stable
+     */
+    function containsCoordinate(extent: ol.Extent, coordinate: ol.Coordinate): boolean;
 
-        /**
-         * Check if the passed coordinate is contained or on the edge of the extent.
-         *
-         * @param {ol.Extent} extent Extent.
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @return {boolean} The coordinate is contained in the extent.
-         * @api stable
-         */
-        function containsCoordinate(extent: ol.Extent, coordinate: ol.Coordinate): boolean;
+    /**
+     * Check if one extent contains another.
+     *
+     * An extent is deemed contained if it lies completely within the other extent,
+     * including if they share one or more edges.
+     *
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @return The second extent is contained by or on the edge of the
+     *     first.
+     * @api stable
+     */
+    function containsExtent(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Check if one extent contains another.
-         *
-         * An extent is deemed contained if it lies completely within the other extent,
-         * including if they share one or more edges.
-         *
-         * @param {ol.Extent} extent1 Extent 1.
-         * @param {ol.Extent} extent2 Extent 2.
-         * @return {boolean} The second extent is contained by or on the edge of the
-         *     first.
-         * @api stable
-         */
-        function containsExtent(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Check if the passed coordinate is contained or on the edge of the extent.
+     *
+     * @param extent Extent.
+     * @param x X coordinate.
+     * @param y Y coordinate.
+     * @return The x, y values are contained in the extent.
+     * @api stable
+     */
+    function containsXY(extent: ol.Extent, x: number, y: number): boolean;
 
-        /**
-         * Check if the passed coordinate is contained or on the edge of the extent.
-         *
-         * @param {ol.Extent} extent Extent.
-         * @param {number} x X coordinate.
-         * @param {number} y Y coordinate.
-         * @return {boolean} The x, y values are contained in the extent.
-         * @api stable
-         */
-        function containsXY(extent: ol.Extent, x: number, y: number): boolean;
+    /**
+     * Create an empty extent.
+     * @return Empty extent.
+     * @api stable
+     */
+    function createEmpty(): ol.Extent;
 
-        /**
-         * Create an empty extent.
-         * @return {ol.Extent} Empty extent.
-         * @api stable
-         */
-        function createEmpty(): ol.Extent;
+    /**
+     * Determine if two extents are equivalent.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @return The two extents are equivalent.
+     * @api stable
+     */
+    function equals(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Determine if two extents are equivalent.
-         * @param {ol.Extent} extent1 Extent 1.
-         * @param {ol.Extent} extent2 Extent 2.
-         * @return {boolean} The two extents are equivalent.
-         * @api stable
-         */
-        function equals(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Modify an extent to include another extent.
+     * @param extent1 The extent to be modified.
+     * @param extent2 The extent that will be included in the first.
+     * @return A reference to the first (extended) extent.
+     * @api stable
+     */
+    function extend(extent1: ol.Extent, extent2: ol.Extent): ol.Extent;
 
-        /**
-         * Modify an extent to include another extent.
-         * @param {ol.Extent} extent1 The extent to be modified.
-         * @param {ol.Extent} extent2 The extent that will be included in the first.
-         * @return {ol.Extent} A reference to the first (extended) extent.
-         * @api stable
-         */
-        function extend(extent1: ol.Extent, extent2: ol.Extent): ol.Extent;
+    /**
+     * Get the bottom left coordinate of an extent.
+     * @param extent Extent.
+     * @return Bottom left coordinate.
+     * @api stable
+     */
+    function getBottomLeft(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the bottom left coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Bottom left coordinate.
-         * @api stable
-         */
-        function getBottomLeft(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the bottom right coordinate of an extent.
+     * @param extent Extent.
+     * @return Bottom right coordinate.
+     * @api stable
+     */
+    function getBottomRight(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the bottom right coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Bottom right coordinate.
-         * @api stable
-         */
-        function getBottomRight(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the center coordinate of an extent.
+     * @param extent Extent.
+     * @return Center.
+     * @api stable
+     */
+    function getCenter(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the center coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Center.
-         * @api stable
-         */
-        function getCenter(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the height of an extent.
+     * @param extent Extent.
+     * @return Height.
+     * @api stable
+     */
+    function getHeight(extent: ol.Extent): number;
 
-        /**
-         * Get the height of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {number} Height.
-         * @api stable
-         */
-        function getHeight(extent: ol.Extent): number;
+    /**
+     * Get the intersection of two extents.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @param opt_extent Optional extent to populate with intersection.
+     * @return Intersecting extent.
+     * @api stable
+     */
+    function getIntersection(extent1: ol.Extent, extent2: ol.Extent, opt_extent?: ol.Extent): ol.Extent;
 
-        /**
-         * Get the intersection of two extents.
-         * @param {ol.Extent} extent1 Extent 1.
-         * @param {ol.Extent} extent2 Extent 2.
-         * @param {ol.Extent=} opt_extent Optional extent to populate with intersection.
-         * @return {ol.Extent} Intersecting extent.
-         * @api stable
-         */
-        function getIntersection(extent1: ol.Extent, extent2: ol.Extent, opt_extent?: ol.Extent): ol.Extent;
+    /**
+     * Get the size (width, height) of an extent.
+     * @param extent The extent.
+     * @return The extent size.
+     * @api stable
+     */
+    function getSize(extent: ol.Extent): ol.Size;
 
-        /**
-         * Get the size (width, height) of an extent.
-         * @param {ol.Extent} extent The extent.
-         * @return {ol.Size} The extent size.
-         * @api stable
-         */
-        function getSize(extent: ol.Extent): ol.Size;
+    /**
+     * Get the top left coordinate of an extent.
+     * @param extent Extent.
+     * @return Top left coordinate.
+     * @api stable
+     */
+    function getTopLeft(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the top left coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Top left coordinate.
-         * @api stable
-         */
-        function getTopLeft(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the top right coordinate of an extent.
+     * @param extent Extent.
+     * @return Top right coordinate.
+     * @api stable
+     */
+    function getTopRight(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the top right coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Top right coordinate.
-         * @api stable
-         */
-        function getTopRight(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the width of an extent.
+     * @param extent Extent.
+     * @return Width.
+     * @api stable
+     */
+    function getWidth(extent: ol.Extent): number;
 
-        /**
-         * Get the width of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {number} Width.
-         * @api stable
-         */
-        function getWidth(extent: ol.Extent): number;
+    /**
+     * Determine if one extent intersects another.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent.
+     * @return The two extents intersect.
+     * @api stable
+     */
+    function intersects(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Determine if one extent intersects another.
-         * @param {ol.Extent} extent1 Extent 1.
-         * @param {ol.Extent} extent2 Extent.
-         * @return {boolean} The two extents intersect.
-         * @api stable
-         */
-        function intersects(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Determine if an extent is empty.
+     * @param extent Extent.
+     * @return Is empty.
+     * @api stable
+     */
+    function isEmpty(extent: ol.Extent): boolean;
 
-        /**
-         * Determine if an extent is empty.
-         * @param {ol.Extent} extent Extent.
-         * @return {boolean} Is empty.
-         * @api stable
-         */
-        function isEmpty(extent: ol.Extent): boolean;
-
-        /**
-         * Apply a transform function to the extent.
-         * @param {ol.Extent} extent Extent.
-         * @param {ol.TransformFunction} transformFn Transform function.  Called with
-         * [minX, minY, maxX, maxY] extent coordinates.
-         * @param {ol.Extent=} opt_extent Destination extent.
-         * @return {ol.Extent} Extent.
-         * @api stable
-         */
-        function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
-    }
+    /**
+     * Apply a transform function to the extent.
+     * @param extent Extent.
+     * @param transformFn Transform function.  Called with
+     * [minX, minY, maxX, maxY] extent coordinates.
+     * @param opt_extent Destination extent.
+     * @return Extent.
+     * @api stable
+     */
+    function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
+}
 
+/**
+ * @classdesc
+ * A vector object for geographic features with a geometry and other
+ * attribute properties, similar to the features in vector file formats like
+ * GeoJSON.
+ *
+ * Features can be styled individually with `setStyle`; otherwise they use the
+ * style of their vector layer.
+ *
+ * Note that attribute properties are set as {@link ol.Object} properties on
+ * the feature object, so they are observable, and have get/set accessors.
+ *
+ * Typically, a feature has a single geometry property. You can set the
+ * geometry using the `setGeometry` method and get it with `getGeometry`.
+ * It is possible to store more than one geometry on a feature using attribute
+ * properties. By default, the geometry used for rendering is identified by
+ * the property name `geometry`. If you want to use another geometry property
+ * for rendering, use the `setGeometryName` method to change the attribute
+ * property associated with the geometry for the feature.  For example:
+ *
+ * ```js
+ * var feature = new ol.Feature({
+ *   geometry: new ol.geom.Polygon(polyCoords),
+ *   labelPoint: new ol.geom.Point(labelCoords),
+ *   name: 'My Polygon'
+ * });
+ *
+ * // get the polygon geometry
+ * var poly = feature.getGeometry();
+ *
+ * // Render the feature as a point using the coordinates from labelPoint
+ * feature.setGeometryName('labelPoint');
+ *
+ * // get the point geometry
+ * var point = feature.getGeometry();
+ * ```
+ *
+ * @param opt_geometryOrProperties
+ *     You may pass a Geometry object directly, or an object literal
+ *     containing properties.  If you pass an object literal, you may
+ *     include a Geometry associated with a `geometry` key.
+ * @api stable
+ */
+export class Feature extends Object {
     /**
      * @classdesc
      * A vector object for geographic features with a geometry and other
@@ -1714,322 +1653,269 @@ declare module ol {
      * var point = feature.getGeometry();
      * ```
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {ol.geom.Geometry|Object.<string, *>=} opt_geometryOrProperties
+     * @param opt_geometryOrProperties
      *     You may pass a Geometry object directly, or an object literal
      *     containing properties.  If you pass an object literal, you may
      *     include a Geometry associated with a `geometry` key.
      * @api stable
      */
-    class Feature extends ol.Object {
-        /**
-         * @classdesc
-         * A vector object for geographic features with a geometry and other
-         * attribute properties, similar to the features in vector file formats like
-         * GeoJSON.
-         *
-         * Features can be styled individually with `setStyle`; otherwise they use the
-         * style of their vector layer.
-         *
-         * Note that attribute properties are set as {@link ol.Object} properties on
-         * the feature object, so they are observable, and have get/set accessors.
-         *
-         * Typically, a feature has a single geometry property. You can set the
-         * geometry using the `setGeometry` method and get it with `getGeometry`.
-         * It is possible to store more than one geometry on a feature using attribute
-         * properties. By default, the geometry used for rendering is identified by
-         * the property name `geometry`. If you want to use another geometry property
-         * for rendering, use the `setGeometryName` method to change the attribute
-         * property associated with the geometry for the feature.  For example:
-         *
-         * ```js
-         * var feature = new ol.Feature({
-         *   geometry: new ol.geom.Polygon(polyCoords),
-         *   labelPoint: new ol.geom.Point(labelCoords),
-         *   name: 'My Polygon'
-         * });
-         *
-         * // get the polygon geometry
-         * var poly = feature.getGeometry();
-         *
-         * // Render the feature as a point using the coordinates from labelPoint
-         * feature.setGeometryName('labelPoint');
-         *
-         * // get the point geometry
-         * var point = feature.getGeometry();
-         * ```
-         *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {ol.geom.Geometry|Object.<string, *>=} opt_geometryOrProperties
-         *     You may pass a Geometry object directly, or an object literal
-         *     containing properties.  If you pass an object literal, you may
-         *     include a Geometry associated with a `geometry` key.
-         * @api stable
-         */
-        constructor(opt_geometryOrProperties?: (ol.geom.Geometry | { [k: string]: any }));
-
-        /**
-         * Clone this feature. If the original feature has a geometry it
-         * is also cloned. The feature id is not set in the clone.
-         * @return {ol.Feature} The clone.
-         * @api stable
-         */
-        clone(): ol.Feature;
-
-        /**
-         * Get the feature's default geometry.  A feature may have any number of named
-         * geometries.  The "default" geometry (the one that is rendered by default) is
-         * set when calling {@link ol.Feature#setGeometry}.
-         * @return {ol.geom.Geometry|undefined} The default geometry for the feature.
-         * @api stable
-         * @observable
-         */
-        getGeometry(): (ol.geom.Geometry);
-
-        /**
-         * Get the feature identifier.  This is a stable identifier for the feature and
-         * is either set when reading data from a remote source or set explicitly by
-         * calling {@link ol.Feature#setId}.
-         * @return {number|string|undefined} Id.
-         * @api stable
-         * @observable
-         */
-        getId(): (number | string);
-
-        /**
-         * Get the name of the feature's default geometry.  By default, the default
-         * geometry is named `geometry`.
-         * @return {string} Get the property name associated with the default geometry
-         *     for this feature.
-         * @api stable
-         */
-        getGeometryName(): string;
-
-        /**
-         * Get the feature's style.  This return for this method depends on what was
-         * provided to the {@link ol.Feature#setStyle} method.
-         * @return {ol.style.Style|Array.<ol.style.Style>|
-         *     ol.FeatureStyleFunction|ol.StyleFunction} The feature style.
-         * @api stable
-         * @observable
-         */
-        getStyle(): (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction);
-
-        /**
-         * Get the feature's style function.
-         * @return {ol.FeatureStyleFunction|undefined} Return a function
-         * representing the current style of this feature.
-         * @api stable
-         */
-        getStyleFunction(): (ol.FeatureStyleFunction);
-
-        /**
-         * Set the default geometry for the feature.  This will update the property
-         * with the name returned by {@link ol.Feature#getGeometryName}.
-         * @param {ol.geom.Geometry|undefined} geometry The new geometry.
-         * @api stable
-         * @observable
-         */
-        setGeometry(geometry: (ol.geom.Geometry)): void;
-
-        /**
-         * Set the style for the feature.  This can be a single style object, an array
-         * of styles, or a function that takes a resolution and returns an array of
-         * styles. If it is `null` the feature has no style (a `null` style).
-         * @param {ol.style.Style|Array.<ol.style.Style>|
-         *     ol.FeatureStyleFunction|ol.StyleFunction} style Style for this feature.
-         * @api stable
-         * @observable
-         */
-        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction)): void;
-
-        /**
-         * Set the feature id.  The feature id is considered stable and may be used when
-         * requesting features or comparing identifiers returned from a remote source.
-         * The feature id can be used with the {@link ol.source.Vector#getFeatureById}
-         * method.
-         * @param {number|string|undefined} id The feature id.
-         * @api stable
-         * @observable
-         */
-        setId(id: (number | string)): void;
-
-        /**
-         * Set the property name to be used when getting the feature's default geometry.
-         * When calling {@link ol.Feature#getGeometry}, the value of the property with
-         * this name will be returned.
-         * @param {string} name The property name of the default geometry.
-         * @api stable
-         */
-        setGeometryName(name: string): void;
-    }
+    constructor(opt_geometryOrProperties?: (ol.geom.Geometry | { [k: string]: any }));
 
     /**
-     * Loading mechanisms for vector data.
-     * @namespace ol.featureloader
+     * Clone this feature. If the original feature has a geometry it
+     * is also cloned. The feature id is not set in the clone.
+     * @return The clone.
+     * @api stable
      */
-    module featureloader {
-        /**
-         * Create an XHR feature loader for a `url` and `format`. The feature loader
-         * loads features (with XHR), parses the features, and adds them to the
-         * vector tile.
-         * @param {string|ol.FeatureUrlFunction} url Feature URL service.
-         * @param {ol.format.Feature} format Feature format.
-         * @return {ol.FeatureLoader} The feature loader.
-         * @api
-         */
-        function tile(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
-
-        /**
-         * Create an XHR feature loader for a `url` and `format`. The feature loader
-         * loads features (with XHR), parses the features, and adds them to the
-         * vector source.
-         * @param {string|ol.FeatureUrlFunction} url Feature URL service.
-         * @param {ol.format.Feature} format Feature format.
-         * @return {ol.FeatureLoader} The feature loader.
-         * @api
-         */
-        function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
-    }
+    clone(): ol.Feature;
 
     /**
-     * @namespace ol.format
+     * Get the feature's default geometry.  A feature may have any number of named
+     * geometries.  The "default" geometry (the one that is rendered by default) is
+     * set when calling {@link ol.Feature#setGeometry}.
+     * @return The default geometry for the feature.
+     * @api stable
+     * @observable
      */
-    module format {
+    getGeometry(): (ol.geom.Geometry);
+
+    /**
+     * Get the feature identifier.  This is a stable identifier for the feature and
+     * is either set when reading data from a remote source or set explicitly by
+     * calling {@link ol.Feature#setId}.
+     * @return Id.
+     * @api stable
+     * @observable
+     */
+    getId(): (number | string);
+
+    /**
+     * Get the name of the feature's default geometry.  By default, the default
+     * geometry is named `geometry`.
+     * @return Get the property name associated with the default geometry
+     *     for this feature.
+     * @api stable
+     */
+    getGeometryName(): string;
+
+    /**
+     * Get the feature's style.  This return for this method depends on what was
+     * provided to the {@link ol.Feature#setStyle} method.
+     * @return The feature style.
+     * @api stable
+     * @observable
+     */
+    getStyle(): (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction);
+
+    /**
+     * Get the feature's style function.
+     * @return Return a function
+     * representing the current style of this feature.
+     * @api stable
+     */
+    getStyleFunction(): (ol.FeatureStyleFunction);
+
+    /**
+     * Set the default geometry for the feature.  This will update the property
+     * with the name returned by {@link ol.Feature#getGeometryName}.
+     * @param geometry The new geometry.
+     * @api stable
+     * @observable
+     */
+    setGeometry(geometry: (ol.geom.Geometry)): void;
+
+    /**
+     * Set the style for the feature.  This can be a single style object, an array
+     * of styles, or a function that takes a resolution and returns an array of
+     * styles. If it is `null` the feature has no style (a `null` style).
+     * @param style Style for this feature.
+     * @api stable
+     * @observable
+     */
+    setStyle(style: (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction)): void;
+
+    /**
+     * Set the feature id.  The feature id is considered stable and may be used when
+     * requesting features or comparing identifiers returned from a remote source.
+     * The feature id can be used with the {@link ol.source.Vector#getFeatureById}
+     * method.
+     * @param id The feature id.
+     * @api stable
+     * @observable
+     */
+    setId(id: (number | string)): void;
+
+    /**
+     * Set the property name to be used when getting the feature's default geometry.
+     * When calling {@link ol.Feature#getGeometry}, the value of the property with
+     * this name will be returned.
+     * @param name The property name of the default geometry.
+     * @api stable
+     */
+    setGeometryName(name: string): void;
+}
+
+/**
+ * Loading mechanisms for vector data.
+ */
+export namespace featureloader {
+    /**
+     * Create an XHR feature loader for a `url` and `format`. The feature loader
+     * loads features (with XHR), parses the features, and adds them to the
+     * vector tile.
+     * @param url Feature URL service.
+     * @param format Feature format.
+     * @return The feature loader.
+     * @api
+     */
+    function tile(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
+
+    /**
+     * Create an XHR feature loader for a `url` and `format`. The feature loader
+     * loads features (with XHR), parses the features, and adds them to the
+     * vector source.
+     * @param url Feature URL service.
+     * @param format Feature format.
+     * @return The feature loader.
+     * @api
+     */
+    function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
+}
+
+export namespace format {
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the EsriJSON format.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class EsriJSON extends format.JSONFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the EsriJSON format.
          *
-         * @constructor
-         * @extends {ol.format.JSONFeature}
-         * @param {olx.format.EsriJSONOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class EsriJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the EsriJSON format.
-             *
-             * @constructor
-             * @extends {ol.format.JSONFeature}
-             * @param {olx.format.EsriJSONOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.EsriJSONOptions);
+        constructor(opt_options?: olx.format.EsriJSONOptions);
 
-            /**
-             * Read a feature from a EsriJSON Feature source.  Only works for Feature,
-             * use `readFeatures` to read FeatureCollection source.
-             *
-             * @function
-             * @param {ArrayBuffer|Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
-             * @api
-             */
-            readFeature(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a EsriJSON Feature source.  Only works for Feature,
+         * use `readFeatures` to read FeatureCollection source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api
+         */
+        readFeature(source: (ArrayBuffer | Document | Node | GlobalObject| string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a EsriJSON source.  Works with both Feature and
-             * FeatureCollection sources.
-             *
-             * @function
-             * @param {ArrayBuffer|Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api
-             */
-            readFeatures(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a EsriJSON source.  Works with both Feature and
+         * FeatureCollection sources.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api
+         */
+        readFeatures(source: (ArrayBuffer | Document | Node | GlobalObject| string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a geometry from a EsriJSON source.
-             *
-             * @function
-             * @param {ArrayBuffer|Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.geom.Geometry} Geometry.
-             * @api
-             */
-            readGeometry(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a geometry from a EsriJSON source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api
+         */
+        readGeometry(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a EsriJSON source.
-             *
-             * @function
-             * @param {ArrayBuffer|Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
-             * @api
-             */
-            readProjection(source: (ArrayBuffer | Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a EsriJSON source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api
+         */
+        readProjection(source: (ArrayBuffer | Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode a geometry as a EsriJSON string.
-             *
-             * @function
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} EsriJSON.
-             * @api
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a geometry as a EsriJSON string.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a geometry as a EsriJSON object.
-             *
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {EsriJSONGeometry} Object.
-             * @api
-             */
-            writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): EsriJSONGeometry;
+        /**
+         * Encode a geometry as a EsriJSON object.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api
+         */
+        writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): EsriJSONGeometry;
 
-            /**
-             * Encode a feature as a EsriJSON Feature string.
-             *
-             * @function
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} EsriJSON.
-             * @api
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a EsriJSON Feature string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a feature as a esriJSON Feature object.
-             *
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {Object} Object.
-             * @api
-             */
-            writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GlobalObject;
+        /**
+         * Encode a feature as a esriJSON Feature object.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api
+         */
+        writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GlobalObject;
 
-            /**
-             * Encode an array of features as EsriJSON.
-             *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} EsriJSON.
-             * @api
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as EsriJSON.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a EsriJSON object.
-             *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {Object} EsriJSON Object.
-             * @api
-             */
-            writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
-        }
+        /**
+         * Encode an array of features as a EsriJSON object.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return EsriJSON Object.
+         * @api
+         */
+        writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
+    }
 
-        type EsriJSONGeometry = JSON;
+    type EsriJSONGeometry = JSON;
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for feature formats.
+     * {ol.format.Feature} subclasses provide the ability to decode and encode
+     * {@link ol.Feature} objects from a variety of commonly used geospatial
+     * file formats.  See the documentation for each format for more details.
+     *
+     * @api stable
+     */
+    class Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -2039,293 +1925,266 @@ declare module ol {
          * {@link ol.Feature} objects from a variety of commonly used geospatial
          * file formats.  See the documentation for each format for more details.
          *
-         * @constructor
          * @api stable
          */
-        class Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for feature formats.
-             * {ol.format.Feature} subclasses provide the ability to decode and encode
-             * {@link ol.Feature} objects from a variety of commonly used geospatial
-             * file formats.  See the documentation for each format for more details.
-             *
-             * @constructor
-             * @api stable
-             */
-            constructor();
-        }
+        constructor();
+    }
 
-        type GeoJSONFeature = JSON;
-        type GeoJSONFeatureCollection = JSON;
-        type GeoJSONGeometry = JSON;
-        type GeoJSONGeometryCollection = JSON;
+    type GeoJSONFeature = JSON;
+    type GeoJSONFeatureCollection = JSON;
+    type GeoJSONGeometry = JSON;
+    type GeoJSONGeometryCollection = JSON;
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GeoJSON format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class GeoJSON extends format.JSONFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GeoJSON format.
          *
-         * @constructor
-         * @extends {ol.format.JSONFeature}
-         * @param {olx.format.GeoJSONOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class GeoJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GeoJSON format.
-             *
-             * @constructor
-             * @extends {ol.format.JSONFeature}
-             * @param {olx.format.GeoJSONOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GeoJSONOptions);
+        constructor(opt_options?: olx.format.GeoJSONOptions);
 
-            /**
-             * Read a feature from a GeoJSON Feature source.  Only works for Feature,
-             * use `readFeatures` to read FeatureCollection source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a GeoJSON Feature source.  Only works for Feature,
+         * use `readFeatures` to read FeatureCollection source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a GeoJSON source.  Works with both Feature and
-             * FeatureCollection sources.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a GeoJSON source.  Works with both Feature and
+         * FeatureCollection sources.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a geometry from a GeoJSON source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.geom.Geometry} Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a geometry from a GeoJSON source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a GeoJSON source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a GeoJSON source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode a feature as a GeoJSON Feature string.
-             *
-             * @function
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} GeoJSON.
-             * @api stable
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a GeoJSON Feature string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a feature as a GeoJSON Feature object.
-             *
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {GeoJSONFeature} Object.
-             * @api stable
-             */
-            writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GeoJSONFeature;
+        /**
+         * Encode a feature as a GeoJSON Feature object.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api stable
+         */
+        writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GeoJSONFeature;
 
-            /**
-             * Encode an array of features as GeoJSON.
-             *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} GeoJSON.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as GeoJSON.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a GeoJSON object.
-             *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {GeoJSONFeatureCollection} GeoJSON Object.
-             * @api stable
-             */
-            writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GeoJSONFeatureCollection;
+        /**
+         * Encode an array of features as a GeoJSON object.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return GeoJSON Object.
+         * @api stable
+         */
+        writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GeoJSONFeatureCollection;
 
-            /**
-             * Encode a geometry as a GeoJSON string.
-             *
-             * @function
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} GeoJSON.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a geometry as a GeoJSON string.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a geometry as a GeoJSON object.
-             *
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {GeoJSONGeometry|GeoJSONGeometryCollection} Object.
-             * @api stable
-             */
-            writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
-        }
+        /**
+         * Encode a geometry as a GeoJSON object.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api stable
+         */
+        writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format
+     * version 3.1.1.
+     * Currently only supports GML 3.1.1 Simple Features profile.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class GML extends format.GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format
          * version 3.1.1.
          * Currently only supports GML 3.1.1 Simple Features profile.
          *
-         * @constructor
-         * @param {olx.format.GMLOptions=} opt_options
+         * @param opt_options
          *     Optional configuration object.
-         * @extends {ol.format.GMLBase}
          * @api stable
          */
-        class GML extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format
-             * version 3.1.1.
-             * Currently only supports GML 3.1.1 Simple Features profile.
-             *
-             * @constructor
-             * @param {olx.format.GMLOptions=} opt_options
-             *     Optional configuration object.
-             * @extends {ol.format.GMLBase}
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Encode an array of features in GML 3.1.1 Simple Features.
-             *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {string} Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in GML 3.1.1 Simple Features.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the GML 3.1.1 format as an XML node.
-             *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the GML 3.1.1 format as an XML node.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format,
+     * version 2.1.2.
+     *
+     * @param opt_options Optional configuration object.
+     * @api
+     */
+    class GML2 extends format.GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format,
          * version 2.1.2.
          *
-         * @constructor
-         * @param {olx.format.GMLOptions=} opt_options Optional configuration object.
-         * @extends {ol.format.GMLBase}
+         * @param opt_options Optional configuration object.
          * @api
          */
-        class GML2 extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format,
-             * version 2.1.2.
-             *
-             * @constructor
-             * @param {olx.format.GMLOptions=} opt_options Optional configuration object.
-             * @extends {ol.format.GMLBase}
-             * @api
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
-        }
+        constructor(opt_options?: olx.format.GMLOptions);
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format
+     * version 3.1.1.
+     * Currently only supports GML 3.1.1 Simple Features profile.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api
+     */
+    class GML3 extends format.GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format
          * version 3.1.1.
          * Currently only supports GML 3.1.1 Simple Features profile.
          *
-         * @constructor
-         * @param {olx.format.GMLOptions=} opt_options
+         * @param opt_options
          *     Optional configuration object.
-         * @extends {ol.format.GMLBase}
          * @api
          */
-        class GML3 extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format
-             * version 3.1.1.
-             * Currently only supports GML 3.1.1 Simple Features profile.
-             *
-             * @constructor
-             * @param {olx.format.GMLOptions=} opt_options
-             *     Optional configuration object.
-             * @extends {ol.format.GMLBase}
-             * @api
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Encode a geometry in GML 3.1.1 Simple Features.
-             *
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
-             * @api
-             */
-            writeGeometryNode(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): Node;
+        /**
+         * Encode a geometry in GML 3.1.1 Simple Features.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeGeometryNode(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): Node;
 
-            /**
-             * Encode an array of features in GML 3.1.1 Simple Features.
-             *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {string} Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in GML 3.1.1 Simple Features.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the GML 3.1.1 format as an XML node.
-             *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the GML 3.1.1 format as an XML node.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Feature base format for reading and writing data in the GML format.
+     * This class cannot be instantiated, it contains only base content that
+     * is shared with versioned format classes ol.format.GML2 and
+     * ol.format.GML3.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     */
+    class GMLBase extends format.XMLFeature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -2335,206 +2194,179 @@ declare module ol {
          * is shared with versioned format classes ol.format.GML2 and
          * ol.format.GML3.
          *
-         * @constructor
-         * @param {olx.format.GMLOptions=} opt_options
+         * @param opt_options
          *     Optional configuration object.
-         * @extends {ol.format.XMLFeature}
          */
-        class GMLBase extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Feature base format for reading and writing data in the GML format.
-             * This class cannot be instantiated, it contains only base content that
-             * is shared with versioned format classes ol.format.GML2 and
-             * ol.format.GML3.
-             *
-             * @constructor
-             * @param {olx.format.GMLOptions=} opt_options
-             *     Optional configuration object.
-             * @extends {ol.format.XMLFeature}
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Read all features from a GML FeatureCollection.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-        }
+        /**
+         * Read all features from a GML FeatureCollection.
+         *
+         * @param source Source.
+         * @param opt_options Options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GPX format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class GPX extends format.XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GPX format.
          *
-         * @constructor
-         * @extends {ol.format.XMLFeature}
-         * @param {olx.format.GPXOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class GPX extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GPX format.
-             *
-             * @constructor
-             * @extends {ol.format.XMLFeature}
-             * @param {olx.format.GPXOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GPXOptions);
-
-            /**
-             * Read the first feature from a GPX source.
-             * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
-             * into MultiLineString. Any properties on route and track waypoints are ignored.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
-
-            /**
-             * Read all features from a GPX source.
-             * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
-             * into MultiLineString. Any properties on route and track waypoints are ignored.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-
-            /**
-             * Read the projection from a GPX source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-
-            /**
-             * Encode an array of features in the GPX format.
-             * LineString geometries are output as routes (`<rte>`), and MultiLineString
-             * as tracks (`<trk>`).
-             *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
-
-            /**
-             * Encode an array of features in the GPX format as an XML node.
-             * LineString geometries are output as routes (`<rte>`), and MultiLineString
-             * as tracks (`<trk>`).
-             *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        constructor(opt_options?: olx.format.GPXOptions);
 
         /**
-         * IGC altitude/z. One of 'barometric', 'gps', 'none'.
-         * @enum {string}
+         * Read the first feature from a GPX source.
+         * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
+         * into MultiLineString. Any properties on route and track waypoints are ignored.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
          */
-        type IGCZ = "barometric" | "gps" | "none";
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
+        /**
+         * Read all features from a GPX source.
+         * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
+         * into MultiLineString. Any properties on route and track waypoints are ignored.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+
+        /**
+         * Read the projection from a GPX source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+
+        /**
+         * Encode an array of features in the GPX format.
+         * LineString geometries are output as routes (`<rte>`), and MultiLineString
+         * as tracks (`<trk>`).
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+
+        /**
+         * Encode an array of features in the GPX format as an XML node.
+         * LineString geometries are output as routes (`<rte>`), and MultiLineString
+         * as tracks (`<trk>`).
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
+
+    /**
+     * IGC altitude/z. One of 'barometric', 'gps', 'none'.
+     */
+    type IGCZ = "barometric" | "gps" | "none";
+
+    /**
+     * @classdesc
+     * Feature format for `*.igc` flight recording files.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class IGC extends format.TextFeature {
         /**
          * @classdesc
          * Feature format for `*.igc` flight recording files.
          *
-         * @constructor
-         * @extends {ol.format.TextFeature}
-         * @param {olx.format.IGCOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class IGC extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Feature format for `*.igc` flight recording files.
-             *
-             * @constructor
-             * @extends {ol.format.TextFeature}
-             * @param {olx.format.IGCOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.IGCOptions);
+        constructor(opt_options?: olx.format.IGCOptions);
 
-            /**
-             * Read the feature from the IGC source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
-             * @api
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the feature from the IGC source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read the feature from the source. As IGC sources contain a single
-             * feature, this will return the feature in an array.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read the feature from the source. As IGC sources contain a single
+         * feature, this will return the feature in an array.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the projection from the IGC source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
-             * @api
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from the IGC source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for JSON feature formats.
+     *
+     */
+    class JSONFeature extends format.Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
          * instantiated in apps.
          * Base class for JSON feature formats.
          *
-         * @constructor
-         * @extends {ol.format.Feature}
          */
-        class JSONFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for JSON feature formats.
-             *
-             * @constructor
-             * @extends {ol.format.Feature}
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the KML format.
+     *
+     * Note that the KML format uses the URL() constructor. Older browsers such as IE
+     * which do not support this will need a URL polyfill to be loaded before use.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KML extends format.XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the KML format.
@@ -2542,498 +2374,465 @@ declare module ol {
          * Note that the KML format uses the URL() constructor. Older browsers such as IE
          * which do not support this will need a URL polyfill to be loaded before use.
          *
-         * @constructor
-         * @extends {ol.format.XMLFeature}
-         * @param {olx.format.KMLOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class KML extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the KML format.
-             *
-             * Note that the KML format uses the URL() constructor. Older browsers such as IE
-             * which do not support this will need a URL polyfill to be loaded before use.
-             *
-             * @constructor
-             * @extends {ol.format.XMLFeature}
-             * @param {olx.format.KMLOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.KMLOptions);
+        constructor(opt_options?: olx.format.KMLOptions);
 
-            /**
-             * Read the first feature from a KML source. MultiGeometries are converted into
-             * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
-             * MultiLineString/MultiPolygon if they are all of the same type.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the first feature from a KML source. MultiGeometries are converted into
+         * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
+         * MultiLineString/MultiPolygon if they are all of the same type.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a KML source. MultiGeometries are converted into
-             * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
-             * MultiLineString/MultiPolygon if they are all of the same type.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a KML source. MultiGeometries are converted into
+         * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
+         * MultiLineString/MultiPolygon if they are all of the same type.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the name of the KML.
-             *
-             * @param {Document|Node|string} source Souce.
-             * @return {string|undefined} Name.
-             * @api stable
-             */
-            readName(source: (Document | Node | string)): (string);
+        /**
+         * Read the name of the KML.
+         *
+         * @param source Souce.
+         * @return Name.
+         * @api stable
+         */
+        readName(source: (Document | Node | string)): (string);
 
-            /**
-             * Read the network links of the KML.
-             *
-             * @param {Document|Node|string} source Source.
-             * @return {Array.<Object>} Network links.
-             * @api
-             */
-            readNetworkLinks(source: (Document | Node | string)): GlobalObject[];
+        /**
+         * Read the network links of the KML.
+         *
+         * @param source Source.
+         * @return Network links.
+         * @api
+         */
+        readNetworkLinks(source: (Document | Node | string)): GlobalObject[];
 
-            /**
-             * Read the projection from a KML source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a KML source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode an array of features in the KML format. GeometryCollections, MultiPoints,
-             * MultiLineStrings, and MultiPolygons are output as MultiGeometries.
-             *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {string} Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in the KML format. GeometryCollections, MultiPoints,
+         * MultiLineStrings, and MultiPolygons are output as MultiGeometries.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the KML format as an XML node. GeometryCollections,
-             * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries.
-             *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the KML format as an XML node. GeometryCollections,
+         * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the Mapbox MVT format.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class MVT extends format.Feature {
         /**
          * @classdesc
          * Feature format for reading data in the Mapbox MVT format.
          *
-         * @constructor
-         * @extends {ol.format.Feature}
-         * @param {olx.format.MVTOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class MVT extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the Mapbox MVT format.
-             *
-             * @constructor
-             * @extends {ol.format.Feature}
-             * @param {olx.format.MVTOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.MVTOptions);
+        constructor(opt_options?: olx.format.MVTOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            readFeatures(source: (Document | Node | ArrayBuffer | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        readFeatures(source: (Document | Node | ArrayBuffer | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Sets the layers that features will be read from.
-             * @param {Array.<string>} layers Layers.
-             * @api
-             */
-            setLayers(layers: string[]): void;
-        }
+        /**
+         * Sets the layers that features will be read from.
+         * @param layers Layers.
+         * @api
+         */
+        setLayers(layers: string[]): void;
+    }
 
-        module filter {
-            /**
-             * Create a `<Intersects>` operator to test whether a geometry-valued property
-             * intersects a given geometry.
-             *
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns {!ol.format.filter.Intersects} `<Intersects>` operator.
-             * @api
-             */
-            function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
+    namespace filter {
+        /**
+         * Create a `<Intersects>` operator to test whether a geometry-valued property
+         * intersects a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<Intersects>` operator.
+         * @api
+         */
+        function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
 
-            /**
-             * Create a logical `<Or>` operator between two or more filter conditions.
-             *
-             * @param {...ol.format.filter.Filter} conditions Filter conditions.
-             * @returns {!ol.format.filter.Or} `<Or>` operator.
-             * @api
-             */
-            function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
+        /**
+         * Create a logical `<Or>` operator between two or more filter conditions.
+         *
+         * @param conditions Filter conditions.
+         * @returns `<Or>` operator.
+         * @api
+         */
+        function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
 
-            /**
-             * Create a logical `<And>` operator between two or more filter conditions.
-             *
-             * @param {...ol.format.filter.Filter} conditions Filter conditions.
-             * @returns {!ol.format.filter.And} `<And>` operator.
-             * @api
-             */
-            function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
+        /**
+         * Create a logical `<And>` operator between two or more filter conditions.
+         *
+         * @param conditions Filter conditions.
+         * @returns `<And>` operator.
+         * @api
+         */
+        function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
 
-            /**
-             * Represents a logical `<Not>` operator for a filter condition.
-             *
-             * @param {!ol.format.filter.Filter} condition Filter condition.
-             * @returns {!ol.format.filter.Not} `<Not>` operator.
-             * @api
-             */
-            function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
+        /**
+         * Represents a logical `<Not>` operator for a filter condition.
+         *
+         * @param condition Filter condition.
+         * @returns `<Not>` operator.
+         * @api
+         */
+        function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
 
-            /**
-             * Create a `<BBOX>` operator to test whether a geometry-valued property
-             * intersects a fixed bounding box
-             *
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.Extent} extent Extent.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns {!ol.format.filter.Bbox} `<BBOX>` operator.
-             * @api
-             */
-            function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
+        /**
+         * Create a `<BBOX>` operator to test whether a geometry-valued property
+         * intersects a fixed bounding box
+         *
+         * @param geometryName Geometry name to use.
+         * @param extent Extent.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<BBOX>` operator.
+         * @api
+         */
+        function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
 
-            /**
-             * Create a `<Within>` operator to test whether a geometry-valued property
-             * is within a given geometry.
-             *
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns {!ol.format.filter.Within} `<Within>` operator.
-             * @api
-             */
-            function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
+        /**
+         * Create a `<Within>` operator to test whether a geometry-valued property
+         * is within a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<Within>` operator.
+         * @api
+         */
+        function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
 
-            /**
-             * Creates a `<PropertyIsEqualTo>` comparison operator.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @returns {!ol.format.filter.EqualTo} `<PropertyIsEqualTo>` operator.
-             * @api
-             */
-            function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
+        /**
+         * Creates a `<PropertyIsEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsEqualTo>` operator.
+         * @api
+         */
+        function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
 
-            /**
-             * Creates a `<PropertyIsNotEqualTo>` comparison operator.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @returns {!ol.format.filter.NotEqualTo} `<PropertyIsNotEqualTo>` operator.
-             * @api
-             */
-            function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
+        /**
+         * Creates a `<PropertyIsNotEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsNotEqualTo>` operator.
+         * @api
+         */
+        function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
 
-            /**
-             * Creates a `<PropertyIsLessThan>` comparison operator.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @returns {!ol.format.filter.LessThan} `<PropertyIsLessThan>` operator.
-             * @api
-             */
-            function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
+        /**
+         * Creates a `<PropertyIsLessThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsLessThan>` operator.
+         * @api
+         */
+        function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
 
-            /**
-             * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @returns {!ol.format.filter.LessThanOrEqualTo} `<PropertyIsLessThanOrEqualTo>` operator.
-             * @api
-             */
-            function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
+        /**
+         * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsLessThanOrEqualTo>` operator.
+         * @api
+         */
+        function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
 
-            /**
-             * Creates a `<PropertyIsGreaterThan>` comparison operator.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @returns {!ol.format.filter.GreaterThan} `<PropertyIsGreaterThan>` operator.
-             * @api
-             */
-            function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
+        /**
+         * Creates a `<PropertyIsGreaterThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsGreaterThan>` operator.
+         * @api
+         */
+        function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
 
-            /**
-             * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @returns {!ol.format.filter.GreaterThanOrEqualTo} `<PropertyIsGreaterThanOrEqualTo>` operator.
-             * @api
-             */
-            function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
+        /**
+         * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsGreaterThanOrEqualTo>` operator.
+         * @api
+         */
+        function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
 
-            /**
-             * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
-             * is null.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @returns {!ol.format.filter.IsNull} `<PropertyIsNull>` operator.
-             * @api
-             */
-            function isNull(propertyName: string): ol.format.filter.IsNull;
+        /**
+         * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
+         * is null.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @returns `<PropertyIsNull>` operator.
+         * @api
+         */
+        function isNull(propertyName: string): ol.format.filter.IsNull;
 
-            /**
-             * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
-             * value lies within a range given by a lower and upper bound (inclusive).
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} lowerBoundary The lower bound of the range.
-             * @param {!number} upperBoundary The upper bound of the range.
-             * @returns {!ol.format.filter.IsBetween} `<PropertyIsBetween>` operator.
-             * @api
-             */
-            function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
+        /**
+         * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
+         * value lies within a range given by a lower and upper bound (inclusive).
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param lowerBoundary The lower bound of the range.
+         * @param upperBoundary The upper bound of the range.
+         * @returns `<PropertyIsBetween>` operator.
+         * @api
+         */
+        function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
 
-            /**
-             * Represents a `<PropertyIsLike>` comparison operator that matches a string property
-             * value against a text pattern.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!string} pattern Text pattern.
-             * @param {string=} opt_wildCard Pattern character which matches any sequence of
-             *    zero or more string characters. Default is '*'.
-             * @param {string=} opt_singleChar pattern character which matches any single
-             *    string character. Default is '.'.
-             * @param {string=} opt_escapeChar Escape character which can be used to escape
-             *    the pattern characters. Default is '!'.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @returns {!ol.format.filter.IsLike} `<PropertyIsLike>` operator.
-             * @api
-             */
-            function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
+        /**
+         * Represents a `<PropertyIsLike>` comparison operator that matches a string property
+         * value against a text pattern.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param pattern Text pattern.
+         * @param opt_wildCard Pattern character which matches any sequence of
+         *    zero or more string characters. Default is '*'.
+         * @param opt_singleChar pattern character which matches any single
+         *    string character. Default is '.'.
+         * @param opt_escapeChar Escape character which can be used to escape
+         *    the pattern characters. Default is '!'.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsLike>` operator.
+         * @api
+         */
+        function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
 
-            /**
-             * Create a `<During>` temporal operator.
-             *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!string} begin The begin date in ISO-8601 format.
-             * @param {!string} end The end date in ISO-8601 format.
-             * @returns {!ol.format.filter.During} `<During>` operator.
-             * @api
-             */
-            function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
+        /**
+         * Create a `<During>` temporal operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param begin The begin date in ISO-8601 format.
+         * @param end The end date in ISO-8601 format.
+         * @returns `<During>` operator.
+         * @api
+         */
+        function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature filters.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @struct
+         * @api
+         */
+        class Filter {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
              * Base class for WFS GetFeature filters.
              *
-             * @constructor
-             * @param {!string} tagName The XML tag name for this filter.
+             * @param tagName The XML tag name for this filter.
              * @struct
              * @api
              */
-            class Filter {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature filters.
-                 *
-                 * @constructor
-                 * @param {!string} tagName The XML tag name for this filter.
-                 * @struct
-                 * @api
-                 */
-                constructor(tagName: string);
+            constructor(tagName: string);
 
-                /**
-                 * The XML tag name for a filter.
-                 * @returns {!string} Name.
-                 */
-                getTagName(): string;
-            }
+            /**
+             * The XML tag name for a filter.
+             * @returns Name.
+             */
+            getTagName(): string;
+        }
 
+        /**
+         * @classdesc
+         * Represents a spatial operator to test whether a geometry-valued property
+         * relates to a given geometry.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Spatial extends format.filter.Filter {
             /**
              * @classdesc
              * Represents a spatial operator to test whether a geometry-valued property
              * relates to a given geometry.
              *
-             * @constructor
-             * @param {!string} tagName The XML tag name for this filter.
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
+             * @param tagName The XML tag name for this filter.
+             * @param geometryName Geometry name to use.
+             * @param geometry Geometry.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @extends {ol.format.filter.Filter}
              * @api
              */
-            class Spatial extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a spatial operator to test whether a geometry-valued property
-                 * relates to a given geometry.
-                 *
-                 * @constructor
-                 * @param {!string} tagName The XML tag name for this filter.
-                 * @param {!string} geometryName Geometry name to use.
-                 * @param {!ol.geom.Geometry} geometry Geometry.
-                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @extends {ol.format.filter.Filter}
-                 * @api
-                 */
-                constructor(tagName: string, geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(tagName: string, geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<Intersects>` operator to test whether a geometry-valued property
+         * intersects a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Intersects extends format.filter.Spatial {
             /**
              * @classdesc
              * Represents a `<Intersects>` operator to test whether a geometry-valued property
              * intersects a given geometry.
              *
-             * @constructor
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
+             * @param geometryName Geometry name to use.
+             * @param geometry Geometry.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @extends {ol.format.filter.Spatial}
              * @api
              */
-            class Intersects extends ol.format.filter.Spatial {
-                /**
-                 * @classdesc
-                 * Represents a `<Intersects>` operator to test whether a geometry-valued property
-                 * intersects a given geometry.
-                 *
-                 * @constructor
-                 * @param {!string} geometryName Geometry name to use.
-                 * @param {!ol.geom.Geometry} geometry Geometry.
-                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @extends {ol.format.filter.Spatial}
-                 * @api
-                 */
-                constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<Within>` operator to test whether a geometry-valued property
+         * is within a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Within extends format.filter.Spatial {
             /**
              * @classdesc
              * Represents a `<Within>` operator to test whether a geometry-valued property
              * is within a given geometry.
              *
-             * @constructor
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
+             * @param geometryName Geometry name to use.
+             * @param geometry Geometry.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @extends {ol.format.filter.Spatial}
              * @api
              */
-            class Within extends ol.format.filter.Spatial {
-                /**
-                 * @classdesc
-                 * Represents a `<Within>` operator to test whether a geometry-valued property
-                 * is within a given geometry.
-                 *
-                 * @constructor
-                 * @param {!string} geometryName Geometry name to use.
-                 * @param {!ol.geom.Geometry} geometry Geometry.
-                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @extends {ol.format.filter.Spatial}
-                 * @api
-                 */
-                constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
-            /**
-             * @classdesc
-             * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-             * Base class for WFS GetFeature n-ary logical filters.
-             */
-            class LogicalNary extends ol.format.filter.Filter { }
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature n-ary logical filters.
+         */
+        class LogicalNary extends format.filter.Filter { }
 
+        /**
+         * @classdesc
+         * Represents a logical <And> operator between two or more filter conditions.
+         *
+         * @param conditions Conditions
+         * @api
+         */
+        class And extends format.filter.LogicalNary {
             /**
              * @classdesc
              * Represents a logical <And> operator between two or more filter conditions.
              *
-             * @constructor
-             * @param {!ol.format.filter.Filter} conditions Conditions
-             * @extends {ol.format.filter.LogicalNary}
+             * @param conditions Conditions
              * @api
              */
-            class And extends ol.format.filter.LogicalNary {
-                /**
-                 * @classdesc
-                 * Represents a logical <And> operator between two or more filter conditions.
-                 *
-                 * @constructor
-                 * @param {!ol.format.filter.Filter} conditions Conditions
-                 * @extends {ol.format.filter.LogicalNary}
-                 * @api
-                 */
-                constructor(...conditions: ol.format.filter.Filter[]);
-            }
+            constructor(...conditions: ol.format.filter.Filter[]);
+        }
 
+        /**
+         * @classdesc
+         * Represents a logical <Or> operator between two or more filter conditions.
+         *
+         * @param conditions Conditions
+         * @api
+         */
+        class Or extends format.filter.LogicalNary {
             /**
              * @classdesc
              * Represents a logical <Or> operator between two or more filter conditions.
              *
-             * @constructor
-             * @param {!ol.format.filter.Filter} conditions Conditions
-             * @extends {ol.format.filter.LogicalNary}
+             * @param conditions Conditions
              * @api
              */
-            class Or extends ol.format.filter.LogicalNary {
-                /**
-                 * @classdesc
-                 * Represents a logical <Or> operator between two or more filter conditions.
-                 *
-                 * @constructor
-                 * @param {!ol.format.filter.Filter} conditions Conditions
-                 * @extends {ol.format.filter.LogicalNary}
-                 * @api
-                 */
-                constructor(...conditions: ol.format.filter.Filter[]);
-            }
+            constructor(...conditions: ol.format.filter.Filter[]);
+        }
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature property comparison filters.
+         *
+         * deprecated: This class will no longer be exported starting from the next major version.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param propertyName Name of the context property to compare.
+         * @api
+         */
+        class Comparison extends format.filter.Filter {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -3041,31 +2840,27 @@ declare module ol {
              *
              * deprecated: This class will no longer be exported starting from the next major version.
              *
-             * @constructor
-             * @abstract
-             * @param {!string} tagName The XML tag name for this filter.
-             * @param {!string} propertyName Name of the context property to compare.
-             * @extends {ol.format.filter.Filter}
+             * @param tagName The XML tag name for this filter.
+             * @param propertyName Name of the context property to compare.
              * @api
              */
-            class Comparison extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature property comparison filters.
-                 *
-                 * deprecated: This class will no longer be exported starting from the next major version.
-                 *
-                 * @constructor
-                 * @abstract
-                 * @param {!string} tagName The XML tag name for this filter.
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @extends {ol.format.filter.Filter}
-                 * @api
-                 */
-                constructor(tagName: string, propertyName: string);
-            }
+            constructor(tagName: string, propertyName: string);
+        }
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature property binary comparison filters.
+         *
+         * deprecated: This class will no longer be exported starting from the next major version.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class ComparisonBinary extends format.filter.Comparison {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -3073,590 +2868,509 @@ declare module ol {
              *
              * deprecated: This class will no longer be exported starting from the next major version.
              *
-             * @constructor
-             * @abstract
-             * @param {!string} tagName The XML tag name for this filter.
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @extends {ol.format.filter.Comparison}
+             * @param tagName The XML tag name for this filter.
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class ComparisonBinary extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature property binary comparison filters.
-                 *
-                 * deprecated: This class will no longer be exported starting from the next major version.
-                 *
-                 * @constructor
-                 * @abstract
-                 * @param {!string} tagName The XML tag name for this filter.
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!(string|number)} expression The value to compare.
-                 * @param {boolean=} opt_matchCase Case-sensitive?
-                 * @extends {ol.format.filter.Comparison}
-                 * @api
-                 */
-                constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class EqualTo extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsEqualTo>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @extends {ol.format.filter.ComparisonBinary}
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class EqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsEqualTo>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!(string|number)} expression The value to compare.
-                 * @param {boolean=} opt_matchCase Case-sensitive?
-                 * @extends {ol.format.filter.ComparisonBinary}
-                 * @api
-                 */
-                constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsGreaterThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class GreaterThan extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsGreaterThan>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @extends {ol.format.filter.ComparisonBinary}
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
              * @api
              */
-            class GreaterThan extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsGreaterThan>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} expression The value to compare.
-                 * @extends {ol.format.filter.ComparisonBinary}
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class GreaterThanOrEqualTo extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @extends {ol.format.filter.ComparisonBinary}
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
              * @api
              */
-            class GreaterThanOrEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} expression The value to compare.
-                 * @extends {ol.format.filter.ComparisonBinary}
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLessThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class LessThan extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsLessThan>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @extends {ol.format.filter.ComparisonBinary}
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
              * @api
              */
-            class LessThan extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLessThan>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} expression The value to compare.
-                 * @extends {ol.format.filter.ComparisonBinary}
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class LessThanOrEqualTo extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @extends {ol.format.filter.ComparisonBinary}
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
              * @api
              */
-            class LessThanOrEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} expression The value to compare.
-                 * @extends {ol.format.filter.ComparisonBinary}
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsNotEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class NotEqualTo extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsNotEqualTo>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @extends {ol.format.filter.ComparisonBinary}
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class NotEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsNotEqualTo>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!(string|number)} expression The value to compare.
-                 * @param {boolean=} opt_matchCase Case-sensitive?
-                 * @extends {ol.format.filter.ComparisonBinary}
-                 * @api
-                 */
-                constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<During>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param begin The begin date in ISO-8601 format.
+         * @param end The end date in ISO-8601 format.
+         * @api
+         */
+        class During extends format.filter.Comparison {
             /**
              * @classdesc
              * Represents a `<During>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!string} begin The begin date in ISO-8601 format.
-             * @param {!string} end The end date in ISO-8601 format.
-             * @extends {ol.format.filter.Comparison}
+             * @param propertyName Name of the context property to compare.
+             * @param begin The begin date in ISO-8601 format.
+             * @param end The end date in ISO-8601 format.
              * @api
              */
-            class During extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<During>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!string} begin The begin date in ISO-8601 format.
-                 * @param {!string} end The end date in ISO-8601 format.
-                 * @extends {ol.format.filter.Comparison}
-                 * @api
-                 */
-                constructor(propertyName: string, begin: string, end: string);
-            }
+            constructor(propertyName: string, begin: string, end: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsBetween>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param lowerBoundary The lower bound of the range.
+         * @param upperBoundary The upper bound of the range.
+         * @api
+         */
+        class IsBetween extends format.filter.Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsBetween>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} lowerBoundary The lower bound of the range.
-             * @param {!number} upperBoundary The upper bound of the range.
-             * @extends {ol.format.filter.Comparison}
+             * @param propertyName Name of the context property to compare.
+             * @param lowerBoundary The lower bound of the range.
+             * @param upperBoundary The upper bound of the range.
              * @api
              */
-            class IsBetween extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsBetween>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} lowerBoundary The lower bound of the range.
-                 * @param {!number} upperBoundary The upper bound of the range.
-                 * @extends {ol.format.filter.Comparison}
-                 * @api
-                 */
-                constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
-            }
+            constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLike>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param pattern Text pattern.
+         * @param opt_wildCard Pattern character which matches any sequence of
+         *    zero or more string characters. Default is '*'.
+         * @param opt_singleChar pattern character which matches any single
+         *    string character. Default is '.'.
+         * @param opt_escapeChar Escape character which can be used to escape
+         *    the pattern characters. Default is '!'.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class IsLike extends format.filter.Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsLike>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!string} pattern Text pattern.
-             * @param {string=} opt_wildCard Pattern character which matches any sequence of
+             * @param propertyName Name of the context property to compare.
+             * @param pattern Text pattern.
+             * @param opt_wildCard Pattern character which matches any sequence of
              *    zero or more string characters. Default is '*'.
-             * @param {string=} opt_singleChar pattern character which matches any single
+             * @param opt_singleChar pattern character which matches any single
              *    string character. Default is '.'.
-             * @param {string=} opt_escapeChar Escape character which can be used to escape
+             * @param opt_escapeChar Escape character which can be used to escape
              *    the pattern characters. Default is '!'.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @extends {ol.format.filter.Comparison}
+             * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class IsLike extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLike>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!string} pattern Text pattern.
-                 * @param {string=} opt_wildCard Pattern character which matches any sequence of
-                 *    zero or more string characters. Default is '*'.
-                 * @param {string=} opt_singleChar pattern character which matches any single
-                 *    string character. Default is '.'.
-                 * @param {string=} opt_escapeChar Escape character which can be used to escape
-                 *    the pattern characters. Default is '!'.
-                 * @param {boolean=} opt_matchCase Case-sensitive?
-                 * @extends {ol.format.filter.Comparison}
-                 * @api
-                 */
-                constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsNull>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @api
+         */
+        class IsNull extends format.filter.Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsNull>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @extends {ol.format.filter.Comparison}
+             * @param propertyName Name of the context property to compare.
              * @api
              */
-            class IsNull extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsNull>` comparison operator.
-                 *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @extends {ol.format.filter.Comparison}
-                 * @api
-                 */
-                constructor(propertyName: string);
-            }
+            constructor(propertyName: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a logical `<Not>` operator for a filter condition.
+         *
+         * @param condition Filter condition.
+         * @api
+         */
+        class Not extends format.filter.Filter {
             /**
              * @classdesc
              * Represents a logical `<Not>` operator for a filter condition.
              *
-             * @constructor
-             * @param {!ol.format.filter.Filter} condition Filter condition.
-             * @extends {ol.format.filter.Filter}
+             * @param condition Filter condition.
              * @api
              */
-            class Not extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a logical `<Not>` operator for a filter condition.
-                 *
-                 * @constructor
-                 * @param {!ol.format.filter.Filter} condition Filter condition.
-                 * @extends {ol.format.filter.Filter}
-                 * @api
-                 */
-                constructor(condition: ol.format.filter.Filter);
-            }
+            constructor(condition: ol.format.filter.Filter);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<BBOX>` operator to test whether a geometry-valued property
+         * intersects a fixed bounding box
+         *
+         * @param geometryName Geometry name to use.
+         * @param extent Extent.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Bbox extends format.filter.Filter {
             /**
              * @classdesc
              * Represents a `<BBOX>` operator to test whether a geometry-valued property
              * intersects a fixed bounding box
              *
-             * @constructor
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.Extent} extent Extent.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
+             * @param geometryName Geometry name to use.
+             * @param extent Extent.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @extends {ol.format.filter.Filter}
              * @api
              */
-            class Bbox extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a `<BBOX>` operator to test whether a geometry-valued property
-                 * intersects a fixed bounding box
-                 *
-                 * @constructor
-                 * @param {!string} geometryName Geometry name to use.
-                 * @param {!ol.Extent} extent Extent.
-                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @extends {ol.format.filter.Filter}
-                 * @api
-                 */
-                constructor(geometryName: string, extent: ol.Extent, opt_srsName?: string);
-            }
+            constructor(geometryName: string, extent: ol.Extent, opt_srsName?: string);
         }
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the
+     * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
+     *
+     * @api stable
+     */
+    class OSMXML extends format.XMLFeature {
         /**
          * @classdesc
          * Feature format for reading data in the
          * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
          *
-         * @constructor
-         * @extends {ol.format.XMLFeature}
          * @api stable
          */
-        class OSMXML extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the
-             * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
-             *
-             * @constructor
-             * @extends {ol.format.XMLFeature}
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read all features from an OSM source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from an OSM source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the projection from an OSM source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from an OSM source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the Encoded
+     * Polyline Algorithm Format.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class Polyline extends format.TextFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the Encoded
          * Polyline Algorithm Format.
          *
-         * @constructor
-         * @extends {ol.format.TextFeature}
-         * @param {olx.format.PolylineOptions=} opt_options
+         * @param opt_options
          *     Optional configuration object.
          * @api stable
          */
-        class Polyline extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the Encoded
-             * Polyline Algorithm Format.
-             *
-             * @constructor
-             * @extends {ol.format.TextFeature}
-             * @param {olx.format.PolylineOptions=} opt_options
-             *     Optional configuration object.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.PolylineOptions);
+        constructor(opt_options?: olx.format.PolylineOptions);
 
-            /**
-             * Encode a list of n-dimensional points and return an encoded string
-             *
-             * Attention: This function will modify the passed array!
-             *
-             * @param {Array.<number>} numbers A list of n-dimensional points.
-             * @param {number} stride The number of dimension of the points in the list.
-             * @param {number=} opt_factor The factor by which the numbers will be
-             *     multiplied. The remaining decimal places will get rounded away.
-             *     Default is `1e5`.
-             * @return {string} The encoded string.
-             * @api
-             */
-            static encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string;
+        /**
+         * Encode a list of n-dimensional points and return an encoded string
+         *
+         * Attention: This function will modify the passed array!
+         *
+         * @param numbers A list of n-dimensional points.
+         * @param stride The number of dimension of the points in the list.
+         * @param opt_factor The factor by which the numbers will be
+         *     multiplied. The remaining decimal places will get rounded away.
+         *     Default is `1e5`.
+         * @return The encoded string.
+         * @api
+         */
+        static encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string;
 
-            /**
-             * Decode a list of n-dimensional points from an encoded string
-             *
-             * @param {string} encoded An encoded string.
-             * @param {number} stride The number of dimension of the points in the
-             *     encoded string.
-             * @param {number=} opt_factor The factor by which the resulting numbers will
-             *     be divided. Default is `1e5`.
-             * @return {Array.<number>} A list of n-dimensional points.
-             * @api
-             */
-            static decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[];
+        /**
+         * Decode a list of n-dimensional points from an encoded string
+         *
+         * @param encoded An encoded string.
+         * @param stride The number of dimension of the points in the
+         *     encoded string.
+         * @param opt_factor The factor by which the resulting numbers will
+         *     be divided. Default is `1e5`.
+         * @return A list of n-dimensional points.
+         * @api
+         */
+        static decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[];
 
-            /**
-             * Encode a list of floating point numbers and return an encoded string
-             *
-             * Attention: This function will modify the passed array!
-             *
-             * @param {Array.<number>} numbers A list of floating point numbers.
-             * @param {number=} opt_factor The factor by which the numbers will be
-             *     multiplied. The remaining decimal places will get rounded away.
-             *     Default is `1e5`.
-             * @return {string} The encoded string.
-             * @api
-             */
-            static encodeFloats(numbers: number[], opt_factor?: number): string;
+        /**
+         * Encode a list of floating point numbers and return an encoded string
+         *
+         * Attention: This function will modify the passed array!
+         *
+         * @param numbers A list of floating point numbers.
+         * @param opt_factor The factor by which the numbers will be
+         *     multiplied. The remaining decimal places will get rounded away.
+         *     Default is `1e5`.
+         * @return The encoded string.
+         * @api
+         */
+        static encodeFloats(numbers: number[], opt_factor?: number): string;
 
-            /**
-             * Decode a list of floating point numbers from an encoded string
-             *
-             * @param {string} encoded An encoded string.
-             * @param {number=} opt_factor The factor by which the result will be divided.
-             *     Default is `1e5`.
-             * @return {Array.<number>} A list of floating point numbers.
-             * @api
-             */
-            static decodeFloats(encoded: string, opt_factor?: number): number[];
+        /**
+         * Decode a list of floating point numbers from an encoded string
+         *
+         * @param encoded An encoded string.
+         * @param opt_factor The factor by which the result will be divided.
+         *     Default is `1e5`.
+         * @return A list of floating point numbers.
+         * @api
+         */
+        static decodeFloats(encoded: string, opt_factor?: number): number[];
 
-            /**
-             * Read the feature from the Polyline source. The coordinates are assumed to be
-             * in two dimensions and in latitude, longitude order.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the feature from the Polyline source. The coordinates are assumed to be
+         * in two dimensions and in latitude, longitude order.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read the feature from the source. As Polyline sources contain a single
-             * feature, this will return the feature in an array.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read the feature from the source. As Polyline sources contain a single
+         * feature, this will return the feature in an array.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the geometry from the source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.geom.Geometry} Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read the geometry from the source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a Polyline source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a Polyline source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Write a single geometry in Polyline format.
-             *
-             * @function
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} Geometry.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
-        }
+        /**
+         * Write a single geometry in Polyline format.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Geometry.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for text feature formats.
+     *
+     */
+    class TextFeature extends format.Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
          * instantiated in apps.
          * Base class for text feature formats.
          *
-         * @constructor
-         * @extends {ol.format.Feature}
          */
-        class TextFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for text feature formats.
-             *
-             * @constructor
-             * @extends {ol.format.Feature}
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the TopoJSON format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class TopoJSON extends format.JSONFeature {
         /**
          * @classdesc
          * Feature format for reading data in the TopoJSON format.
          *
-         * @constructor
-         * @extends {ol.format.JSONFeature}
-         * @param {olx.format.TopoJSONOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class TopoJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the TopoJSON format.
-             *
-             * @constructor
-             * @extends {ol.format.JSONFeature}
-             * @param {olx.format.TopoJSONOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.TopoJSONOptions);
+        constructor(opt_options?: olx.format.TopoJSONOptions);
 
-            /**
-             * Read all features from a TopoJSON source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string)): ol.Feature[];
+        /**
+         * Read all features from a TopoJSON source.
+         *
+         * @param source Source.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string)): ol.Feature[];
 
-            /**
-             * Read the projection from a TopoJSON source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} object Source.
-             * @return {ol.proj.Projection} Projection.
-             * @api stable
-             */
-            readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from a TopoJSON source.
+         *
+         * @param object Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the WFS format.
+     * By default, supports WFS version 1.1.0. You can pass a GML format
+     * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
+     * Also see {@link ol.format.GMLBase} which is used by this format.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class WFS extends format.XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the WFS format.
@@ -3664,315 +3378,290 @@ declare module ol {
          * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
          * Also see {@link ol.format.GMLBase} which is used by this format.
          *
-         * @constructor
-         * @param {olx.format.WFSOptions=} opt_options
+         * @param opt_options
          *     Optional configuration object.
-         * @extends {ol.format.XMLFeature}
          * @api stable
          */
-        class WFS extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the WFS format.
-             * By default, supports WFS version 1.1.0. You can pass a GML format
-             * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
-             * Also see {@link ol.format.GMLBase} which is used by this format.
-             *
-             * @constructor
-             * @param {olx.format.WFSOptions=} opt_options
-             *     Optional configuration object.
-             * @extends {ol.format.XMLFeature}
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.WFSOptions);
+        constructor(opt_options?: olx.format.WFSOptions);
 
-            /**
-             * Read all features from a WFS FeatureCollection.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a WFS FeatureCollection.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read transaction response of the source.
-             *
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.WFSTransactionResponse|undefined} Transaction response.
-             * @api stable
-             */
-            readTransactionResponse(source: (Document | Node | GlobalObject | string)): (ol.WFSTransactionResponse);
+        /**
+         * Read transaction response of the source.
+         *
+         * @param source Source.
+         * @return Transaction response.
+         * @api stable
+         */
+        readTransactionResponse(source: (Document | Node | GlobalObject | string)): (ol.WFSTransactionResponse);
 
-            /**
-             * Read feature collection metadata of the source.
-             *
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.WFSFeatureCollectionMetadata|undefined}
-             *     FeatureCollection metadata.
-             * @api stable
-             */
-            readFeatureCollectionMetadata(source: (Document | Node | GlobalObject | string)): (ol.WFSFeatureCollectionMetadata);
+        /**
+         * Read feature collection metadata of the source.
+         *
+         * @param source Source.
+         * @return FeatureCollection metadata.
+         * @api stable
+         */
+        readFeatureCollectionMetadata(source: (Document | Node | GlobalObject | string)): (ol.WFSFeatureCollectionMetadata);
 
-            /**
-             * Encode format as WFS `GetFeature` and return the Node.
-             *
-             * @param {olx.format.WFSWriteGetFeatureOptions} options Options.
-             * @return {Node} Result.
-             * @api stable
-             */
-            writeGetFeature(options: olx.format.WFSWriteGetFeatureOptions): Node;
+        /**
+         * Encode format as WFS `GetFeature` and return the Node.
+         *
+         * @param options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeGetFeature(options: olx.format.WFSWriteGetFeatureOptions): Node;
 
-            /**
-             * Encode format as WFS `Transaction` and return the Node.
-             *
-             * @param {Array.<ol.Feature>} inserts The features to insert.
-             * @param {Array.<ol.Feature>} updates The features to update.
-             * @param {Array.<ol.Feature>} deletes The features to delete.
-             * @param {olx.format.WFSWriteTransactionOptions} options Write options.
-             * @return {Node} Result.
-             * @api stable
-             */
-            writeTransaction(inserts: ol.Feature[], updates: ol.Feature[], deletes: ol.Feature[], options: olx.format.WFSWriteTransactionOptions): Node;
+        /**
+         * Encode format as WFS `Transaction` and return the Node.
+         *
+         * @param inserts The features to insert.
+         * @param updates The features to update.
+         * @param deletes The features to delete.
+         * @param options Write options.
+         * @return Result.
+         * @api stable
+         */
+        writeTransaction(inserts: ol.Feature[], updates: ol.Feature[], deletes: ol.Feature[], options: olx.format.WFSWriteTransactionOptions): Node;
 
-            /**
-             * Read the projection from a WFS source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {?ol.proj.Projection} Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from a WFS source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Geometry format for reading and writing data in the `WellKnownText` (WKT)
+     * format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class WKT extends format.TextFeature {
         /**
          * @classdesc
          * Geometry format for reading and writing data in the `WellKnownText` (WKT)
          * format.
          *
-         * @constructor
-         * @extends {ol.format.TextFeature}
-         * @param {olx.format.WKTOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class WKT extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Geometry format for reading and writing data in the `WellKnownText` (WKT)
-             * format.
-             *
-             * @constructor
-             * @extends {ol.format.TextFeature}
-             * @param {olx.format.WKTOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.WKTOptions);
+        constructor(opt_options?: olx.format.WKTOptions);
 
-            /**
-             * Read a feature from a WKT source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a WKT source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a single geometry from a WKT source.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.geom.Geometry} Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a single geometry from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Encode a feature as a WKT string.
-             *
-             * @function
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} WKT string.
-             * @api stable
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a WKT string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return WKT string.
+         * @api stable
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a WKT string.
-             *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} WKT string.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as a WKT string.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return WKT string.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Write a single geometry as a WKT string.
-             *
-             * @function
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @return {string} WKT string.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry): string;
-        }
+        /**
+         * Write a single geometry as a WKT string.
+         *
+         * @param geometry Geometry.
+         * @return WKT string.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry): string;
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMS capabilities data
+     *
+     * @api
+     */
+    class WMSCapabilities extends format.XML {
         /**
          * @classdesc
          * Format for reading WMS capabilities data
          *
-         * @constructor
-         * @extends {ol.format.XML}
          * @api
          */
-        class WMSCapabilities extends ol.format.XML {
-            /**
-             * @classdesc
-             * Format for reading WMS capabilities data
-             *
-             * @constructor
-             * @extends {ol.format.XML}
-             * @api
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read a WMS capabilities document.
-             *
-             * @function
-             * @param {Document|Node|string} source The XML source.
-             * @return {Object} An object representing the WMS capabilities.
-             * @api
-             */
-            read(source: (Document | Node | string)): GlobalObject;
-        }
+        /**
+         * Read a WMS capabilities document.
+         *
+         * @param source The XML source.
+         * @return An object representing the WMS capabilities.
+         * @api
+         */
+        read(source: (Document | Node | string)): GlobalObject;
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMSGetFeatureInfo format. It uses
+     * {@link ol.format.GML2} to read features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class WMSGetFeatureInfo extends format.XMLFeature {
         /**
          * @classdesc
          * Format for reading WMSGetFeatureInfo format. It uses
          * {@link ol.format.GML2} to read features.
          *
-         * @constructor
-         * @extends {ol.format.XMLFeature}
-         * @param {olx.format.WMSGetFeatureInfoOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class WMSGetFeatureInfo extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Format for reading WMSGetFeatureInfo format. It uses
-             * {@link ol.format.GML2} to read features.
-             *
-             * @constructor
-             * @extends {ol.format.XMLFeature}
-             * @param {olx.format.WMSGetFeatureInfoOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.WMSGetFeatureInfoOptions);
+        constructor(opt_options?: olx.format.WMSGetFeatureInfoOptions);
 
-            /**
-             * Read all features from a WMSGetFeatureInfo response.
-             *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Options.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-        }
+        /**
+         * Read all features from a WMSGetFeatureInfo response.
+         *
+         * @param source Source.
+         * @param opt_options Options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMTS capabilities data.
+     *
+     * @api
+     */
+    class WMTSCapabilities extends format.XML {
         /**
          * @classdesc
          * Format for reading WMTS capabilities data.
          *
-         * @constructor
-         * @extends {ol.format.XML}
          * @api
          */
-        class WMTSCapabilities extends ol.format.XML {
-            /**
-             * @classdesc
-             * Format for reading WMTS capabilities data.
-             *
-             * @constructor
-             * @extends {ol.format.XML}
-             * @api
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read a WMTS capabilities document.
-             *
-             * @function
-             * @param {Document|Node|string} source The XML source.
-             * @return {Object} An object representing the WMTS capabilities.
-             * @api
-             */
-            read(source: (Document | Node | string)): GlobalObject;
-        }
+        /**
+         * Read a WMTS capabilities document.
+         *
+         * @param source The XML source.
+         * @return An object representing the WMTS capabilities.
+         * @api
+         */
+        read(source: (Document | Node | string)): GlobalObject;
+    }
 
+    /**
+     * @classdesc
+     * Generic format for reading non-feature XML data
+     *
+     * @struct
+     */
+    class XML {
         /**
          * @classdesc
          * Generic format for reading non-feature XML data
          *
-         * @constructor
          * @struct
          */
-        class XML {
-            /**
-             * @classdesc
-             * Generic format for reading non-feature XML data
-             *
-             * @constructor
-             * @struct
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for XML feature formats.
+     *
+     */
+    class XMLFeature extends format.Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
          * instantiated in apps.
          * Base class for XML feature formats.
          *
-         * @constructor
-         * @extends {ol.format.Feature}
          */
-        class XMLFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for XML feature formats.
-             *
-             * @constructor
-             * @extends {ol.format.Feature}
-             */
-            constructor();
-        }
+        constructor();
     }
+}
 
+/**
+ * @classdesc
+ * Helper class for providing HTML5 Geolocation capabilities.
+ * The [Geolocation API](http://www.w3.org/TR/geolocation-API/)
+ * is used to locate a user's position.
+ *
+ * To get notified of position changes, register a listener for the generic
+ * `change` event on your instance of `ol.Geolocation`.
+ *
+ * Example:
+ *
+ *     var geolocation = new ol.Geolocation({
+ *       // take the projection to use from the map's view
+ *       projection: view.getProjection()
+ *     });
+ *     // listen to changes in position
+ *     geolocation.on('change', function(evt) {
+ *       window.console.log(geolocation.getPosition());
+ *     });
+ *
+ * @fires error
+ * @param opt_options Options.
+ * @api stable
+ */
+export class Geolocation extends Object {
     /**
      * @classdesc
      * Helper class for providing HTML5 Geolocation capabilities.
@@ -3994,261 +3683,235 @@ declare module ol {
      *     });
      *
      * @fires error
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.GeolocationOptions=} opt_options Options.
+     * @param opt_options Options.
      * @api stable
      */
-    class Geolocation extends ol.Object {
-        /**
-         * @classdesc
-         * Helper class for providing HTML5 Geolocation capabilities.
-         * The [Geolocation API](http://www.w3.org/TR/geolocation-API/)
-         * is used to locate a user's position.
-         *
-         * To get notified of position changes, register a listener for the generic
-         * `change` event on your instance of `ol.Geolocation`.
-         *
-         * Example:
-         *
-         *     var geolocation = new ol.Geolocation({
-         *       // take the projection to use from the map's view
-         *       projection: view.getProjection()
-         *     });
-         *     // listen to changes in position
-         *     geolocation.on('change', function(evt) {
-         *       window.console.log(geolocation.getPosition());
-         *     });
-         *
-         * @fires error
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.GeolocationOptions=} opt_options Options.
-         * @api stable
-         */
-        constructor(opt_options?: olx.GeolocationOptions);
-
-        /**
-         * Get the accuracy of the position in meters.
-         * @return {number|undefined} The accuracy of the position measurement in
-         *     meters.
-         * @observable
-         * @api stable
-         */
-        getAccuracy(): (number);
-
-        /**
-         * Get a geometry of the position accuracy.
-         * @return {?ol.geom.Geometry} A geometry of the position accuracy.
-         * @observable
-         * @api stable
-         */
-        getAccuracyGeometry(): ol.geom.Geometry;
-
-        /**
-         * Get the altitude associated with the position.
-         * @return {number|undefined} The altitude of the position in meters above mean
-         *     sea level.
-         * @observable
-         * @api stable
-         */
-        getAltitude(): (number);
-
-        /**
-         * Get the altitude accuracy of the position.
-         * @return {number|undefined} The accuracy of the altitude measurement in
-         *     meters.
-         * @observable
-         * @api stable
-         */
-        getAltitudeAccuracy(): (number);
-
-        /**
-         * Get the heading as radians clockwise from North.
-         * @return {number|undefined} The heading of the device in radians from north.
-         * @observable
-         * @api stable
-         */
-        getHeading(): (number);
-
-        /**
-         * Get the position of the device.
-         * @return {ol.Coordinate|undefined} The current position of the device reported
-         *     in the current projection.
-         * @observable
-         * @api stable
-         */
-        getPosition(): (ol.Coordinate);
-
-        /**
-         * Get the projection associated with the position.
-         * @return {ol.proj.Projection|undefined} The projection the position is
-         *     reported in.
-         * @observable
-         * @api stable
-         */
-        getProjection(): (ol.proj.Projection);
-
-        /**
-         * Get the speed in meters per second.
-         * @return {number|undefined} The instantaneous speed of the device in meters
-         *     per second.
-         * @observable
-         * @api stable
-         */
-        getSpeed(): (number);
-
-        /**
-         * Determine if the device location is being tracked.
-         * @return {boolean} The device location is being tracked.
-         * @observable
-         * @api stable
-         */
-        getTracking(): boolean;
-
-        /**
-         * Get the tracking options.
-         * @see http://www.w3.org/TR/geolocation-API/#position-options
-         * @return {GeolocationPositionOptions|undefined} PositionOptions as defined by
-         *     the [HTML5 Geolocation spec
-         *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
-         * @observable
-         * @api stable
-         */
-        getTrackingOptions(): (PositionOptions);
-
-        /**
-         * Set the projection to use for transforming the coordinates.
-         * @param {ol.proj.Projection} projection The projection the position is
-         *     reported in.
-         * @observable
-         * @api stable
-         */
-        setProjection(projection: ol.proj.Projection): void;
-
-        /**
-         * Enable or disable tracking.
-         * @param {boolean} tracking Enable tracking.
-         * @observable
-         * @api stable
-         */
-        setTracking(tracking: boolean): void;
-
-        /**
-         * Set the tracking options.
-         * @see http://www.w3.org/TR/geolocation-API/#position-options
-         * @param {GeolocationPositionOptions} options PositionOptions as defined by the
-         *     [HTML5 Geolocation spec
-         *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
-         * @observable
-         * @api stable
-         */
-        setTrackingOptions(options: PositionOptions): void;
-    }
+    constructor(opt_options?: olx.GeolocationOptions);
 
     /**
-     * @namespace ol.geom
+     * Get the accuracy of the position in meters.
+     * @return The accuracy of the position measurement in
+     *     meters.
+     * @observable
+     * @api stable
      */
-    module geom {
+    getAccuracy(): (number);
+
+    /**
+     * Get a geometry of the position accuracy.
+     * @return A geometry of the position accuracy.
+     * @observable
+     * @api stable
+     */
+    getAccuracyGeometry(): ol.geom.Geometry;
+
+    /**
+     * Get the altitude associated with the position.
+     * @return The altitude of the position in meters above mean
+     *     sea level.
+     * @observable
+     * @api stable
+     */
+    getAltitude(): (number);
+
+    /**
+     * Get the altitude accuracy of the position.
+     * @return The accuracy of the altitude measurement in
+     *     meters.
+     * @observable
+     * @api stable
+     */
+    getAltitudeAccuracy(): (number);
+
+    /**
+     * Get the heading as radians clockwise from North.
+     * @return The heading of the device in radians from north.
+     * @observable
+     * @api stable
+     */
+    getHeading(): (number);
+
+    /**
+     * Get the position of the device.
+     * @return The current position of the device reported
+     *     in the current projection.
+     * @observable
+     * @api stable
+     */
+    getPosition(): (ol.Coordinate);
+
+    /**
+     * Get the projection associated with the position.
+     * @return The projection the position is
+     *     reported in.
+     * @observable
+     * @api stable
+     */
+    getProjection(): (ol.proj.Projection);
+
+    /**
+     * Get the speed in meters per second.
+     * @return The instantaneous speed of the device in meters
+     *     per second.
+     * @observable
+     * @api stable
+     */
+    getSpeed(): (number);
+
+    /**
+     * Determine if the device location is being tracked.
+     * @return The device location is being tracked.
+     * @observable
+     * @api stable
+     */
+    getTracking(): boolean;
+
+    /**
+     * Get the tracking options.
+     * @see http://www.w3.org/TR/geolocation-API/#position-options
+     * @return PositionOptions as defined by
+     *     the [HTML5 Geolocation spec
+     *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
+     * @observable
+     * @api stable
+     */
+    getTrackingOptions(): (PositionOptions);
+
+    /**
+     * Set the projection to use for transforming the coordinates.
+     * @param projection The projection the position is
+     *     reported in.
+     * @observable
+     * @api stable
+     */
+    setProjection(projection: ol.proj.Projection): void;
+
+    /**
+     * Enable or disable tracking.
+     * @param tracking Enable tracking.
+     * @observable
+     * @api stable
+     */
+    setTracking(tracking: boolean): void;
+
+    /**
+     * Set the tracking options.
+     * @see http://www.w3.org/TR/geolocation-API/#position-options
+     * @param options PositionOptions as defined by the
+     *     [HTML5 Geolocation spec
+     *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
+     * @observable
+     * @api stable
+     */
+    setTrackingOptions(options: PositionOptions): void;
+}
+
+export namespace geom {
+    /**
+     * @classdesc
+     * Circle geometry.
+     *
+     * @param center Center.
+     * @param opt_radius Radius.
+     * @param opt_layout Layout.
+     * @api
+     */
+    class Circle extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Circle geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {ol.Coordinate} center Center.
-         * @param {number=} opt_radius Radius.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
+         * @param center Center.
+         * @param opt_radius Radius.
+         * @param opt_layout Layout.
          * @api
          */
-        class Circle extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Circle geometry.
-             *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {ol.Coordinate} center Center.
-             * @param {number=} opt_radius Radius.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api
-             */
-            constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: ol.geom.GeometryLayout);
-
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.Circle} Clone.
-             * @api
-             */
-            clone(): ol.geom.Circle;
-
-            /**
-             * Return the center of the circle as {@link ol.Coordinate coordinate}.
-             * @return {ol.Coordinate} Center.
-             * @api
-             */
-            getCenter(): ol.Coordinate;
-
-            /**
-             * Return the radius of the circle.
-             * @return {number} Radius.
-             * @api
-             */
-            getRadius(): number;
-
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getType(): ol.geom.GeometryType;
-
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
-
-            /**
-             * Set the center of the circle as {@link ol.Coordinate coordinate}.
-             * @param {ol.Coordinate} center Center.
-             * @api
-             */
-            setCenter(center: ol.Coordinate): void;
-
-            /**
-             * Set the center (as {@link ol.Coordinate coordinate}) and the radius (as
-             * number) of the circle.
-             * @param {ol.Coordinate} center Center.
-             * @param {number} radius Radius.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api
-             */
-            setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: ol.geom.GeometryLayout): void;
-
-            /**
-             * Set the radius of the circle. The radius is in the units of the projection.
-             * @param {number} radius Radius.
-             * @api
-             */
-            setRadius(radius: number): void;
-        }
+        constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: ol.geom.GeometryLayout);
 
         /**
-         * The geometry type. One of `'Point'`, `'LineString'`, `'LinearRing'`,
-         * `'Polygon'`, `'MultiPoint'`, `'MultiLineString'`, `'MultiPolygon'`,
-         * `'GeometryCollection'`, `'Circle'`.
-         * @enum {string}
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api
          */
-        type GeometryType = "Point" | "LineString" | "LinearRing" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | "Circle";
+        clone(): ol.geom.Circle;
 
         /**
-         * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z')
-         * or measure ('M') coordinate is available. Supported values are `'XY'`,
-         * `'XYZ'`, `'XYM'`, `'XYZM'`.
-         * @enum {string}
+         * Return the center of the circle as {@link ol.Coordinate coordinate}.
+         * @return Center.
+         * @api
          */
-        type GeometryLayout = "XY" | "XYZ" | "XYM" | "XYZM";
+        getCenter(): ol.Coordinate;
 
+        /**
+         * Return the radius of the circle.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
+
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getType(): ol.geom.GeometryType;
+
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
+
+        /**
+         * Set the center of the circle as {@link ol.Coordinate coordinate}.
+         * @param center Center.
+         * @api
+         */
+        setCenter(center: ol.Coordinate): void;
+
+        /**
+         * Set the center (as {@link ol.Coordinate coordinate}) and the radius (as
+         * number) of the circle.
+         * @param center Center.
+         * @param radius Radius.
+         * @param opt_layout Layout.
+         * @api
+         */
+        setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: ol.geom.GeometryLayout): void;
+
+        /**
+         * Set the radius of the circle. The radius is in the units of the projection.
+         * @param radius Radius.
+         * @api
+         */
+        setRadius(radius: number): void;
+    }
+
+    /**
+     * The geometry type. One of `'Point'`, `'LineString'`, `'LinearRing'`,
+     * `'Polygon'`, `'MultiPoint'`, `'MultiLineString'`, `'MultiPolygon'`,
+     * `'GeometryCollection'`, `'Circle'`.
+     */
+    type GeometryType = "Point" | "LineString" | "LinearRing" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | "Circle";
+
+    /**
+     * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z')
+     * or measure ('M') coordinate is available. Supported values are `'XY'`,
+     * `'XYZ'`, `'XYM'`, `'XYZM'`.
+     */
+    type GeometryLayout = "XY" | "XYZ" | "XYM" | "XYZM";
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for vector geometries.
+     *
+     * To get notified of changes to the geometry, register a listener for the
+     * generic `change` event on your geometry instance.
+     *
+     * @api stable
+     */
+    class Geometry extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -4258,1255 +3921,1166 @@ declare module ol {
          * To get notified of changes to the geometry, register a listener for the
          * generic `change` event on your geometry instance.
          *
-         * @constructor
-         * @extends {ol.Object}
          * @api stable
          */
-        class Geometry extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for vector geometries.
-             *
-             * To get notified of changes to the geometry, register a listener for the
-             * generic `change` event on your geometry instance.
-             *
-             * @constructor
-             * @extends {ol.Object}
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Return the closest point of the geometry to the passed point as
-             * {@link ol.Coordinate coordinate}.
-             * @param {ol.Coordinate} point Point.
-             * @param {ol.Coordinate=} opt_closestPoint Closest point.
-             * @return {ol.Coordinate} Closest point.
-             * @api stable
-             */
-            getClosestPoint(point: ol.Coordinate, opt_closestPoint?: ol.Coordinate): ol.Coordinate;
+        /**
+         * Return the closest point of the geometry to the passed point as
+         * {@link ol.Coordinate coordinate}.
+         * @param point Point.
+         * @param opt_closestPoint Closest point.
+         * @return Closest point.
+         * @api stable
+         */
+        getClosestPoint(point: ol.Coordinate, opt_closestPoint?: ol.Coordinate): ol.Coordinate;
 
-            /**
-             * Returns true if this geometry includes the specified coordinate. If the
-             * coordinate is on the boundary of the geometry, returns false.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @return {boolean} Contains coordinate.
-             * @api
-             */
-            intersectsCoordinate(coordinate: ol.Coordinate): boolean;
+        /**
+         * Returns true if this geometry includes the specified coordinate. If the
+         * coordinate is on the boundary of the geometry, returns false.
+         * @param coordinate Coordinate.
+         * @return Contains coordinate.
+         * @api
+         */
+        intersectsCoordinate(coordinate: ol.Coordinate): boolean;
 
-            /**
-             * Get the extent of the geometry.
-             * @param {ol.Extent=} opt_extent Extent.
-             * @return {ol.Extent} extent Extent.
-             * @api stable
-             */
-            getExtent(opt_extent?: ol.Extent): ol.Extent;
+        /**
+         * Get the extent of the geometry.
+         * @param opt_extent Extent.
+         * @return extent Extent.
+         * @api stable
+         */
+        getExtent(opt_extent?: ol.Extent): ol.Extent;
 
-            /**
-             * Rotate the geometry around a given coordinate. This modifies the geometry
-             * coordinates in place.
-             * @abstract
-             * @param {number} angle Rotation angle in radians.
-             * @param {ol.Coordinate} anchor The rotation center.
-             * @api
-             */
-            rotate(angle: number, anchor: ol.Coordinate): void;
+        /**
+         * Rotate the geometry around a given coordinate. This modifies the geometry
+         * coordinates in place.
+         * @param angle Rotation angle in radians.
+         * @param anchor The rotation center.
+         * @api
+         */
+        rotate(angle: number, anchor: ol.Coordinate): void;
 
-            /**
-             * Scale the geometry (with an optional origin).  This modifies the geometry
-             * coordinates in place.
-             * @abstract
-             * @param {number} sx The scaling factor in the x-direction.
-             * @param {number=} opt_sy The scaling factor in the y-direction (defaults to
-             *     sx).
-             * @param {ol.Coordinate=} opt_anchor The scale origin (defaults to the center
-             *     of the geometry extent).
-             * @api
-             */
-            scale(sx: number, opt_sy?: number, opt_anchor?: ol.Coordinate): void;
+        /**
+         * Scale the geometry (with an optional origin).  This modifies the geometry
+         * coordinates in place.
+         * @param sx The scaling factor in the x-direction.
+         * @param opt_sy The scaling factor in the y-direction (defaults to
+         *     sx).
+         * @param opt_anchor The scale origin (defaults to the center
+         *     of the geometry extent).
+         * @api
+         */
+        scale(sx: number, opt_sy?: number, opt_anchor?: ol.Coordinate): void;
 
-            /**
-             * Create a simplified version of this geometry.  For linestrings, this uses
-             * the the {@link
-             * https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
-             * Douglas Peucker} algorithm.  For polygons, a quantization-based
-             * simplification is used to preserve topology.
-             * @function
-             * @param {number} tolerance The tolerance distance for simplification.
-             * @return {ol.geom.Geometry} A new, simplified version of the original
-             *     geometry.
-             * @api
-             */
-            simplify(tolerance: number): ol.geom.Geometry;
+        /**
+         * Create a simplified version of this geometry.  For linestrings, this uses
+         * the the {@link
+         * https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
+         * Douglas Peucker} algorithm.  For polygons, a quantization-based
+         * simplification is used to preserve topology.
+         * @param tolerance The tolerance distance for simplification.
+         * @return A new, simplified version of the original
+         *     geometry.
+         * @api
+         */
+        simplify(tolerance: number): ol.geom.Geometry;
 
-            /**
-             * Transform each coordinate of the geometry from one coordinate reference
-             * system to another. The geometry is modified in place.
-             * For example, a line will be transformed to a line and a circle to a circle.
-             * If you do not want the geometry modified in place, first `clone()` it and
-             * then use this function on the clone.
-             *
-             * @param {ol.ProjectionLike} source The current projection.  Can be a
-             *     string identifier or a {@link ol.proj.Projection} object.
-             * @param {ol.ProjectionLike} destination The desired projection.  Can be a
-             *     string identifier or a {@link ol.proj.Projection} object.
-             * @return {ol.geom.Geometry} This geometry.  Note that original geometry is
-             *     modified in place.
-             * @api stable
-             */
-            transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.geom.Geometry;
+        /**
+         * Transform each coordinate of the geometry from one coordinate reference
+         * system to another. The geometry is modified in place.
+         * For example, a line will be transformed to a line and a circle to a circle.
+         * If you do not want the geometry modified in place, first `clone()` it and
+         * then use this function on the clone.
+         *
+         * @param source The current projection.  Can be a
+         *     string identifier or a {@link ol.proj.Projection} object.
+         * @param destination The desired projection.  Can be a
+         *     string identifier or a {@link ol.proj.Projection} object.
+         * @return This geometry.  Note that original geometry is
+         *     modified in place.
+         * @api stable
+         */
+        transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.geom.Geometry;
 
-            /**
-             * Get the type of this geometry.
-             * @abstract
-             * @return {ol.geom.GeometryType} Geometry type.
-             */
-            getType(): ol.geom.GeometryType;
-        }
+        /**
+         * Get the type of this geometry.
+         * @return Geometry type.
+         */
+        getType(): ol.geom.GeometryType;
+    }
 
+    /**
+     * @classdesc
+     * An array of {@link ol.geom.Geometry} objects.
+     *
+     * @param opt_geometries Geometries.
+     * @api stable
+     */
+    class GeometryCollection extends geom.Geometry {
         /**
          * @classdesc
          * An array of {@link ol.geom.Geometry} objects.
          *
-         * @constructor
-         * @extends {ol.geom.Geometry}
-         * @param {Array.<ol.geom.Geometry>=} opt_geometries Geometries.
+         * @param opt_geometries Geometries.
          * @api stable
          */
-        class GeometryCollection extends ol.geom.Geometry {
-            /**
-             * @classdesc
-             * An array of {@link ol.geom.Geometry} objects.
-             *
-             * @constructor
-             * @extends {ol.geom.Geometry}
-             * @param {Array.<ol.geom.Geometry>=} opt_geometries Geometries.
-             * @api stable
-             */
-            constructor(opt_geometries?: ol.geom.Geometry[]);
+        constructor(opt_geometries?: ol.geom.Geometry[]);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.GeometryCollection} Clone.
-             * @api stable
-             */
-            clone(): ol.geom.GeometryCollection;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.GeometryCollection;
 
-            /**
-             * Return the geometries that make up this geometry collection.
-             * @return {Array.<ol.geom.Geometry>} Geometries.
-             * @api stable
-             */
-            getGeometries(): ol.geom.Geometry[];
+        /**
+         * Return the geometries that make up this geometry collection.
+         * @return Geometries.
+         * @api stable
+         */
+        getGeometries(): ol.geom.Geometry[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the geometries that make up this geometry collection.
-             * @param {Array.<ol.geom.Geometry>} geometries Geometries.
-             * @api stable
-             */
-            setGeometries(geometries: ol.geom.Geometry[]): void;
+        /**
+         * Set the geometries that make up this geometry collection.
+         * @param geometries Geometries.
+         * @api stable
+         */
+        setGeometries(geometries: ol.geom.Geometry[]): void;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            applyTransform(transformFn: ol.TransformFunction): void;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        applyTransform(transformFn: ol.TransformFunction): void;
 
-            /**
-             * Translate the geometry.
-             * @param {number} deltaX Delta X.
-             * @param {number} deltaY Delta Y.
-             * @api
-             */
-            translate(deltaX: number, deltaY: number): void;
-        }
+        /**
+         * Translate the geometry.
+         * @param deltaX Delta X.
+         * @param deltaY Delta Y.
+         * @api
+         */
+        translate(deltaX: number, deltaY: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Linear ring geometry. Only used as part of polygon; cannot be rendered
+     * on its own.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class LinearRing extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Linear ring geometry. Only used as part of polygon; cannot be rendered
          * on its own.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
-        class LinearRing extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Linear ring geometry. Only used as part of polygon; cannot be rendered
-             * on its own.
-             *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.LinearRing} Clone.
-             * @api stable
-             */
-            clone(): ol.geom.LinearRing;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.LinearRing;
 
-            /**
-             * Return the area of the linear ring on projected plane.
-             * @return {number} Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the linear ring on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Return the coordinates of the linear ring.
-             * @return {Array.<ol.Coordinate>} Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the linear ring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * Set the coordinates of the linear ring.
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the linear ring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Linestring geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class LineString extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Linestring geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
-        class LineString extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Linestring geometry.
-             *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed coordinate to the coordinates of the linestring.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @api stable
-             */
-            appendCoordinate(coordinate: ol.Coordinate): void;
+        /**
+         * Append the passed coordinate to the coordinates of the linestring.
+         * @param coordinate Coordinate.
+         * @api stable
+         */
+        appendCoordinate(coordinate: ol.Coordinate): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.LineString} Clone.
-             * @api stable
-             */
-            clone(): ol.geom.LineString;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.LineString;
 
-            /**
-             * Iterate over each segment, calling the provided callback.
-             * If the callback returns a truthy value the function returns that
-             * value immediately. Otherwise the function returns `false`.
-             *
-             * @param {function(this: S, ol.Coordinate, ol.Coordinate): T} callback Function
-             *     called for each segment.
-             * @param {S=} opt_this The object to be used as the value of 'this'
-             *     within callback.
-             * @return {T|boolean} Value.
-             * @template T,S
-             * @api
-             */
-            forEachSegment<T, S>(callback: ((this: S, start: ol.Coordinate, end: ol.Coordinate) => T), opt_this?: S): (T | boolean);
+        /**
+         * Iterate over each segment, calling the provided callback.
+         * If the callback returns a truthy value the function returns that
+         * value immediately. Otherwise the function returns `false`.
+         *
+         * @param callback Function
+         *     called for each segment.
+         * @param opt_this The object to be used as the value of 'this'
+         *     within callback.
+         * @return Value.
+         * @template T,S
+         * @api
+         */
+        forEachSegment<T, S>(callback: ((this: S, start: ol.Coordinate, end: ol.Coordinate) => T), opt_this?: S): (T | boolean);
 
-            /**
-             * Returns the coordinate at `m` using linear interpolation, or `null` if no
-             * such coordinate exists.
-             *
-             * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
-             * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
-             * M will return the first coordinate and Ms greater than the last M will
-             * return the last coordinate.
-             *
-             * @param {number} m M.
-             * @param {boolean=} opt_extrapolate Extrapolate. Default is `false`.
-             * @return {ol.Coordinate} Coordinate.
-             * @api stable
-             */
-            getCoordinateAtM(m: number, opt_extrapolate?: boolean): ol.Coordinate;
+        /**
+         * Returns the coordinate at `m` using linear interpolation, or `null` if no
+         * such coordinate exists.
+         *
+         * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
+         * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
+         * M will return the first coordinate and Ms greater than the last M will
+         * return the last coordinate.
+         *
+         * @param m M.
+         * @param opt_extrapolate Extrapolate. Default is `false`.
+         * @return Coordinate.
+         * @api stable
+         */
+        getCoordinateAtM(m: number, opt_extrapolate?: boolean): ol.Coordinate;
 
-            /**
-             * Return the coordinates of the linestring.
-             * @return {Array.<ol.Coordinate>} Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the linestring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * Return the coordinate at the provided fraction along the linestring.
-             * The `fraction` is a number between 0 and 1, where 0 is the start of the
-             * linestring and 1 is the end.
-             * @param {number} fraction Fraction.
-             * @param {ol.Coordinate=} opt_dest Optional coordinate whose values will
-             *     be modified. If not provided, a new coordinate will be returned.
-             * @return {ol.Coordinate} Coordinate of the interpolated point.
-             * @api
-             */
-            getCoordinateAt(fraction: number, opt_dest?: ol.Coordinate): ol.Coordinate;
+        /**
+         * Return the coordinate at the provided fraction along the linestring.
+         * The `fraction` is a number between 0 and 1, where 0 is the start of the
+         * linestring and 1 is the end.
+         * @param fraction Fraction.
+         * @param opt_dest Optional coordinate whose values will
+         *     be modified. If not provided, a new coordinate will be returned.
+         * @return Coordinate of the interpolated point.
+         * @api
+         */
+        getCoordinateAt(fraction: number, opt_dest?: ol.Coordinate): ol.Coordinate;
 
-            /**
-             * Return the length of the linestring on projected plane.
-             * @return {number} Length (on projected plane).
-             * @api stable
-             */
-            getLength(): number;
+        /**
+         * Return the length of the linestring on projected plane.
+         * @return Length (on projected plane).
+         * @api stable
+         */
+        getLength(): number;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the linestring.
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the linestring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-linestring geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiLineString extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Multi-linestring geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
-        class MultiLineString extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-linestring geometry.
-             *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed linestring to the multilinestring.
-             * @param {ol.geom.LineString} lineString LineString.
-             * @api stable
-             */
-            appendLineString(lineString: ol.geom.LineString): void;
+        /**
+         * Append the passed linestring to the multilinestring.
+         * @param lineString LineString.
+         * @api stable
+         */
+        appendLineString(lineString: ol.geom.LineString): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.MultiLineString} Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiLineString;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.MultiLineString;
 
-            /**
-             * Returns the coordinate at `m` using linear interpolation, or `null` if no
-             * such coordinate exists.
-             *
-             * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
-             * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
-             * M will return the first coordinate and Ms greater than the last M will
-             * return the last coordinate.
-             *
-             * `opt_interpolate` controls interpolation between consecutive LineStrings
-             * within the MultiLineString. If `opt_interpolate` is `true` the coordinates
-             * will be linearly interpolated between the last coordinate of one LineString
-             * and the first coordinate of the next LineString.  If `opt_interpolate` is
-             * `false` then the function will return `null` for Ms falling between
-             * LineStrings.
-             *
-             * @param {number} m M.
-             * @param {boolean=} opt_extrapolate Extrapolate. Default is `false`.
-             * @param {boolean=} opt_interpolate Interpolate. Default is `false`.
-             * @return {ol.Coordinate} Coordinate.
-             * @api stable
-             */
-            getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): ol.Coordinate;
+        /**
+         * Returns the coordinate at `m` using linear interpolation, or `null` if no
+         * such coordinate exists.
+         *
+         * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
+         * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
+         * M will return the first coordinate and Ms greater than the last M will
+         * return the last coordinate.
+         *
+         * `opt_interpolate` controls interpolation between consecutive LineStrings
+         * within the MultiLineString. If `opt_interpolate` is `true` the coordinates
+         * will be linearly interpolated between the last coordinate of one LineString
+         * and the first coordinate of the next LineString.  If `opt_interpolate` is
+         * `false` then the function will return `null` for Ms falling between
+         * LineStrings.
+         *
+         * @param m M.
+         * @param opt_extrapolate Extrapolate. Default is `false`.
+         * @param opt_interpolate Interpolate. Default is `false`.
+         * @return Coordinate.
+         * @api stable
+         */
+        getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): ol.Coordinate;
 
-            /**
-             * Return the coordinates of the multilinestring.
-             * @return {Array.<Array.<ol.Coordinate>>} Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[][];
+        /**
+         * Return the coordinates of the multilinestring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[][];
 
-            /**
-             * Return the linestring at the specified index.
-             * @param {number} index Index.
-             * @return {ol.geom.LineString} LineString.
-             * @api stable
-             */
-            getLineString(index: number): ol.geom.LineString;
+        /**
+         * Return the linestring at the specified index.
+         * @param index Index.
+         * @return LineString.
+         * @api stable
+         */
+        getLineString(index: number): ol.geom.LineString;
 
-            /**
-             * Return the linestrings of this multilinestring.
-             * @return {Array.<ol.geom.LineString>} LineStrings.
-             * @api stable
-             */
-            getLineStrings(): ol.geom.LineString[];
+        /**
+         * Return the linestrings of this multilinestring.
+         * @return LineStrings.
+         * @api stable
+         */
+        getLineStrings(): ol.geom.LineString[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multilinestring.
-             * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multilinestring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-point geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiPoint extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Multi-point geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
-        class MultiPoint extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-point geometry.
-             *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed point to this multipoint.
-             * @param {ol.geom.Point} point Point.
-             * @api stable
-             */
-            appendPoint(point: ol.geom.Point): void;
+        /**
+         * Append the passed point to this multipoint.
+         * @param point Point.
+         * @api stable
+         */
+        appendPoint(point: ol.geom.Point): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.MultiPoint} Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiPoint;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.MultiPoint;
 
-            /**
-             * Return the coordinates of the multipoint.
-             * @return {Array.<ol.Coordinate>} Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the multipoint.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * Return the point at the specified index.
-             * @param {number} index Index.
-             * @return {ol.geom.Point} Point.
-             * @api stable
-             */
-            getPoint(index: number): ol.geom.Point;
+        /**
+         * Return the point at the specified index.
+         * @param index Index.
+         * @return Point.
+         * @api stable
+         */
+        getPoint(index: number): ol.geom.Point;
 
-            /**
-             * Return the points of this multipoint.
-             * @return {Array.<ol.geom.Point>} Points.
-             * @api stable
-             */
-            getPoints(): ol.geom.Point[];
+        /**
+         * Return the points of this multipoint.
+         * @return Points.
+         * @api stable
+         */
+        getPoints(): ol.geom.Point[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multipoint.
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multipoint.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-polygon geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiPolygon extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Multi-polygon geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<Array.<Array.<ol.Coordinate>>>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
-        class MultiPolygon extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-polygon geometry.
-             *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<Array.<Array.<ol.Coordinate>>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed polygon to this multipolygon.
-             * @param {ol.geom.Polygon} polygon Polygon.
-             * @api stable
-             */
-            appendPolygon(polygon: ol.geom.Polygon): void;
+        /**
+         * Append the passed polygon to this multipolygon.
+         * @param polygon Polygon.
+         * @api stable
+         */
+        appendPolygon(polygon: ol.geom.Polygon): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.MultiPolygon} Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiPolygon;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.MultiPolygon;
 
-            /**
-             * Return the area of the multipolygon on projected plane.
-             * @return {number} Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the multipolygon on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Get the coordinate array for this geometry.  This array has the structure
-             * of a GeoJSON coordinate array for multi-polygons.
-             *
-             * @param {boolean=} opt_right Orient coordinates according to the right-hand
-             *     rule (counter-clockwise for exterior and clockwise for interior rings).
-             *     If `false`, coordinates will be oriented according to the left-hand rule
-             *     (clockwise for exterior and counter-clockwise for interior rings).
-             *     By default, coordinate orientation will depend on how the geometry was
-             *     constructed.
-             * @return {Array.<Array.<Array.<ol.Coordinate>>>} Coordinates.
-             * @api stable
-             */
-            getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
+        /**
+         * Get the coordinate array for this geometry.  This array has the structure
+         * of a GeoJSON coordinate array for multi-polygons.
+         *
+         * @param opt_right Orient coordinates according to the right-hand
+         *     rule (counter-clockwise for exterior and clockwise for interior rings).
+         *     If `false`, coordinates will be oriented according to the left-hand rule
+         *     (clockwise for exterior and counter-clockwise for interior rings).
+         *     By default, coordinate orientation will depend on how the geometry was
+         *     constructed.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
 
-            /**
-             * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
-             * @return {ol.geom.MultiPoint} Interior points.
-             * @api stable
-             */
-            getInteriorPoints(): ol.geom.MultiPoint;
+        /**
+         * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
+         * @return Interior points.
+         * @api stable
+         */
+        getInteriorPoints(): ol.geom.MultiPoint;
 
-            /**
-             * Return the polygon at the specified index.
-             * @param {number} index Index.
-             * @return {ol.geom.Polygon} Polygon.
-             * @api stable
-             */
-            getPolygon(index: number): ol.geom.Polygon;
+        /**
+         * Return the polygon at the specified index.
+         * @param index Index.
+         * @return Polygon.
+         * @api stable
+         */
+        getPolygon(index: number): ol.geom.Polygon;
 
-            /**
-             * Return the polygons of this multipolygon.
-             * @return {Array.<ol.geom.Polygon>} Polygons.
-             * @api stable
-             */
-            getPolygons(): ol.geom.Polygon[];
+        /**
+         * Return the polygons of this multipolygon.
+         * @return Polygons.
+         * @api stable
+         */
+        getPolygons(): ol.geom.Polygon[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multipolygon.
-             * @param {Array.<Array.<Array.<ol.Coordinate>>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multipolygon.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Point geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class Point extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Point geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {ol.Coordinate} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
-        class Point extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Point geometry.
-             *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {ol.Coordinate} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.Point} Clone.
-             * @api stable
-             */
-            clone(): ol.geom.Point;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.Point;
 
-            /**
-             * Return the coordinate of the point.
-             * @return {ol.Coordinate} Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate;
+        /**
+         * Return the coordinate of the point.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinate of the point.
-             * @param {ol.Coordinate} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinate of the point.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Polygon geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class Polygon extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Polygon geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
-        class Polygon extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Polygon geometry.
-             *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed linear ring to this polygon.
-             * @param {ol.geom.LinearRing} linearRing Linear ring.
-             * @api stable
-             */
-            appendLinearRing(linearRing: ol.geom.LinearRing): void;
+        /**
+         * Append the passed linear ring to this polygon.
+         * @param linearRing Linear ring.
+         * @api stable
+         */
+        appendLinearRing(linearRing: ol.geom.LinearRing): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return {!ol.geom.Polygon} Clone.
-             * @api stable
-             */
-            clone(): ol.geom.Polygon;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.Polygon;
 
-            /**
-             * Return the area of the polygon on projected plane.
-             * @return {number} Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the polygon on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Get the coordinate array for this geometry.  This array has the structure
-             * of a GeoJSON coordinate array for polygons.
-             *
-             * @param {boolean=} opt_right Orient coordinates according to the right-hand
-             *     rule (counter-clockwise for exterior and clockwise for interior rings).
-             *     If `false`, coordinates will be oriented according to the left-hand rule
-             *     (clockwise for exterior and counter-clockwise for interior rings).
-             *     By default, coordinate orientation will depend on how the geometry was
-             *     constructed.
-             * @return {Array.<Array.<ol.Coordinate>>} Coordinates.
-             * @api stable
-             */
-            getCoordinates(opt_right?: boolean): ol.Coordinate[][];
+        /**
+         * Get the coordinate array for this geometry.  This array has the structure
+         * of a GeoJSON coordinate array for polygons.
+         *
+         * @param opt_right Orient coordinates according to the right-hand
+         *     rule (counter-clockwise for exterior and clockwise for interior rings).
+         *     If `false`, coordinates will be oriented according to the left-hand rule
+         *     (clockwise for exterior and counter-clockwise for interior rings).
+         *     By default, coordinate orientation will depend on how the geometry was
+         *     constructed.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(opt_right?: boolean): ol.Coordinate[][];
 
-            /**
-             * Return an interior point of the polygon.
-             * @return {ol.geom.Point} Interior point.
-             * @api stable
-             */
-            getInteriorPoint(): ol.geom.Point;
+        /**
+         * Return an interior point of the polygon.
+         * @return Interior point.
+         * @api stable
+         */
+        getInteriorPoint(): ol.geom.Point;
 
-            /**
-             * Return the number of rings of the polygon,  this includes the exterior
-             * ring and any interior rings.
-             *
-             * @return {number} Number of rings.
-             * @api
-             */
-            getLinearRingCount(): number;
+        /**
+         * Return the number of rings of the polygon,  this includes the exterior
+         * ring and any interior rings.
+         *
+         * @return Number of rings.
+         * @api
+         */
+        getLinearRingCount(): number;
 
-            /**
-             * Return the Nth linear ring of the polygon geometry. Return `null` if the
-             * given index is out of range.
-             * The exterior linear ring is available at index `0` and the interior rings
-             * at index `1` and beyond.
-             *
-             * @param {number} index Index.
-             * @return {ol.geom.LinearRing} Linear ring.
-             * @api stable
-             */
-            getLinearRing(index: number): ol.geom.LinearRing;
+        /**
+         * Return the Nth linear ring of the polygon geometry. Return `null` if the
+         * given index is out of range.
+         * The exterior linear ring is available at index `0` and the interior rings
+         * at index `1` and beyond.
+         *
+         * @param index Index.
+         * @return Linear ring.
+         * @api stable
+         */
+        getLinearRing(index: number): ol.geom.LinearRing;
 
-            /**
-             * Return the linear rings of the polygon.
-             * @return {Array.<ol.geom.LinearRing>} Linear rings.
-             * @api stable
-             */
-            getLinearRings(): ol.geom.LinearRing[];
+        /**
+         * Return the linear rings of the polygon.
+         * @return Linear rings.
+         * @api stable
+         */
+        getLinearRings(): ol.geom.LinearRing[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the polygon.
-             * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
+        /**
+         * Set the coordinates of the polygon.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
 
-            /**
-             * Create an approximation of a circle on the surface of a sphere.
-             * @param {ol.Sphere} sphere The sphere.
-             * @param {ol.Coordinate} center Center (`[lon, lat]` in degrees).
-             * @param {number} radius The great-circle distance from the center to
-             *     the polygon vertices.
-             * @param {number=} opt_n Optional number of vertices for the resulting
-             *     polygon. Default is `32`.
-             * @return {ol.geom.Polygon} The "circular" polygon.
-             * @api stable
-             */
-            static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): ol.geom.Polygon;
+        /**
+         * Create an approximation of a circle on the surface of a sphere.
+         * @param sphere The sphere.
+         * @param center Center (`[lon, lat]` in degrees).
+         * @param radius The great-circle distance from the center to
+         *     the polygon vertices.
+         * @param opt_n Optional number of vertices for the resulting
+         *     polygon. Default is `32`.
+         * @return The "circular" polygon.
+         * @api stable
+         */
+        static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): ol.geom.Polygon;
 
-            /**
-             * Create a polygon from an extent. The layout used is `XY`.
-             * @param {ol.Extent} extent The extent.
-             * @return {ol.geom.Polygon} The polygon.
-             * @api
-             */
-            static fromExtent(extent: ol.Extent): ol.geom.Polygon;
+        /**
+         * Create a polygon from an extent. The layout used is `XY`.
+         * @param extent The extent.
+         * @return The polygon.
+         * @api
+         */
+        static fromExtent(extent: ol.Extent): ol.geom.Polygon;
 
-            /**
-             * Create a regular polygon from a circle.
-             * @param {ol.geom.Circle} circle Circle geometry.
-             * @param {number=} opt_sides Number of sides of the polygon. Default is 32.
-             * @param {number=} opt_angle Start angle for the first vertex of the polygon in
-             *     radians. Default is 0.
-             * @return {ol.geom.Polygon} Polygon geometry.
-             * @api
-             */
-            static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
-        }
+        /**
+         * Create a regular polygon from a circle.
+         * @param circle Circle geometry.
+         * @param opt_sides Number of sides of the polygon. Default is 32.
+         * @param opt_angle Start angle for the first vertex of the polygon in
+         *     radians. Default is 0.
+         * @return Polygon geometry.
+         * @api
+         */
+        static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; only used for creating subclasses; do not instantiate
+     * in apps, as cannot be rendered.
+     *
+     * @api stable
+     */
+    class SimpleGeometry extends geom.Geometry {
         /**
          * @classdesc
          * Abstract base class; only used for creating subclasses; do not instantiate
          * in apps, as cannot be rendered.
          *
-         * @constructor
-         * @extends {ol.geom.Geometry}
          * @api stable
          */
-        class SimpleGeometry extends ol.geom.Geometry {
-            /**
-             * @classdesc
-             * Abstract base class; only used for creating subclasses; do not instantiate
-             * in apps, as cannot be rendered.
-             *
-             * @constructor
-             * @extends {ol.geom.Geometry}
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Return the first coordinate of the geometry.
-             * @return {ol.Coordinate} First coordinate.
-             * @api stable
-             */
-            getFirstCoordinate(): ol.Coordinate;
+        /**
+         * Return the first coordinate of the geometry.
+         * @return First coordinate.
+         * @api stable
+         */
+        getFirstCoordinate(): ol.Coordinate;
 
-            /**
-             * Return the last coordinate of the geometry.
-             * @return {ol.Coordinate} Last point.
-             * @api stable
-             */
-            getLastCoordinate(): ol.Coordinate;
+        /**
+         * Return the last coordinate of the geometry.
+         * @return Last point.
+         * @api stable
+         */
+        getLastCoordinate(): ol.Coordinate;
 
-            /**
-             * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
-             * @return {ol.geom.GeometryLayout} Layout.
-             * @api stable
-             */
-            getLayout(): ol.geom.GeometryLayout;
+        /**
+         * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
+         * @return Layout.
+         * @api stable
+         */
+        getLayout(): ol.geom.GeometryLayout;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            applyTransform(transformFn: ol.TransformFunction): void;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        applyTransform(transformFn: ol.TransformFunction): void;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            translate(deltaX: number, deltaY: number): void;
-        }
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        translate(deltaX: number, deltaY: number): void;
     }
+}
 
+/**
+ * Render a grid for a coordinate system on a map.
+ * @param opt_options Options.
+ * @api
+ */
+export class Graticule {
     /**
      * Render a grid for a coordinate system on a map.
-     * @constructor
-     * @param {olx.GraticuleOptions=} opt_options Options.
+     * @param opt_options Options.
      * @api
      */
-    class Graticule {
-        /**
-         * Render a grid for a coordinate system on a map.
-         * @constructor
-         * @param {olx.GraticuleOptions=} opt_options Options.
-         * @api
-         */
-        constructor(opt_options?: olx.GraticuleOptions);
-
-        /**
-         * Get the map associated with this graticule.
-         * @return {ol.Map} The map.
-         * @api
-         */
-        getMap(): ol.Map;
-
-        /**
-         * Get the list of meridians.  Meridians are lines of equal longitude.
-         * @return {Array.<ol.geom.LineString>} The meridians.
-         * @api
-         */
-        getMeridians(): ol.geom.LineString[];
-
-        /**
-         * Get the list of parallels.  Pallels are lines of equal latitude.
-         * @return {Array.<ol.geom.LineString>} The parallels.
-         * @api
-         */
-        getParallels(): ol.geom.LineString[];
-
-        /**
-         * Set the map for this graticule.  The graticule will be rendered on the
-         * provided map.
-         * @param {ol.Map} map Map.
-         * @api
-         */
-        setMap(map: ol.Map): void;
-    }
+    constructor(opt_options?: olx.GraticuleOptions);
 
     /**
-     * @namespace ol.has
-     */
-    module has {
-        /**
-         * The ratio between physical pixels and device-independent pixels
-         * (dips) on the device (`window.devicePixelRatio`).
-         * @const
-         * @type {number}
-         * @api stable
-         */
-        const DEVICE_PIXEL_RATIO: number;
-
-        /**
-         * True if both the library and browser support Canvas.  Always `false`
-         * if `ol.ENABLE_CANVAS` is set to `false` at compile time.
-         * @const
-         * @type {boolean}
-         * @api stable
-         */
-        const CANVAS: boolean;
-
-        /**
-         * Indicates if DeviceOrientation is supported in the user's browser.
-         * @const
-         * @type {boolean}
-         * @api stable
-         */
-        const DEVICE_ORIENTATION: boolean;
-
-        /**
-         * Is HTML5 geolocation supported in the current browser?
-         * @const
-         * @type {boolean}
-         * @api stable
-         */
-        const GEOLOCATION: boolean;
-
-        /**
-         * True if browser supports touch events.
-         * @const
-         * @type {boolean}
-         * @api stable
-         */
-        const TOUCH: boolean;
-
-        /**
-         * True if both OpenLayers and browser support WebGL.  Always `false`
-         * if `ol.ENABLE_WEBGL` is set to `false` at compile time.
-         * @const
-         * @type {boolean}
-         * @api stable
-         */
-        const WEBGL: boolean;
-    }
-
-    /**
-     * @constructor
-     * @extends {ol.ImageBase}
-     * @param {ol.Extent} extent Extent.
-     * @param {number|undefined} resolution Resolution.
-     * @param {number} pixelRatio Pixel ratio.
-     * @param {Array.<ol.Attribution>} attributions Attributions.
-     * @param {string} src Image source URI.
-     * @param {?string} crossOrigin Cross origin.
-     * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
-     */
-    class Image extends ol.ImageBase {
-        /**
-         * @constructor
-         * @extends {ol.ImageBase}
-         * @param {ol.Extent} extent Extent.
-         * @param {number|undefined} resolution Resolution.
-         * @param {number} pixelRatio Pixel ratio.
-         * @param {Array.<ol.Attribution>} attributions Attributions.
-         * @param {string} src Image source URI.
-         * @param {?string} crossOrigin Cross origin.
-         * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
-         */
-        constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, attributions: ol.Attribution[], src: string, crossOrigin?: string, imageLoadFunction?: ol.ImageLoadFunctionType);
-
-        /**
-         * Get the HTML image element (may be a Canvas, Image, or Video).
-         * @param {Object=} opt_context Object.
-         * @return {HTMLCanvasElement|Image|HTMLVideoElement} Image.
-         * @api
-         */
-        getImage(opt_context?: GlobalObject): (HTMLCanvasElement | Image | HTMLVideoElement);
-
-        /**
-         * Load the image or retry if loading previously failed.
-         * Loading is taken care of by the tile queue, and calling this method is
-         * only needed for preloading or for reloading in case of an error.
-         * @api
-         */
-        load(): void;
-    }
-
-    /**
-     * @constructor
-     * @extends {ol.events.EventTarget}
-     * @param {ol.Extent} extent Extent.
-     * @param {number|undefined} resolution Resolution.
-     * @param {number} pixelRatio Pixel ratio.
-     * @param {ol.ImageState} state State.
-     * @param {Array.<ol.Attribution>} attributions Attributions.
-     */
-    class ImageBase extends ol.events.EventTarget {
-        /**
-         * @constructor
-         * @extends {ol.events.EventTarget}
-         * @param {ol.Extent} extent Extent.
-         * @param {number|undefined} resolution Resolution.
-         * @param {number} pixelRatio Pixel ratio.
-         * @param {ol.ImageState} state State.
-         * @param {Array.<ol.Attribution>} attributions Attributions.
-         */
-        constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
-    }
-
-    type ImageState = number;
-
-    /**
-     * @constructor
-     * @extends {ol.Tile}
-     * @param {ol.TileCoord} tileCoord Tile coordinate.
-     * @param {ol.Tile.State} state State.
-     * @param {string} src Image source URI.
-     * @param {?string} crossOrigin Cross origin.
-     * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-     */
-    class ImageTile extends ol.Tile {
-        /**
-         * @constructor
-         * @extends {ol.Tile}
-         * @param {ol.TileCoord} tileCoord Tile coordinate.
-         * @param {ol.Tile.State} state State.
-         * @param {string} src Image source URI.
-         * @param {?string} crossOrigin Cross origin.
-         * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, crossOrigin?: string, tileLoadFunction?: ol.TileLoadFunctionType);
-
-        /**
-         * Get the image element for this tile.
-         * @inheritDoc
-         * @api
-         */
-        getImage(opt_context?: GlobalObject): (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement);
-    }
-
-    /**
-     * Inherit the prototype methods from one constructor into another.
-     *
-     * Usage:
-     *
-     *     function ParentClass(a, b) { }
-     *     ParentClass.prototype.foo = function(a) { }
-     *
-     *     function ChildClass(a, b, c) {
-     *       // Call parent constructor
-     *       ParentClass.call(this, a, b);
-     *     }
-     *     ol.inherits(ChildClass, ParentClass);
-     *
-     *     var child = new ChildClass('a', 'b', 'see');
-     *     child.foo(); // This works.
-     *
-     * @param {!Function} childCtor Child constructor.
-     * @param {!Function} parentCtor Parent constructor.
-     * @function
+     * Get the map associated with this graticule.
+     * @return The map.
      * @api
      */
-    function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
+    getMap(): ol.Map;
 
     /**
-     * @namespace ol.interaction
+     * Get the list of meridians.  Meridians are lines of equal longitude.
+     * @return The meridians.
+     * @api
      */
-    module interaction {
+    getMeridians(): ol.geom.LineString[];
+
+    /**
+     * Get the list of parallels.  Pallels are lines of equal latitude.
+     * @return The parallels.
+     * @api
+     */
+    getParallels(): ol.geom.LineString[];
+
+    /**
+     * Set the map for this graticule.  The graticule will be rendered on the
+     * provided map.
+     * @param map Map.
+     * @api
+     */
+    setMap(map: ol.Map): void;
+}
+
+export namespace has {
+    /**
+     * The ratio between physical pixels and device-independent pixels
+     * (dips) on the device (`window.devicePixelRatio`).
+     * @const
+     * @api stable
+     */
+    const DEVICE_PIXEL_RATIO: number;
+
+    /**
+     * True if both the library and browser support Canvas.  Always `false`
+     * if `ol.ENABLE_CANVAS` is set to `false` at compile time.
+     * @const
+     * @api stable
+     */
+    const CANVAS: boolean;
+
+    /**
+     * Indicates if DeviceOrientation is supported in the user's browser.
+     * @const
+     * @api stable
+     */
+    const DEVICE_ORIENTATION: boolean;
+
+    /**
+     * Is HTML5 geolocation supported in the current browser?
+     * @const
+     * @api stable
+     */
+    const GEOLOCATION: boolean;
+
+    /**
+     * True if browser supports touch events.
+     * @const
+     * @api stable
+     */
+    const TOUCH: boolean;
+
+    /**
+     * True if both OpenLayers and browser support WebGL.  Always `false`
+     * if `ol.ENABLE_WEBGL` is set to `false` at compile time.
+     * @const
+     * @api stable
+     */
+    const WEBGL: boolean;
+}
+
+/**
+ * @param extent Extent.
+ * @param resolution Resolution.
+ * @param pixelRatio Pixel ratio.
+ * @param attributions Attributions.
+ * @param src Image source URI.
+ * @param crossOrigin Cross origin.
+ * @param imageLoadFunction Image load function.
+ */
+export class Image extends ImageBase {
+    /**
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @param pixelRatio Pixel ratio.
+     * @param attributions Attributions.
+     * @param src Image source URI.
+     * @param crossOrigin Cross origin.
+     * @param imageLoadFunction Image load function.
+     */
+    constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, attributions: ol.Attribution[], src: string, crossOrigin?: string, imageLoadFunction?: ol.ImageLoadFunctionType);
+
+    /**
+     * Get the HTML image element (may be a Canvas, Image, or Video).
+     * @param opt_context Object.
+     * @return Image.
+     * @api
+     */
+    getImage(opt_context?: GlobalObject): (HTMLCanvasElement | Image | HTMLVideoElement);
+
+    /**
+     * Load the image or retry if loading previously failed.
+     * Loading is taken care of by the tile queue, and calling this method is
+     * only needed for preloading or for reloading in case of an error.
+     * @api
+     */
+    load(): void;
+}
+
+/**
+ * @param extent Extent.
+ * @param resolution Resolution.
+ * @param pixelRatio Pixel ratio.
+ * @param state State.
+ * @param attributions Attributions.
+ */
+export class ImageBase extends events.EventTarget {
+    /**
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @param pixelRatio Pixel ratio.
+     * @param state State.
+     * @param attributions Attributions.
+     */
+    constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
+}
+
+export type ImageState = number;
+
+/**
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ * @param src Image source URI.
+ * @param crossOrigin Cross origin.
+ * @param tileLoadFunction Tile load function.
+ */
+export class ImageTile extends Tile {
+    /**
+     * @param tileCoord Tile coordinate.
+     * @param state State.
+     * @param src Image source URI.
+     * @param crossOrigin Cross origin.
+     * @param tileLoadFunction Tile load function.
+     */
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, crossOrigin?: string, tileLoadFunction?: ol.TileLoadFunctionType);
+
+    /**
+     * Get the image element for this tile.
+     * @inheritDoc
+     * @api
+     */
+    getImage(opt_context?: GlobalObject): (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement);
+}
+
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * Usage:
+ *
+ *     function ParentClass(a, b) { }
+ *     ParentClass.prototype.foo = function(a) { }
+ *
+ *     function ChildClass(a, b, c) {
+ *       // Call parent constructor
+ *       ParentClass.call(this, a, b);
+ *     }
+ *     ol.inherits(ChildClass, ParentClass);
+ *
+ *     var child = new ChildClass('a', 'b', 'see');
+ *     child.foo(); // This works.
+ *
+ * @param childCtor Child constructor.
+ * @param parentCtor Parent constructor.
+ * @api
+ */
+export function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
+
+export namespace interaction {
+    /**
+     * @classdesc
+     * Allows the user to zoom by double-clicking on the map.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DoubleClickZoom extends interaction.Interaction {
         /**
          * @classdesc
          * Allows the user to zoom by double-clicking on the map.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
-         * @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class DoubleClickZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom by double-clicking on the map.
-             *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
+        constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
-             * doubleclick) and eventually zooms the map.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.DoubleClickZoom}
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
+         * doubleclick) and eventually zooms the map.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Handles input of vector data by drag and drop.
+     *
+     * @fires ol.interaction.DragAndDropEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragAndDrop extends interaction.Interaction {
         /**
          * @classdesc
          * Handles input of vector data by drag and drop.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
          * @fires ol.interaction.DragAndDropEvent
-         * @param {olx.interaction.DragAndDropOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class DragAndDrop extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Handles input of vector data by drag and drop.
-             *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @fires ol.interaction.DragAndDropEvent
-             * @param {olx.interaction.DragAndDropOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragAndDropOptions);
-
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} unconditionally and
-             * neither prevents the browser default nor stops event propagation.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.DragAndDrop}
-             * @api
-             */
-            static handleEvent: any;
-        }
+        constructor(opt_options?: olx.interaction.DragAndDropOptions);
 
         /**
-         * @namespace ol.interaction.DragAndDrop
+         * Handles the {@link ol.MapBrowserEvent map browser event} unconditionally and
+         * neither prevents the browser default nor stops event propagation.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
          */
-        module DragAndDrop {
+        static handleEvent: any;
+    }
+
+    namespace DragAndDrop {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
+         * of this type.
+         *
+         * @param type Type.
+         * @param file File.
+         * @param opt_features Features.
+         * @param opt_projection Projection.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
              * of this type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.interaction.DragAndDropEvent}
-             * @param {ol.interaction.DragAndDropEventType} type Type.
-             * @param {File} file File.
-             * @param {Array.<ol.Feature>=} opt_features Features.
-             * @param {ol.proj.Projection=} opt_projection Projection.
+             * @param type Type.
+             * @param file File.
+             * @param opt_features Features.
+             * @param opt_projection Projection.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
-                 * of this type.
-                 *
-                 * @constructor
-                 * @extends {ol.events.Event}
-                 * @implements {oli.interaction.DragAndDropEvent}
-                 * @param {ol.interaction.DragAndDropEventType} type Type.
-                 * @param {File} file File.
-                 * @param {Array.<ol.Feature>=} opt_features Features.
-                 * @param {ol.proj.Projection=} opt_projection Projection.
-                 */
-                constructor(type: ol.interaction.DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
+            constructor(type: ol.interaction.DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
 
-                /**
-                 * The features parsed from dropped data.
-                 * @type {Array.<ol.Feature>|undefined}
-                 * @api stable
-                 */
-                features: ol.Feature[];
+            /**
+             * The features parsed from dropped data.
+             * @api stable
+             */
+            features: ol.Feature[];
 
-                /**
-                 * The dropped file.
-                 * @type {File}
-                 * @api stable
-                 */
-                file: File;
+            /**
+             * The dropped file.
+             * @api stable
+             */
+            file: File;
 
-                /**
-                 * The feature projection.
-                 * @type {ol.proj.Projection|undefined}
-                 * @api
-                 */
-                projection: ol.proj.Projection;
-            }
+            /**
+             * The feature projection.
+             * @api
+             */
+            projection: ol.proj.Projection;
         }
+    }
 
-        type DragAndDropEventType = string;
+    type DragAndDropEventType = string;
 
+    /**
+     * @classdesc
+     * Allows the user to draw a vector box by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when the shift or other key is held down. This is used, for example,
+     * for zooming to a specific area of the map
+     * (see {@link ol.interaction.DragZoom} and
+     * {@link ol.interaction.DragRotateAndZoom}).
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * @fires ol.DragBoxEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragBox extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to draw a vector box by clicking and dragging on the map,
@@ -5518,112 +5092,89 @@ declare module ol {
          *
          * This interaction is only supported for mouse devices.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
          * @fires ol.DragBoxEvent
-         * @param {olx.interaction.DragBoxOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class DragBox extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to draw a vector box by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when the shift or other key is held down. This is used, for example,
-             * for zooming to a specific area of the map
-             * (see {@link ol.interaction.DragZoom} and
-             * {@link ol.interaction.DragRotateAndZoom}).
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @fires ol.DragBoxEvent
-             * @param {olx.interaction.DragBoxOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragBoxOptions);
-
-            /**
-             * Returns geometry of last drawn box.
-             * @return {ol.geom.Polygon} Geometry.
-             * @api stable
-             */
-            getGeometry(): ol.geom.Polygon;
-        }
+        constructor(opt_options?: olx.interaction.DragBoxOptions);
 
         /**
-         * @namespace ol.interaction.DragBox
+         * Returns geometry of last drawn box.
+         * @return Geometry.
+         * @api stable
          */
-        module DragBox {
+        getGeometry(): ol.geom.Polygon;
+    }
+
+    namespace DragBox {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.DragBox} instances are instances of
+         * this type.
+         *
+         * @param type The event type.
+         * @param coordinate The event coordinate.
+         * @param mapBrowserEvent Originating event.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragBox} instances are instances of
              * this type.
              *
-             * @param {string} type The event type.
-             * @param {ol.Coordinate} coordinate The event coordinate.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Originating event.
-             * @extends {ol.events.Event}
-             * @constructor
-             * @implements {oli.DragBoxEvent}
+             * @param type The event type.
+             * @param coordinate The event coordinate.
+             * @param mapBrowserEvent Originating event.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.DragBox} instances are instances of
-                 * this type.
-                 *
-                 * @param {string} type The event type.
-                 * @param {ol.Coordinate} coordinate The event coordinate.
-                 * @param {ol.MapBrowserEvent} mapBrowserEvent Originating event.
-                 * @extends {ol.events.Event}
-                 * @constructor
-                 * @implements {oli.DragBoxEvent}
-                 */
-                constructor(type: string, coordinate: ol.Coordinate, mapBrowserEvent: ol.MapBrowserEvent);
+            constructor(type: string, coordinate: ol.Coordinate, mapBrowserEvent: ol.MapBrowserEvent);
 
-                /**
-                 * The coordinate of the drag event.
-                 * @const
-                 * @type {ol.Coordinate}
-                 * @api stable
-                 */
-                coordinate: ol.Coordinate;
+            /**
+             * The coordinate of the drag event.
+             * @const
+             * @api stable
+             */
+            coordinate: ol.Coordinate;
 
-                /**
-                 * @const
-                 * @type {ol.MapBrowserEvent}
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * @const
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
-        type DragBoxEventType = string;
+    type DragBoxEventType = string;
 
+    /**
+     * @classdesc
+     * Allows the user to pan the map by dragging the map.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragPan extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to pan the map by dragging the map.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.DragPanOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class DragPan extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to pan the map by dragging the map.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.DragPanOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragPanOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragPanOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to rotate the map by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when the alt and shift keys are held down.
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragRotate extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to rotate the map by clicking and dragging on the map,
@@ -5632,28 +5183,26 @@ declare module ol {
          *
          * This interaction is only supported for mouse devices.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.DragRotateOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class DragRotate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to rotate the map by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when the alt and shift keys are held down.
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.DragRotateOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragRotateOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragRotateOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom and rotate the map by clicking and dragging
+     * on the map.  By default, this interaction is limited to when the shift
+     * key is held down.
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * And this interaction is not included in the default interactions.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragRotateAndZoom extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to zoom and rotate the map by clicking and dragging
@@ -5664,30 +5213,25 @@ declare module ol {
          *
          * And this interaction is not included in the default interactions.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class DragRotateAndZoom extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to zoom and rotate the map by clicking and dragging
-             * on the map.  By default, this interaction is limited to when the shift
-             * key is held down.
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * And this interaction is not included in the default interactions.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when a key, shift by default, is held down.
+     *
+     * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
+     * your custom one configured with `className`.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragZoom extends interaction.DragBox {
         /**
          * @classdesc
          * Allows the user to zoom the map by clicking and dragging on the map,
@@ -5697,165 +5241,150 @@ declare module ol {
          * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
          * your custom one configured with `className`.
          *
-         * @constructor
-         * @extends {ol.interaction.DragBox}
-         * @param {olx.interaction.DragZoomOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class DragZoom extends ol.interaction.DragBox {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when a key, shift by default, is held down.
-             *
-             * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
-             * your custom one configured with `className`.
-             *
-             * @constructor
-             * @extends {ol.interaction.DragBox}
-             * @param {olx.interaction.DragZoomOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragZoomOptions);
+    }
 
+    namespace Draw {
         /**
-         * @namespace ol.interaction.Draw
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Draw} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param feature The feature drawn.
          */
-        module Draw {
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Draw} instances are instances of
              * this type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.DrawEvent}
-             * @param {ol.interaction.DrawEventType} type Type.
-             * @param {ol.Feature} feature The feature drawn.
+             * @param type Type.
+             * @param feature The feature drawn.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Draw} instances are instances of
-                 * this type.
-                 *
-                 * @constructor
-                 * @extends {ol.events.Event}
-                 * @implements {oli.DrawEvent}
-                 * @param {ol.interaction.DrawEventType} type Type.
-                 * @param {ol.Feature} feature The feature drawn.
-                 */
-                constructor(type: ol.interaction.DrawEventType, feature: ol.Feature);
+            constructor(type: ol.interaction.DrawEventType, feature: ol.Feature);
 
-                /**
-                 * The feature being drawn.
-                 * @type {ol.Feature}
-                 * @api stable
-                 */
-                feature: ol.Feature;
-            }
+            /**
+             * The feature being drawn.
+             * @api stable
+             */
+            feature: ol.Feature;
         }
+    }
 
-        type DrawEventType = string;
+    type DrawEventType = string;
 
+    /**
+     * @classdesc
+     * Interaction for drawing feature geometries.
+     *
+     * @fires ol.interaction.DrawEvent
+     * @param options Options.
+     * @api stable
+     */
+    class Draw extends interaction.Pointer {
         /**
          * @classdesc
          * Interaction for drawing feature geometries.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
          * @fires ol.interaction.DrawEvent
-         * @param {olx.interaction.DrawOptions} options Options.
+         * @param options Options.
          * @api stable
          */
-        class Draw extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for drawing feature geometries.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @fires ol.interaction.DrawEvent
-             * @param {olx.interaction.DrawOptions} options Options.
-             * @api stable
-             */
-            constructor(options: olx.interaction.DrawOptions);
-
-            /**
-             * Remove last point of the feature currently being drawn.
-             * @api
-             */
-            removeLastPoint(): void;
-
-            /**
-             * Stop drawing and add the sketch feature to the target layer.
-             * The {@link ol.interaction.DrawEventType.DRAWEND} event is dispatched before
-             * inserting the feature.
-             * @api
-             */
-            finishDrawing(): void;
-
-            /**
-             * Extend an existing geometry by adding additional points. This only works
-             * on features with `LineString` geometries, where the interaction will
-             * extend lines by adding points to the end of the coordinates array.
-             * @param {!ol.Feature} feature Feature to be extended.
-             * @api
-             */
-            extend(feature: ol.Feature): void;
-
-            /**
-             * Create a `geometryFunction` that will create a box-shaped polygon (aligned
-             * with the coordinate system axes).  Use this with the draw interaction and
-             * `type: 'Circle'` to return a box instead of a circle geometry.
-             * @return {ol.DrawGeometryFunctionType} Function that draws a box-shaped polygon.
-             * @api
-             */
-            static createBox(): ol.DrawGeometryFunctionType;
-
-            /**
-             * Create a `geometryFunction` for `mode: 'Circle'` that will create a regular
-             * polygon with a user specified number of sides and start angle instead of an
-             * `ol.geom.Circle` geometry.
-             * @param {number=} opt_sides Number of sides of the regular polygon. Default is
-             *     32.
-             * @param {number=} opt_angle Angle of the first point in radians. 0 means East.
-             *     Default is the angle defined by the heading from the center of the
-             *     regular polygon to the current pointer position.
-             * @return {ol.DrawGeometryFunctionType} Function that draws a
-             *     polygon.
-             * @api
-             */
-            static createRegularPolygon(opt_sides?: number, opt_angle?: number): ol.DrawGeometryFunctionType;
-        }
+        constructor(options: olx.interaction.DrawOptions);
 
         /**
-         * Set of interactions included in maps by default. Specific interactions can be
-         * excluded by setting the appropriate option to false in the constructor
-         * options, but the order of the interactions is fixed.  If you want to specify
-         * a different order for interactions, you will need to create your own
-         * {@link ol.interaction.Interaction} instances and insert them into a
-         * {@link ol.Collection} in the order you want before creating your
-         * {@link ol.Map} instance. The default set of interactions, in sequence, is:
-         * * {@link ol.interaction.DragRotate}
-         * * {@link ol.interaction.DoubleClickZoom}
-         * * {@link ol.interaction.DragPan}
-         * * {@link ol.interaction.PinchRotate}
-         * * {@link ol.interaction.PinchZoom}
-         * * {@link ol.interaction.KeyboardPan}
-         * * {@link ol.interaction.KeyboardZoom}
-         * * {@link ol.interaction.MouseWheelZoom}
-         * * {@link ol.interaction.DragZoom}
-         *
-         * @param {olx.interaction.DefaultsOptions=} opt_options Defaults options.
-         * @return {ol.Collection.<ol.interaction.Interaction>} A collection of
-         * interactions to be used with the ol.Map constructor's interactions option.
-         * @api stable
+         * Remove last point of the feature currently being drawn.
+         * @api
          */
-        function defaults(opt_options?: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
+        removeLastPoint(): void;
 
+        /**
+         * Stop drawing and add the sketch feature to the target layer.
+         * The {@link ol.interaction.DrawEventType.DRAWEND} event is dispatched before
+         * inserting the feature.
+         * @api
+         */
+        finishDrawing(): void;
+
+        /**
+         * Extend an existing geometry by adding additional points. This only works
+         * on features with `LineString` geometries, where the interaction will
+         * extend lines by adding points to the end of the coordinates array.
+         * @param feature Feature to be extended.
+         * @api
+         */
+        extend(feature: ol.Feature): void;
+
+        /**
+         * Create a `geometryFunction` that will create a box-shaped polygon (aligned
+         * with the coordinate system axes).  Use this with the draw interaction and
+         * `type: 'Circle'` to return a box instead of a circle geometry.
+         * @return Function that draws a box-shaped polygon.
+         * @api
+         */
+        static createBox(): ol.DrawGeometryFunctionType;
+
+        /**
+         * Create a `geometryFunction` for `mode: 'Circle'` that will create a regular
+         * polygon with a user specified number of sides and start angle instead of an
+         * `ol.geom.Circle` geometry.
+         * @param opt_sides Number of sides of the regular polygon. Default is
+         *     32.
+         * @param opt_angle Angle of the first point in radians. 0 means East.
+         *     Default is the angle defined by the heading from the center of the
+         *     regular polygon to the current pointer position.
+         * @return Function that draws a
+         *     polygon.
+         * @api
+         */
+        static createRegularPolygon(opt_sides?: number, opt_angle?: number): ol.DrawGeometryFunctionType;
+    }
+
+    /**
+     * Set of interactions included in maps by default. Specific interactions can be
+     * excluded by setting the appropriate option to false in the constructor
+     * options, but the order of the interactions is fixed.  If you want to specify
+     * a different order for interactions, you will need to create your own
+     * {@link ol.interaction.Interaction} instances and insert them into a
+     * {@link ol.Collection} in the order you want before creating your
+     * {@link ol.Map} instance. The default set of interactions, in sequence, is:
+     * * {@link ol.interaction.DragRotate}
+     * * {@link ol.interaction.DoubleClickZoom}
+     * * {@link ol.interaction.DragPan}
+     * * {@link ol.interaction.PinchRotate}
+     * * {@link ol.interaction.PinchZoom}
+     * * {@link ol.interaction.KeyboardPan}
+     * * {@link ol.interaction.KeyboardZoom}
+     * * {@link ol.interaction.MouseWheelZoom}
+     * * {@link ol.interaction.DragZoom}
+     *
+     * @param opt_options Defaults options.
+     * @return A collection of
+     * interactions to be used with the ol.Map constructor's interactions option.
+     * @api stable
+     */
+    function defaults(opt_options?: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * User actions that change the state of the map. Some are similar to controls,
+     * but are not associated with a DOM element.
+     * For example, {@link ol.interaction.KeyboardZoom} is functionally the same as
+     * {@link ol.control.Zoom}, but triggered by a keyboard event not a button
+     * element event.
+     * Although interactions do not have a DOM element, some of them do render
+     * vectors and so are visible on the screen.
+     *
+     * @param options Options.
+     * @api
+     */
+    class Interaction extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -5868,55 +5397,51 @@ declare module ol {
          * Although interactions do not have a DOM element, some of them do render
          * vectors and so are visible on the screen.
          *
-         * @constructor
-         * @param {olx.interaction.InteractionOptions} options Options.
-         * @extends {ol.Object}
+         * @param options Options.
          * @api
          */
-        class Interaction extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * User actions that change the state of the map. Some are similar to controls,
-             * but are not associated with a DOM element.
-             * For example, {@link ol.interaction.KeyboardZoom} is functionally the same as
-             * {@link ol.control.Zoom}, but triggered by a keyboard event not a button
-             * element event.
-             * Although interactions do not have a DOM element, some of them do render
-             * vectors and so are visible on the screen.
-             *
-             * @constructor
-             * @param {olx.interaction.InteractionOptions} options Options.
-             * @extends {ol.Object}
-             * @api
-             */
-            constructor(options: olx.interaction.InteractionOptions);
+        constructor(options: olx.interaction.InteractionOptions);
 
-            /**
-             * Return whether the interaction is currently active.
-             * @return {boolean} `true` if the interaction is active, `false` otherwise.
-             * @observable
-             * @api
-             */
-            getActive(): boolean;
+        /**
+         * Return whether the interaction is currently active.
+         * @return `true` if the interaction is active, `false` otherwise.
+         * @observable
+         * @api
+         */
+        getActive(): boolean;
 
-            /**
-             * Get the map associated with this interaction.
-             * @return {ol.Map} Map.
-             * @api
-             */
-            getMap(): ol.Map;
+        /**
+         * Get the map associated with this interaction.
+         * @return Map.
+         * @api
+         */
+        getMap(): ol.Map;
 
-            /**
-             * Activate or deactivate the interaction.
-             * @param {boolean} active Active.
-             * @observable
-             * @api
-             */
-            setActive(active: boolean): void;
-        }
+        /**
+         * Activate or deactivate the interaction.
+         * @param active Active.
+         * @observable
+         * @api
+         */
+        setActive(active: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to pan the map using keyboard arrows.
+     * Note that, although this interaction is by default included in maps,
+     * the keys can only be used when browser focus is on the element to which
+     * the keyboard events are attached. By default, this is the map div,
+     * though you can change this with the `keyboardEventTarget` in
+     * {@link ol.Map}. `document` never loses focus but, for any other element,
+     * focus will have to be on, and returned to, this element if the keys are to
+     * function.
+     * See also {@link ol.interaction.KeyboardZoom}.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KeyboardPan extends interaction.Interaction {
         /**
          * @classdesc
          * Allows the user to pan the map using keyboard arrows.
@@ -5929,43 +5454,38 @@ declare module ol {
          * function.
          * See also {@link ol.interaction.KeyboardZoom}.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
-         * @param {olx.interaction.KeyboardPanOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class KeyboardPan extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to pan the map using keyboard arrows.
-             * Note that, although this interaction is by default included in maps,
-             * the keys can only be used when browser focus is on the element to which
-             * the keyboard events are attached. By default, this is the map div,
-             * though you can change this with the `keyboardEventTarget` in
-             * {@link ol.Map}. `document` never loses focus but, for any other element,
-             * focus will have to be on, and returned to, this element if the keys are to
-             * function.
-             * See also {@link ol.interaction.KeyboardZoom}.
-             *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @param {olx.interaction.KeyboardPanOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.KeyboardPanOptions);
+        constructor(opt_options?: olx.interaction.KeyboardPanOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
-             * `KeyEvent`, and decides the direction to pan to (if an arrow key was
-             * pressed).
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.KeyboardPan}
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
+         * `KeyEvent`, and decides the direction to pan to (if an arrow key was
+         * pressed).
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map using keyboard + and -.
+     * Note that, although this interaction is by default included in maps,
+     * the keys can only be used when browser focus is on the element to which
+     * the keyboard events are attached. By default, this is the map div,
+     * though you can change this with the `keyboardEventTarget` in
+     * {@link ol.Map}. `document` never loses focus but, for any other element,
+     * focus will have to be on, and returned to, this element if the keys are to
+     * function.
+     * See also {@link ol.interaction.KeyboardPan}.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KeyboardZoom extends interaction.Interaction {
         /**
          * @classdesc
          * Allows the user to zoom the map using keyboard + and -.
@@ -5978,211 +5498,176 @@ declare module ol {
          * function.
          * See also {@link ol.interaction.KeyboardPan}.
          *
-         * @constructor
-         * @param {olx.interaction.KeyboardZoomOptions=} opt_options Options.
-         * @extends {ol.interaction.Interaction}
+         * @param opt_options Options.
          * @api stable
          */
-        class KeyboardZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map using keyboard + and -.
-             * Note that, although this interaction is by default included in maps,
-             * the keys can only be used when browser focus is on the element to which
-             * the keyboard events are attached. By default, this is the map div,
-             * though you can change this with the `keyboardEventTarget` in
-             * {@link ol.Map}. `document` never loses focus but, for any other element,
-             * focus will have to be on, and returned to, this element if the keys are to
-             * function.
-             * See also {@link ol.interaction.KeyboardPan}.
-             *
-             * @constructor
-             * @param {olx.interaction.KeyboardZoomOptions=} opt_options Options.
-             * @extends {ol.interaction.Interaction}
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
-
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
-             * `KeyEvent`, and decides whether to zoom in or out (depending on whether the
-             * key pressed was '+' or '-').
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.KeyboardZoom}
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
 
         /**
-         * @namespace ol.interaction.Modify
+         * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
+         * `KeyEvent`, and decides whether to zoom in or out (depending on whether the
+         * key pressed was '+' or '-').
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
          */
-        module Modify {
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
+
+    namespace Modify {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Modify} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param features The features modified.
+         * @param mapBrowserPointerEvent Associated
+         *     {@link ol.MapBrowserPointerEvent}.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Modify} instances are instances of
              * this type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.ModifyEvent}
-             * @param {ol.ModifyEventType} type Type.
-             * @param {ol.Collection.<ol.Feature>} features The features modified.
-             * @param {ol.MapBrowserPointerEvent} mapBrowserPointerEvent Associated
+             * @param type Type.
+             * @param features The features modified.
+             * @param mapBrowserPointerEvent Associated
              *     {@link ol.MapBrowserPointerEvent}.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Modify} instances are instances of
-                 * this type.
-                 *
-                 * @constructor
-                 * @extends {ol.events.Event}
-                 * @implements {oli.ModifyEvent}
-                 * @param {ol.ModifyEventType} type Type.
-                 * @param {ol.Collection.<ol.Feature>} features The features modified.
-                 * @param {ol.MapBrowserPointerEvent} mapBrowserPointerEvent Associated
-                 *     {@link ol.MapBrowserPointerEvent}.
-                 */
-                constructor(type: ol.ModifyEventType, features: ol.Collection<ol.Feature>, mapBrowserPointerEvent: ol.MapBrowserPointerEvent);
+            constructor(type: ol.ModifyEventType, features: ol.Collection<ol.Feature>, mapBrowserPointerEvent: ol.MapBrowserPointerEvent);
 
-                /**
-                 * The features being modified.
-                 * @type {ol.Collection.<ol.Feature>}
-                 * @api
-                 */
-                features: ol.Collection<ol.Feature>;
+            /**
+             * The features being modified.
+             * @api
+             */
+            features: ol.Collection<ol.Feature>;
 
-                /**
-                 * Associated {@link ol.MapBrowserEvent}.
-                 * @type {ol.MapBrowserEvent}
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * Associated {@link ol.MapBrowserEvent}.
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
+    /**
+     * @classdesc
+     * Interaction for modifying feature geometries.
+     *
+     * @param options Options.
+     * @fires ol.interaction.ModifyEvent
+     * @api
+     */
+    class Modify extends interaction.Pointer {
         /**
          * @classdesc
          * Interaction for modifying feature geometries.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.ModifyOptions} options Options.
+         * @param options Options.
          * @fires ol.interaction.ModifyEvent
          * @api
          */
-        class Modify extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for modifying feature geometries.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.ModifyOptions} options Options.
-             * @fires ol.interaction.ModifyEvent
-             * @api
-             */
-            constructor(options: olx.interaction.ModifyOptions);
+        constructor(options: olx.interaction.ModifyOptions);
 
-            /**
-             * Removes the vertex currently being pointed.
-             * @return {boolean} True when a vertex was removed.
-             * @api
-             */
-            removePoint(): boolean;
-        }
+        /**
+         * Removes the vertex currently being pointed.
+         * @return True when a vertex was removed.
+         * @api
+         */
+        removePoint(): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by scrolling the mouse wheel.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class MouseWheelZoom extends interaction.Interaction {
         /**
          * @classdesc
          * Allows the user to zoom the map by scrolling the mouse wheel.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
-         * @param {olx.interaction.MouseWheelZoomOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class MouseWheelZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by scrolling the mouse wheel.
-             *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @param {olx.interaction.MouseWheelZoomOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
+        constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
-             * mousewheel-event) and eventually zooms the map.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.MouseWheelZoom}
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
+         * mousewheel-event) and eventually zooms the map.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
-            /**
-             * Enable or disable using the mouse's location as an anchor when zooming
-             * @param {boolean} useAnchor true to zoom to the mouse's location, false
-             * to zoom to the center of the map
-             * @api
-             */
-            setMouseAnchor(useAnchor: boolean): void;
-        }
+        /**
+         * Enable or disable using the mouse's location as an anchor when zooming
+         * @param useAnchor true to zoom to the mouse's location, false
+         * to zoom to the center of the map
+         * @api
+         */
+        setMouseAnchor(useAnchor: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to rotate the map by twisting with two fingers
+     * on a touch screen.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class PinchRotate extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to rotate the map by twisting with two fingers
          * on a touch screen.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.PinchRotateOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class PinchRotate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to rotate the map by twisting with two fingers
-             * on a touch screen.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.PinchRotateOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.PinchRotateOptions);
-        }
+        constructor(opt_options?: olx.interaction.PinchRotateOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by pinching with two fingers
+     * on a touch screen.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class PinchZoom extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to zoom the map by pinching with two fingers
          * on a touch screen.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.PinchZoomOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class PinchZoom extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by pinching with two fingers
-             * on a touch screen.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.PinchZoomOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.PinchZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.PinchZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * Base class that calls user-defined functions on `down`, `move` and `up`
+     * events. This class also manages "drag sequences".
+     *
+     * When the `handleDownEvent` user function returns `true` a drag sequence is
+     * started. During a drag sequence the `handleDragEvent` user function is
+     * called on `move` events. The drag sequence ends when the `handleUpEvent`
+     * user function is called and returns `false`.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Pointer extends interaction.Interaction {
         /**
          * @classdesc
          * Base class that calls user-defined functions on `down`, `move` and `up`
@@ -6193,99 +5678,85 @@ declare module ol {
          * called on `move` events. The drag sequence ends when the `handleUpEvent`
          * user function is called and returns `false`.
          *
-         * @constructor
-         * @param {olx.interaction.PointerOptions=} opt_options Options.
-         * @extends {ol.interaction.Interaction}
+         * @param opt_options Options.
          * @api
          */
-        class Pointer extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Base class that calls user-defined functions on `down`, `move` and `up`
-             * events. This class also manages "drag sequences".
-             *
-             * When the `handleDownEvent` user function returns `true` a drag sequence is
-             * started. During a drag sequence the `handleDragEvent` user function is
-             * called on `move` events. The drag sequence ends when the `handleUpEvent`
-             * user function is called and returns `false`.
-             *
-             * @constructor
-             * @param {olx.interaction.PointerOptions=} opt_options Options.
-             * @extends {ol.interaction.Interaction}
-             * @api
-             */
-            constructor(opt_options?: olx.interaction.PointerOptions);
-
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} and may call into
-             * other functions, if event sequences like e.g. 'drag' or 'down-up' etc. are
-             * detected.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.Pointer}
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        constructor(opt_options?: olx.interaction.PointerOptions);
 
         /**
-         * @namespace ol.interaction.Select
+         * Handles the {@link ol.MapBrowserEvent map browser event} and may call into
+         * other functions, if event sequences like e.g. 'drag' or 'down-up' etc. are
+         * detected.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
          */
-        module Select {
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
+
+    namespace Select {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Select} instances are instances of
+         * this type.
+         *
+         * @param type The event type.
+         * @param selected Selected features.
+         * @param deselected Deselected features.
+         * @param mapBrowserEvent Associated
+         *     {@link ol.MapBrowserEvent}.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Select} instances are instances of
              * this type.
              *
-             * @param {string} type The event type.
-             * @param {Array.<ol.Feature>} selected Selected features.
-             * @param {Array.<ol.Feature>} deselected Deselected features.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Associated
+             * @param type The event type.
+             * @param selected Selected features.
+             * @param deselected Deselected features.
+             * @param mapBrowserEvent Associated
              *     {@link ol.MapBrowserEvent}.
-             * @implements {oli.SelectEvent}
-             * @extends {ol.events.Event}
-             * @constructor
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Select} instances are instances of
-                 * this type.
-                 *
-                 * @param {string} type The event type.
-                 * @param {Array.<ol.Feature>} selected Selected features.
-                 * @param {Array.<ol.Feature>} deselected Deselected features.
-                 * @param {ol.MapBrowserEvent} mapBrowserEvent Associated
-                 *     {@link ol.MapBrowserEvent}.
-                 * @implements {oli.SelectEvent}
-                 * @extends {ol.events.Event}
-                 * @constructor
-                 */
-                constructor(type: string, selected: ol.Feature[], deselected: ol.Feature[], mapBrowserEvent: ol.MapBrowserEvent);
+            constructor(type: string, selected: ol.Feature[], deselected: ol.Feature[], mapBrowserEvent: ol.MapBrowserEvent);
 
-                /**
-                 * Selected features array.
-                 * @type {Array.<ol.Feature>}
-                 * @api
-                 */
-                selected: ol.Feature[];
+            /**
+             * Selected features array.
+             * @api
+             */
+            selected: ol.Feature[];
 
-                /**
-                 * Deselected features array.
-                 * @type {Array.<ol.Feature>}
-                 * @api
-                 */
-                deselected: ol.Feature[];
+            /**
+             * Deselected features array.
+             * @api
+             */
+            deselected: ol.Feature[];
 
-                /**
-                 * Associated {@link ol.MapBrowserEvent}.
-                 * @type {ol.MapBrowserEvent}
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * Associated {@link ol.MapBrowserEvent}.
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
+    /**
+     * @classdesc
+     * Interaction for selecting vector features. By default, selected features are
+     * styled differently, so this interaction can be used for visual highlighting,
+     * as well as selecting features for other actions, such as modification or
+     * output. There are three ways of controlling which features are selected:
+     * using the browser event as defined by the `condition` and optionally the
+     * `toggle`, `add`/`remove`, and `multi` options; a `layers` filter; and a
+     * further feature filter using the `filter` option.
+     *
+     * Selected features are added to an internal unmanaged layer.
+     *
+     * @param opt_options Options.
+     * @fires ol.interaction.SelectEvent
+     * @api stable
+     */
+    class Select extends interaction.Interaction {
         /**
          * @classdesc
          * Interaction for selecting vector features. By default, selected features are
@@ -6298,70 +5769,69 @@ declare module ol {
          *
          * Selected features are added to an internal unmanaged layer.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
-         * @param {olx.interaction.SelectOptions=} opt_options Options.
+         * @param opt_options Options.
          * @fires ol.interaction.SelectEvent
          * @api stable
          */
-        class Select extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Interaction for selecting vector features. By default, selected features are
-             * styled differently, so this interaction can be used for visual highlighting,
-             * as well as selecting features for other actions, such as modification or
-             * output. There are three ways of controlling which features are selected:
-             * using the browser event as defined by the `condition` and optionally the
-             * `toggle`, `add`/`remove`, and `multi` options; a `layers` filter; and a
-             * further feature filter using the `filter` option.
-             *
-             * Selected features are added to an internal unmanaged layer.
-             *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @param {olx.interaction.SelectOptions=} opt_options Options.
-             * @fires ol.interaction.SelectEvent
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.SelectOptions);
+        constructor(opt_options?: olx.interaction.SelectOptions);
 
-            /**
-             * Get the selected features.
-             * @return {ol.Collection.<ol.Feature>} Features collection.
-             * @api stable
-             */
-            getFeatures(): ol.Collection<ol.Feature>;
+        /**
+         * Get the selected features.
+         * @return Features collection.
+         * @api stable
+         */
+        getFeatures(): ol.Collection<ol.Feature>;
 
-            /**
-             * Returns the associated {@link ol.layer.Vector vectorlayer} of
-             * the (last) selected feature. Note that this will not work with any
-             * programmatic method like pushing features to
-             * {@link ol.interaction.Select#getFeatures collection}.
-             * @param {ol.Feature|ol.render.Feature} feature Feature
-             * @return {ol.layer.Vector} Layer.
-             * @api
-             */
-            getLayer(feature: (ol.Feature | ol.render.Feature)): ol.layer.Vector;
+        /**
+         * Returns the associated {@link ol.layer.Vector vectorlayer} of
+         * the (last) selected feature. Note that this will not work with any
+         * programmatic method like pushing features to
+         * {@link ol.interaction.Select#getFeatures collection}.
+         * @param feature Feature
+         * @return Layer.
+         * @api
+         */
+        getLayer(feature: (ol.Feature | ol.render.Feature)): ol.layer.Vector;
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} and may change the
-             * selected state of features.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.Select}
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} and may change the
+         * selected state of features.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
-            /**
-             * Remove the interaction from its current map, if any,  and attach it to a new
-             * map, if any. Pass `null` to just remove the interaction from the current map.
-             * @param {ol.Map} map Map.
-             * @api stable
-             */
-            setMap(map: ol.Map): void;
-        }
+        /**
+         * Remove the interaction from its current map, if any,  and attach it to a new
+         * map, if any. Pass `null` to just remove the interaction from the current map.
+         * @param map Map.
+         * @api stable
+         */
+        setMap(map: ol.Map): void;
+    }
 
+    /**
+     * @classdesc
+     * Handles snapping of vector features while modifying or drawing them.  The
+     * features can come from a {@link ol.source.Vector} or {@link ol.Collection}
+     * Any interaction object that allows the user to interact
+     * with the features using the mouse can benefit from the snapping, as long
+     * as it is added before.
+     *
+     * The snap interaction modifies map browser event `coordinate` and `pixel`
+     * properties to force the snap to occur to any interaction that them.
+     *
+     * Example:
+     *
+     *     var snap = new ol.interaction.Snap({
+     *       source: source
+     *     });
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Snap extends interaction.Pointer {
         /**
          * @classdesc
          * Handles snapping of vector features while modifying or drawing them.  The
@@ -6379,162 +5849,129 @@ declare module ol {
          *       source: source
          *     });
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.SnapOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class Snap extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Handles snapping of vector features while modifying or drawing them.  The
-             * features can come from a {@link ol.source.Vector} or {@link ol.Collection}
-             * Any interaction object that allows the user to interact
-             * with the features using the mouse can benefit from the snapping, as long
-             * as it is added before.
-             *
-             * The snap interaction modifies map browser event `coordinate` and `pixel`
-             * properties to force the snap to occur to any interaction that them.
-             *
-             * Example:
-             *
-             *     var snap = new ol.interaction.Snap({
-             *       source: source
-             *     });
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.SnapOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.interaction.SnapOptions);
-
-            /**
-             * Add a feature to the collection of features that we may snap to.
-             * @param {ol.Feature} feature Feature.
-             * @param {boolean=} opt_listen Whether to listen to the geometry change or not
-             *     Defaults to `true`.
-             * @api
-             */
-            addFeature(feature: ol.Feature, opt_listen?: boolean): void;
-
-            /**
-             * Remove a feature from the collection of features that we may snap to.
-             * @param {ol.Feature} feature Feature
-             * @param {boolean=} opt_unlisten Whether to unlisten to the geometry change
-             *     or not. Defaults to `true`.
-             * @api
-             */
-            removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
-        }
+        constructor(opt_options?: olx.interaction.SnapOptions);
 
         /**
-         * @namespace ol.interaction.Translate
+         * Add a feature to the collection of features that we may snap to.
+         * @param feature Feature.
+         * @param opt_listen Whether to listen to the geometry change or not
+         *     Defaults to `true`.
+         * @api
          */
-        module Translate {
+        addFeature(feature: ol.Feature, opt_listen?: boolean): void;
+
+        /**
+         * Remove a feature from the collection of features that we may snap to.
+         * @param feature Feature
+         * @param opt_unlisten Whether to unlisten to the geometry change
+         *     or not. Defaults to `true`.
+         * @api
+         */
+        removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
+    }
+
+    namespace Translate {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Translate} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param features The features translated.
+         * @param coordinate The event coordinate.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Translate} instances are instances of
              * this type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.interaction.TranslateEvent}
-             * @param {ol.interaction.TranslateEventType} type Type.
-             * @param {ol.Collection.<ol.Feature>} features The features translated.
-             * @param {ol.Coordinate} coordinate The event coordinate.
+             * @param type Type.
+             * @param features The features translated.
+             * @param coordinate The event coordinate.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Translate} instances are instances of
-                 * this type.
-                 *
-                 * @constructor
-                 * @extends {ol.events.Event}
-                 * @implements {oli.interaction.TranslateEvent}
-                 * @param {ol.interaction.TranslateEventType} type Type.
-                 * @param {ol.Collection.<ol.Feature>} features The features translated.
-                 * @param {ol.Coordinate} coordinate The event coordinate.
-                 */
-                constructor(type: ol.interaction.TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
+            constructor(type: ol.interaction.TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
 
-                /**
-                 * The features being translated.
-                 * @type {ol.Collection.<ol.Feature>}
-                 * @api
-                 */
-                features: ol.Collection<ol.Feature>;
+            /**
+             * The features being translated.
+             * @api
+             */
+            features: ol.Collection<ol.Feature>;
 
-                /**
-                 * The coordinate of the drag event.
-                 * @const
-                 * @type {ol.Coordinate}
-                 * @api
-                 */
-                coordinate: ol.Coordinate;
-            }
+            /**
+             * The coordinate of the drag event.
+             * @const
+             * @api
+             */
+            coordinate: ol.Coordinate;
         }
+    }
 
-        type TranslateEventType = string;
+    type TranslateEventType = string;
 
+    /**
+     * @classdesc
+     * Interaction for translating (moving) features.
+     *
+     * @fires ol.interaction.TranslateEvent
+     * @param options Options.
+     * @api
+     */
+    class Translate extends interaction.Pointer {
         /**
          * @classdesc
          * Interaction for translating (moving) features.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
          * @fires ol.interaction.TranslateEvent
-         * @param {olx.interaction.TranslateOptions} options Options.
+         * @param options Options.
          * @api
          */
-        class Translate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for translating (moving) features.
-             *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @fires ol.interaction.TranslateEvent
-             * @param {olx.interaction.TranslateOptions} options Options.
-             * @api
-             */
-            constructor(options: olx.interaction.TranslateOptions);
-        }
+        constructor(options: olx.interaction.TranslateOptions);
     }
+}
 
+/**
+ * @classdesc
+ * Implementation of inertial deceleration for map movement.
+ *
+ * @param decay Rate of decay (must be negative).
+ * @param minVelocity Minimum velocity (pixels/millisecond).
+ * @param delay Delay to consider to calculate the kinetic
+ *     initial values (milliseconds).
+ * @struct
+ * @api
+ */
+export class Kinetic {
     /**
      * @classdesc
      * Implementation of inertial deceleration for map movement.
      *
-     * @constructor
-     * @param {number} decay Rate of decay (must be negative).
-     * @param {number} minVelocity Minimum velocity (pixels/millisecond).
-     * @param {number} delay Delay to consider to calculate the kinetic
+     * @param decay Rate of decay (must be negative).
+     * @param minVelocity Minimum velocity (pixels/millisecond).
+     * @param delay Delay to consider to calculate the kinetic
      *     initial values (milliseconds).
      * @struct
      * @api
      */
-    class Kinetic {
-        /**
-         * @classdesc
-         * Implementation of inertial deceleration for map movement.
-         *
-         * @constructor
-         * @param {number} decay Rate of decay (must be negative).
-         * @param {number} minVelocity Minimum velocity (pixels/millisecond).
-         * @param {number} delay Delay to consider to calculate the kinetic
-         *     initial values (milliseconds).
-         * @struct
-         * @api
-         */
-        constructor(decay: number, minVelocity: number, delay: number);
-    }
+    constructor(decay: number, minVelocity: number, delay: number);
+}
 
+export namespace layer {
     /**
-     * @namespace ol.layer
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Note that with `ol.layer.Base` and all its subclasses, any property set in
+     * the options is set as a {@link ol.Object} property on the layer object, so
+     * is observable, and has get/set accessors.
+     *
+     * @param options Layer options.
+     * @api stable
      */
-    module layer {
+    class Base extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -6543,174 +5980,166 @@ declare module ol {
          * the options is set as a {@link ol.Object} property on the layer object, so
          * is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.layer.BaseOptions} options Layer options.
+         * @param options Layer options.
          * @api stable
          */
-        class Base extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Note that with `ol.layer.Base` and all its subclasses, any property set in
-             * the options is set as a {@link ol.Object} property on the layer object, so
-             * is observable, and has get/set accessors.
-             *
-             * @constructor
-             * @extends {ol.Object}
-             * @param {olx.layer.BaseOptions} options Layer options.
-             * @api stable
-             */
-            constructor(options: olx.layer.BaseOptions);
+        constructor(options: olx.layer.BaseOptions);
 
-            /**
-             * Return the {@link ol.Extent extent} of the layer or `undefined` if it
-             * will be visible regardless of extent.
-             * @return {ol.Extent|undefined} The layer extent.
-             * @observable
-             * @api stable
-             */
-            getExtent(): (ol.Extent);
+        /**
+         * Return the {@link ol.Extent extent} of the layer or `undefined` if it
+         * will be visible regardless of extent.
+         * @return The layer extent.
+         * @observable
+         * @api stable
+         */
+        getExtent(): (ol.Extent);
 
-            /**
-             * Return the maximum resolution of the layer.
-             * @return {number} The maximum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            getMaxResolution(): number;
+        /**
+         * Return the maximum resolution of the layer.
+         * @return The maximum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        getMaxResolution(): number;
 
-            /**
-             * Return the minimum resolution of the layer.
-             * @return {number} The minimum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            getMinResolution(): number;
+        /**
+         * Return the minimum resolution of the layer.
+         * @return The minimum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        getMinResolution(): number;
 
-            /**
-             * Return the opacity of the layer (between 0 and 1).
-             * @return {number} The opacity of the layer.
-             * @observable
-             * @api stable
-             */
-            getOpacity(): number;
+        /**
+         * Return the opacity of the layer (between 0 and 1).
+         * @return The opacity of the layer.
+         * @observable
+         * @api stable
+         */
+        getOpacity(): number;
 
-            /**
-             * Return the visibility of the layer (`true` or `false`).
-             * @return {boolean} The visibility of the layer.
-             * @observable
-             * @api stable
-             */
-            getVisible(): boolean;
+        /**
+         * Return the visibility of the layer (`true` or `false`).
+         * @return The visibility of the layer.
+         * @observable
+         * @api stable
+         */
+        getVisible(): boolean;
 
-            /**
-             * Return the Z-index of the layer, which is used to order layers before
-             * rendering. The default Z-index is 0.
-             * @return {number} The Z-index of the layer.
-             * @observable
-             * @api
-             */
-            getZIndex(): number;
+        /**
+         * Return the Z-index of the layer, which is used to order layers before
+         * rendering. The default Z-index is 0.
+         * @return The Z-index of the layer.
+         * @observable
+         * @api
+         */
+        getZIndex(): number;
 
-            /**
-             * Set the extent at which the layer is visible.  If `undefined`, the layer
-             * will be visible at all extents.
-             * @param {ol.Extent|undefined} extent The extent of the layer.
-             * @observable
-             * @api stable
-             */
-            setExtent(extent: (ol.Extent)): void;
+        /**
+         * Set the extent at which the layer is visible.  If `undefined`, the layer
+         * will be visible at all extents.
+         * @param extent The extent of the layer.
+         * @observable
+         * @api stable
+         */
+        setExtent(extent: (ol.Extent)): void;
 
-            /**
-             * Set the maximum resolution at which the layer is visible.
-             * @param {number} maxResolution The maximum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            setMaxResolution(maxResolution: number): void;
+        /**
+         * Set the maximum resolution at which the layer is visible.
+         * @param maxResolution The maximum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        setMaxResolution(maxResolution: number): void;
 
-            /**
-             * Set the minimum resolution at which the layer is visible.
-             * @param {number} minResolution The minimum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            setMinResolution(minResolution: number): void;
+        /**
+         * Set the minimum resolution at which the layer is visible.
+         * @param minResolution The minimum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        setMinResolution(minResolution: number): void;
 
-            /**
-             * Set the opacity of the layer, allowed values range from 0 to 1.
-             * @param {number} opacity The opacity of the layer.
-             * @observable
-             * @api stable
-             */
-            setOpacity(opacity: number): void;
+        /**
+         * Set the opacity of the layer, allowed values range from 0 to 1.
+         * @param opacity The opacity of the layer.
+         * @observable
+         * @api stable
+         */
+        setOpacity(opacity: number): void;
 
-            /**
-             * Set the visibility of the layer (`true` or `false`).
-             * @param {boolean} visible The visibility of the layer.
-             * @observable
-             * @api stable
-             */
-            setVisible(visible: boolean): void;
+        /**
+         * Set the visibility of the layer (`true` or `false`).
+         * @param visible The visibility of the layer.
+         * @observable
+         * @api stable
+         */
+        setVisible(visible: boolean): void;
 
-            /**
-             * Set Z-index of the layer, which is used to order layers before rendering.
-             * The default Z-index is 0.
-             * @param {number} zindex The z-index of the layer.
-             * @observable
-             * @api
-             */
-            setZIndex(zindex: number): void;
-        }
+        /**
+         * Set Z-index of the layer, which is used to order layers before rendering.
+         * The default Z-index is 0.
+         * @param zindex The z-index of the layer.
+         * @observable
+         * @api
+         */
+        setZIndex(zindex: number): void;
+    }
 
+    /**
+     * @classdesc
+     * A {@link ol.Collection} of layers that are handled together.
+     *
+     * A generic `change` event is triggered when the group/Collection changes.
+     *
+     * @param opt_options Layer options.
+     * @api stable
+     */
+    class Group extends layer.Base {
         /**
          * @classdesc
          * A {@link ol.Collection} of layers that are handled together.
          *
          * A generic `change` event is triggered when the group/Collection changes.
          *
-         * @constructor
-         * @extends {ol.layer.Base}
-         * @param {olx.layer.GroupOptions=} opt_options Layer options.
+         * @param opt_options Layer options.
          * @api stable
          */
-        class Group extends ol.layer.Base {
-            /**
-             * @classdesc
-             * A {@link ol.Collection} of layers that are handled together.
-             *
-             * A generic `change` event is triggered when the group/Collection changes.
-             *
-             * @constructor
-             * @extends {ol.layer.Base}
-             * @param {olx.layer.GroupOptions=} opt_options Layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.GroupOptions);
+        constructor(opt_options?: olx.layer.GroupOptions);
 
-            /**
-             * Returns the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
-             * in this group.
-             * @return {!ol.Collection.<ol.layer.Base>} Collection of
-             *   {@link ol.layer.Base layers} that are part of this group.
-             * @observable
-             * @api stable
-             */
-            getLayers(): ol.Collection<ol.layer.Base>;
+        /**
+         * Returns the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
+         * in this group.
+         * @return Collection of
+         *   {@link ol.layer.Base layers} that are part of this group.
+         * @observable
+         * @api stable
+         */
+        getLayers(): ol.Collection<ol.layer.Base>;
 
-            /**
-             * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
-             * in this group.
-             * @param {!ol.Collection.<ol.layer.Base>} layers Collection of
-             *   {@link ol.layer.Base layers} that are part of this group.
-             * @observable
-             * @api stable
-             */
-            setLayers(layers: ol.Collection<ol.layer.Base>): void;
-        }
+        /**
+         * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
+         * in this group.
+         * @param layers Collection of
+         *   {@link ol.layer.Base layers} that are part of this group.
+         * @observable
+         * @api stable
+         */
+        setLayers(layers: ol.Collection<ol.layer.Base>): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer for rendering vector data as a heatmap.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Options.
+     * @api
+     */
+    class Heatmap extends layer.Vector {
         /**
          * @classdesc
          * Layer for rendering vector data as a heatmap.
@@ -6718,77 +6147,74 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Vector}
          * @fires ol.render.Event
-         * @param {olx.layer.HeatmapOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class Heatmap extends ol.layer.Vector {
-            /**
-             * @classdesc
-             * Layer for rendering vector data as a heatmap.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @constructor
-             * @extends {ol.layer.Vector}
-             * @fires ol.render.Event
-             * @param {olx.layer.HeatmapOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.layer.HeatmapOptions);
+        constructor(opt_options?: olx.layer.HeatmapOptions);
 
-            /**
-             * Return the blur size in pixels.
-             * @return {number} Blur size in pixels.
-             * @api
-             * @observable
-             */
-            getBlur(): number;
+        /**
+         * Return the blur size in pixels.
+         * @return Blur size in pixels.
+         * @api
+         * @observable
+         */
+        getBlur(): number;
 
-            /**
-             * Return the gradient colors as array of strings.
-             * @return {Array.<string>} Colors.
-             * @api
-             * @observable
-             */
-            getGradient(): string[];
+        /**
+         * Return the gradient colors as array of strings.
+         * @return Colors.
+         * @api
+         * @observable
+         */
+        getGradient(): string[];
 
-            /**
-             * Return the size of the radius in pixels.
-             * @return {number} Radius size in pixel.
-             * @api
-             * @observable
-             */
-            getRadius(): number;
+        /**
+         * Return the size of the radius in pixels.
+         * @return Radius size in pixel.
+         * @api
+         * @observable
+         */
+        getRadius(): number;
 
-            /**
-             * Set the blur size in pixels.
-             * @param {number} blur Blur size in pixels.
-             * @api
-             * @observable
-             */
-            setBlur(blur: number): void;
+        /**
+         * Set the blur size in pixels.
+         * @param blur Blur size in pixels.
+         * @api
+         * @observable
+         */
+        setBlur(blur: number): void;
 
-            /**
-             * Set the gradient colors as array of strings.
-             * @param {Array.<string>} colors Gradient.
-             * @api
-             * @observable
-             */
-            setGradient(colors: string[]): void;
+        /**
+         * Set the gradient colors as array of strings.
+         * @param colors Gradient.
+         * @api
+         * @observable
+         */
+        setGradient(colors: string[]): void;
 
-            /**
-             * Set the size of the radius in pixels.
-             * @param {number} radius Radius size in pixel.
-             * @api
-             * @observable
-             */
-            setRadius(radius: number): void;
-        }
+        /**
+         * Set the size of the radius in pixels.
+         * @param radius Radius size in pixel.
+         * @api
+         * @observable
+         */
+        setRadius(radius: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Server-rendered images that are available for arbitrary extents and
+     * resolutions.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Layer options.
+     * @api stable
+     */
+    class Image extends layer.Layer {
         /**
          * @classdesc
          * Server-rendered images that are available for arbitrary extents and
@@ -6797,30 +6223,33 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Layer}
          * @fires ol.render.Event
-         * @param {olx.layer.ImageOptions=} opt_options Layer options.
+         * @param opt_options Layer options.
          * @api stable
          */
-        class Image extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * Server-rendered images that are available for arbitrary extents and
-             * resolutions.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @constructor
-             * @extends {ol.layer.Layer}
-             * @fires ol.render.Event
-             * @param {olx.layer.ImageOptions=} opt_options Layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.ImageOptions);
-        }
+        constructor(opt_options?: olx.layer.ImageOptions);
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * A visual representation of raster or vector map data.
+     * Layers group together those properties that pertain to how the data is to be
+     * displayed, irrespective of the source of that data.
+     *
+     * Layers are usually added to a map with {@link ol.Map#addLayer}. Components
+     * like {@link ol.interaction.Select} use unmanaged layers internally. These
+     * unmanaged layers are associated with the map using
+     * {@link ol.layer.Layer#setMap} instead.
+     *
+     * A generic `change` event is fired when the state of the source changes.
+     *
+     * @fires ol.render.Event
+     * @param options Layer options.
+     * @api stable
+     */
+    class Layer extends layer.Base {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -6836,67 +6265,56 @@ declare module ol {
          *
          * A generic `change` event is fired when the state of the source changes.
          *
-         * @constructor
-         * @extends {ol.layer.Base}
          * @fires ol.render.Event
-         * @param {olx.layer.LayerOptions} options Layer options.
+         * @param options Layer options.
          * @api stable
          */
-        class Layer extends ol.layer.Base {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * A visual representation of raster or vector map data.
-             * Layers group together those properties that pertain to how the data is to be
-             * displayed, irrespective of the source of that data.
-             *
-             * Layers are usually added to a map with {@link ol.Map#addLayer}. Components
-             * like {@link ol.interaction.Select} use unmanaged layers internally. These
-             * unmanaged layers are associated with the map using
-             * {@link ol.layer.Layer#setMap} instead.
-             *
-             * A generic `change` event is fired when the state of the source changes.
-             *
-             * @constructor
-             * @extends {ol.layer.Base}
-             * @fires ol.render.Event
-             * @param {olx.layer.LayerOptions} options Layer options.
-             * @api stable
-             */
-            constructor(options: olx.layer.LayerOptions);
+        constructor(options: olx.layer.LayerOptions);
 
-            /**
-             * Get the layer source.
-             * @return {ol.source.Source} The layer source (or `null` if not yet set).
-             * @observable
-             * @api stable
-             */
-            getSource(): ol.source.Source;
+        /**
+         * Get the layer source.
+         * @return The layer source (or `null` if not yet set).
+         * @observable
+         * @api stable
+         */
+        getSource(): ol.source.Source;
 
-            /**
-             * Sets the layer to be rendered on top of other layers on a map. The map will
-             * not manage this layer in its layers collection, and the callback in
-             * {@link ol.Map#forEachLayerAtPixel} will receive `null` as layer. This
-             * is useful for temporary layers. To remove an unmanaged layer from the map,
-             * use `#setMap(null)`.
-             *
-             * To add the layer to a map and have it managed by the map, use
-             * {@link ol.Map#addLayer} instead.
-             * @param {ol.Map} map Map.
-             * @api
-             */
-            setMap(map: ol.Map): void;
+        /**
+         * Sets the layer to be rendered on top of other layers on a map. The map will
+         * not manage this layer in its layers collection, and the callback in
+         * {@link ol.Map#forEachLayerAtPixel} will receive `null` as layer. This
+         * is useful for temporary layers. To remove an unmanaged layer from the map,
+         * use `#setMap(null)`.
+         *
+         * To add the layer to a map and have it managed by the map, use
+         * {@link ol.Map#addLayer} instead.
+         * @param map Map.
+         * @api
+         */
+        setMap(map: ol.Map): void;
 
-            /**
-             * Set the layer source.
-             * @param {ol.source.Source} source The layer source.
-             * @observable
-             * @api stable
-             */
-            setSource(source: ol.source.Source): void;
-        }
+        /**
+         * Set the layer source.
+         * @param source The layer source.
+         * @observable
+         * @api stable
+         */
+        setSource(source: ol.source.Source): void;
+    }
 
+    /**
+     * @classdesc
+     * For layer sources that provide pre-rendered, tiled images in grids that are
+     * organized by zoom levels for specific resolutions.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Tile layer options.
+     * @api stable
+     */
+    class Tile extends layer.Layer {
         /**
          * @classdesc
          * For layer sources that provide pre-rendered, tiled images in grids that are
@@ -6905,62 +6323,57 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Layer}
          * @fires ol.render.Event
-         * @param {olx.layer.TileOptions=} opt_options Tile layer options.
+         * @param opt_options Tile layer options.
          * @api stable
          */
-        class Tile extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * For layer sources that provide pre-rendered, tiled images in grids that are
-             * organized by zoom levels for specific resolutions.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @constructor
-             * @extends {ol.layer.Layer}
-             * @fires ol.render.Event
-             * @param {olx.layer.TileOptions=} opt_options Tile layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.TileOptions);
+        constructor(opt_options?: olx.layer.TileOptions);
 
-            /**
-             * Return the level as number to which we will preload tiles up to.
-             * @return {number} The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            getPreload(): number;
+        /**
+         * Return the level as number to which we will preload tiles up to.
+         * @return The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        getPreload(): number;
 
-            /**
-             * Set the level as number to which we will preload tiles up to.
-             * @param {number} preload The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            setPreload(preload: number): void;
+        /**
+         * Set the level as number to which we will preload tiles up to.
+         * @param preload The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        setPreload(preload: number): void;
 
-            /**
-             * Whether we use interim tiles on error.
-             * @return {boolean} Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            getUseInterimTilesOnError(): boolean;
+        /**
+         * Whether we use interim tiles on error.
+         * @return Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        getUseInterimTilesOnError(): boolean;
 
-            /**
-             * Set whether we use interim tiles on error.
-             * @param {boolean} useInterimTilesOnError Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
-        }
+        /**
+         * Set whether we use interim tiles on error.
+         * @param useInterimTilesOnError Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Vector data that is rendered client-side.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Options.
+     * @api stable
+     */
+    class Vector extends layer.Layer {
         /**
          * @classdesc
          * Vector data that is rendered client-side.
@@ -6968,80 +6381,72 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Layer}
          * @fires ol.render.Event
-         * @param {olx.layer.VectorOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class Vector extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * Vector data that is rendered client-side.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @constructor
-             * @extends {ol.layer.Layer}
-             * @fires ol.render.Event
-             * @param {olx.layer.VectorOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.VectorOptions);
-
-            /**
-             * Return the associated {@link ol.source.Vector vectorsource} of the layer.
-             * @return {ol.source.Vector} Source.
-             * @api stable
-             */
-            getSource(): ol.source.Vector;
-
-            /**
-             * Get the style for features.  This returns whatever was passed to the `style`
-             * option at construction or to the `setStyle` method.
-             * @return {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction}
-             *     Layer style.
-             * @api stable
-             */
-            getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
-
-            /**
-             * Get the style function.
-             * @return {ol.StyleFunction|undefined} Layer style function.
-             * @api stable
-             */
-            getStyleFunction(): (ol.StyleFunction);
-
-            /**
-             * Set the style for features.  This can be a single style object, an array
-             * of styles, or a function that takes a feature and resolution and returns
-             * an array of styles. If it is `undefined` the default style is used. If
-             * it is `null` the layer has no style (a `null` style), so only features
-             * that have their own styles will be rendered in the layer. See
-             * {@link ol.style} for information on the default style.
-             * @param {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|null|undefined}
-             *     style Layer style.
-             * @api stable
-             */
-            setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
-        }
+        constructor(opt_options?: olx.layer.VectorOptions);
 
         /**
-         * @enum {string}
-         * Render mode for vector tiles:
-         *  * `'image'`: Vector tiles are rendered as images. Great performance, but
-         *    point symbols and texts are always rotated with the view and pixels are
-         *    scaled during zoom animations.
-         *  * `'hybrid'`: Polygon and line elements are rendered as images, so pixels
-         *    are scaled during zoom animations. Point symbols and texts are accurately
-         *    rendered as vectors and can stay upright on rotated views.
-         *  * `'vector'`: Vector tiles are rendered as vectors. Most accurate rendering
-         *    even during animations, but slower performance than the other options.
-         * @api
+         * Return the associated {@link ol.source.Vector vectorsource} of the layer.
+         * @return Source.
+         * @api stable
          */
-        type VectorTileRenderType = "image" | "hybrid" | "vector";
+        getSource(): ol.source.Vector;
 
+        /**
+         * Get the style for features.  This returns whatever was passed to the `style`
+         * option at construction or to the `setStyle` method.
+         * @return Layer style.
+         * @api stable
+         */
+        getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
+
+        /**
+         * Get the style function.
+         * @return Layer style function.
+         * @api stable
+         */
+        getStyleFunction(): (ol.StyleFunction);
+
+        /**
+         * Set the style for features.  This can be a single style object, an array
+         * of styles, or a function that takes a feature and resolution and returns
+         * an array of styles. If it is `undefined` the default style is used. If
+         * it is `null` the layer has no style (a `null` style), so only features
+         * that have their own styles will be rendered in the layer. See
+         * {@link ol.style} for information on the default style.
+         * @param style Layer style.
+         * @api stable
+         */
+        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
+    }
+
+    /**
+     * Render mode for vector tiles:
+     *  * `'image'`: Vector tiles are rendered as images. Great performance, but
+     *    point symbols and texts are always rotated with the view and pixels are
+     *    scaled during zoom animations.
+     *  * `'hybrid'`: Polygon and line elements are rendered as images, so pixels
+     *    are scaled during zoom animations. Point symbols and texts are accurately
+     *    rendered as vectors and can stay upright on rotated views.
+     *  * `'vector'`: Vector tiles are rendered as vectors. Most accurate rendering
+     *    even during animations, but slower performance than the other options.
+     * @api
+     */
+    type VectorTileRenderType = "image" | "hybrid" | "vector";
+
+    /**
+     * @classdesc
+     * Layer for vector tile data that is rendered client-side.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class VectorTile extends layer.Vector {
         /**
          * @classdesc
          * Layer for vector tile data that is rendered client-side.
@@ -7049,93 +6454,125 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Vector}
-         * @param {olx.layer.VectorTileOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class VectorTile extends ol.layer.Vector {
-            /**
-             * @classdesc
-             * Layer for vector tile data that is rendered client-side.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @constructor
-             * @extends {ol.layer.Vector}
-             * @param {olx.layer.VectorTileOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.layer.VectorTileOptions);
+        constructor(opt_options?: olx.layer.VectorTileOptions);
 
-            /**
-             * Return the level as number to which we will preload tiles up to.
-             * @return {number} The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            getPreload(): number;
+        /**
+         * Return the level as number to which we will preload tiles up to.
+         * @return The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        getPreload(): number;
 
-            /**
-             * Whether we use interim tiles on error.
-             * @return {boolean} Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            getUseInterimTilesOnError(): boolean;
+        /**
+         * Whether we use interim tiles on error.
+         * @return Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        getUseInterimTilesOnError(): boolean;
 
-            /**
-             * Set the level as number to which we will preload tiles up to.
-             * @param {number} preload The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            setPreload(preload: number): void;
+        /**
+         * Set the level as number to which we will preload tiles up to.
+         * @param preload The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        setPreload(preload: number): void;
 
-            /**
-             * Set whether we use interim tiles on error.
-             * @param {boolean} useInterimTilesOnError Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
-        }
+        /**
+         * Set whether we use interim tiles on error.
+         * @param useInterimTilesOnError Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
     }
+}
+
+/**
+ * Strategies for loading vector data.
+ */
+export namespace loadingstrategy {
+    /**
+     * Strategy function for loading all features with a single request.
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @return Extents.
+     * @api
+     */
+    function all(extent: ol.Extent, resolution: number): ol.Extent[];
 
     /**
-     * Strategies for loading vector data.
-     * @namespace ol.loadingstrategy
+     * Strategy function for loading features based on the view's extent and
+     * resolution.
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @return Extents.
+     * @api
      */
-    module loadingstrategy {
-        /**
-         * Strategy function for loading all features with a single request.
-         * @param {ol.Extent} extent Extent.
-         * @param {number} resolution Resolution.
-         * @return {Array.<ol.Extent>} Extents.
-         * @api
-         */
-        function all(extent: ol.Extent, resolution: number): ol.Extent[];
+    function bbox(extent: ol.Extent, resolution: number): ol.Extent[];
 
-        /**
-         * Strategy function for loading features based on the view's extent and
-         * resolution.
-         * @param {ol.Extent} extent Extent.
-         * @param {number} resolution Resolution.
-         * @return {Array.<ol.Extent>} Extents.
-         * @api
-         */
-        function bbox(extent: ol.Extent, resolution: number): ol.Extent[];
-
-        /**
-         * Creates a strategy function for loading features based on a tile grid.
-         * @param {ol.tilegrid.TileGrid} tileGrid Tile grid.
-         * @return {function(ol.Extent, number): Array.<ol.Extent>} Loading strategy.
-         * @api
-         */
-        function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
-    }
+    /**
+     * Creates a strategy function for loading features based on a tile grid.
+     * @param tileGrid Tile grid.
+     * @return Loading strategy.
+     * @api
+     */
+    function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
+}
 
+/**
+ * @classdesc
+ * The map is the core component of OpenLayers. For a map to render, a view,
+ * one or more layers, and a target container are needed:
+ *
+ *     var map = new ol.Map({
+ *       view: new ol.View({
+ *         center: [0, 0],
+ *         zoom: 1
+ *       }),
+ *       layers: [
+ *         new ol.layer.Tile({
+ *           source: new ol.source.OSM()
+ *         })
+ *       ],
+ *       target: 'map'
+ *     });
+ *
+ * The above snippet creates a map using a {@link ol.layer.Tile} to display
+ * {@link ol.source.OSM} OSM data and render it to a DOM element with the
+ * id `map`.
+ *
+ * The constructor places a viewport container (with CSS class name
+ * `ol-viewport`) in the target element (see `getViewport()`), and then two
+ * further elements within the viewport: one with CSS class name
+ * `ol-overlaycontainer-stopevent` for controls and some overlays, and one with
+ * CSS class name `ol-overlaycontainer` for other overlays (see the `stopEvent`
+ * option of {@link ol.Overlay} for the difference). The map itself is placed in
+ * a further element within the viewport, either DOM or Canvas, depending on the
+ * renderer.
+ *
+ * Layers are stored as a `ol.Collection` in layerGroups. A top-level group is
+ * provided by the library. This is what is accessed by `getLayerGroup` and
+ * `setLayerGroup`. Layers entered in the options are added to this group, and
+ * `addLayer` and `removeLayer` change the layer collection in the group.
+ * `getLayers` is a convenience function for `getLayerGroup().getLayers()`.
+ * Note that `ol.layer.Group` is a subclass of `ol.layer.Base`, so layers
+ * entered in the options or added with `addLayer` can be groups, which can
+ * contain further groups, and so on.
+ *
+ * @param options Map options.
+ * @fires ol.MapBrowserEvent
+ * @fires ol.MapEvent
+ * @fires ol.render.Event#postcompose
+ * @fires ol.render.Event#precompose
+ * @api stable
+ */
+export class Map extends Object {
     /**
      * @classdesc
      * The map is the core component of OpenLayers. For a map to render, a view,
@@ -7176,569 +6613,530 @@ declare module ol {
      * entered in the options or added with `addLayer` can be groups, which can
      * contain further groups, and so on.
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.MapOptions} options Map options.
+     * @param options Map options.
      * @fires ol.MapBrowserEvent
      * @fires ol.MapEvent
      * @fires ol.render.Event#postcompose
      * @fires ol.render.Event#precompose
      * @api stable
      */
-    class Map extends ol.Object {
-        /**
-         * @classdesc
-         * The map is the core component of OpenLayers. For a map to render, a view,
-         * one or more layers, and a target container are needed:
-         *
-         *     var map = new ol.Map({
-         *       view: new ol.View({
-         *         center: [0, 0],
-         *         zoom: 1
-         *       }),
-         *       layers: [
-         *         new ol.layer.Tile({
-         *           source: new ol.source.OSM()
-         *         })
-         *       ],
-         *       target: 'map'
-         *     });
-         *
-         * The above snippet creates a map using a {@link ol.layer.Tile} to display
-         * {@link ol.source.OSM} OSM data and render it to a DOM element with the
-         * id `map`.
-         *
-         * The constructor places a viewport container (with CSS class name
-         * `ol-viewport`) in the target element (see `getViewport()`), and then two
-         * further elements within the viewport: one with CSS class name
-         * `ol-overlaycontainer-stopevent` for controls and some overlays, and one with
-         * CSS class name `ol-overlaycontainer` for other overlays (see the `stopEvent`
-         * option of {@link ol.Overlay} for the difference). The map itself is placed in
-         * a further element within the viewport, either DOM or Canvas, depending on the
-         * renderer.
-         *
-         * Layers are stored as a `ol.Collection` in layerGroups. A top-level group is
-         * provided by the library. This is what is accessed by `getLayerGroup` and
-         * `setLayerGroup`. Layers entered in the options are added to this group, and
-         * `addLayer` and `removeLayer` change the layer collection in the group.
-         * `getLayers` is a convenience function for `getLayerGroup().getLayers()`.
-         * Note that `ol.layer.Group` is a subclass of `ol.layer.Base`, so layers
-         * entered in the options or added with `addLayer` can be groups, which can
-         * contain further groups, and so on.
-         *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.MapOptions} options Map options.
-         * @fires ol.MapBrowserEvent
-         * @fires ol.MapEvent
-         * @fires ol.render.Event#postcompose
-         * @fires ol.render.Event#precompose
-         * @api stable
-         */
-        constructor(options: olx.MapOptions);
+    constructor(options: olx.MapOptions);
 
-        /**
-         * Add the given control to the map.
-         * @param {ol.control.Control} control Control.
-         * @api stable
-         */
-        addControl(control: ol.control.Control): void;
+    /**
+     * Add the given control to the map.
+     * @param control Control.
+     * @api stable
+     */
+    addControl(control: ol.control.Control): void;
 
-        /**
-         * Add the given interaction to the map.
-         * @param {ol.interaction.Interaction} interaction Interaction to add.
-         * @api stable
-         */
-        addInteraction(interaction: ol.interaction.Interaction): void;
+    /**
+     * Add the given interaction to the map.
+     * @param interaction Interaction to add.
+     * @api stable
+     */
+    addInteraction(interaction: ol.interaction.Interaction): void;
 
-        /**
-         * Adds the given layer to the top of this map. If you want to add a layer
-         * elsewhere in the stack, use `getLayers()` and the methods available on
-         * {@link ol.Collection}.
-         * @param {ol.layer.Base} layer Layer.
-         * @api stable
-         */
-        addLayer(layer: ol.layer.Base): void;
+    /**
+     * Adds the given layer to the top of this map. If you want to add a layer
+     * elsewhere in the stack, use `getLayers()` and the methods available on
+     * {@link ol.Collection}.
+     * @param layer Layer.
+     * @api stable
+     */
+    addLayer(layer: ol.layer.Base): void;
 
-        /**
-         * Add the given overlay to the map.
-         * @param {ol.Overlay} overlay Overlay.
-         * @api stable
-         */
-        addOverlay(overlay: ol.Overlay): void;
+    /**
+     * Add the given overlay to the map.
+     * @param overlay Overlay.
+     * @api stable
+     */
+    addOverlay(overlay: ol.Overlay): void;
 
-        /**
-         * Detect features that intersect a pixel on the viewport, and execute a
-         * callback with each intersecting feature. Layers included in the detection can
-         * be configured through `opt_layerFilter`.
-         * @param {ol.Pixel} pixel Pixel.
-         * @param {function(this: S, (ol.Feature|ol.render.Feature),
-         *     ol.layer.Layer): T} callback Feature callback. The callback will be
-         *     called with two arguments. The first argument is one
-         *     {@link ol.Feature feature} or
-         *     {@link ol.render.Feature render feature} at the pixel, the second is
-         *     the {@link ol.layer.Layer layer} of the feature and will be null for
-         *     unmanaged layers. To stop detection, callback functions can return a
-         *     truthy value.
-         * @param {olx.AtPixelOptions=} opt_options Optional options.
-         * @return {T|undefined} Callback result, i.e. the return value of last
-         * callback execution, or the first truthy callback return value.
-         * @template T
-         * @api stable
-         */
-        forEachFeatureAtPixel<T>(
-            pixel: ol.Pixel,
-            callback: ((feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => T),
-            opt_options?: olx.AtPixelOptions
-        ): (T);
+    /**
+     * Detect features that intersect a pixel on the viewport, and execute a
+     * callback with each intersecting feature. Layers included in the detection can
+     * be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param callback Feature callback. The callback will be
+     *     called with two arguments. The first argument is one
+     *     {@link ol.Feature feature} or
+     *     {@link ol.render.Feature render feature} at the pixel, the second is
+     *     the {@link ol.layer.Layer layer} of the feature and will be null for
+     *     unmanaged layers. To stop detection, callback functions can return a
+     *     truthy value.
+     * @param opt_options Optional options.
+     * @return Callback result, i.e. the return value of last
+     * callback execution, or the first truthy callback return value.
+     * @template T
+     * @api stable
+     */
+    forEachFeatureAtPixel<T>(
+        pixel: ol.Pixel,
+        callback: ((feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => T),
+        opt_options?: olx.AtPixelOptions
+    ): (T);
 
-        /**
-         * Get all features that intersect a pixel on the viewport.
-         * @param {ol.Pixel} pixel Pixel.
-         * @param {olx.AtPixelOptions=} opt_options Optional options.
-         * @return {?Array.<(ol.Feature|ol.render.Feature)>} The detected features or null if none were found.
-         * @api stable
-         */
-        getFeaturesAtPixel(
-            pixel: ol.Pixel,
-            opt_options?: olx.AtPixelOptions
-        ): (Array<ol.Feature | ol.render.Feature> | null);
+    /**
+     * Get all features that intersect a pixel on the viewport.
+     * @param pixel Pixel.
+     * @param opt_options Optional options.
+     * @return The detected features or null if none were found.
+     * @api stable
+     */
+    getFeaturesAtPixel(
+        pixel: ol.Pixel,
+        opt_options?: olx.AtPixelOptions
+    ): (Array<ol.Feature | ol.render.Feature> | null);
 
-        /**
-         * Detect layers that have a color value at a pixel on the viewport, and
-         * execute a callback with each matching layer. Layers included in the
-         * detection can be configured through `opt_layerFilter`.
-         * @param {ol.Pixel} pixel Pixel.
-         * @param {function(this: S, ol.layer.Layer, ol.Color): T} callback Layer
-         *     callback. This callback will recieve two arguments: first is the
-         *     {@link ol.layer.Layer layer}, second argument is {@link ol.Color}
-         *     and will be null for layer types that do not currently support this
-         *     argument. To stop detection callback functions can return a truthy value.
-         * @param {S=} opt_this Value to use as `this` when executing `callback`.
-         * @param {(function(this: U, ol.layer.Layer): boolean)=} opt_layerFilter Layer
-         *     filter function. The filter function will receive one argument, the
-         *     {@link ol.layer.Layer layer-candidate} and it should return a boolean
-         *     value. Only layers which are visible and for which this function returns
-         *     `true` will be tested for features. By default, all visible layers will
-         *     be tested.
-         * @param {U=} opt_this2 Value to use as `this` when executing `layerFilter`.
-         * @return {T|undefined} Callback result, i.e. the return value of last
-         * callback execution, or the first truthy callback return value.
-         * @template S,T,U
-         * @api stable
-         */
-        forEachLayerAtPixel<S, T, U>(pixel: ol.Pixel,
-                                     callback: ((layer: ol.layer.Layer, color: ol.Color) => T),
-                                     opt_this?: S,
-                                     opt_layerFilter?: ((layer: ol.layer.Layer) => boolean),
-                                     opt_this2?: U): (T);
+    /**
+     * Detect layers that have a color value at a pixel on the viewport, and
+     * execute a callback with each matching layer. Layers included in the
+     * detection can be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param callback Layer
+     *     callback. This callback will recieve two arguments: first is the
+     *     {@link ol.layer.Layer layer}, second argument is {@link ol.Color}
+     *     and will be null for layer types that do not currently support this
+     *     argument. To stop detection callback functions can return a truthy value.
+     * @param opt_this Value to use as `this` when executing `callback`.
+     * @param opt_layerFilter Layer
+     *     filter function. The filter function will receive one argument, the
+     *     {@link ol.layer.Layer layer-candidate} and it should return a boolean
+     *     value. Only layers which are visible and for which this function returns
+     *     `true` will be tested for features. By default, all visible layers will
+     *     be tested.
+     * @param opt_this2 Value to use as `this` when executing `layerFilter`.
+     * @return Callback result, i.e. the return value of last
+     * callback execution, or the first truthy callback return value.
+     * @template S,T,U
+     * @api stable
+     */
+    forEachLayerAtPixel<S, T, U>(pixel: ol.Pixel,
+                                    callback: ((layer: ol.layer.Layer, color: ol.Color) => T),
+                                    opt_this?: S,
+                                    opt_layerFilter?: ((layer: ol.layer.Layer) => boolean),
+                                    opt_this2?: U): (T);
 
-        /**
-         * Detect if features intersect a pixel on the viewport. Layers included in the
-         * detection can be configured through `opt_layerFilter`.
-         * @param {ol.Pixel} pixel Pixel.
-         * @param {olx.AtPixelOptions=} opt_options Optional options.
-         * @return {boolean} Is there a feature at the given pixel?
-         * @api
-         */
-        hasFeatureAtPixel(
-            pixel: ol.Pixel,
-            opt_options?: olx.AtPixelOptions
-        ): boolean;
+    /**
+     * Detect if features intersect a pixel on the viewport. Layers included in the
+     * detection can be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param opt_options Optional options.
+     * @return Is there a feature at the given pixel?
+     * @api
+     */
+    hasFeatureAtPixel(
+        pixel: ol.Pixel,
+        opt_options?: olx.AtPixelOptions
+    ): boolean;
 
-        /**
-         * Returns the geographical coordinate for a browser event.
-         * @param {Event} event Event.
-         * @return {ol.Coordinate} Coordinate.
-         * @api stable
-         */
-        getEventCoordinate(event: Event): ol.Coordinate;
+    /**
+     * Returns the geographical coordinate for a browser event.
+     * @param event Event.
+     * @return Coordinate.
+     * @api stable
+     */
+    getEventCoordinate(event: Event): ol.Coordinate;
 
-        /**
-         * Returns the map pixel position for a browser event relative to the viewport.
-         * @param {Event} event Event.
-         * @return {ol.Pixel} Pixel.
-         * @api stable
-         */
-        getEventPixel(event: Event): ol.Pixel;
+    /**
+     * Returns the map pixel position for a browser event relative to the viewport.
+     * @param event Event.
+     * @return Pixel.
+     * @api stable
+     */
+    getEventPixel(event: Event): ol.Pixel;
 
-        /**
-         * Get the target in which this map is rendered.
-         * Note that this returns what is entered as an option or in setTarget:
-         * if that was an element, it returns an element; if a string, it returns that.
-         * @return {Element|string|undefined} The Element or id of the Element that the
-         *     map is rendered in.
-         * @observable
-         * @api stable
-         */
-        getTarget(): (Element | string);
+    /**
+     * Get the target in which this map is rendered.
+     * Note that this returns what is entered as an option or in setTarget:
+     * if that was an element, it returns an element; if a string, it returns that.
+     * @return The Element or id of the Element that the
+     *     map is rendered in.
+     * @observable
+     * @api stable
+     */
+    getTarget(): (Element | string);
 
-        /**
-         * Get the DOM element into which this map is rendered. In contrast to
-         * `getTarget` this method always return an `Element`, or `null` if the
-         * map has no target.
-         * @return {Element} The element that the map is rendered in.
-         * @api
-         */
-        getTargetElement(): Element;
+    /**
+     * Get the DOM element into which this map is rendered. In contrast to
+     * `getTarget` this method always return an `Element`, or `null` if the
+     * map has no target.
+     * @return The element that the map is rendered in.
+     * @api
+     */
+    getTargetElement(): Element;
 
-        /**
-         * Get the coordinate for a given pixel.  This returns a coordinate in the
-         * map view projection.
-         * @param {ol.Pixel} pixel Pixel position in the map viewport.
-         * @return {ol.Coordinate} The coordinate for the pixel position.
-         * @api stable
-         */
-        getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
+    /**
+     * Get the coordinate for a given pixel.  This returns a coordinate in the
+     * map view projection.
+     * @param pixel Pixel position in the map viewport.
+     * @return The coordinate for the pixel position.
+     * @api stable
+     */
+    getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
 
-        /**
-         * Get the map controls. Modifying this collection changes the controls
-         * associated with the map.
-         * @return {ol.Collection.<ol.control.Control>} Controls.
-         * @api stable
-         */
-        getControls(): ol.Collection<ol.control.Control>;
+    /**
+     * Get the map controls. Modifying this collection changes the controls
+     * associated with the map.
+     * @return Controls.
+     * @api stable
+     */
+    getControls(): ol.Collection<ol.control.Control>;
 
-        /**
-         * Get the map overlays. Modifying this collection changes the overlays
-         * associated with the map.
-         * @return {ol.Collection.<ol.Overlay>} Overlays.
-         * @api stable
-         */
-        getOverlays(): ol.Collection<ol.Overlay>;
+    /**
+     * Get the map overlays. Modifying this collection changes the overlays
+     * associated with the map.
+     * @return Overlays.
+     * @api stable
+     */
+    getOverlays(): ol.Collection<ol.Overlay>;
 
-        /**
-         * Get an overlay by its identifier (the value returned by overlay.getId()).
-         * Note that the index treats string and numeric identifiers as the same. So
-         * `map.getOverlayById(2)` will return an overlay with id `'2'` or `2`.
-         * @param {string|number} id Overlay identifier.
-         * @return {ol.Overlay} Overlay.
-         * @api
-         */
-        getOverlayById(id: (string | number)): ol.Overlay;
+    /**
+     * Get an overlay by its identifier (the value returned by overlay.getId()).
+     * Note that the index treats string and numeric identifiers as the same. So
+     * `map.getOverlayById(2)` will return an overlay with id `'2'` or `2`.
+     * @param id Overlay identifier.
+     * @return Overlay.
+     * @api
+     */
+    getOverlayById(id: (string | number)): ol.Overlay;
 
-        /**
-         * Get the map interactions. Modifying this collection changes the interactions
-         * associated with the map.
-         *
-         * Interactions are used for e.g. pan, zoom and rotate.
-         * @return {ol.Collection.<ol.interaction.Interaction>} Interactions.
-         * @api stable
-         */
-        getInteractions(): ol.Collection<ol.interaction.Interaction>;
+    /**
+     * Get the map interactions. Modifying this collection changes the interactions
+     * associated with the map.
+     *
+     * Interactions are used for e.g. pan, zoom and rotate.
+     * @return Interactions.
+     * @api stable
+     */
+    getInteractions(): ol.Collection<ol.interaction.Interaction>;
 
-        /**
-         * Get the layergroup associated with this map.
-         * @return {ol.layer.Group} A layer group containing the layers in this map.
-         * @observable
-         * @api stable
-         */
-        getLayerGroup(): ol.layer.Group;
+    /**
+     * Get the layergroup associated with this map.
+     * @return A layer group containing the layers in this map.
+     * @observable
+     * @api stable
+     */
+    getLayerGroup(): ol.layer.Group;
 
-        /**
-         * Get the collection of layers associated with this map.
-         * @return {!ol.Collection.<ol.layer.Base>} Layers.
-         * @api stable
-         */
-        getLayers(): ol.Collection<ol.layer.Base>;
+    /**
+     * Get the collection of layers associated with this map.
+     * @return Layers.
+     * @api stable
+     */
+    getLayers(): ol.Collection<ol.layer.Base>;
 
-        /**
-         * Get the pixel for a coordinate.  This takes a coordinate in the map view
-         * projection and returns the corresponding pixel.
-         * @param {ol.Coordinate} coordinate A map coordinate.
-         * @return {ol.Pixel} A pixel position in the map viewport.
-         * @api stable
-         */
-        getPixelFromCoordinate(coordinate: ol.Coordinate): ol.Pixel;
+    /**
+     * Get the pixel for a coordinate.  This takes a coordinate in the map view
+     * projection and returns the corresponding pixel.
+     * @param coordinate A map coordinate.
+     * @return A pixel position in the map viewport.
+     * @api stable
+     */
+    getPixelFromCoordinate(coordinate: ol.Coordinate): ol.Pixel;
 
-        /**
-         * Get the size of this map.
-         * @return {ol.Size|undefined} The size in pixels of the map in the DOM.
-         * @observable
-         * @api stable
-         */
-        getSize(): (ol.Size);
+    /**
+     * Get the size of this map.
+     * @return The size in pixels of the map in the DOM.
+     * @observable
+     * @api stable
+     */
+    getSize(): (ol.Size);
 
-        /**
-         * Get the view associated with this map. A view manages properties such as
-         * center and resolution.
-         * @return {ol.View} The view that controls this map.
-         * @observable
-         * @api stable
-         */
-        getView(): ol.View;
+    /**
+     * Get the view associated with this map. A view manages properties such as
+     * center and resolution.
+     * @return The view that controls this map.
+     * @observable
+     * @api stable
+     */
+    getView(): ol.View;
 
-        /**
-         * Get the element that serves as the map viewport.
-         * @return {Element} Viewport.
-         * @api stable
-         */
-        getViewport(): Element;
+    /**
+     * Get the element that serves as the map viewport.
+     * @return Viewport.
+     * @api stable
+     */
+    getViewport(): Element;
 
-        /**
-         * Requests an immediate render in a synchronous manner.
-         * @api stable
-         */
-        renderSync(): void;
+    /**
+     * Requests an immediate render in a synchronous manner.
+     * @api stable
+     */
+    renderSync(): void;
 
-        /**
-         * Request a map rendering (at the next animation frame).
-         * @api stable
-         */
-        render(): void;
+    /**
+     * Request a map rendering (at the next animation frame).
+     * @api stable
+     */
+    render(): void;
 
-        /**
-         * Remove the given control from the map.
-         * @param {ol.control.Control} control Control.
-         * @return {ol.control.Control|undefined} The removed control (or undefined
-         *     if the control was not found).
-         * @api stable
-         */
-        removeControl(control: ol.control.Control): (ol.control.Control);
+    /**
+     * Remove the given control from the map.
+     * @param control Control.
+     * @return The removed control (or undefined
+     *     if the control was not found).
+     * @api stable
+     */
+    removeControl(control: ol.control.Control): (ol.control.Control);
 
-        /**
-         * Remove the given interaction from the map.
-         * @param {ol.interaction.Interaction} interaction Interaction to remove.
-         * @return {ol.interaction.Interaction|undefined} The removed interaction (or
-         *     undefined if the interaction was not found).
-         * @api stable
-         */
-        removeInteraction(interaction: ol.interaction.Interaction): (ol.interaction.Interaction);
+    /**
+     * Remove the given interaction from the map.
+     * @param interaction Interaction to remove.
+     * @return The removed interaction (or
+     *     undefined if the interaction was not found).
+     * @api stable
+     */
+    removeInteraction(interaction: ol.interaction.Interaction): (ol.interaction.Interaction);
 
-        /**
-         * Removes the given layer from the map.
-         * @param {ol.layer.Base} layer Layer.
-         * @return {ol.layer.Base|undefined} The removed layer (or undefined if the
-         *     layer was not found).
-         * @api stable
-         */
-        removeLayer(layer: ol.layer.Base): (ol.layer.Base);
+    /**
+     * Removes the given layer from the map.
+     * @param layer Layer.
+     * @return The removed layer (or undefined if the
+     *     layer was not found).
+     * @api stable
+     */
+    removeLayer(layer: ol.layer.Base): (ol.layer.Base);
 
-        /**
-         * Remove the given overlay from the map.
-         * @param {ol.Overlay} overlay Overlay.
-         * @return {ol.Overlay|undefined} The removed overlay (or undefined
-         *     if the overlay was not found).
-         * @api stable
-         */
-        removeOverlay(overlay: ol.Overlay): (ol.Overlay);
+    /**
+     * Remove the given overlay from the map.
+     * @param overlay Overlay.
+     * @return The removed overlay (or undefined
+     *     if the overlay was not found).
+     * @api stable
+     */
+    removeOverlay(overlay: ol.Overlay): (ol.Overlay);
 
-        /**
-         * Sets the layergroup of this map.
-         * @param {ol.layer.Group} layerGroup A layer group containing the layers in
-         *     this map.
-         * @observable
-         * @api stable
-         */
-        setLayerGroup(layerGroup: ol.layer.Group): void;
+    /**
+     * Sets the layergroup of this map.
+     * @param layerGroup A layer group containing the layers in
+     *     this map.
+     * @observable
+     * @api stable
+     */
+    setLayerGroup(layerGroup: ol.layer.Group): void;
 
-        /**
-         * Set the size of this map.
-         * @param {ol.Size|undefined} size The size in pixels of the map in the DOM.
-         * @observable
-         * @api
-         */
-        setSize(size: (ol.Size)): void;
+    /**
+     * Set the size of this map.
+     * @param size The size in pixels of the map in the DOM.
+     * @observable
+     * @api
+     */
+    setSize(size: (ol.Size)): void;
 
-        /**
-         * Set the target element to render this map into.
-         * @param {Element|string|undefined} target The Element or id of the Element
-         *     that the map is rendered in.
-         * @observable
-         * @api stable
-         */
-        setTarget(target: (Element | string)): void;
+    /**
+     * Set the target element to render this map into.
+     * @param target The Element or id of the Element
+     *     that the map is rendered in.
+     * @observable
+     * @api stable
+     */
+    setTarget(target: (Element | string)): void;
 
-        /**
-         * Set the view for this map.
-         * @param {ol.View} view The view that controls this map.
-         * @observable
-         * @api stable
-         */
-        setView(view: ol.View): void;
+    /**
+     * Set the view for this map.
+     * @param view The view that controls this map.
+     * @observable
+     * @api stable
+     */
+    setView(view: ol.View): void;
 
-        /**
-         * Force a recalculation of the map viewport size.  This should be called when
-         * third-party code changes the size of the map viewport.
-         * @api stable
-         */
-        updateSize(): void;
-    }
+    /**
+     * Force a recalculation of the map viewport size.  This should be called when
+     * third-party code changes the size of the map viewport.
+     * @api stable
+     */
+    updateSize(): void;
+}
 
+/**
+ * @classdesc
+ * Events emitted as map browser events are instances of this type.
+ * See {@link ol.Map} for which events trigger a map browser event.
+ *
+ * @param type Event type.
+ * @param map Map.
+ * @param browserEvent Browser event.
+ * @param opt_dragging Is the map currently being dragged?
+ * @param opt_frameState Frame state.
+ */
+export class MapBrowserEvent extends MapEvent {
     /**
      * @classdesc
      * Events emitted as map browser events are instances of this type.
      * See {@link ol.Map} for which events trigger a map browser event.
      *
-     * @constructor
-     * @extends {ol.MapEvent}
-     * @implements {oli.MapBrowserEvent}
-     * @param {string} type Event type.
-     * @param {ol.Map} map Map.
-     * @param {Event} browserEvent Browser event.
-     * @param {boolean=} opt_dragging Is the map currently being dragged?
-     * @param {?olx.FrameState=} opt_frameState Frame state.
+     * @param type Event type.
+     * @param map Map.
+     * @param browserEvent Browser event.
+     * @param opt_dragging Is the map currently being dragged?
+     * @param opt_frameState Frame state.
      */
-    class MapBrowserEvent extends ol.MapEvent {
-        /**
-         * @classdesc
-         * Events emitted as map browser events are instances of this type.
-         * See {@link ol.Map} for which events trigger a map browser event.
-         *
-         * @constructor
-         * @extends {ol.MapEvent}
-         * @implements {oli.MapBrowserEvent}
-         * @param {string} type Event type.
-         * @param {ol.Map} map Map.
-         * @param {Event} browserEvent Browser event.
-         * @param {boolean=} opt_dragging Is the map currently being dragged?
-         * @param {?olx.FrameState=} opt_frameState Frame state.
-         */
-        constructor(type: string, map: ol.Map, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: olx.FrameState);
-
-        /**
-         * The original browser event.
-         * @const
-         * @type {Event}
-         * @api stable
-         */
-        originalEvent: Event;
-
-        /**
-         * The pixel of the original browser event.
-         * @type {ol.Pixel}
-         * @api stable
-         */
-        pixel: ol.Pixel;
-
-        /**
-         * The coordinate of the original browser event.
-         * @type {ol.Coordinate}
-         * @api stable
-         */
-        coordinate: ol.Coordinate;
-
-        /**
-         * Indicates if the map is currently being dragged. Only set for
-         * `POINTERDRAG` and `POINTERMOVE` events. Default is `false`.
-         *
-         * @type {boolean}
-         * @api stable
-         */
-        dragging: boolean;
-    }
+    constructor(type: string, map: ol.Map, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: olx.FrameState);
 
     /**
-     * @constructor
-     * @extends {ol.MapBrowserEvent}
-     * @param {string} type Event type.
-     * @param {ol.Map} map Map.
-     * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
-     * @param {boolean=} opt_dragging Is the map currently being dragged?
-     * @param {?olx.FrameState=} opt_frameState Frame state.
+     * The original browser event.
+     * @const
+     * @api stable
      */
-    class MapBrowserPointerEvent extends ol.MapBrowserEvent {
-        // /**
-        //  * @constructor
-        //  * @extends {ol.MapBrowserEvent}
-        //  * @param {string} type Event type.
-        //  * @param {ol.Map} map Map.
-        //  * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
-        //  * @param {boolean=} opt_dragging Is the map currently being dragged?
-        //  * @param {?olx.FrameState=} opt_frameState Frame state.
-        //  */
-        // constructor (type: string,
-        //           map: ol.Map,
-        //           pointerEvent: ol.pointer.PointerEvent,
-        //           opt_dragging?: boolean,
-        //           opt_frameState?: olx.FrameState)
+    originalEvent: Event;
 
-        pointerEvent: ol.pointer.PointerEvent;
-    }
+    /**
+     * The pixel of the original browser event.
+     * @api stable
+     */
+    pixel: ol.Pixel;
 
+    /**
+     * The coordinate of the original browser event.
+     * @api stable
+     */
+    coordinate: ol.Coordinate;
+
+    /**
+     * Indicates if the map is currently being dragged. Only set for
+     * `POINTERDRAG` and `POINTERMOVE` events. Default is `false`.
+     *
+     * @api stable
+     */
+    dragging: boolean;
+}
+
+/**
+ * @param type Event type.
+ * @param map Map.
+ * @param pointerEvent Pointer event.
+ * @param opt_dragging Is the map currently being dragged?
+ * @param opt_frameState Frame state.
+ */
+export class MapBrowserPointerEvent extends MapBrowserEvent {
+    // /**
+    //  * @param type Event type.
+    //  * @param map Map.
+    //  * @param pointerEvent Pointer event.
+    //  * @param opt_dragging Is the map currently being dragged?
+    //  * @param opt_frameState Frame state.
+    //  */
+    // constructor (type: string,
+    //           map: ol.Map,
+    //           pointerEvent: ol.pointer.PointerEvent,
+    //           opt_dragging?: boolean,
+    //           opt_frameState?: olx.FrameState)
+
+    pointerEvent: ol.pointer.PointerEvent;
+}
+
+/**
+ * @classdesc
+ * Events emitted as map events are instances of this type.
+ * See {@link ol.Map} for which events trigger a map event.
+ *
+ * @param type Event type.
+ * @param map Map.
+ * @param opt_frameState Frame state.
+ */
+export class MapEvent extends events.Event {
     /**
      * @classdesc
      * Events emitted as map events are instances of this type.
      * See {@link ol.Map} for which events trigger a map event.
      *
-     * @constructor
-     * @extends {ol.events.Event}
-     * @implements {oli.MapEvent}
-     * @param {string} type Event type.
-     * @param {ol.Map} map Map.
-     * @param {?olx.FrameState=} opt_frameState Frame state.
+     * @param type Event type.
+     * @param map Map.
+     * @param opt_frameState Frame state.
      */
-    class MapEvent extends ol.events.Event {
-        /**
-         * @classdesc
-         * Events emitted as map events are instances of this type.
-         * See {@link ol.Map} for which events trigger a map event.
-         *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.MapEvent}
-         * @param {string} type Event type.
-         * @param {ol.Map} map Map.
-         * @param {?olx.FrameState=} opt_frameState Frame state.
-         */
-        constructor(type: string, map: ol.Map, opt_frameState?: olx.FrameState);
+    constructor(type: string, map: ol.Map, opt_frameState?: olx.FrameState);
 
-        /**
-         * The map where the event occurred.
-         * @type {ol.Map}
-         * @api stable
-         */
-        map: ol.Map;
+    /**
+     * The map where the event occurred.
+     * @api stable
+     */
+    map: ol.Map;
 
-        /**
-         * The frame state at the time of the event.
-         * @type {?olx.FrameState}
-         * @api
-         */
-        frameState: olx.FrameState;
-    }
+    /**
+     * The frame state at the time of the event.
+     * @api
+     */
+    frameState: olx.FrameState;
+}
 
+/**
+ * @classdesc
+ * Events emitted by {@link ol.Object} instances are instances of this type.
+ *
+ * @param type The event type.
+ * @param key The property name.
+ * @param oldValue The old value for `key`.
+ */
+export class ObjectEvent extends events.Event {
     /**
      * @classdesc
      * Events emitted by {@link ol.Object} instances are instances of this type.
      *
-     * @param {string} type The event type.
-     * @param {string} key The property name.
-     * @param {*} oldValue The old value for `key`.
-     * @extends {ol.events.Event}
-     * @implements {oli.ObjectEvent}
-     * @constructor
+     * @param type The event type.
+     * @param key The property name.
+     * @param oldValue The old value for `key`.
      */
-    class ObjectEvent extends ol.events.Event {
-        /**
-         * @classdesc
-         * Events emitted by {@link ol.Object} instances are instances of this type.
-         *
-         * @param {string} type The event type.
-         * @param {string} key The property name.
-         * @param {*} oldValue The old value for `key`.
-         * @extends {ol.events.Event}
-         * @implements {oli.ObjectEvent}
-         * @constructor
-         */
-        constructor(type: string, key: string, oldValue: any);
+    constructor(type: string, key: string, oldValue: any);
 
-        /**
-         * The name of the property whose value is changing.
-         * @type {string}
-         * @api stable
-         */
-        key: string;
+    /**
+     * The name of the property whose value is changing.
+     * @api stable
+     */
+    key: string;
 
-        /**
-         * The old value. To get the new value use `e.target.get(e.key)` where
-         * `e` is the event object.
-         * @type {*}
-         * @api stable
-         */
-        oldValue: any;
-    }
+    /**
+     * The old value. To get the new value use `e.target.get(e.key)` where
+     * `e` is the event object.
+     * @api stable
+     */
+    oldValue: any;
+}
 
+/**
+ * @classdesc
+ * Abstract base class; normally only used for creating subclasses and not
+ * instantiated in apps.
+ * Most non-trivial classes inherit from this.
+ *
+ * This extends {@link ol.Observable} with observable properties, where each
+ * property is observable as well as the object as a whole.
+ *
+ * Classes that inherit from this have pre-defined properties, to which you can
+ * add your owns. The pre-defined properties are listed in this documentation as
+ * 'Observable Properties', and have their own accessors; for example,
+ * {@link ol.Map} has a `target` property, accessed with `getTarget()`  and
+ * changed with `setTarget()`. Not all properties are however settable. There
+ * are also general-purpose accessors `get()` and `set()`. For example,
+ * `get('target')` is equivalent to `getTarget()`.
+ *
+ * The `set` accessors trigger a change event, and you can monitor this by
+ * registering a listener. For example, {@link ol.View} has a `center`
+ * property, so `view.on('change:center', function(evt) {...});` would call the
+ * function whenever the value of the center property changes. Within the
+ * function, `evt.target` would be the view, so `evt.target.getCenter()` would
+ * return the new center.
+ *
+ * You can add your own observable properties with
+ * `object.set('prop', 'value')`, and retrieve that with `object.get('prop')`.
+ * You can listen for changes on that property value with
+ * `object.on('change:prop', listener)`. You can get a list of all
+ * properties with {@link ol.Object#getProperties object.getProperties()}.
+ *
+ * Note that the observable properties are separate from standard JS properties.
+ * You can, for example, give your map object a title with
+ * `map.title='New title'` and with `map.set('title', 'Another title')`. The
+ * first will be a `hasOwnProperty`; the second will appear in
+ * `getProperties()`. Only the second is observable.
+ *
+ * Properties can be deleted by using the unset method. E.g.
+ * object.unset('foo').
+ *
+ * @param opt_values An object with key-value pairs.
+ * @fires ol.ObjectEvent
+ * @api
+ */
+export class Object extends Observable {
     /**
      * @classdesc
      * Abstract base class; normally only used for creating subclasses and not
@@ -7778,109 +7176,74 @@ declare module ol {
      * Properties can be deleted by using the unset method. E.g.
      * object.unset('foo').
      *
-     * @constructor
-     * @extends {ol.Observable}
-     * @param {Object.<string, *>=} opt_values An object with key-value pairs.
+     * @param opt_values An object with key-value pairs.
      * @fires ol.ObjectEvent
      * @api
      */
-    class Object extends ol.Observable {
-        /**
-         * @classdesc
-         * Abstract base class; normally only used for creating subclasses and not
-         * instantiated in apps.
-         * Most non-trivial classes inherit from this.
-         *
-         * This extends {@link ol.Observable} with observable properties, where each
-         * property is observable as well as the object as a whole.
-         *
-         * Classes that inherit from this have pre-defined properties, to which you can
-         * add your owns. The pre-defined properties are listed in this documentation as
-         * 'Observable Properties', and have their own accessors; for example,
-         * {@link ol.Map} has a `target` property, accessed with `getTarget()`  and
-         * changed with `setTarget()`. Not all properties are however settable. There
-         * are also general-purpose accessors `get()` and `set()`. For example,
-         * `get('target')` is equivalent to `getTarget()`.
-         *
-         * The `set` accessors trigger a change event, and you can monitor this by
-         * registering a listener. For example, {@link ol.View} has a `center`
-         * property, so `view.on('change:center', function(evt) {...});` would call the
-         * function whenever the value of the center property changes. Within the
-         * function, `evt.target` would be the view, so `evt.target.getCenter()` would
-         * return the new center.
-         *
-         * You can add your own observable properties with
-         * `object.set('prop', 'value')`, and retrieve that with `object.get('prop')`.
-         * You can listen for changes on that property value with
-         * `object.on('change:prop', listener)`. You can get a list of all
-         * properties with {@link ol.Object#getProperties object.getProperties()}.
-         *
-         * Note that the observable properties are separate from standard JS properties.
-         * You can, for example, give your map object a title with
-         * `map.title='New title'` and with `map.set('title', 'Another title')`. The
-         * first will be a `hasOwnProperty`; the second will appear in
-         * `getProperties()`. Only the second is observable.
-         *
-         * Properties can be deleted by using the unset method. E.g.
-         * object.unset('foo').
-         *
-         * @constructor
-         * @extends {ol.Observable}
-         * @param {Object.<string, *>=} opt_values An object with key-value pairs.
-         * @fires ol.ObjectEvent
-         * @api
-         */
-        constructor(opt_values?: { [k: string]: any });
+    constructor(opt_values?: { [k: string]: any });
 
-        /**
-         * Gets a value.
-         * @param {string} key Key name.
-         * @return {*} Value.
-         * @api stable
-         */
-        get(key: string): any;
+    /**
+     * Gets a value.
+     * @param key Key name.
+     * @return Value.
+     * @api stable
+     */
+    get(key: string): any;
 
-        /**
-         * Get a list of object property names.
-         * @return {Array.<string>} List of property names.
-         * @api stable
-         */
-        getKeys(): string[];
+    /**
+     * Get a list of object property names.
+     * @return List of property names.
+     * @api stable
+     */
+    getKeys(): string[];
 
-        /**
-         * Get an object of all property names and values.
-         * @return {Object.<string, *>} Object.
-         * @api stable
-         */
-        getProperties(): { [k: string]: any };
+    /**
+     * Get an object of all property names and values.
+     * @return Object.
+     * @api stable
+     */
+    getProperties(): { [k: string]: any };
 
-        /**
-         * Sets a value.
-         * @param {string} key Key name.
-         * @param {*} value Value.
-         * @param {boolean=} opt_silent Update without triggering an event.
-         * @api stable
-         */
-        set(key: string, value: any, opt_silent?: boolean): void;
+    /**
+     * Sets a value.
+     * @param key Key name.
+     * @param value Value.
+     * @param opt_silent Update without triggering an event.
+     * @api stable
+     */
+    set(key: string, value: any, opt_silent?: boolean): void;
 
-        /**
-         * Sets a collection of key-value pairs.  Note that this changes any existing
-         * properties and adds new ones (it does not remove any existing properties).
-         * @param {Object.<string, *>} values Values.
-         * @param {boolean=} opt_silent Update without triggering an event.
-         * @api stable
-         */
-        setProperties(values: { [k: string]: any }, opt_silent?: boolean): void;
+    /**
+     * Sets a collection of key-value pairs.  Note that this changes any existing
+     * properties and adds new ones (it does not remove any existing properties).
+     * @param values Values.
+     * @param opt_silent Update without triggering an event.
+     * @api stable
+     */
+    setProperties(values: { [k: string]: any }, opt_silent?: boolean): void;
 
-        /**
-         * Unsets a property.
-         * @param {string} key Key name.
-         * @param {boolean=} opt_silent Unset without triggering an event.
-         * @api stable
-         */
-        unset(key: string, opt_silent?: boolean): void;
-    }
+    /**
+     * Unsets a property.
+     * @param key Key name.
+     * @param opt_silent Unset without triggering an event.
+     * @api stable
+     */
+    unset(key: string, opt_silent?: boolean): void;
+}
 
+/**
+ * @classdesc
+ * Abstract base class; normally only used for creating subclasses and not
+ * instantiated in apps.
+ * An event target providing convenient methods for listener registration
+ * and unregistration. A generic `change` event is always available through
+ * {@link ol.Observable#changed}.
+ *
+ * @fires ol.events.Event
+ * @struct
+ * @api stable
+ */
+export class Observable extends events.EventTarget {
     /**
      * @classdesc
      * Abstract base class; normally only used for creating subclasses and not
@@ -7889,107 +7252,106 @@ declare module ol {
      * and unregistration. A generic `change` event is always available through
      * {@link ol.Observable#changed}.
      *
-     * @constructor
-     * @extends {ol.events.EventTarget}
      * @fires ol.events.Event
      * @struct
      * @api stable
      */
-    class Observable extends ol.events.EventTarget {
-        /**
-         * @classdesc
-         * Abstract base class; normally only used for creating subclasses and not
-         * instantiated in apps.
-         * An event target providing convenient methods for listener registration
-         * and unregistration. A generic `change` event is always available through
-         * {@link ol.Observable#changed}.
-         *
-         * @constructor
-         * @extends {ol.events.EventTarget}
-         * @fires ol.events.Event
-         * @struct
-         * @api stable
-         */
-        constructor();
-
-        /**
-         * Removes an event listener using the key returned by `on()` or `once()`.
-         * @param {ol.EventsKey|Array.<ol.EventsKey>} key The key returned by `on()`
-         *     or `once()` (or an array of keys).
-         * @api stable
-         */
-        static unByKey(key: (ol.EventsKey | ol.EventsKey[])): void;
-
-        /**
-         * Increases the revision counter and dispatches a 'change' event.
-         * @api
-         */
-        changed(): void;
-
-        /**
-         * Dispatches an event and calls all listeners listening for events
-         * of this type. The event parameter can either be a string or an
-         * Object with a `type` property.
-         *
-         * @param {{type: string,
-         *     target: (EventTarget|ol.events.EventTarget|undefined)}|ol.events.Event|
-         *     string} event Event object.
-         * @function
-         * @api
-         */
-        dispatchEvent(event: (GlobalObject | ol.events.Event | string)): void;
-
-        /**
-         * Get the version number for this object.  Each time the object is modified,
-         * its version number will be incremented.
-         * @return {number} Revision.
-         * @api
-         */
-        getRevision(): number;
-
-        /**
-         * Listen for a certain type of event.
-         * @param {string|Array.<string>} type The event type or array of event types.
-         * @param {function(?): ?} listener The listener function.
-         * @param {Object=} opt_this The object to use as `this` in `listener`.
-         * @return {ol.EventsKey|Array.<ol.EventsKey>} Unique key for the listener. If
-         *     called with an array of event types as the first argument, the return
-         *     will be an array of keys.
-         * @api stable
-         */
-        on(type: (string | string[]), listener: Function, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
-
-        /**
-         * Listen once for a certain type of event.
-         * @param {string|Array.<string>} type The event type or array of event types.
-         * @param {function(?): ?} listener The listener function.
-         * @param {Object=} opt_this The object to use as `this` in `listener`.
-         * @return {ol.EventsKey|Array.<ol.EventsKey>} Unique key for the listener. If
-         *     called with an array of event types as the first argument, the return
-         *     will be an array of keys.
-         * @api stable
-         */
-        once(type: (string | string[]), listener: Function, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
-
-        /**
-         * Unlisten for a certain type of event.
-         * @param {string|Array.<string>} type The event type or array of event types.
-         * @param {function(?): ?} listener The listener function.
-         * @param {Object=} opt_this The object which was used as `this` by the
-         * `listener`.
-         * @api stable
-         */
-        un(type: (string | string[]), listener: Function, opt_this?: GlobalObject): void;
-    }
+    constructor();
 
     /**
-     * Overlay position: `'bottom-left'`, `'bottom-center'`,  `'bottom-right'`,
-     * `'center-left'`, `'center-center'`, `'center-right'`, `'top-left'`,
-     * `'top-center'`, `'top-right'`
-     * @enum {string}
+     * Removes an event listener using the key returned by `on()` or `once()`.
+     * @param key The key returned by `on()`
+     *     or `once()` (or an array of keys).
+     * @api stable
      */
-    type OverlayPositioning = "bottom-left" | "bottom-center" | "bottom-right" | "center-left" | "center-center" | "center-right" | "top-left" | "top-center" | "top-right";
+    static unByKey(key: (ol.EventsKey | ol.EventsKey[])): void;
 
+    /**
+     * Increases the revision counter and dispatches a 'change' event.
+     * @api
+     */
+    changed(): void;
+
+    /**
+     * Dispatches an event and calls all listeners listening for events
+     * of this type. The event parameter can either be a string or an
+     * Object with a `type` property.
+     *
+     * @param event Event object.
+     * @api
+     */
+    dispatchEvent(event: (GlobalObject| ol.events.Event | string)): void;
+
+    /**
+     * Get the version number for this object.  Each time the object is modified,
+     * its version number will be incremented.
+     * @return Revision.
+     * @api
+     */
+    getRevision(): number;
+
+    /**
+     * Listen for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object to use as `this` in `listener`.
+     * @return Unique key for the listener. If
+     *     called with an array of event types as the first argument, the return
+     *     will be an array of keys.
+     * @api stable
+     */
+    on(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
+
+    /**
+     * Listen once for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object to use as `this` in `listener`.
+     * @return Unique key for the listener. If
+     *     called with an array of event types as the first argument, the return
+     *     will be an array of keys.
+     * @api stable
+     */
+    once(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
+
+    /**
+     * Unlisten for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object which was used as `this` by the
+     * `listener`.
+     * @api stable
+     */
+    un(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): void;
+}
+
+/**
+ * Overlay position: `'bottom-left'`, `'bottom-center'`,  `'bottom-right'`,
+ * `'center-left'`, `'center-center'`, `'center-right'`, `'top-left'`,
+ * `'top-center'`, `'top-right'`
+ */
+export type OverlayPositioning = "bottom-left" | "bottom-center" | "bottom-right" | "center-left" | "center-center" | "center-right" | "top-left" | "top-center" | "top-right";
+
+/**
+ * @classdesc
+ * An element to be displayed over the map and attached to a single map
+ * location.  Like {@link ol.control.Control}, Overlays are visible widgets.
+ * Unlike Controls, they are not in a fixed position on the screen, but are tied
+ * to a geographical coordinate, so panning the map will move an Overlay but not
+ * a Control.
+ *
+ * Example:
+ *
+ *     var popup = new ol.Overlay({
+ *       element: document.getElementById('popup')
+ *     });
+ *     popup.setPosition(coordinate);
+ *     map.addOverlay(popup);
+ *
+ * @param options Overlay options.
+ * @api stable
+ */
+export class Overlay extends Object {
     /**
      * @classdesc
      * An element to be displayed over the map and attached to a single map
@@ -8006,217 +7368,218 @@ declare module ol {
      *     popup.setPosition(coordinate);
      *     map.addOverlay(popup);
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.OverlayOptions} options Overlay options.
+     * @param options Overlay options.
      * @api stable
      */
-    class Overlay extends ol.Object {
-        /**
-         * @classdesc
-         * An element to be displayed over the map and attached to a single map
-         * location.  Like {@link ol.control.Control}, Overlays are visible widgets.
-         * Unlike Controls, they are not in a fixed position on the screen, but are tied
-         * to a geographical coordinate, so panning the map will move an Overlay but not
-         * a Control.
-         *
-         * Example:
-         *
-         *     var popup = new ol.Overlay({
-         *       element: document.getElementById('popup')
-         *     });
-         *     popup.setPosition(coordinate);
-         *     map.addOverlay(popup);
-         *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.OverlayOptions} options Overlay options.
-         * @api stable
-         */
-        constructor(options: olx.OverlayOptions);
-
-        /**
-         * Get the DOM element of this overlay.
-         * @return {Element|undefined} The Element containing the overlay.
-         * @observable
-         * @api stable
-         */
-        getElement(): (Element);
-
-        /**
-         * Get the overlay identifier which is set on constructor.
-         * @return {number|string|undefined} Id.
-         * @api
-         */
-        getId(): (number | string);
-
-        /**
-         * Get the map associated with this overlay.
-         * @return {ol.Map|undefined} The map that the overlay is part of.
-         * @observable
-         * @api stable
-         */
-        getMap(): (ol.Map);
-
-        /**
-         * Get the offset of this overlay.
-         * @return {Array.<number>} The offset.
-         * @observable
-         * @api stable
-         */
-        getOffset(): number[];
-
-        /**
-         * Get the current position of this overlay.
-         * @return {ol.Coordinate|undefined} The spatial point that the overlay is
-         *     anchored at.
-         * @observable
-         * @api stable
-         */
-        getPosition(): (ol.Coordinate);
-
-        /**
-         * Get the current positioning of this overlay.
-         * @return {ol.OverlayPositioning} How the overlay is positioned
-         *     relative to its point on the map.
-         * @observable
-         * @api stable
-         */
-        getPositioning(): ol.OverlayPositioning;
-
-        /**
-         * Set the DOM element to be associated with this overlay.
-         * @param {Element|undefined} element The Element containing the overlay.
-         * @observable
-         * @api stable
-         */
-        setElement(element: (Element)): void;
-
-        /**
-         * Set the map to be associated with this overlay.
-         * @param {ol.Map|undefined} map The map that the overlay is part of.
-         * @observable
-         * @api stable
-         */
-        setMap(map: (ol.Map)): void;
-
-        /**
-         * Set the offset for this overlay.
-         * @param {Array.<number>} offset Offset.
-         * @observable
-         * @api stable
-         */
-        setOffset(offset: number[]): void;
-
-        /**
-         * Set the position for this overlay. If the position is `undefined` the
-         * overlay is hidden.
-         * @param {ol.Coordinate|undefined} position The spatial point that the overlay
-         *     is anchored at.
-         * @observable
-         * @api stable
-         */
-        setPosition(position: (ol.Coordinate | undefined)): void;
-
-        /**
-         * Set the positioning for this overlay.
-         * @param {ol.OverlayPositioning} positioning how the overlay is
-         *     positioned relative to its point on the map.
-         * @observable
-         * @api stable
-         */
-        setPositioning(positioning: ol.OverlayPositioning): void;
-    }
-
-    module pointer {
-        /**
-         * @classdesc
-         * A class for pointer events.
-         *
-         * This class is used as an abstraction for mouse events,
-         * touch events and even native pointer events.
-         *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @param {string} type The type of the event to create.
-         * @param {Event} originalEvent The event.
-         * @param {Object.<string, ?>=} opt_eventDict An optional dictionary of
-         *    initial event properties.
-         */
-        class PointerEvent {
-        }
-    }
+    constructor(options: olx.OverlayOptions);
 
     /**
-     * The ol.proj namespace stores:
-     * * a list of {@link ol.proj.Projection}
-     * objects, one for each projection supported by the application
-     * * a list of transform functions needed to convert coordinates in one projection
-     * into another.
-     *
-     * The static functions are the methods used to maintain these.
-     * Each transform function can handle not only simple coordinate pairs, but also
-     * large arrays of coordinates such as vector geometries.
-     *
-     * When loaded, the library adds projection objects for EPSG:4326 (WGS84
-     * geographic coordinates) and EPSG:3857 (Web or Spherical Mercator, as used
-     * for example by Bing Maps or OpenStreetMap), together with the relevant
-     * transform functions.
-     *
-     * Additional transforms may be added by using the {@link http://proj4js.org/}
-     * library (version 2.2 or later). You can use the full build supplied by
-     * Proj4js, or create a custom build to support those projections you need; see
-     * the Proj4js website for how to do this. You also need the Proj4js definitions
-     * for the required projections. These definitions can be obtained from
-     * {@link http://epsg.io/}, and are a JS function, so can be loaded in a script
-     * tag (as in the examples) or pasted into your application.
-     * The first time there is a request for a projection, either with a
-     * {@link ol.proj.projectionLike} or directly with {@link ol.proj.get}, the
-     * code will check if the Proj4js library and the necessary definition are
-     * loaded; if so, it will register the appropriate {@link ol.proj.Projection}
-     * object and add transform functions between the new projection and all the
-     * existing ones. See examples/wms-image-custom-proj for an example of this.
-     * Because the check for presence of the Proj4js library and the definition only
-     * takes place on the first request for them, this means they can be loaded
-     * dynamically as needed; for example, with user-supplied data where you don't
-     * know in advance what projections are needed, you can initially load minimal
-     * support and then load whichever are requested.
-     *
-     * Note that Proj4js does not support projection extents. If you want to add
-     * one for creating default tile grids, you can add it after the Projection
-     * object has been created with `setExtent`, for example,
-     * `ol.proj.get('EPSG:1234').setExtent(extent)`.
-     *
-     * In addition to Proj4js support, any transform functions can be added with
-     * {@link ol.proj.addCoordinateTransforms}. To use this, you must first create
-     * a {@link ol.proj.Projection} object for the new projection and add it with
-     * {@link ol.proj.addProjection}. You can then add the forward and inverse
-     * functions with {@link ol.proj.addCoordinateTransforms}. See
-     * examples/wms-custom-proj for an example of this.
-     *
-     * Note that if no transforms are needed and you only need to define the
-     * projection, just add a {@link ol.proj.Projection} with
-     * {@link ol.proj.addProjection}. See examples/wms-no-proj for an example of
-     * this.
-     *
-     * @namespace ol.proj
+     * Get the DOM element of this overlay.
+     * @return The Element containing the overlay.
+     * @observable
+     * @api stable
      */
-    module proj {
-        /**
-         * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
-         * `'us-ft'`.
-         * @enum {string}
-         */
-        type Units = "degress" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
+    getElement(): (Element);
 
-        /**
-         * Meters per unit lookup table.
-         * @const
-         * @type {Object.<ol.proj.Units, number>}
-         * @api stable
-         */
-        const METERS_PER_UNIT: { [k: string]: number };
+    /**
+     * Get the overlay identifier which is set on constructor.
+     * @return Id.
+     * @api
+     */
+    getId(): (number | string);
 
+    /**
+     * Get the map associated with this overlay.
+     * @return The map that the overlay is part of.
+     * @observable
+     * @api stable
+     */
+    getMap(): (ol.Map);
+
+    /**
+     * Get the offset of this overlay.
+     * @return The offset.
+     * @observable
+     * @api stable
+     */
+    getOffset(): number[];
+
+    /**
+     * Get the current position of this overlay.
+     * @return The spatial point that the overlay is
+     *     anchored at.
+     * @observable
+     * @api stable
+     */
+    getPosition(): (ol.Coordinate);
+
+    /**
+     * Get the current positioning of this overlay.
+     * @return How the overlay is positioned
+     *     relative to its point on the map.
+     * @observable
+     * @api stable
+     */
+    getPositioning(): ol.OverlayPositioning;
+
+    /**
+     * Set the DOM element to be associated with this overlay.
+     * @param element The Element containing the overlay.
+     * @observable
+     * @api stable
+     */
+    setElement(element: (Element)): void;
+
+    /**
+     * Set the map to be associated with this overlay.
+     * @param map The map that the overlay is part of.
+     * @observable
+     * @api stable
+     */
+    setMap(map: (ol.Map)): void;
+
+    /**
+     * Set the offset for this overlay.
+     * @param offset Offset.
+     * @observable
+     * @api stable
+     */
+    setOffset(offset: number[]): void;
+
+    /**
+     * Set the position for this overlay. If the position is `undefined` the
+     * overlay is hidden.
+     * @param position The spatial point that the overlay
+     *     is anchored at.
+     * @observable
+     * @api stable
+     */
+    setPosition(position: (ol.Coordinate | undefined)): void;
+
+    /**
+     * Set the positioning for this overlay.
+     * @param positioning how the overlay is
+     *     positioned relative to its point on the map.
+     * @observable
+     * @api stable
+     */
+    setPositioning(positioning: ol.OverlayPositioning): void;
+}
+
+export namespace pointer {
+    /**
+     * @classdesc
+     * A class for pointer events.
+     *
+     * This class is used as an abstraction for mouse events,
+     * touch events and even native pointer events.
+     *
+     * @param type The type of the event to create.
+     * @param originalEvent The event.
+     * @param opt_eventDict An optional dictionary of
+     *    initial event properties.
+     */
+    class PointerEvent {
+    }
+}
+
+/**
+ * The ol.proj namespace stores:
+ * * a list of {@link ol.proj.Projection}
+ * objects, one for each projection supported by the application
+ * * a list of transform functions needed to convert coordinates in one projection
+ * into another.
+ *
+ * The static functions are the methods used to maintain these.
+ * Each transform function can handle not only simple coordinate pairs, but also
+ * large arrays of coordinates such as vector geometries.
+ *
+ * When loaded, the library adds projection objects for EPSG:4326 (WGS84
+ * geographic coordinates) and EPSG:3857 (Web or Spherical Mercator, as used
+ * for example by Bing Maps or OpenStreetMap), together with the relevant
+ * transform functions.
+ *
+ * Additional transforms may be added by using the {@link http://proj4js.org/}
+ * library (version 2.2 or later). You can use the full build supplied by
+ * Proj4js, or create a custom build to support those projections you need; see
+ * the Proj4js website for how to do this. You also need the Proj4js definitions
+ * for the required projections. These definitions can be obtained from
+ * {@link http://epsg.io/}, and are a JS function, so can be loaded in a script
+ * tag (as in the examples) or pasted into your application.
+ * The first time there is a request for a projection, either with a
+ * {@link ol.proj.projectionLike} or directly with {@link ol.proj.get}, the
+ * code will check if the Proj4js library and the necessary definition are
+ * loaded; if so, it will register the appropriate {@link ol.proj.Projection}
+ * object and add transform functions between the new projection and all the
+ * existing ones. See examples/wms-image-custom-proj for an example of this.
+ * Because the check for presence of the Proj4js library and the definition only
+ * takes place on the first request for them, this means they can be loaded
+ * dynamically as needed; for example, with user-supplied data where you don't
+ * know in advance what projections are needed, you can initially load minimal
+ * support and then load whichever are requested.
+ *
+ * Note that Proj4js does not support projection extents. If you want to add
+ * one for creating default tile grids, you can add it after the Projection
+ * object has been created with `setExtent`, for example,
+ * `ol.proj.get('EPSG:1234').setExtent(extent)`.
+ *
+ * In addition to Proj4js support, any transform functions can be added with
+ * {@link ol.proj.addCoordinateTransforms}. To use this, you must first create
+ * a {@link ol.proj.Projection} object for the new projection and add it with
+ * {@link ol.proj.addProjection}. You can then add the forward and inverse
+ * functions with {@link ol.proj.addCoordinateTransforms}. See
+ * examples/wms-custom-proj for an example of this.
+ *
+ * Note that if no transforms are needed and you only need to define the
+ * projection, just add a {@link ol.proj.Projection} with
+ * {@link ol.proj.addProjection}. See examples/wms-no-proj for an example of
+ * this.
+ *
+ */
+export namespace proj {
+    /**
+     * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
+     * `'us-ft'`.
+     */
+    type Units = "degress" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
+
+    /**
+     * Meters per unit lookup table.
+     * @const
+     * @api stable
+     */
+    const METERS_PER_UNIT: { [k: string]: number };
+
+    /**
+     * @classdesc
+     * Projection definition class. One of these is created for each projection
+     * supported in the application and stored in the {@link ol.proj} namespace.
+     * You can use these in applications, but this is not required, as API params
+     * and options use {@link ol.ProjectionLike} which means the simple string
+     * code will suffice.
+     *
+     * You can use {@link ol.proj.get} to retrieve the object for a particular
+     * projection.
+     *
+     * The library includes definitions for `EPSG:4326` and `EPSG:3857`, together
+     * with the following aliases:
+     * * `EPSG:4326`: CRS:84, urn:ogc:def:crs:EPSG:6.6:4326,
+     *     urn:ogc:def:crs:OGC:1.3:CRS84, urn:ogc:def:crs:OGC:2:84,
+     *     http://www.opengis.net/gml/srs/epsg.xml#4326,
+     *     urn:x-ogc:def:crs:EPSG:4326
+     * * `EPSG:3857`: EPSG:102100, EPSG:102113, EPSG:900913,
+     *     urn:ogc:def:crs:EPSG:6.18:3:3857,
+     *     http://www.opengis.net/gml/srs/epsg.xml#3857
+     *
+     * If you use proj4js, aliases can be added using `proj4.defs()`; see
+     * [documentation](https://github.com/proj4js/proj4js). To set an alternative
+     * namespace for proj4, use {@link ol.proj.setProj4}.
+     *
+     * @param options Projection options.
+     * @struct
+     * @api stable
+     */
+    class Projection {
         /**
          * @classdesc
          * Projection definition class. One of these is created for each projection
@@ -8242,301 +7605,280 @@ declare module ol {
          * [documentation](https://github.com/proj4js/proj4js). To set an alternative
          * namespace for proj4, use {@link ol.proj.setProj4}.
          *
-         * @constructor
-         * @param {olx.ProjectionOptions} options Projection options.
+         * @param options Projection options.
          * @struct
          * @api stable
          */
-        class Projection {
-            /**
-             * @classdesc
-             * Projection definition class. One of these is created for each projection
-             * supported in the application and stored in the {@link ol.proj} namespace.
-             * You can use these in applications, but this is not required, as API params
-             * and options use {@link ol.ProjectionLike} which means the simple string
-             * code will suffice.
-             *
-             * You can use {@link ol.proj.get} to retrieve the object for a particular
-             * projection.
-             *
-             * The library includes definitions for `EPSG:4326` and `EPSG:3857`, together
-             * with the following aliases:
-             * * `EPSG:4326`: CRS:84, urn:ogc:def:crs:EPSG:6.6:4326,
-             *     urn:ogc:def:crs:OGC:1.3:CRS84, urn:ogc:def:crs:OGC:2:84,
-             *     http://www.opengis.net/gml/srs/epsg.xml#4326,
-             *     urn:x-ogc:def:crs:EPSG:4326
-             * * `EPSG:3857`: EPSG:102100, EPSG:102113, EPSG:900913,
-             *     urn:ogc:def:crs:EPSG:6.18:3:3857,
-             *     http://www.opengis.net/gml/srs/epsg.xml#3857
-             *
-             * If you use proj4js, aliases can be added using `proj4.defs()`; see
-             * [documentation](https://github.com/proj4js/proj4js). To set an alternative
-             * namespace for proj4, use {@link ol.proj.setProj4}.
-             *
-             * @constructor
-             * @param {olx.ProjectionOptions} options Projection options.
-             * @struct
-             * @api stable
-             */
-            constructor(options: olx.ProjectionOptions);
-
-            /**
-             * Get the code for this projection, e.g. 'EPSG:4326'.
-             * @return {string} Code.
-             * @api stable
-             */
-            getCode(): string;
-
-            /**
-             * Get the validity extent for this projection.
-             * @return {ol.Extent} Extent.
-             * @api stable
-             */
-            getExtent(): ol.Extent;
-
-            /**
-             * Get the units of this projection.
-             * @return {ol.proj.Units} Units.
-             * @api stable
-             */
-            getUnits(): ol.proj.Units;
-
-            /**
-             * Get the amount of meters per unit of this projection.  If the projection is
-             * not configured with `metersPerUnit` or a units identifier, the return is
-             * `undefined`.
-             * @return {number|undefined} Meters.
-             * @api stable
-             */
-            getMetersPerUnit(): (number);
-
-            /**
-             * Get the world extent for this projection.
-             * @return {ol.Extent} Extent.
-             * @api
-             */
-            getWorldExtent(): ol.Extent;
-
-            /**
-             * Is this projection a global projection which spans the whole world?
-             * @return {boolean} Whether the projection is global.
-             * @api stable
-             */
-            isGlobal(): boolean;
-
-            /**
-             * Set if the projection is a global projection which spans the whole world
-             * @param {boolean} global Whether the projection is global.
-             * @api stable
-             */
-            setGlobal(global: boolean): void;
-
-            /**
-             * Set the validity extent for this projection.
-             * @param {ol.Extent} extent Extent.
-             * @api stable
-             */
-            setExtent(extent: ol.Extent): void;
-
-            /**
-             * Set the world extent for this projection.
-             * @param {ol.Extent} worldExtent World extent
-             *     [minlon, minlat, maxlon, maxlat].
-             * @api
-             */
-            setWorldExtent(worldExtent: ol.Extent): void;
-
-            /**
-             * Set the getPointResolution function for this projection.
-             * @param {function(number, ol.Coordinate):number} func Function
-             * @api
-             */
-            setGetPointResolution(func: ((resolution: number, coords: ol.Coordinate) => number)): void;
-
-            /**
-             * Get the resolution of the point in degrees or distance units.
-             * For projections with degrees as the unit this will simply return the
-             * provided resolution. The default for other projections is to estimate
-             * the point resolution by transforming the 'point' pixel to EPSG:4326,
-             * measuring its width and height on the normal sphere,
-             * and taking the average of the width and height.
-             * An alternative implementation may be given when constructing a
-             * projection. For many local projections,
-             * such a custom function will return the resolution unchanged.
-             * @param {number} resolution Resolution in projection units.
-             * @param {ol.Coordinate} point Point.
-             * @return {number} Point resolution in projection units.
-             * @api
-             */
-            getPointResolution(resolution: number, point: ol.Coordinate): number;
-        }
+        constructor(options: olx.ProjectionOptions);
 
         /**
-         * Register proj4. If not explicitly registered, it will be assumed that
-         * proj4js will be loaded in the global namespace. For example in a
-         * browserify ES6 environment you could use:
-         *
-         *     import ol from 'openlayers';
-         *     import proj4 from 'proj4';
-         *     ol.proj.setProj4(proj4);
-         *
-         * @param {any} proj4 Proj4.
+         * Get the code for this projection, e.g. 'EPSG:4326'.
+         * @return Code.
+         * @api stable
+         */
+        getCode(): string;
+
+        /**
+         * Get the validity extent for this projection.
+         * @return Extent.
+         * @api stable
+         */
+        getExtent(): ol.Extent;
+
+        /**
+         * Get the units of this projection.
+         * @return Units.
+         * @api stable
+         */
+        getUnits(): ol.proj.Units;
+
+        /**
+         * Get the amount of meters per unit of this projection.  If the projection is
+         * not configured with `metersPerUnit` or a units identifier, the return is
+         * `undefined`.
+         * @return Meters.
+         * @api stable
+         */
+        getMetersPerUnit(): (number);
+
+        /**
+         * Get the world extent for this projection.
+         * @return Extent.
          * @api
          */
-        function setProj4(proj4: any): void;
+        getWorldExtent(): ol.Extent;
 
         /**
-         * Registers transformation functions that don't alter coordinates. Those allow
-         * to transform between projections with equal meaning.
-         *
-         * @param {Array.<ol.proj.Projection>} projections Projections.
+         * Is this projection a global projection which spans the whole world?
+         * @return Whether the projection is global.
+         * @api stable
+         */
+        isGlobal(): boolean;
+
+        /**
+         * Set if the projection is a global projection which spans the whole world
+         * @param global Whether the projection is global.
+         * @api stable
+         */
+        setGlobal(global: boolean): void;
+
+        /**
+         * Set the validity extent for this projection.
+         * @param extent Extent.
+         * @api stable
+         */
+        setExtent(extent: ol.Extent): void;
+
+        /**
+         * Set the world extent for this projection.
+         * @param worldExtent World extent
+         *     [minlon, minlat, maxlon, maxlat].
          * @api
          */
-        function addEquivalentProjections(projections: ol.proj.Projection[]): void;
+        setWorldExtent(worldExtent: ol.Extent): void;
 
         /**
-         * Add a Projection object to the list of supported projections that can be
-         * looked up by their code.
-         *
-         * @param {ol.proj.Projection} projection Projection instance.
-         * @api stable
-         */
-        function addProjection(projection: ol.proj.Projection): void;
-
-        /**
-         * Registers coordinate transform functions to convert coordinates between the
-         * source projection and the destination projection.
-         * The forward and inverse functions convert coordinate pairs; this function
-         * converts these into the functions used internally which also handle
-         * extents and coordinate arrays.
-         *
-         * @param {ol.ProjectionLike} source Source projection.
-         * @param {ol.ProjectionLike} destination Destination projection.
-         * @param {function(ol.Coordinate): ol.Coordinate} forward The forward transform
-         *     function (that is, from the source projection to the destination
-         *     projection) that takes a {@link ol.Coordinate} as argument and returns
-         *     the transformed {@link ol.Coordinate}.
-         * @param {function(ol.Coordinate): ol.Coordinate} inverse The inverse transform
-         *     function (that is, from the destination projection to the source
-         *     projection) that takes a {@link ol.Coordinate} as argument and returns
-         *     the transformed {@link ol.Coordinate}.
-         * @api stable
-         */
-        function addCoordinateTransforms(source: ol.ProjectionLike,
-                                         destination: ol.ProjectionLike,
-                                         forward: ((coords: ol.Coordinate) => ol.Coordinate),
-                                         inverse: ((coords: ol.Coordinate) => ol.Coordinate)): void;
-
-        /**
-         * Transforms a coordinate from longitude/latitude to a different projection.
-         * @param {ol.Coordinate} coordinate Coordinate as longitude and latitude, i.e.
-         *     an array with longitude as 1st and latitude as 2nd element.
-         * @param {ol.ProjectionLike=} opt_projection Target projection. The
-         *     default is Web Mercator, i.e. 'EPSG:3857'.
-         * @return {ol.Coordinate} Coordinate projected to the target projection.
-         * @api stable
-         */
-        function fromLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Transforms a coordinate to longitude/latitude.
-         * @param {ol.Coordinate} coordinate Projected coordinate.
-         * @param {ol.ProjectionLike=} opt_projection Projection of the coordinate.
-         *     The default is Web Mercator, i.e. 'EPSG:3857'.
-         * @return {ol.Coordinate} Coordinate as longitude and latitude, i.e. an array
-         *     with longitude as 1st and latitude as 2nd element.
-         * @api stable
-         */
-        function toLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Fetches a Projection object for the code specified.
-         *
-         * @param {ol.ProjectionLike} projectionLike Either a code string which is
-         *     a combination of authority and identifier such as "EPSG:4326", or an
-         *     existing projection object, or undefined.
-         * @return {ol.proj.Projection} Projection object, or null if not in list.
-         * @api stable
-         */
-        function get(projectionLike: ol.ProjectionLike): ol.proj.Projection;
-
-        /**
-         * Checks if two projections are the same, that is every coordinate in one
-         * projection does represent the same geographic point as the same coordinate in
-         * the other projection.
-         *
-         * @param {ol.proj.Projection} projection1 Projection 1.
-         * @param {ol.proj.Projection} projection2 Projection 2.
-         * @return {boolean} Equivalent.
+         * Set the getPointResolution function for this projection.
+         * @param func Function
          * @api
          */
-        function equivalent(projection1: ol.proj.Projection, projection2: ol.proj.Projection): boolean;
+        setGetPointResolution(func: ((resolution: number, coords: ol.Coordinate) => number)): void;
 
         /**
-         * Given the projection-like objects, searches for a transformation
-         * function to convert a coordinates array from the source projection to the
-         * destination projection.
-         *
-         * @param {ol.ProjectionLike} source Source.
-         * @param {ol.ProjectionLike} destination Destination.
-         * @return {ol.TransformFunction} Transform function.
-         * @api stable
+         * Get the resolution of the point in degrees or distance units.
+         * For projections with degrees as the unit this will simply return the
+         * provided resolution. The default for other projections is to estimate
+         * the point resolution by transforming the 'point' pixel to EPSG:4326,
+         * measuring its width and height on the normal sphere,
+         * and taking the average of the width and height.
+         * An alternative implementation may be given when constructing a
+         * projection. For many local projections,
+         * such a custom function will return the resolution unchanged.
+         * @param resolution Resolution in projection units.
+         * @param point Point.
+         * @return Point resolution in projection units.
+         * @api
          */
-        function getTransform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.TransformFunction;
-
-        /**
-         * Transforms a coordinate from source projection to destination projection.
-         * This returns a new coordinate (and does not modify the original).
-         *
-         * See {@link ol.proj.transformExtent} for extent transformation.
-         * See the transform method of {@link ol.geom.Geometry} and its subclasses for
-         * geometry transforms.
-         *
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @param {ol.ProjectionLike} source Source projection-like.
-         * @param {ol.ProjectionLike} destination Destination projection-like.
-         */
-        function transform(coordinate: ol.Coordinate, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Transforms an extent from source projection to destination projection.  This
-         * returns a new extent (and does not modify the original).
-         *
-         * @param {ol.Extent} extent The extent to transform.
-         * @param {ol.ProjectionLike} source Source projection-like.
-         * @param {ol.ProjectionLike} destination Destination projection-like.
-         * @return {ol.Extent} The transformed extent.
-         * @api stable
-         */
-        function transformExtent(extent: ol.Extent, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Extent;
-
-        /**
-         * Get the resolution of the point in degrees or distance units. For
-         * projections with degrees as the unit this will simply return the
-         * provided resolution. For other projections the point resolution is
-         * estimated by transforming the 'point' pixel to EPSG:4326, measuring
-         * its width and height on the normal sphere, and taking the average of
-         * the width and height.
-         * @param {ol.proj.Projection} projection The projection.
-         * @param {number} resolution Nominal resolution in projection units.
-         * @param {ol.Coordinate} point Point to find adjusted resolution at.
-         * @return {number} Point to find adjusted resolution at.
-         */
-        function getPointResolution(
-            projection: ol.proj.Projection,
-            resolution: number,
-            point: ol.Coordinate
-        ): number;
+        getPointResolution(resolution: number, point: ol.Coordinate): number;
     }
 
     /**
-     * @namespace ol.render
+     * Register proj4. If not explicitly registered, it will be assumed that
+     * proj4js will be loaded in the global namespace. For example in a
+     * browserify ES6 environment you could use:
+     *
+     *     import ol from 'openlayers';
+     *     import proj4 from 'proj4';
+     *     ol.proj.setProj4(proj4);
+     *
+     * @param proj4 Proj4.
+     * @api
      */
-    module render {
+    function setProj4(proj4: any): void;
+
+    /**
+     * Registers transformation functions that don't alter coordinates. Those allow
+     * to transform between projections with equal meaning.
+     *
+     * @param projections Projections.
+     * @api
+     */
+    function addEquivalentProjections(projections: ol.proj.Projection[]): void;
+
+    /**
+     * Add a Projection object to the list of supported projections that can be
+     * looked up by their code.
+     *
+     * @param projection Projection instance.
+     * @api stable
+     */
+    function addProjection(projection: ol.proj.Projection): void;
+
+    /**
+     * Registers coordinate transform functions to convert coordinates between the
+     * source projection and the destination projection.
+     * The forward and inverse functions convert coordinate pairs; this function
+     * converts these into the functions used internally which also handle
+     * extents and coordinate arrays.
+     *
+     * @param source Source projection.
+     * @param destination Destination projection.
+     * @param forward The forward transform
+     *     function (that is, from the source projection to the destination
+     *     projection) that takes a {@link ol.Coordinate} as argument and returns
+     *     the transformed {@link ol.Coordinate}.
+     * @param inverse The inverse transform
+     *     function (that is, from the destination projection to the source
+     *     projection) that takes a {@link ol.Coordinate} as argument and returns
+     *     the transformed {@link ol.Coordinate}.
+     * @api stable
+     */
+    function addCoordinateTransforms(source: ol.ProjectionLike,
+                                        destination: ol.ProjectionLike,
+                                        forward: ((coords: ol.Coordinate) => ol.Coordinate),
+                                        inverse: ((coords: ol.Coordinate) => ol.Coordinate)): void;
+
+    /**
+     * Transforms a coordinate from longitude/latitude to a different projection.
+     * @param coordinate Coordinate as longitude and latitude, i.e.
+     *     an array with longitude as 1st and latitude as 2nd element.
+     * @param opt_projection Target projection. The
+     *     default is Web Mercator, i.e. 'EPSG:3857'.
+     * @return Coordinate projected to the target projection.
+     * @api stable
+     */
+    function fromLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Transforms a coordinate to longitude/latitude.
+     * @param coordinate Projected coordinate.
+     * @param opt_projection Projection of the coordinate.
+     *     The default is Web Mercator, i.e. 'EPSG:3857'.
+     * @return Coordinate as longitude and latitude, i.e. an array
+     *     with longitude as 1st and latitude as 2nd element.
+     * @api stable
+     */
+    function toLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Fetches a Projection object for the code specified.
+     *
+     * @param projectionLike Either a code string which is
+     *     a combination of authority and identifier such as "EPSG:4326", or an
+     *     existing projection object, or undefined.
+     * @return Projection object, or null if not in list.
+     * @api stable
+     */
+    function get(projectionLike: ol.ProjectionLike): ol.proj.Projection;
+
+    /**
+     * Checks if two projections are the same, that is every coordinate in one
+     * projection does represent the same geographic point as the same coordinate in
+     * the other projection.
+     *
+     * @param projection1 Projection 1.
+     * @param projection2 Projection 2.
+     * @return Equivalent.
+     * @api
+     */
+    function equivalent(projection1: ol.proj.Projection, projection2: ol.proj.Projection): boolean;
+
+    /**
+     * Given the projection-like objects, searches for a transformation
+     * function to convert a coordinates array from the source projection to the
+     * destination projection.
+     *
+     * @param source Source.
+     * @param destination Destination.
+     * @return Transform function.
+     * @api stable
+     */
+    function getTransform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.TransformFunction;
+
+    /**
+     * Transforms a coordinate from source projection to destination projection.
+     * This returns a new coordinate (and does not modify the original).
+     *
+     * See {@link ol.proj.transformExtent} for extent transformation.
+     * See the transform method of {@link ol.geom.Geometry} and its subclasses for
+     * geometry transforms.
+     *
+     * @param coordinate Coordinate.
+     * @param source Source projection-like.
+     * @param destination Destination projection-like.
+     */
+    function transform(coordinate: ol.Coordinate, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Transforms an extent from source projection to destination projection.  This
+     * returns a new extent (and does not modify the original).
+     *
+     * @param extent The extent to transform.
+     * @param source Source projection-like.
+     * @param destination Destination projection-like.
+     * @return The transformed extent.
+     * @api stable
+     */
+    function transformExtent(extent: ol.Extent, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Extent;
+
+    /**
+     * Get the resolution of the point in degrees or distance units. For
+     * projections with degrees as the unit this will simply return the
+     * provided resolution. For other projections the point resolution is
+     * estimated by transforming the 'point' pixel to EPSG:4326, measuring
+     * its width and height on the normal sphere, and taking the average of
+     * the width and height.
+     * @param projection The projection.
+     * @param resolution Nominal resolution in projection units.
+     * @param point Point to find adjusted resolution at.
+     * @return Point to find adjusted resolution at.
+     */
+    function getPointResolution(
+        projection: ol.proj.Projection,
+        resolution: number,
+        point: ol.Coordinate
+    ): number;
+}
+
+export namespace render {
+    namespace canvas {
         /**
-         * @namespace ol.render.canvas
+         * @classdesc
+         * A concrete subclass of {@link ol.render.VectorContext} that implements
+         * direct rendering of features and geometries to an HTML5 Canvas context.
+         * Instances of this class are created internally by the library and
+         * provided to application code as vectorContext member of the
+         * {@link ol.render.Event} object associated with postcompose, precompose and
+         * render events emitted by layers and maps.
+         *
+         * @param context Context.
+         * @param pixelRatio Pixel ratio.
+         * @param extent Extent.
+         * @param transform Transform.
+         * @param viewRotation View rotation.
+         * @struct
          */
-        module canvas {
+        class Immediate extends render.VectorContext {
             /**
              * @classdesc
              * A concrete subclass of {@link ol.render.VectorContext} that implements
@@ -8546,437 +7888,387 @@ declare module ol {
              * {@link ol.render.Event} object associated with postcompose, precompose and
              * render events emitted by layers and maps.
              *
-             * @constructor
-             * @extends {ol.render.VectorContext}
-             * @param {CanvasRenderingContext2D} context Context.
-             * @param {number} pixelRatio Pixel ratio.
-             * @param {ol.Extent} extent Extent.
-             * @param {ol.Transform} transform Transform.
-             * @param {number} viewRotation View rotation.
+             * @param context Context.
+             * @param pixelRatio Pixel ratio.
+             * @param extent Extent.
+             * @param transform Transform.
+             * @param viewRotation View rotation.
              * @struct
              */
-            class Immediate extends ol.render.VectorContext {
-                /**
-                 * @classdesc
-                 * A concrete subclass of {@link ol.render.VectorContext} that implements
-                 * direct rendering of features and geometries to an HTML5 Canvas context.
-                 * Instances of this class are created internally by the library and
-                 * provided to application code as vectorContext member of the
-                 * {@link ol.render.Event} object associated with postcompose, precompose and
-                 * render events emitted by layers and maps.
-                 *
-                 * @constructor
-                 * @extends {ol.render.VectorContext}
-                 * @param {CanvasRenderingContext2D} context Context.
-                 * @param {number} pixelRatio Pixel ratio.
-                 * @param {ol.Extent} extent Extent.
-                 * @param {ol.Transform} transform Transform.
-                 * @param {number} viewRotation View rotation.
-                 * @struct
-                 */
-                constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: ol.Extent, transform: any, viewRotation: number);
+            constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: ol.Extent, transform: any, viewRotation: number);
 
-                /**
-                 * Render a circle geometry into the canvas.  Rendering is immediate and uses
-                 * the current fill and stroke styles.
-                 *
-                 * @param {ol.geom.Circle} geometry Circle geometry.
-                 * @api
-                 */
-                drawCircle(geometry: ol.geom.Circle): void;
+            /**
+             * Render a circle geometry into the canvas.  Rendering is immediate and uses
+             * the current fill and stroke styles.
+             *
+             * @param geometry Circle geometry.
+             * @api
+             */
+            drawCircle(geometry: ol.geom.Circle): void;
 
-                /**
-                 * Set the rendering style.  Note that since this is an immediate rendering API,
-                 * any `zIndex` on the provided style will be ignored.
-                 *
-                 * @param {ol.style.Style} style The rendering style.
-                 * @api
-                 */
-                setStyle(style: ol.style.Style): void;
+            /**
+             * Set the rendering style.  Note that since this is an immediate rendering API,
+             * any `zIndex` on the provided style will be ignored.
+             *
+             * @param style The rendering style.
+             * @api
+             */
+            setStyle(style: ol.style.Style): void;
 
-                /**
-                 * Render a geometry into the canvas.  Call
-                 * {@link ol.render.canvas.Immediate#setStyle} first to set the rendering style.
-                 *
-                 * @param {ol.geom.Geometry|ol.render.Feature} geometry The geometry to render.
-                 * @api
-                 */
-                drawGeometry(geometry: (ol.geom.Geometry | ol.render.Feature)): void;
+            /**
+             * Render a geometry into the canvas.  Call
+             * {@link ol.render.canvas.Immediate#setStyle} first to set the rendering style.
+             *
+             * @param geometry The geometry to render.
+             * @api
+             */
+            drawGeometry(geometry: (ol.geom.Geometry | ol.render.Feature)): void;
 
-                /**
-                 * Render a feature into the canvas.  Note that any `zIndex` on the provided
-                 * style will be ignored - features are rendered immediately in the order that
-                 * this method is called.  If you need `zIndex` support, you should be using an
-                 * {@link ol.layer.Vector} instead.
-                 *
-                 * @param {ol.Feature} feature Feature.
-                 * @param {ol.style.Style} style Style.
-                 * @api
-                 */
-                drawFeature(feature: ol.Feature, style: ol.style.Style): void;
-            }
+            /**
+             * Render a feature into the canvas.  Note that any `zIndex` on the provided
+             * style will be ignored - features are rendered immediately in the order that
+             * this method is called.  If you need `zIndex` support, you should be using an
+             * {@link ol.layer.Vector} instead.
+             *
+             * @param feature Feature.
+             * @param style Style.
+             * @api
+             */
+            drawFeature(feature: ol.Feature, style: ol.style.Style): void;
         }
+    }
+
+    /**
+     * @param type Type.
+     * @param opt_vectorContext Vector context.
+     * @param opt_frameState Frame state.
+     * @param opt_context Context.
+     * @param opt_glContext WebGL Context.
+     */
+    class Event extends events.Event {
+        /**
+         * @param type Type.
+         * @param opt_vectorContext Vector context.
+         * @param opt_frameState Frame state.
+         * @param opt_context Context.
+         * @param opt_glContext WebGL Context.
+         */
+        constructor(type: ol.render.EventType, opt_vectorContext?: ol.render.VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
 
         /**
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.render.Event}
-         * @param {ol.render.EventType} type Type.
-         * @param {ol.render.VectorContext=} opt_vectorContext Vector context.
-         * @param {olx.FrameState=} opt_frameState Frame state.
-         * @param {?CanvasRenderingContext2D=} opt_context Context.
-         * @param {?ol.webgl.Context=} opt_glContext WebGL Context.
+         * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
+         * @api
          */
-        class Event extends ol.events.Event {
-            /**
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.render.Event}
-             * @param {ol.render.EventType} type Type.
-             * @param {ol.render.VectorContext=} opt_vectorContext Vector context.
-             * @param {olx.FrameState=} opt_frameState Frame state.
-             * @param {?CanvasRenderingContext2D=} opt_context Context.
-             * @param {?ol.webgl.Context=} opt_glContext WebGL Context.
-             */
-            constructor(type: ol.render.EventType, opt_vectorContext?: ol.render.VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
+        vectorContext: ol.render.VectorContext;
 
-            /**
-             * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
-             * @type {ol.render.VectorContext|undefined}
-             * @api
-             */
-            vectorContext: ol.render.VectorContext;
+        /**
+         * An object representing the current render frame state.
+         * @api
+         */
+        frameState: olx.FrameState;
 
-            /**
-             * An object representing the current render frame state.
-             * @type {olx.FrameState|undefined}
-             * @api
-             */
-            frameState: olx.FrameState;
+        /**
+         * Canvas context. Only available when a Canvas renderer is used, null
+         * otherwise.
+         * @api
+         */
+        context: CanvasRenderingContext2D;
 
-            /**
-             * Canvas context. Only available when a Canvas renderer is used, null
-             * otherwise.
-             * @type {CanvasRenderingContext2D|null|undefined}
-             * @api
-             */
-            context: CanvasRenderingContext2D;
+        /**
+         * WebGL context. Only available when a WebGL renderer is used, null
+         * otherwise.
+         * @api
+         */
+        glContext: any;
+    }
 
-            /**
-             * WebGL context. Only available when a WebGL renderer is used, null
-             * otherwise.
-             * @type {ol.webgl.Context|null|undefined}
-             * @api
-             */
-            glContext: any;
-        }
-
-        type EventType = string;
+    type EventType = string;
 
+    /**
+     * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
+     * structure, optimized for rendering and styling. Geometry access through the
+     * API is limited to getting the type and extent of the geometry.
+     *
+     * @param type Geometry type.
+     * @param flatCoordinates Flat coordinates. These always need
+     *     to be right-handed for polygons.
+     * @param ends Ends or Endss.
+     * @param properties Properties.
+     */
+    class Feature {
         /**
          * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
          * structure, optimized for rendering and styling. Geometry access through the
          * API is limited to getting the type and extent of the geometry.
          *
-         * @constructor
-         * @param {ol.geom.GeometryType} type Geometry type.
-         * @param {Array.<number>} flatCoordinates Flat coordinates. These always need
+         * @param type Geometry type.
+         * @param flatCoordinates Flat coordinates. These always need
          *     to be right-handed for polygons.
-         * @param {Array.<number>|Array.<Array.<number>>} ends Ends or Endss.
-         * @param {Object.<string, *>} properties Properties.
+         * @param ends Ends or Endss.
+         * @param properties Properties.
          */
-        class Feature {
-            /**
-             * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
-             * structure, optimized for rendering and styling. Geometry access through the
-             * API is limited to getting the type and extent of the geometry.
-             *
-             * @constructor
-             * @param {ol.geom.GeometryType} type Geometry type.
-             * @param {Array.<number>} flatCoordinates Flat coordinates. These always need
-             *     to be right-handed for polygons.
-             * @param {Array.<number>|Array.<Array.<number>>} ends Ends or Endss.
-             * @param {Object.<string, *>} properties Properties.
-             */
-            constructor(type: ol.geom.GeometryType, flatCoordinates: number[], ends: (number[] | number[][]), properties: { [k: string]: any });
-
-            /**
-             * Get a feature property by its key.
-             * @param {string} key Key
-             * @return {*} Value for the requested key.
-             * @api
-             */
-            get(key: string): any;
-
-            /**
-             * Get the extent of this feature's geometry.
-             * @return {ol.Extent} Extent.
-             * @api
-             */
-            getExtent(): ol.Extent;
-
-            /**
-             * Get the feature for working with its geometry.
-             * @return {ol.render.Feature} Feature.
-             * @api
-             */
-            getGeometry(): ol.render.Feature;
-
-            /**
-             * Get the feature properties.
-             * @return {Object.<string, *>} Feature properties.
-             * @api
-             */
-            getProperties(): { [k: string]: any };
-
-            /**
-             * Get the type of this feature's geometry.
-             * @return {ol.geom.GeometryType} Geometry type.
-             * @api
-             */
-            getType(): ol.geom.GeometryType;
-        }
+        constructor(type: ol.geom.GeometryType, flatCoordinates: number[], ends: (number[] | number[][]), properties: { [k: string]: any });
 
         /**
-         * Context for drawing geometries.  A vector context is available on render
-         * events and does not need to be constructed directly.
-         * @constructor
-         * @struct
+         * Get a feature property by its key.
+         * @param key Key
+         * @return Value for the requested key.
          * @api
          */
-        class VectorContext {
-            /**
-             * Context for drawing geometries.  A vector context is available on render
-             * events and does not need to be constructed directly.
-             * @constructor
-             * @struct
-             * @api
-             */
-            constructor();
-        }
+        get(key: string): any;
 
         /**
-         * Binds a Canvas Immediate API to a canvas context, to allow drawing geometries
-         * to the context's canvas.
-         *
-         * The units for geometry coordinates are css pixels relative to the top left
-         * corner of the canvas element.
-         * ```js
-         * var canvas = document.createElement('canvas');
-         * var render = ol.render.toContext(canvas.getContext('2d'),
-         *     { size: [100, 100] });
-         * render.setFillStrokeStyle(new ol.style.Fill({ color: blue }));
-         * render.drawPolygon(
-         *     new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
-         * ```
-         *
-         * @param {CanvasRenderingContext2D} context Canvas context.
-         * @param {olx.render.ToContextOptions=} opt_options Options.
-         * @return {ol.render.canvas.Immediate} Canvas Immediate.
+         * Get the extent of this feature's geometry.
+         * @return Extent.
          * @api
          */
-        function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
+        getExtent(): ol.Extent;
+
+        /**
+         * Get the feature for working with its geometry.
+         * @return Feature.
+         * @api
+         */
+        getGeometry(): ol.render.Feature;
+
+        /**
+         * Get the feature properties.
+         * @return Feature properties.
+         * @api
+         */
+        getProperties(): { [k: string]: any };
+
+        /**
+         * Get the type of this feature's geometry.
+         * @return Geometry type.
+         * @api
+         */
+        getType(): ol.geom.GeometryType;
     }
 
     /**
-     * Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
-     * @enum {string}
+     * Context for drawing geometries.  A vector context is available on render
+     * events and does not need to be constructed directly.
+     * @struct
+     * @api
      */
-    type RendererType = "canvas" | "dom" | "webgl";
+    class VectorContext {
+        /**
+         * Context for drawing geometries.  A vector context is available on render
+         * events and does not need to be constructed directly.
+         * @struct
+         * @api
+         */
+        constructor();
+    }
 
     /**
-     * Raster operation type. Supported values are `'pixel'` and `'image'`.
-     * @enum {string}
+     * Binds a Canvas Immediate API to a canvas context, to allow drawing geometries
+     * to the context's canvas.
+     *
+     * The units for geometry coordinates are css pixels relative to the top left
+     * corner of the canvas element.
+     * ```js
+     * var canvas = document.createElement('canvas');
+     * var render = ol.render.toContext(canvas.getContext('2d'),
+     *     { size: [100, 100] });
+     * render.setFillStrokeStyle(new ol.style.Fill({ color: blue }));
+     * render.drawPolygon(
+     *     new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
+     * ```
+     *
+     * @param context Canvas context.
+     * @param opt_options Options.
+     * @return Canvas Immediate.
+     * @api
      */
-    type RasterOperationType = "pixel" | "image";
+    function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
+}
 
+/**
+ * Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
+ */
+export type RendererType = "canvas" | "dom" | "webgl";
+
+/**
+ * Raster operation type. Supported values are `'pixel'` and `'image'`.
+ */
+export type RasterOperationType = "pixel" | "image";
+
+export namespace source {
     /**
-     * @namespace ol.source
+     * @classdesc
+     * Layer source for Bing Maps tile data.
+     *
+     * @param options Bing Maps options.
+     * @api stable
      */
-    module source {
+    class BingMaps extends source.TileImage {
         /**
          * @classdesc
          * Layer source for Bing Maps tile data.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.BingMapsOptions} options Bing Maps options.
+         * @param options Bing Maps options.
          * @api stable
          */
-        class BingMaps extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for Bing Maps tile data.
-             *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.BingMapsOptions} options Bing Maps options.
-             * @api stable
-             */
-            constructor(options: olx.source.BingMapsOptions);
+        constructor(options: olx.source.BingMapsOptions);
 
-            /**
-             * The attribution containing a link to the Microsoft® Bing™ Maps Platform APIs’
-             * Terms Of Use.
-             * @const
-             * @type {ol.Attribution}
-             * @api
-             */
-            static TOS_ATTRIBUTION: ol.Attribution;
-        }
+        /**
+         * The attribution containing a link to the Microsoft® Bing™ Maps Platform APIs’
+         * Terms Of Use.
+         * @const
+         * @api
+         */
+        static TOS_ATTRIBUTION: ol.Attribution;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the CartoDB tiles.
+     *
+     * @param options CartoDB options.
+     * @api
+     */
+    class CartoDB extends source.XYZ {
         /**
          * @classdesc
          * Layer source for the CartoDB tiles.
          *
-         * @constructor
-         * @extends {ol.source.XYZ}
-         * @param {olx.source.CartoDBOptions} options CartoDB options.
+         * @param options CartoDB options.
          * @api
          */
-        class CartoDB extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the CartoDB tiles.
-             *
-             * @constructor
-             * @extends {ol.source.XYZ}
-             * @param {olx.source.CartoDBOptions} options CartoDB options.
-             * @api
-             */
-            constructor(options: olx.source.CartoDBOptions);
+        constructor(options: olx.source.CartoDBOptions);
 
-            /**
-             * Returns the current config.
-             * @return {!Object} The current configuration.
-             * @api
-             */
-            getConfig(): GlobalObject;
+        /**
+         * Returns the current config.
+         * @return The current configuration.
+         * @api
+         */
+        getConfig(): GlobalObject;
 
-            /**
-             * Updates the carto db config.
-             * @param {Object} config a key-value lookup. Values will replace current values
-             *     in the config.
-             * @api
-             */
-            updateConfig(config: GlobalObject): void;
+        /**
+         * Updates the carto db config.
+         * @param config a key-value lookup. Values will replace current values
+         *     in the config.
+         * @api
+         */
+        updateConfig(config: GlobalObject): void;
 
-            /**
-             * Sets the CartoDB config
-             * @param {Object} config In the case of anonymous maps, a CartoDB configuration
-             *     object.
-             * If using named maps, a key-value lookup with the template parameters.
-             * @api
-             */
-            setConfig(config: GlobalObject): void;
-        }
+        /**
+         * Sets the CartoDB config
+         * @param config In the case of anonymous maps, a CartoDB configuration
+         *     object.
+         * If using named maps, a key-value lookup with the template parameters.
+         * @api
+         */
+        setConfig(config: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source to cluster vector data. Works out of the box with point
+     * geometries. For other geometry types, or if not all geometries should be
+     * considered for clustering, a custom `geometryFunction` can be defined.
+     *
+     * @param options Constructor options.
+     * @api
+     */
+    class Cluster extends source.Vector {
         /**
          * @classdesc
          * Layer source to cluster vector data. Works out of the box with point
          * geometries. For other geometry types, or if not all geometries should be
          * considered for clustering, a custom `geometryFunction` can be defined.
          *
-         * @constructor
-         * @param {olx.source.ClusterOptions} options Constructor options.
-         * @extends {ol.source.Vector}
+         * @param options Constructor options.
          * @api
          */
-        class Cluster extends ol.source.Vector {
-            /**
-             * @classdesc
-             * Layer source to cluster vector data. Works out of the box with point
-             * geometries. For other geometry types, or if not all geometries should be
-             * considered for clustering, a custom `geometryFunction` can be defined.
-             *
-             * @constructor
-             * @param {olx.source.ClusterOptions} options Constructor options.
-             * @extends {ol.source.Vector}
-             * @api
-             */
-            constructor(options: olx.source.ClusterOptions);
+        constructor(options: olx.source.ClusterOptions);
 
-            /**
-             * Get a reference to the wrapped source.
-             * @return {ol.source.Vector} Source.
-             * @api
-             */
-            getSource(): ol.source.Vector;
+        /**
+         * Get a reference to the wrapped source.
+         * @return Source.
+         * @api
+         */
+        getSource(): ol.source.Vector;
 
-            /**
-             * Get the distance in pixels between clusters.
-             * @return {number} The distance in pixels.
-             * @api
-             */
-            getDistance(): number;
+        /**
+         * Get the distance in pixels between clusters.
+         * @return The distance in pixels.
+         * @api
+         */
+        getDistance(): number;
 
-            /**
-             * Set the distance in pixels between clusters.
-             * @param {number} distance The distance in pixels.
-             * @api
-             */
-            setDistance(distance: number): void;
-        }
+        /**
+         * Set the distance in pixels between clusters.
+         * @param distance The distance in pixels.
+         * @api
+         */
+        setDistance(distance: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for sources providing a single image.
+     *
+     * @param options Single image source options.
+     * @api
+     */
+    class Image extends source.Source {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
          * instantiated in apps.
          * Base class for sources providing a single image.
          *
-         * @constructor
-         * @extends {ol.source.Source}
-         * @param {ol.SourceImageOptions} options Single image source options.
+         * @param options Single image source options.
          * @api
          */
-        class Image extends ol.source.Source {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for sources providing a single image.
-             *
-             * @constructor
-             * @extends {ol.source.Source}
-             * @param {ol.SourceImageOptions} options Single image source options.
-             * @api
-             */
-            constructor(options: ol.SourceImageOptions);
-        }
+        constructor(options: ol.SourceImageOptions);
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Image} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param image The image.
+     */
+    class ImageEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Image} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.source.ImageEvent}
-         * @param {string} type Type.
-         * @param {ol.Image} image The image.
+         * @param type Type.
+         * @param image The image.
          */
-        class ImageEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Image} instances are instances of this
-             * type.
-             *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.source.ImageEvent}
-             * @param {string} type Type.
-             * @param {ol.Image} image The image.
-             */
-            constructor(type: string, image: ol.Image);
+        constructor(type: string, image: ol.Image);
 
-            /**
-             * The image related to the event.
-             * @type {ol.Image}
-             * @api
-             */
-            image: ol.Image;
-        }
+        /**
+         * The image related to the event.
+         * @api
+         */
+        image: ol.Image;
+    }
 
+    /**
+     * @classdesc
+     * Source for data from ArcGIS Rest services providing single, untiled images.
+     * Useful when underlying map service has labels.
+     *
+     * If underlying map service is not using labels,
+     * take advantage of ol image caching and use
+     * {@link ol.source.TileArcGISRest} data source.
+     *
+     * @fires ol.source.ImageEvent
+     * @param opt_options Image ArcGIS Rest Options.
+     * @api
+     */
+    class ImageArcGISRest extends source.Image {
         /**
          * @classdesc
          * Source for data from ArcGIS Rest services providing single, untiled images.
@@ -8986,171 +8278,157 @@ declare module ol {
          * take advantage of ol image caching and use
          * {@link ol.source.TileArcGISRest} data source.
          *
-         * @constructor
          * @fires ol.source.ImageEvent
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageArcGISRestOptions=} opt_options Image ArcGIS Rest Options.
+         * @param opt_options Image ArcGIS Rest Options.
          * @api
          */
-        class ImageArcGISRest extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for data from ArcGIS Rest services providing single, untiled images.
-             * Useful when underlying map service has labels.
-             *
-             * If underlying map service is not using labels,
-             * take advantage of ol image caching and use
-             * {@link ol.source.TileArcGISRest} data source.
-             *
-             * @constructor
-             * @fires ol.source.ImageEvent
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageArcGISRestOptions=} opt_options Image ArcGIS Rest Options.
-             * @api
-             */
-            constructor(opt_options?: olx.source.ImageArcGISRestOptions);
+        constructor(opt_options?: olx.source.ImageArcGISRestOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return {ol.ImageLoadFunctionType} The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Return the URL used for this ArcGIS source.
-             * @return {string|undefined} URL.
-             * @api stable
-             */
-            getUrl(): (string);
+        /**
+         * Return the URL used for this ArcGIS source.
+         * @return URL.
+         * @api stable
+         */
+        getUrl(): (string);
 
-            /**
-             * Set the image load function of the source.
-             * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+        /**
+         * Set the image load function of the source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param {string|undefined} url URL.
-             * @api stable
-             */
-            setUrl(url: (string)): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: (string)): void;
 
-            /**
-             * Update the user-provided params.
-             * @param {Object} params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Base class for image sources where a canvas element is the image.
+     *
+     * @param options Constructor options.
+     * @api
+     */
+    class ImageCanvas extends source.Image {
         /**
          * @classdesc
          * Base class for image sources where a canvas element is the image.
          *
-         * @constructor
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageCanvasOptions} options Constructor options.
+         * @param options Constructor options.
          * @api
          */
-        class ImageCanvas extends ol.source.Image {
-            /**
-             * @classdesc
-             * Base class for image sources where a canvas element is the image.
-             *
-             * @constructor
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageCanvasOptions} options Constructor options.
-             * @api
-             */
-            constructor(options: olx.source.ImageCanvasOptions);
-        }
+        constructor(options: olx.source.ImageCanvasOptions);
+    }
 
+    /**
+     * @classdesc
+     * Source for images from Mapguide servers
+     *
+     * @fires ol.source.ImageEvent
+     * @param options Options.
+     * @api stable
+     */
+    class ImageMapGuide extends source.Image {
         /**
          * @classdesc
          * Source for images from Mapguide servers
          *
-         * @constructor
          * @fires ol.source.ImageEvent
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageMapGuideOptions} options Options.
+         * @param options Options.
          * @api stable
          */
-        class ImageMapGuide extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for images from Mapguide servers
-             *
-             * @constructor
-             * @fires ol.source.ImageEvent
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageMapGuideOptions} options Options.
-             * @api stable
-             */
-            constructor(options: olx.source.ImageMapGuideOptions);
+        constructor(options: olx.source.ImageMapGuideOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return {ol.ImageLoadFunctionType} The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Update the user-provided params.
-             * @param {Object} params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
 
-            /**
-             * Set the image load function of the MapGuide source.
-             * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
-        }
+        /**
+         * Set the image load function of the MapGuide source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+    }
 
+    /**
+     * @classdesc
+     * A layer source for displaying a single, static image.
+     *
+     * @param options Options.
+     * @api stable
+     */
+    class ImageStatic extends source.Image {
         /**
          * @classdesc
          * A layer source for displaying a single, static image.
          *
-         * @constructor
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageStaticOptions} options Options.
+         * @param options Options.
          * @api stable
          */
-        class ImageStatic extends ol.source.Image {
-            /**
-             * @classdesc
-             * A layer source for displaying a single, static image.
-             *
-             * @constructor
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageStaticOptions} options Options.
-             * @api stable
-             */
-            constructor(options: olx.source.ImageStaticOptions);
-        }
+        constructor(options: olx.source.ImageStaticOptions);
+    }
 
+    /**
+     * @classdesc
+     * An image source whose images are canvas elements into which vector features
+     * read from a vector source (`ol.source.Vector`) are drawn. An
+     * `ol.source.ImageVector` object is to be used as the `source` of an image
+     * layer (`ol.layer.Image`). Image layers are rotated, scaled, and translated,
+     * as opposed to being re-rendered, during animations and interactions. So, like
+     * any other image layer, an image layer configured with an
+     * `ol.source.ImageVector` will exhibit this behaviour. This is in contrast to a
+     * vector layer, where vector features are re-drawn during animations and
+     * interactions.
+     *
+     * @param options Options.
+     * @api
+     */
+    class ImageVector extends source.ImageCanvas {
         /**
          * @classdesc
          * An image source whose images are canvas elements into which vector features
@@ -9163,275 +8441,242 @@ declare module ol {
          * vector layer, where vector features are re-drawn during animations and
          * interactions.
          *
-         * @constructor
-         * @extends {ol.source.ImageCanvas}
-         * @param {olx.source.ImageVectorOptions} options Options.
+         * @param options Options.
          * @api
          */
-        class ImageVector extends ol.source.ImageCanvas {
-            /**
-             * @classdesc
-             * An image source whose images are canvas elements into which vector features
-             * read from a vector source (`ol.source.Vector`) are drawn. An
-             * `ol.source.ImageVector` object is to be used as the `source` of an image
-             * layer (`ol.layer.Image`). Image layers are rotated, scaled, and translated,
-             * as opposed to being re-rendered, during animations and interactions. So, like
-             * any other image layer, an image layer configured with an
-             * `ol.source.ImageVector` will exhibit this behaviour. This is in contrast to a
-             * vector layer, where vector features are re-drawn during animations and
-             * interactions.
-             *
-             * @constructor
-             * @extends {ol.source.ImageCanvas}
-             * @param {olx.source.ImageVectorOptions} options Options.
-             * @api
-             */
-            constructor(options: olx.source.ImageVectorOptions);
+        constructor(options: olx.source.ImageVectorOptions);
 
-            /**
-             * Get a reference to the wrapped source.
-             * @return {ol.source.Vector} Source.
-             * @api
-             */
-            getSource(): ol.source.Vector;
+        /**
+         * Get a reference to the wrapped source.
+         * @return Source.
+         * @api
+         */
+        getSource(): ol.source.Vector;
 
-            /**
-             * Get the style for features.  This returns whatever was passed to the `style`
-             * option at construction or to the `setStyle` method.
-             * @return {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction}
-             *     Layer style.
-             * @api stable
-             */
-            getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
+        /**
+         * Get the style for features.  This returns whatever was passed to the `style`
+         * option at construction or to the `setStyle` method.
+         * @return Layer style.
+         * @api stable
+         */
+        getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
 
-            /**
-             * Get the style function.
-             * @return {ol.StyleFunction|undefined} Layer style function.
-             * @api stable
-             */
-            getStyleFunction(): (ol.StyleFunction);
+        /**
+         * Get the style function.
+         * @return Layer style function.
+         * @api stable
+         */
+        getStyleFunction(): (ol.StyleFunction);
 
-            /**
-             * Set the style for features.  This can be a single style object, an array
-             * of styles, or a function that takes a feature and resolution and returns
-             * an array of styles. If it is `undefined` the default style is used. If
-             * it is `null` the layer has no style (a `null` style), so only features
-             * that have their own styles will be rendered in the layer. See
-             * {@link ol.style} for information on the default style.
-             * @param {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined}
-             *     style Layer style.
-             * @api stable
-             */
-            setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
-        }
+        /**
+         * Set the style for features.  This can be a single style object, an array
+         * of styles, or a function that takes a feature and resolution and returns
+         * an array of styles. If it is `undefined` the default style is used. If
+         * it is `null` the layer has no style (a `null` style), so only features
+         * that have their own styles will be rendered in the layer. See
+         * {@link ol.style} for information on the default style.
+         * @param style Layer style.
+         * @api stable
+         */
+        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
+    }
 
+    /**
+     * @classdesc
+     * Source for WMS servers providing single, untiled images.
+     *
+     * @fires ol.source.ImageEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class ImageWMS extends source.Image {
         /**
          * @classdesc
          * Source for WMS servers providing single, untiled images.
          *
-         * @constructor
          * @fires ol.source.ImageEvent
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageWMSOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class ImageWMS extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for WMS servers providing single, untiled images.
-             *
-             * @constructor
-             * @fires ol.source.ImageEvent
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageWMSOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.ImageWMSOptions);
+        constructor(opt_options?: olx.source.ImageWMSOptions);
 
-            /**
-             * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
-             * projection. Return `undefined` if the GetFeatureInfo URL cannot be
-             * constructed.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} resolution Resolution.
-             * @param {ol.ProjectionLike} projection Projection.
-             * @param {!Object} params GetFeatureInfo params. `INFO_FORMAT` at least should
-             *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
-             *     in the `LAYERS` parameter will be used. `VERSION` should not be
-             *     specified here.
-             * @return {string|undefined} GetFeatureInfo URL.
-             * @api stable
-             */
-            getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
+        /**
+         * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
+         * projection. Return `undefined` if the GetFeatureInfo URL cannot be
+         * constructed.
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param projection Projection.
+         * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
+         *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
+         *     in the `LAYERS` parameter will be used. `VERSION` should not be
+         *     specified here.
+         * @return GetFeatureInfo URL.
+         * @api stable
+         */
+        getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return {ol.ImageLoadFunctionType} The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Return the URL used for this WMS source.
-             * @return {string|undefined} URL.
-             * @api stable
-             */
-            getUrl(): (string);
+        /**
+         * Return the URL used for this WMS source.
+         * @return URL.
+         * @api stable
+         */
+        getUrl(): (string);
 
-            /**
-             * Set the image load function of the source.
-             * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+        /**
+         * Set the image load function of the source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param {string|undefined} url URL.
-             * @api stable
-             */
-            setUrl(url: (string)): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: (string)): void;
 
-            /**
-             * Update the user-provided params.
-             * @param {Object} params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the OpenStreetMap tile server.
+     *
+     * @param opt_options Open Street Map options.
+     * @api stable
+     */
+    class OSM extends source.XYZ {
         /**
          * @classdesc
          * Layer source for the OpenStreetMap tile server.
          *
-         * @constructor
-         * @extends {ol.source.XYZ}
-         * @param {olx.source.OSMOptions=} opt_options Open Street Map options.
+         * @param opt_options Open Street Map options.
          * @api stable
          */
-        class OSM extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the OpenStreetMap tile server.
-             *
-             * @constructor
-             * @extends {ol.source.XYZ}
-             * @param {olx.source.OSMOptions=} opt_options Open Street Map options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.OSMOptions);
+        constructor(opt_options?: olx.source.OSMOptions);
 
-            /**
-             * The attribution containing a link to the OpenStreetMap Copyright and License
-             * page.
-             * @const
-             * @type {ol.Attribution}
-             * @api
-             */
-            static ATTRIBUTION: ol.Attribution;
-        }
+        /**
+         * The attribution containing a link to the OpenStreetMap Copyright and License
+         * page.
+         * @const
+         * @api
+         */
+        static ATTRIBUTION: ol.Attribution;
+    }
 
+    /**
+     * @classdesc
+     * A source that transforms data from any number of input sources using an array
+     * of {@link ol.RasterOperation} functions to transform input pixel values into
+     * output pixel values.
+     *
+     * @fires ol.source.RasterEvent
+     * @param options Options.
+     * @api
+     */
+    class Raster extends source.Image {
         /**
          * @classdesc
          * A source that transforms data from any number of input sources using an array
          * of {@link ol.RasterOperation} functions to transform input pixel values into
          * output pixel values.
          *
-         * @constructor
-         * @extends {ol.source.Image}
          * @fires ol.source.RasterEvent
-         * @param {olx.source.RasterOptions} options Options.
+         * @param options Options.
          * @api
          */
-        class Raster extends ol.source.Image {
-            /**
-             * @classdesc
-             * A source that transforms data from any number of input sources using an array
-             * of {@link ol.RasterOperation} functions to transform input pixel values into
-             * output pixel values.
-             *
-             * @constructor
-             * @extends {ol.source.Image}
-             * @fires ol.source.RasterEvent
-             * @param {olx.source.RasterOptions} options Options.
-             * @api
-             */
-            constructor(options: olx.source.RasterOptions);
+        constructor(options: olx.source.RasterOptions);
 
-            /**
-             * Set the operation.
-             * @param {ol.RasterOperation} operation New operation.
-             * @param {Object=} opt_lib Functions that will be available to operations run
-             *     in a worker.
-             * @api
-             */
-            setOperation(operation: ol.RasterOperation, opt_lib?: GlobalObject): void;
-        }
+        /**
+         * Set the operation.
+         * @param operation New operation.
+         * @param opt_lib Functions that will be available to operations run
+         *     in a worker.
+         * @api
+         */
+        setOperation(operation: ol.RasterOperation, opt_lib?: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Raster} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param frameState The frame state.
+     * @param data An object made available to operations.
+     */
+    class RasterEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Raster} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.source.RasterEvent}
-         * @param {string} type Type.
-         * @param {olx.FrameState} frameState The frame state.
-         * @param {Object} data An object made available to operations.
+         * @param type Type.
+         * @param frameState The frame state.
+         * @param data An object made available to operations.
          */
-        class RasterEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Raster} instances are instances of this
-             * type.
-             *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.source.RasterEvent}
-             * @param {string} type Type.
-             * @param {olx.FrameState} frameState The frame state.
-             * @param {Object} data An object made available to operations.
-             */
-            constructor(type: string, frameState: olx.FrameState, data: GlobalObject);
-
-            /**
-             * The raster extent.
-             * @type {ol.Extent}
-             * @api
-             */
-            extent: ol.Extent;
-
-            /**
-             * The pixel resolution (map units per pixel).
-             * @type {number}
-             * @api
-             */
-            resolution: number;
-
-            /**
-             * An object made available to all operations.  This can be used by operations
-             * as a storage object (e.g. for calculating statistics).
-             * @type {Object}
-             * @api
-             */
-            data: GlobalObject;
-        }
+        constructor(type: string, frameState: olx.FrameState, data: GlobalObject);
 
         /**
-         * State of the source, one of 'undefined', 'loading', 'ready' or 'error'.
-         * @enum {string}
+         * The raster extent.
+         * @api
          */
-        type State = "undefined" | "loading" | "ready" | "error";
+        extent: ol.Extent;
 
+        /**
+         * The pixel resolution (map units per pixel).
+         * @api
+         */
+        resolution: number;
+
+        /**
+         * An object made available to all operations.  This can be used by operations
+         * as a storage object (e.g. for calculating statistics).
+         * @api
+         */
+        data: GlobalObject;
+    }
+
+    /**
+     * State of the source, one of 'undefined', 'loading', 'ready' or 'error'.
+     */
+    type State = "undefined" | "loading" | "ready" | "error";
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for {@link ol.layer.Layer} sources.
+     *
+     * A generic `change` event is triggered when the state of the source changes.
+     *
+     * @param options Source options.
+     * @api stable
+     */
+    class Source extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -9440,159 +8685,141 @@ declare module ol {
          *
          * A generic `change` event is triggered when the state of the source changes.
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {ol.SourceSourceOptions} options Source options.
+         * @param options Source options.
          * @api stable
          */
-        class Source extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for {@link ol.layer.Layer} sources.
-             *
-             * A generic `change` event is triggered when the state of the source changes.
-             *
-             * @constructor
-             * @extends {ol.Object}
-             * @param {ol.SourceSourceOptions} options Source options.
-             * @api stable
-             */
-            constructor(options: ol.SourceSourceOptions);
+        constructor(options: ol.SourceSourceOptions);
 
-            /**
-             * Get the attributions of the source.
-             * @return {Array.<ol.Attribution>} Attributions.
-             * @api stable
-             */
-            getAttributions(): ol.Attribution[];
+        /**
+         * Get the attributions of the source.
+         * @return Attributions.
+         * @api stable
+         */
+        getAttributions(): ol.Attribution[];
 
-            /**
-             * Get the logo of the source.
-             * @return {string|olx.LogoOptions|undefined} Logo.
-             * @api stable
-             */
-            getLogo(): (string | olx.LogoOptions);
+        /**
+         * Get the logo of the source.
+         * @return Logo.
+         * @api stable
+         */
+        getLogo(): (string | olx.LogoOptions);
 
-            /**
-             * Get the projection of the source.
-             * @return {ol.proj.Projection} Projection.
-             * @api
-             */
-            getProjection(): ol.proj.Projection;
+        /**
+         * Get the projection of the source.
+         * @return Projection.
+         * @api
+         */
+        getProjection(): ol.proj.Projection;
 
-            /**
-             * Get the state of the source, see {@link ol.source.State} for possible states.
-             * @return {ol.source.State} State.
-             * @api
-             */
-            getState(): ol.source.State;
+        /**
+         * Get the state of the source, see {@link ol.source.State} for possible states.
+         * @return State.
+         * @api
+         */
+        getState(): ol.source.State;
 
-            /**
-             * Refreshes the source and finally dispatches a 'change' event.
-             * @api
-             */
-            refresh(): void;
+        /**
+         * Refreshes the source and finally dispatches a 'change' event.
+         * @api
+         */
+        refresh(): void;
 
-            /**
-             * Set the attributions of the source.
-             * @param {ol.AttributionLike|undefined} attributions Attributions.
-             *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
-             *     `Array<{@link ol.Attribution}>` or `undefined`.
-             * @api
-             */
-            setAttributions(attributions: (ol.AttributionLike)): void;
-        }
+        /**
+         * Set the attributions of the source.
+         * @param attributions Attributions.
+         *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
+         *     `Array<{@link ol.Attribution}>` or `undefined`.
+         * @api
+         */
+        setAttributions(attributions: (ol.AttributionLike)): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the Stamen tile server.
+     *
+     * @param options Stamen options.
+     * @api stable
+     */
+    class Stamen extends source.XYZ {
         /**
          * @classdesc
          * Layer source for the Stamen tile server.
          *
-         * @constructor
-         * @extends {ol.source.XYZ}
-         * @param {olx.source.StamenOptions} options Stamen options.
+         * @param options Stamen options.
          * @api stable
          */
-        class Stamen extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the Stamen tile server.
-             *
-             * @constructor
-             * @extends {ol.source.XYZ}
-             * @param {olx.source.StamenOptions} options Stamen options.
-             * @api stable
-             */
-            constructor(options: olx.source.StamenOptions);
-        }
+        constructor(options: olx.source.StamenOptions);
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for sources providing images divided into a tile grid.
+     *
+     * @param options Tile source options.
+     * @api
+     */
+    class Tile extends source.Source {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
          * instantiated in apps.
          * Base class for sources providing images divided into a tile grid.
          *
-         * @constructor
-         * @extends {ol.source.Source}
-         * @param {ol.SourceTileOptions} options Tile source options.
+         * @param options Tile source options.
          * @api
          */
-        class Tile extends ol.source.Source {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for sources providing images divided into a tile grid.
-             *
-             * @constructor
-             * @extends {ol.source.Source}
-             * @param {ol.SourceTileOptions} options Tile source options.
-             * @api
-             */
-            constructor(options: ol.SourceTileOptions);
+        constructor(options: ol.SourceTileOptions);
 
-            /**
-             * Return the tile grid of the tile source.
-             * @return {ol.tilegrid.TileGrid} Tile grid.
-             * @api stable
-             */
-            getTileGrid(): ol.tilegrid.TileGrid;
-        }
+        /**
+         * Return the tile grid of the tile source.
+         * @return Tile grid.
+         * @api stable
+         */
+        getTileGrid(): ol.tilegrid.TileGrid;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Tile} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param tile The tile.
+     */
+    class TileEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Tile} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.source.TileEvent}
-         * @param {string} type Type.
-         * @param {ol.Tile} tile The tile.
+         * @param type Type.
+         * @param tile The tile.
          */
-        class TileEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Tile} instances are instances of this
-             * type.
-             *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.source.TileEvent}
-             * @param {string} type Type.
-             * @param {ol.Tile} tile The tile.
-             */
-            constructor(type: string, tile: ol.Tile);
+        constructor(type: string, tile: ol.Tile);
 
-            /**
-             * The tile related to the event.
-             * @type {ol.Tile}
-             * @api
-             */
-            tile: ol.Tile;
-        }
+        /**
+         * The tile related to the event.
+         * @api
+         */
+        tile: ol.Tile;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data from ArcGIS Rest services. Map and Image
+     * Services are supported.
+     *
+     * For cached ArcGIS services, better performance is available using the
+     * {@link ol.source.XYZ} data source.
+     *
+     * @param opt_options Tile ArcGIS Rest
+     *     options.
+     * @api
+     */
+    class TileArcGISRest extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data from ArcGIS Rest services. Map and Image
@@ -9601,45 +8828,40 @@ declare module ol {
          * For cached ArcGIS services, better performance is available using the
          * {@link ol.source.XYZ} data source.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.TileArcGISRestOptions=} opt_options Tile ArcGIS Rest
+         * @param opt_options Tile ArcGIS Rest
          *     options.
          * @api
          */
-        class TileArcGISRest extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from ArcGIS Rest services. Map and Image
-             * Services are supported.
-             *
-             * For cached ArcGIS services, better performance is available using the
-             * {@link ol.source.XYZ} data source.
-             *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.TileArcGISRestOptions=} opt_options Tile ArcGIS Rest
-             *     options.
-             * @api
-             */
-            constructor(opt_options?: olx.source.TileArcGISRestOptions);
+        constructor(opt_options?: olx.source.TileArcGISRestOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
-             * @api
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Update the user-provided params.
-             * @param {Object} params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * A pseudo tile source, which does not fetch tiles from a server, but renders
+     * a grid outline for the tile grid/projection along with the coordinates for
+     * each tile. See examples/canvas-tiles for an example.
+     *
+     * Uses Canvas context2d, so requires Canvas support.
+     *
+     * @param options Debug tile options.
+     * @api
+     */
+    class TileDebug extends source.Tile {
         /**
          * @classdesc
          * A pseudo tile source, which does not fetch tiles from a server, but renders
@@ -9648,509 +8870,477 @@ declare module ol {
          *
          * Uses Canvas context2d, so requires Canvas support.
          *
-         * @constructor
-         * @extends {ol.source.Tile}
-         * @param {olx.source.TileDebugOptions} options Debug tile options.
+         * @param options Debug tile options.
          * @api
          */
-        class TileDebug extends ol.source.Tile {
-            /**
-             * @classdesc
-             * A pseudo tile source, which does not fetch tiles from a server, but renders
-             * a grid outline for the tile grid/projection along with the coordinates for
-             * each tile. See examples/canvas-tiles for an example.
-             *
-             * Uses Canvas context2d, so requires Canvas support.
-             *
-             * @constructor
-             * @extends {ol.source.Tile}
-             * @param {olx.source.TileDebugOptions} options Debug tile options.
-             * @api
-             */
-            constructor(options: olx.source.TileDebugOptions);
-        }
+        constructor(options: olx.source.TileDebugOptions);
+    }
 
+    /**
+     * @classdesc
+     * Base class for sources providing images divided into a tile grid.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Image tile options.
+     * @api
+     */
+    class TileImage extends source.UrlTile {
         /**
          * @classdesc
          * Base class for sources providing images divided into a tile grid.
          *
-         * @constructor
          * @fires ol.source.TileEvent
-         * @extends {ol.source.UrlTile}
-         * @param {olx.source.TileImageOptions} options Image tile options.
+         * @param options Image tile options.
          * @api
          */
-        class TileImage extends ol.source.UrlTile {
-            /**
-             * @classdesc
-             * Base class for sources providing images divided into a tile grid.
-             *
-             * @constructor
-             * @fires ol.source.TileEvent
-             * @extends {ol.source.UrlTile}
-             * @param {olx.source.TileImageOptions} options Image tile options.
-             * @api
-             */
-            constructor(options: olx.source.TileImageOptions);
+        constructor(options: olx.source.TileImageOptions);
 
-            /**
-             * Sets whether to render reprojection edges or not (usually for debugging).
-             * @param {boolean} render Render the edges.
-             * @api
-             */
-            setRenderReprojectionEdges(render: boolean): void;
+        /**
+         * Sets whether to render reprojection edges or not (usually for debugging).
+         * @param render Render the edges.
+         * @api
+         */
+        setRenderReprojectionEdges(render: boolean): void;
 
-            /**
-             * Sets the tile grid to use when reprojecting the tiles to the given
-             * projection instead of the default tile grid for the projection.
-             *
-             * This can be useful when the default tile grid cannot be created
-             * (e.g. projection has no extent defined) or
-             * for optimization reasons (custom tile size, resolutions, ...).
-             *
-             * @param {ol.ProjectionLike} projection Projection.
-             * @param {ol.tilegrid.TileGrid} tilegrid Tile grid to use for the projection.
-             * @api
-             */
-            setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
-        }
+        /**
+         * Sets the tile grid to use when reprojecting the tiles to the given
+         * projection instead of the default tile grid for the projection.
+         *
+         * This can be useful when the default tile grid cannot be created
+         * (e.g. projection has no extent defined) or
+         * for optimization reasons (custom tile size, resolutions, ...).
+         *
+         * @param projection Projection.
+         * @param tilegrid Tile grid to use for the projection.
+         * @api
+         */
+        setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data in TileJSON format.
+     *
+     * @param options TileJSON options.
+     * @api stable
+     */
+    class TileJSON extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data in TileJSON format.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.TileJSONOptions} options TileJSON options.
+         * @param options TileJSON options.
          * @api stable
          */
-        class TileJSON extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data in TileJSON format.
-             *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.TileJSONOptions} options TileJSON options.
-             * @api stable
-             */
-            constructor(options: olx.source.TileJSONOptions);
+        constructor(options: olx.source.TileJSONOptions);
 
-            /**
-             * @return {TileJSON} The tilejson object.
-             * @api
-             */
-            getTileJSON(): TileJSON;
-        }
+        /**
+         * @return The tilejson object.
+         * @api
+         */
+        getTileJSON(): TileJSON;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for UTFGrid interaction data loaded from TileJSON format.
+     *
+     * @param options Source options.
+     * @api
+     */
+    class TileUTFGrid extends source.Tile {
         /**
          * @classdesc
          * Layer source for UTFGrid interaction data loaded from TileJSON format.
          *
-         * @constructor
-         * @extends {ol.source.Tile}
-         * @param {olx.source.TileUTFGridOptions} options Source options.
+         * @param options Source options.
          * @api
          */
-        class TileUTFGrid extends ol.source.Tile {
-            /**
-             * @classdesc
-             * Layer source for UTFGrid interaction data loaded from TileJSON format.
-             *
-             * @constructor
-             * @extends {ol.source.Tile}
-             * @param {olx.source.TileUTFGridOptions} options Source options.
-             * @api
-             */
-            constructor(options: olx.source.TileUTFGridOptions);
+        constructor(options: olx.source.TileUTFGridOptions);
 
-            /**
-             * Return the template from TileJSON.
-             * @return {string|undefined} The template from TileJSON.
-             * @api
-             */
-            getTemplate(): (string);
+        /**
+         * Return the template from TileJSON.
+         * @return The template from TileJSON.
+         * @api
+         */
+        getTemplate(): (string);
 
-            /**
-             * Calls the callback (synchronously by default) with the available data
-             * for given coordinate and resolution (or `null` if not yet loaded or
-             * in case of an error).
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} resolution Resolution.
-             * @param {function(this: T, *)} callback Callback.
-             * @param {T=} opt_this The object to use as `this` in the callback.
-             * @param {boolean=} opt_request If `true` the callback is always async.
-             *                               The tile data is requested if not yet loaded.
-             * @template T
-             * @api
-             */
-            forDataAtCoordinateAndResolution<T>(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: T, opt_request?: boolean): void;
-        }
+        /**
+         * Calls the callback (synchronously by default) with the available data
+         * for given coordinate and resolution (or `null` if not yet loaded or
+         * in case of an error).
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param callback Callback.
+         * @param opt_this The object to use as `this` in the callback.
+         * @param opt_request If `true` the callback is always async.
+         *                               The tile data is requested if not yet loaded.
+         * @template T
+         * @api
+         */
+        forDataAtCoordinateAndResolution<T>(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: T, opt_request?: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data from WMS servers.
+     *
+     * @param opt_options Tile WMS options.
+     * @api stable
+     */
+    class TileWMS extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data from WMS servers.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.TileWMSOptions=} opt_options Tile WMS options.
+         * @param opt_options Tile WMS options.
          * @api stable
          */
-        class TileWMS extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from WMS servers.
-             *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.TileWMSOptions=} opt_options Tile WMS options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.TileWMSOptions);
+        constructor(opt_options?: olx.source.TileWMSOptions);
 
-            /**
-             * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
-             * projection. Return `undefined` if the GetFeatureInfo URL cannot be
-             * constructed.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} resolution Resolution.
-             * @param {ol.ProjectionLike} projection Projection.
-             * @param {!Object} params GetFeatureInfo params. `INFO_FORMAT` at least should
-             *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
-             *     in the `LAYERS` parameter will be used. `VERSION` should not be
-             *     specified here.
-             * @return {string|undefined} GetFeatureInfo URL.
-             * @api stable
-             */
-            getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
+        /**
+         * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
+         * projection. Return `undefined` if the GetFeatureInfo URL cannot be
+         * constructed.
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param projection Projection.
+         * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
+         *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
+         *     in the `LAYERS` parameter will be used. `VERSION` should not be
+         *     specified here.
+         * @return GetFeatureInfo URL.
+         * @api stable
+         */
+        getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Update the user-provided params.
-             * @param {Object} params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Base class for sources providing tiles divided into a tile grid over http.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Image tile options.
+     */
+    class UrlTile extends source.Tile {
         /**
          * @classdesc
          * Base class for sources providing tiles divided into a tile grid over http.
          *
-         * @constructor
          * @fires ol.source.TileEvent
-         * @extends {ol.source.Tile}
-         * @param {ol.SourceUrlTileOptions} options Image tile options.
+         * @param options Image tile options.
          */
-        class UrlTile extends ol.source.Tile {
-            /**
-             * @classdesc
-             * Base class for sources providing tiles divided into a tile grid over http.
-             *
-             * @constructor
-             * @fires ol.source.TileEvent
-             * @extends {ol.source.Tile}
-             * @param {ol.SourceUrlTileOptions} options Image tile options.
-             */
-            constructor(options: ol.SourceUrlTileOptions);
+        constructor(options: ol.SourceUrlTileOptions);
 
-            /**
-             * Return the tile load function of the source.
-             * @return {ol.TileLoadFunctionType} TileLoadFunction
-             * @api
-             */
-            getTileLoadFunction(): ol.TileLoadFunctionType;
+        /**
+         * Return the tile load function of the source.
+         * @return TileLoadFunction
+         * @api
+         */
+        getTileLoadFunction(): ol.TileLoadFunctionType;
 
-            /**
-             * Return the tile URL function of the source.
-             * @return {ol.TileUrlFunctionType} TileUrlFunction
-             * @api
-             */
-            getTileUrlFunction(): ol.TileUrlFunctionType;
+        /**
+         * Return the tile URL function of the source.
+         * @return TileUrlFunction
+         * @api
+         */
+        getTileUrlFunction(): ol.TileUrlFunctionType;
 
-            /**
-             * Return the URLs used for this source.
-             * When a tileUrlFunction is used instead of url or urls,
-             * null will be returned.
-             * @return {!Array.<string>|null} URLs.
-             * @api
-             */
-            getUrls(): (string[]);
+        /**
+         * Return the URLs used for this source.
+         * When a tileUrlFunction is used instead of url or urls,
+         * null will be returned.
+         * @return URLs.
+         * @api
+         */
+        getUrls(): (string[]);
 
-            /**
-             * Set the tile load function of the source.
-             * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-             * @api
-             */
-            setTileLoadFunction(tileLoadFunction: ol.TileLoadFunctionType): void;
+        /**
+         * Set the tile load function of the source.
+         * @param tileLoadFunction Tile load function.
+         * @api
+         */
+        setTileLoadFunction(tileLoadFunction: ol.TileLoadFunctionType): void;
 
-            /**
-             * Set the tile URL function of the source.
-             * @param {ol.TileUrlFunctionType} tileUrlFunction Tile URL function.
-             * @param {string=} opt_key Optional new tile key for the source.
-             * @api
-             */
-            setTileUrlFunction(tileUrlFunction: ol.TileUrlFunctionType, opt_key?: string): void;
+        /**
+         * Set the tile URL function of the source.
+         * @param tileUrlFunction Tile URL function.
+         * @param opt_key Optional new tile key for the source.
+         * @api
+         */
+        setTileUrlFunction(tileUrlFunction: ol.TileUrlFunctionType, opt_key?: string): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param {string} url URL.
-             * @api stable
-             */
-            setUrl(url: string): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: string): void;
 
-            /**
-             * Set the URLs to use for requests.
-             * @param {Array.<string>} urls URLs.
-             * @api stable
-             */
-            setUrls(urls: string[]): void;
-        }
+        /**
+         * Set the URLs to use for requests.
+         * @param urls URLs.
+         * @api stable
+         */
+        setUrls(urls: string[]): void;
+    }
 
+    /**
+     * @classdesc
+     * Provides a source of features for vector layers. Vector features provided
+     * by this source are suitable for editing. See {@link ol.source.VectorTile} for
+     * vector data that is optimized for rendering.
+     *
+     * @fires ol.source.VectorEvent
+     * @param opt_options Vector source options.
+     * @api stable
+     */
+    class Vector extends source.Source {
         /**
          * @classdesc
          * Provides a source of features for vector layers. Vector features provided
          * by this source are suitable for editing. See {@link ol.source.VectorTile} for
          * vector data that is optimized for rendering.
          *
-         * @constructor
-         * @extends {ol.source.Source}
          * @fires ol.source.VectorEvent
-         * @param {olx.source.VectorOptions=} opt_options Vector source options.
+         * @param opt_options Vector source options.
          * @api stable
          */
-        class Vector extends ol.source.Source {
-            /**
-             * @classdesc
-             * Provides a source of features for vector layers. Vector features provided
-             * by this source are suitable for editing. See {@link ol.source.VectorTile} for
-             * vector data that is optimized for rendering.
-             *
-             * @constructor
-             * @extends {ol.source.Source}
-             * @fires ol.source.VectorEvent
-             * @param {olx.source.VectorOptions=} opt_options Vector source options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.VectorOptions);
+        constructor(opt_options?: olx.source.VectorOptions);
 
-            /**
-             * Add a single feature to the source.  If you want to add a batch of features
-             * at once, call {@link ol.source.Vector#addFeatures source.addFeatures()}
-             * instead.
-             * @param {ol.Feature} feature Feature to add.
-             * @api stable
-             */
-            addFeature(feature: ol.Feature): void;
+        /**
+         * Add a single feature to the source.  If you want to add a batch of features
+         * at once, call {@link ol.source.Vector#addFeatures source.addFeatures()}
+         * instead.
+         * @param feature Feature to add.
+         * @api stable
+         */
+        addFeature(feature: ol.Feature): void;
 
-            /**
-             * Add a batch of features to the source.
-             * @param {Array.<ol.Feature>} features Features to add.
-             * @api stable
-             */
-            addFeatures(features: ol.Feature[]): void;
+        /**
+         * Add a batch of features to the source.
+         * @param features Features to add.
+         * @api stable
+         */
+        addFeatures(features: ol.Feature[]): void;
 
-            /**
-             * Remove all features from the source.
-             * @param {boolean=} opt_fast Skip dispatching of {@link removefeature} events.
-             * @api stable
-             */
-            clear(opt_fast?: boolean): void;
+        /**
+         * Remove all features from the source.
+         * @param events.
+         * @api stable
+         */
+        clear(opt_fast?: boolean): void;
 
-            /**
-             * Iterate through all features on the source, calling the provided callback
-             * with each one.  If the callback returns any "truthy" value, iteration will
-             * stop and the function will return the same value.
-             *
-             * @param {function(this: T, ol.Feature): S} callback Called with each feature
-             *     on the source.  Return a truthy value to stop iteration.
-             * @param {T=} opt_this The object to use as `this` in the callback.
-             * @return {S|undefined} The return value from the last call to the callback.
-             * @template T,S
-             * @api stable
-             */
-            forEachFeature<T, S>(callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features on the source, calling the provided callback
+         * with each one.  If the callback returns any "truthy" value, iteration will
+         * stop and the function will return the same value.
+         *
+         * @param callback Called with each feature
+         *     on the source.  Return a truthy value to stop iteration.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api stable
+         */
+        forEachFeature<T, S>(callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
 
-            /**
-             * Iterate through all features whose bounding box intersects the provided
-             * extent (note that the feature's geometry may not intersect the extent),
-             * calling the callback with each feature.  If the callback returns a "truthy"
-             * value, iteration will stop and the function will return the same value.
-             *
-             * If you are interested in features whose geometry intersects an extent, call
-             * the {@link ol.source.Vector#forEachFeatureIntersectingExtent
-             * source.forEachFeatureIntersectingExtent()} method instead.
-             *
-             * When `useSpatialIndex` is set to false, this method will loop through all
-             * features, equivalent to {@link ol.source.Vector#forEachFeature}.
-             *
-             * @param {ol.Extent} extent Extent.
-             * @param {function(this: T, ol.Feature): S} callback Called with each feature
-             *     whose bounding box intersects the provided extent.
-             * @param {T=} opt_this The object to use as `this` in the callback.
-             * @return {S|undefined} The return value from the last call to the callback.
-             * @template T,S
-             * @api
-             */
-            forEachFeatureInExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features whose bounding box intersects the provided
+         * extent (note that the feature's geometry may not intersect the extent),
+         * calling the callback with each feature.  If the callback returns a "truthy"
+         * value, iteration will stop and the function will return the same value.
+         *
+         * If you are interested in features whose geometry intersects an extent, call
+         * the {@link ol.source.Vector#forEachFeatureIntersectingExtent
+         * source.forEachFeatureIntersectingExtent()} method instead.
+         *
+         * When `useSpatialIndex` is set to false, this method will loop through all
+         * features, equivalent to {@link ol.source.Vector#forEachFeature}.
+         *
+         * @param extent Extent.
+         * @param callback Called with each feature
+         *     whose bounding box intersects the provided extent.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api
+         */
+        forEachFeatureInExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
 
-            /**
-             * Iterate through all features whose geometry intersects the provided extent,
-             * calling the callback with each feature.  If the callback returns a "truthy"
-             * value, iteration will stop and the function will return the same value.
-             *
-             * If you only want to test for bounding box intersection, call the
-             * {@link ol.source.Vector#forEachFeatureInExtent
-             * source.forEachFeatureInExtent()} method instead.
-             *
-             * @param {ol.Extent} extent Extent.
-             * @param {function(this: T, ol.Feature): S} callback Called with each feature
-             *     whose geometry intersects the provided extent.
-             * @param {T=} opt_this The object to use as `this` in the callback.
-             * @return {S|undefined} The return value from the last call to the callback.
-             * @template T,S
-             * @api
-             */
-            forEachFeatureIntersectingExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features whose geometry intersects the provided extent,
+         * calling the callback with each feature.  If the callback returns a "truthy"
+         * value, iteration will stop and the function will return the same value.
+         *
+         * If you only want to test for bounding box intersection, call the
+         * {@link ol.source.Vector#forEachFeatureInExtent
+         * source.forEachFeatureInExtent()} method instead.
+         *
+         * @param extent Extent.
+         * @param callback Called with each feature
+         *     whose geometry intersects the provided extent.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api
+         */
+        forEachFeatureIntersectingExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
 
-            /**
-             * Get the features collection associated with this source. Will be `null`
-             * unless the source was configured with `useSpatialIndex` set to `false`, or
-             * with an {@link ol.Collection} as `features`.
-             * @return {ol.Collection.<ol.Feature>} The collection of features.
-             * @api
-             */
-            getFeaturesCollection(): ol.Collection<ol.Feature>;
+        /**
+         * Get the features collection associated with this source. Will be `null`
+         * unless the source was configured with `useSpatialIndex` set to `false`, or
+         * with an {@link ol.Collection} as `features`.
+         * @return The collection of features.
+         * @api
+         */
+        getFeaturesCollection(): ol.Collection<ol.Feature>;
 
-            /**
-             * Get all features on the source.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            getFeatures(): ol.Feature[];
+        /**
+         * Get all features on the source.
+         * @return Features.
+         * @api stable
+         */
+        getFeatures(): ol.Feature[];
 
-            /**
-             * Get all features whose geometry intersects the provided coordinate.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @return {Array.<ol.Feature>} Features.
-             * @api stable
-             */
-            getFeaturesAtCoordinate(coordinate: ol.Coordinate): ol.Feature[];
+        /**
+         * Get all features whose geometry intersects the provided coordinate.
+         * @param coordinate Coordinate.
+         * @return Features.
+         * @api stable
+         */
+        getFeaturesAtCoordinate(coordinate: ol.Coordinate): ol.Feature[];
 
-            /**
-             * Get all features in the provided extent.  Note that this returns all features
-             * whose bounding boxes intersect the given extent (so it may include features
-             * whose geometries do not intersect the extent).
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @param {ol.Extent} extent Extent.
-             * @return {Array.<ol.Feature>} Features.
-             * @api
-             */
-            getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
+        /**
+         * Get all features in the provided extent.  Note that this returns all features
+         * whose bounding boxes intersect the given extent (so it may include features
+         * whose geometries do not intersect the extent).
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @param extent Extent.
+         * @return Features.
+         * @api
+         */
+        getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
 
-            /**
-             * Get the closest feature to the provided coordinate.
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {function(ol.Feature):boolean=} opt_filter Feature filter function.
-             *     The filter function will receive one argument, the {@link ol.Feature feature}
-             *     and it should return a boolean value. By default, no filtering is made.
-             * @return {ol.Feature} Closest feature.
-             * @api stable
-             */
-            getClosestFeatureToCoordinate(coordinate: ol.Coordinate, opt_filter?: ((feature: ol.Feature) => boolean)): ol.Feature;
+        /**
+         * Get the closest feature to the provided coordinate.
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @param coordinate Coordinate.
+         * @param opt_filter Feature filter function.
+         *     The filter function will receive one argument, the {@link ol.Feature feature}
+         *     and it should return a boolean value. By default, no filtering is made.
+         * @return Closest feature.
+         * @api stable
+         */
+        getClosestFeatureToCoordinate(coordinate: ol.Coordinate, opt_filter?: ((feature: ol.Feature) => boolean)): ol.Feature;
 
-            /**
-             * Get the extent of the features currently in the source.
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @return {!ol.Extent} Extent.
-             * @api stable
-             */
-            getExtent(): ol.Extent;
+        /**
+         * Get the extent of the features currently in the source.
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @return Extent.
+         * @api stable
+         */
+        getExtent(): ol.Extent;
 
-            /**
-             * Get a feature by its identifier (the value returned by feature.getId()).
-             * Note that the index treats string and numeric identifiers as the same.  So
-             * `source.getFeatureById(2)` will return a feature with id `'2'` or `2`.
-             *
-             * @param {string|number} id Feature identifier.
-             * @return {ol.Feature} The feature (or `null` if not found).
-             * @api stable
-             */
-            getFeatureById(id: (string | number)): ol.Feature;
+        /**
+         * Get a feature by its identifier (the value returned by feature.getId()).
+         * Note that the index treats string and numeric identifiers as the same.  So
+         * `source.getFeatureById(2)` will return a feature with id `'2'` or `2`.
+         *
+         * @param id Feature identifier.
+         * @return The feature (or `null` if not found).
+         * @api stable
+         */
+        getFeatureById(id: (string | number)): ol.Feature;
 
-            /**
-             * Get the format associated with this source.
-             *
-             * @return {ol.format.Feature|undefined} The feature format.
-             * @api
-             */
-            getFormat(): (ol.format.Feature);
+        /**
+         * Get the format associated with this source.
+         *
+         * @return The feature format.
+         * @api
+         */
+        getFormat(): (ol.format.Feature);
 
-            /**
-             * Get the url associated with this source.
-             *
-             * @return {string|ol.FeatureUrlFunction|undefined} The url.
-             * @api
-             */
-            getUrl(): (string | ol.FeatureUrlFunction);
+        /**
+         * Get the url associated with this source.
+         *
+         * @return The url.
+         * @api
+         */
+        getUrl(): (string | ol.FeatureUrlFunction);
 
-            /**
-             * Remove a single feature from the source.  If you want to remove all features
-             * at once, use the {@link ol.source.Vector#clear source.clear()} method
-             * instead.
-             * @param {ol.Feature} feature Feature to remove.
-             * @api stable
-             */
-            removeFeature(feature: ol.Feature): void;
-        }
+        /**
+         * Remove a single feature from the source.  If you want to remove all features
+         * at once, use the {@link ol.source.Vector#clear source.clear()} method
+         * instead.
+         * @param feature Feature to remove.
+         * @api stable
+         */
+        removeFeature(feature: ol.Feature): void;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Vector} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param opt_feature Feature.
+     */
+    class VectorEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Vector} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.source.VectorEvent}
-         * @param {string} type Type.
-         * @param {ol.Feature=} opt_feature Feature.
+         * @param type Type.
+         * @param opt_feature Feature.
          */
-        class VectorEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Vector} instances are instances of this
-             * type.
-             *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.source.VectorEvent}
-             * @param {string} type Type.
-             * @param {ol.Feature=} opt_feature Feature.
-             */
-            constructor(type: string, opt_feature?: ol.Feature);
+        constructor(type: string, opt_feature?: ol.Feature);
 
-            /**
-             * The feature being added or removed.
-             * @type {ol.Feature|undefined}
-             * @api stable
-             */
-            feature: ol.Feature;
-        }
+        /**
+         * The feature being added or removed.
+         * @api stable
+         */
+        feature: ol.Feature;
+    }
 
+    /**
+     * @classdesc
+     * Class for layer sources providing vector data divided into a tile grid, to be
+     * used with {@link ol.layer.VectorTile}. Although this source receives tiles
+     * with vector features from the server, it is not meant for feature editing.
+     * Features are optimized for rendering, their geometries are clipped at or near
+     * tile boundaries and simplified for a view resolution. See
+     * {@link ol.source.Vector} for vector sources that are suitable for feature
+     * editing.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Vector tile options.
+     * @api
+     */
+    class VectorTile extends source.UrlTile {
         /**
          * @classdesc
          * Class for layer sources providing vector data divided into a tile grid, to be
@@ -10161,156 +9351,149 @@ declare module ol {
          * {@link ol.source.Vector} for vector sources that are suitable for feature
          * editing.
          *
-         * @constructor
          * @fires ol.source.TileEvent
-         * @extends {ol.source.UrlTile}
-         * @param {olx.source.VectorTileOptions} options Vector tile options.
+         * @param options Vector tile options.
          * @api
          */
-        class VectorTile extends ol.source.UrlTile {
-            /**
-             * @classdesc
-             * Class for layer sources providing vector data divided into a tile grid, to be
-             * used with {@link ol.layer.VectorTile}. Although this source receives tiles
-             * with vector features from the server, it is not meant for feature editing.
-             * Features are optimized for rendering, their geometries are clipped at or near
-             * tile boundaries and simplified for a view resolution. See
-             * {@link ol.source.Vector} for vector sources that are suitable for feature
-             * editing.
-             *
-             * @constructor
-             * @fires ol.source.TileEvent
-             * @extends {ol.source.UrlTile}
-             * @param {olx.source.VectorTileOptions} options Vector tile options.
-             * @api
-             */
-            constructor(options: olx.source.VectorTileOptions);
-        }
+        constructor(options: olx.source.VectorTileOptions);
+    }
 
+    namespace wms {
         /**
-         * @namespace ol.source.wms
+         * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
+         *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
+         *     specification that OpenLayers can make use of.
          */
-        module wms {
-            /**
-             * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
-             *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
-             *     specification that OpenLayers can make use of.
-             * @enum {string}
-             */
-            type ServerType = "carmentaserver" | "geoserver" | "mapserver" | "qgis";
-        }
+        type ServerType = "carmentaserver" | "geoserver" | "mapserver" | "qgis";
+    }
 
-        /**
-         * Request encoding. One of 'KVP', 'REST'.
-         * @enum {string}
-         */
-        type WMTSRequestEncoding = "KVP" | "REST";
+    /**
+     * Request encoding. One of 'KVP', 'REST'.
+     */
+    type WMTSRequestEncoding = "KVP" | "REST";
 
+    /**
+     * @classdesc
+     * Layer source for tile data from WMTS servers.
+     *
+     * @param options WMTS options.
+     * @api stable
+     */
+    class WMTS extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data from WMTS servers.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.WMTSOptions} options WMTS options.
+         * @param options WMTS options.
          * @api stable
          */
-        class WMTS extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from WMTS servers.
-             *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.WMTSOptions} options WMTS options.
-             * @api stable
-             */
-            constructor(options: olx.source.WMTSOptions);
+        constructor(options: olx.source.WMTSOptions);
 
-            /**
-             * Get the dimensions, i.e. those passed to the constructor through the
-             * "dimensions" option, and possibly updated using the updateDimensions
-             * method.
-             * @return {!Object} Dimensions.
-             * @api
-             */
-            getDimensions(): GlobalObject;
+        /**
+         * Get the dimensions, i.e. those passed to the constructor through the
+         * "dimensions" option, and possibly updated using the updateDimensions
+         * method.
+         * @return Dimensions.
+         * @api
+         */
+        getDimensions(): GlobalObject;
 
-            /**
-             * Return the image format of the WMTS source.
-             * @return {string} Format.
-             * @api
-             */
-            getFormat(): string;
+        /**
+         * Return the image format of the WMTS source.
+         * @return Format.
+         * @api
+         */
+        getFormat(): string;
 
-            /**
-             * Return the layer of the WMTS source.
-             * @return {string} Layer.
-             * @api
-             */
-            getLayer(): string;
+        /**
+         * Return the layer of the WMTS source.
+         * @return Layer.
+         * @api
+         */
+        getLayer(): string;
 
-            /**
-             * Return the matrix set of the WMTS source.
-             * @return {string} MatrixSet.
-             * @api
-             */
-            getMatrixSet(): string;
+        /**
+         * Return the matrix set of the WMTS source.
+         * @return MatrixSet.
+         * @api
+         */
+        getMatrixSet(): string;
 
-            /**
-             * Return the request encoding, either "KVP" or "REST".
-             * @return {ol.source.WMTSRequestEncoding} Request encoding.
-             * @api
-             */
-            getRequestEncoding(): ol.source.WMTSRequestEncoding;
+        /**
+         * Return the request encoding, either "KVP" or "REST".
+         * @return Request encoding.
+         * @api
+         */
+        getRequestEncoding(): ol.source.WMTSRequestEncoding;
 
-            /**
-             * Return the style of the WMTS source.
-             * @return {string} Style.
-             * @api
-             */
-            getStyle(): string;
+        /**
+         * Return the style of the WMTS source.
+         * @return Style.
+         * @api
+         */
+        getStyle(): string;
 
-            /**
-             * Return the version of the WMTS source.
-             * @return {string} Version.
-             * @api
-             */
-            getVersion(): string;
+        /**
+         * Return the version of the WMTS source.
+         * @return Version.
+         * @api
+         */
+        getVersion(): string;
 
-            /**
-             * Update the dimensions.
-             * @param {Object} dimensions Dimensions.
-             * @api
-             */
-            updateDimensions(dimensions: GlobalObject): void;
+        /**
+         * Update the dimensions.
+         * @param dimensions Dimensions.
+         * @api
+         */
+        updateDimensions(dimensions: GlobalObject): void;
 
-            /**
-             * Generate source options from a capabilities object.
-             * @param {Object} wmtsCap An object representing the capabilities document.
-             * @param {Object} config Configuration properties for the layer.  Defaults for
-             *                  the layer will apply if not provided.
-             *
-             * Required config properties:
-             *  - layer - {string} The layer identifier.
-             *
-             * Optional config properties:
-             *  - matrixSet - {string} The matrix set identifier, required if there is
-             *       more than one matrix set in the layer capabilities.
-             *  - projection - {string} The desired CRS when no matrixSet is specified.
-             *       eg: "EPSG:3857". If the desired projection is not available,
-             *       an error is thrown.
-             *  - requestEncoding - {string} url encoding format for the layer. Default is
-             *       the first tile url format found in the GetCapabilities response.
-             *  - style - {string} The name of the style
-             *  - format - {string} Image format for the layer. Default is the first
-             *       format returned in the GetCapabilities response.
-             * @return {olx.source.WMTSOptions} WMTS source options object.
-             * @api
-             */
-            static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
-        }
+        /**
+         * Generate source options from a capabilities object.
+         * @param wmtsCap An object representing the capabilities document.
+         * @param config Configuration properties for the layer.  Defaults for
+         *                  the layer will apply if not provided.
+         *
+         * Required config properties:
+         *  - layer - {string} The layer identifier.
+         *
+         * Optional config properties:
+         *  - matrixSet - {string} The matrix set identifier, required if there is
+         *       more than one matrix set in the layer capabilities.
+         *  - projection - {string} The desired CRS when no matrixSet is specified.
+         *       eg: "EPSG:3857". If the desired projection is not available,
+         *       an error is thrown.
+         *  - requestEncoding - {string} url encoding format for the layer. Default is
+         *       the first tile url format found in the GetCapabilities response.
+         *  - style - {string} The name of the style
+         *  - format - {string} Image format for the layer. Default is the first
+         *       format returned in the GetCapabilities response.
+         * @return WMTS source options object.
+         * @api
+         */
+        static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data with URLs in a set XYZ format that are
+     * defined in a URL template. By default, this follows the widely-used
+     * Google grid where `x` 0 and `y` 0 are in the top left. Grids like
+     * TMS where `x` 0 and `y` 0 are in the bottom left can be used by
+     * using the `{-y}` placeholder in the URL template, so long as the
+     * source does not have a custom tile grid. In this case,
+     * {@link ol.source.TileImage} can be used with a `tileUrlFunction`
+     * such as:
+     *
+     *  tileUrlFunction: function(coordinate) {
+     *    return 'http://mapserver.com/' + coordinate[0] + '/' +
+     *        coordinate[1] + '/' + coordinate[2] + '.png';
+     *    }
+     *
+     *
+     * @param opt_options XYZ options.
+     * @api stable
+     */
+    class XYZ extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data with URLs in a set XYZ format that are
@@ -10328,80 +9511,66 @@ declare module ol {
          *    }
          *
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.XYZOptions=} opt_options XYZ options.
+         * @param opt_options XYZ options.
          * @api stable
          */
-        class XYZ extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data with URLs in a set XYZ format that are
-             * defined in a URL template. By default, this follows the widely-used
-             * Google grid where `x` 0 and `y` 0 are in the top left. Grids like
-             * TMS where `x` 0 and `y` 0 are in the bottom left can be used by
-             * using the `{-y}` placeholder in the URL template, so long as the
-             * source does not have a custom tile grid. In this case,
-             * {@link ol.source.TileImage} can be used with a `tileUrlFunction`
-             * such as:
-             *
-             *  tileUrlFunction: function(coordinate) {
-             *    return 'http://mapserver.com/' + coordinate[0] + '/' +
-             *        coordinate[1] + '/' + coordinate[2] + '.png';
-             *    }
-             *
-             *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.XYZOptions=} opt_options XYZ options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.XYZOptions);
-        }
+        constructor(opt_options?: olx.source.XYZOptions);
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data in Zoomify format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class Zoomify extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data in Zoomify format.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.ZoomifyOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api stable
          */
-        class Zoomify extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data in Zoomify format.
-             *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.ZoomifyOptions=} opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.ZoomifyOptions);
-        }
+        constructor(opt_options?: olx.source.ZoomifyOptions);
     }
+}
+
+/**
+ * Object literal with options for the {@link ol.Sphere.getLength} or
+ * {@link ol.Sphere.getArea} functions.
+ */
+export interface SphereMetricOptions {
+    /**
+     * Projection of the geometry.  By default, the geometry is assumed to be in
+     * EPSG:3857 (Web Mercator).
+     */
+    projection?: ol.proj.Projection;
 
     /**
-     * Object literal with options for the {@link ol.Sphere.getLength} or
-     * {@link ol.Sphere.getArea} functions.
+     * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
+     * Authalic Sphere).
+     * @api
      */
-    interface SphereMetricOptions {
-        /**
-         * Projection of the geometry.  By default, the geometry is assumed to be in
-         * EPSG:3857 (Web Mercator).
-         */
-        projection?: ol.proj.Projection;
-
-        /**
-         * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
-         * Authalic Sphere).
-         * @type {(number|undefined)}
-         * @api
-         */
-        radius?: number;
-    }
+    radius?: number;
+}
 
+/**
+ * @classdesc
+ * Class to create objects that can be used with {@link
+ * ol.geom.Polygon.circular}.
+ *
+ * For example to create a sphere whose radius is equal to the semi-major
+ * axis of the WGS84 ellipsoid:
+ *
+ * ```js
+ * var wgs84Sphere= new ol.Sphere(6378137);
+ * ```
+ *
+ * @param radius Radius.
+ * @api
+ */
+export class Sphere {
     /**
      * @classdesc
      * Class to create objects that can be used with {@link
@@ -10414,163 +9583,161 @@ declare module ol {
      * var wgs84Sphere= new ol.Sphere(6378137);
      * ```
      *
-     * @constructor
-     * @param {number} radius Radius.
+     * @param radius Radius.
      * @api
      */
-    class Sphere {
-        /**
-         * @classdesc
-         * Class to create objects that can be used with {@link
-         * ol.geom.Polygon.circular}.
-         *
-         * For example to create a sphere whose radius is equal to the semi-major
-         * axis of the WGS84 ellipsoid:
-         *
-         * ```js
-         * var wgs84Sphere= new ol.Sphere(6378137);
-         * ```
-         *
-         * @constructor
-         * @param {number} radius Radius.
-         * @api
-         */
-        constructor(radius: number);
-
-        /**
-         * Returns the geodesic area for a list of coordinates.
-         *
-         * [Reference](http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409)
-         * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
-         * Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
-         * Laboratory, Pasadena, CA, June 2007
-         *
-         * @param {Array.<ol.Coordinate>} coordinates List of coordinates of a linear
-         * ring. If the ring is oriented clockwise, the area will be positive,
-         * otherwise it will be negative.
-         * @return {number} Area.
-         * @api
-         */
-        geodesicArea(coordinates: ol.Coordinate[]): number;
-
-        /**
-         * Returns the distance from c1 to c2 using the haversine formula.
-         *
-         * @param {ol.Coordinate} c1 Coordinate 1.
-         * @param {ol.Coordinate} c2 Coordinate 2.
-         * @return {number} Haversine distance.
-         * @api
-         */
-        haversineDistance(c1: ol.Coordinate, c2: ol.Coordinate): number;
-
-        /**
-         * Get the spherical area of a geometry.  This is the area (in meters) assuming
-         * that polygon edges are segments of great circles on a sphere.
-         * @param {ol.geom.Geometry} geometry A geometry.
-         * @param {olx.SphereMetricOptions=} opt_options Options for the area
-         *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
-         *     You can change this by providing a `projection` option.
-         * @return {number} The spherical area (in square meters).
-         * @api
-         */
-        static getArea(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
-
-        /**
-         * Get the spherical length of a geometry.  This length is the sum of the
-         * great circle distances between coordinates.  For polygons, the length is
-         * the sum of all rings.  For points, the length is zero.  For multi-part
-         * geometries, the length is the sum of the length of each part.
-         * @param {ol.geom.Geometry} geometry A geometry.
-         * @param {olx.SphereMetricOptions=} opt_options Options for the length
-         *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
-         *     You can change this by providing a `projection` option.
-         * @return {number} The spherical length (in meters).
-         * @api
-         */
-        static getLength(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
-    }
+    constructor(radius: number);
 
     /**
-     * Feature styles.
+     * Returns the geodesic area for a list of coordinates.
      *
-     * If no style is defined, the following default style is used:
-     * ```js
-     *  var fill = new ol.style.Fill({
-     *    color: 'rgba(255,255,255,0.4)'
-     *  });
-     *  var stroke = new ol.style.Stroke({
-     *    color: '#3399CC',
-     *    width: 1.25
-     *  });
-     *  var styles = [
-     *    new ol.style.Style({
-     *      image: new ol.style.Circle({
-     *        fill: fill,
-     *        stroke: stroke,
-     *        radius: 5
-     *      }),
-     *      fill: fill,
-     *      stroke: stroke
-     *    })
-     *  ];
-     * ```
+     * [Reference](http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409)
+     * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
+     * Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
+     * Laboratory, Pasadena, CA, June 2007
      *
-     * A separate editing style has the following defaults:
-     * ```js
-     *  var white = [255, 255, 255, 1];
-     *  var blue = [0, 153, 255, 1];
-     *  var width = 3;
-     *  styles[ol.geom.GeometryType.POLYGON] = [
-     *    new ol.style.Style({
-     *      fill: new ol.style.Fill({
-     *        color: [255, 255, 255, 0.5]
-     *      })
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_POLYGON] =
-     *      styles[ol.geom.GeometryType.POLYGON];
-     *  styles[ol.geom.GeometryType.LINE_STRING] = [
-     *    new ol.style.Style({
-     *      stroke: new ol.style.Stroke({
-     *        color: white,
-     *        width: width + 2
-     *      })
-     *    }),
-     *    new ol.style.Style({
-     *      stroke: new ol.style.Stroke({
-     *        color: blue,
-     *        width: width
-     *      })
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_LINE_STRING] =
-     *      styles[ol.geom.GeometryType.LINE_STRING];
-     *  styles[ol.geom.GeometryType.POINT] = [
-     *    new ol.style.Style({
-     *      image: new ol.style.Circle({
-     *        radius: width * 2,
-     *        fill: new ol.style.Fill({
-     *          color: blue
-     *        }),
-     *        stroke: new ol.style.Stroke({
-     *          color: white,
-     *          width: width / 2
-     *        })
-     *      }),
-     *      zIndex: Infinity
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_POINT] =
-     *      styles[ol.geom.GeometryType.POINT];
-     *  styles[ol.geom.GeometryType.GEOMETRY_COLLECTION] =
-     *      styles[ol.geom.GeometryType.POLYGON].concat(
-     *          styles[ol.geom.GeometryType.POINT]
-     *      );
-     * ```
-     *
-     * @namespace ol.style
+     * @param coordinates List of coordinates of a linear
+     * ring. If the ring is oriented clockwise, the area will be positive,
+     * otherwise it will be negative.
+     * @return Area.
+     * @api
      */
-    module style {
+    geodesicArea(coordinates: ol.Coordinate[]): number;
+
+    /**
+     * Returns the distance from c1 to c2 using the haversine formula.
+     *
+     * @param c1 Coordinate 1.
+     * @param c2 Coordinate 2.
+     * @return Haversine distance.
+     * @api
+     */
+    haversineDistance(c1: ol.Coordinate, c2: ol.Coordinate): number;
+
+    /**
+     * Get the spherical area of a geometry.  This is the area (in meters) assuming
+     * that polygon edges are segments of great circles on a sphere.
+     * @param geometry A geometry.
+     * @param opt_options Options for the area
+     *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
+     *     You can change this by providing a `projection` option.
+     * @return The spherical area (in square meters).
+     * @api
+     */
+    static getArea(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
+
+    /**
+     * Get the spherical length of a geometry.  This length is the sum of the
+     * great circle distances between coordinates.  For polygons, the length is
+     * the sum of all rings.  For points, the length is zero.  For multi-part
+     * geometries, the length is the sum of the length of each part.
+     * @param geometry A geometry.
+     * @param opt_options Options for the length
+     *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
+     *     You can change this by providing a `projection` option.
+     * @return The spherical length (in meters).
+     * @api
+     */
+    static getLength(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
+}
+
+/**
+ * Feature styles.
+ *
+ * If no style is defined, the following default style is used:
+ * ```js
+ *  var fill = new ol.style.Fill({
+ *    color: 'rgba(255,255,255,0.4)'
+ *  });
+ *  var stroke = new ol.style.Stroke({
+ *    color: '#3399CC',
+ *    width: 1.25
+ *  });
+ *  var styles = [
+ *    new ol.style.Style({
+ *      image: new ol.style.Circle({
+ *        fill: fill,
+ *        stroke: stroke,
+ *        radius: 5
+ *      }),
+ *      fill: fill,
+ *      stroke: stroke
+ *    })
+ *  ];
+ * ```
+ *
+ * A separate editing style has the following defaults:
+ * ```js
+ *  var white = [255, 255, 255, 1];
+ *  var blue = [0, 153, 255, 1];
+ *  var width = 3;
+ *  styles[ol.geom.GeometryType.POLYGON] = [
+ *    new ol.style.Style({
+ *      fill: new ol.style.Fill({
+ *        color: [255, 255, 255, 0.5]
+ *      })
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_POLYGON] =
+ *      styles[ol.geom.GeometryType.POLYGON];
+ *  styles[ol.geom.GeometryType.LINE_STRING] = [
+ *    new ol.style.Style({
+ *      stroke: new ol.style.Stroke({
+ *        color: white,
+ *        width: width + 2
+ *      })
+ *    }),
+ *    new ol.style.Style({
+ *      stroke: new ol.style.Stroke({
+ *        color: blue,
+ *        width: width
+ *      })
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_LINE_STRING] =
+ *      styles[ol.geom.GeometryType.LINE_STRING];
+ *  styles[ol.geom.GeometryType.POINT] = [
+ *    new ol.style.Style({
+ *      image: new ol.style.Circle({
+ *        radius: width * 2,
+ *        fill: new ol.style.Fill({
+ *          color: blue
+ *        }),
+ *        stroke: new ol.style.Stroke({
+ *          color: white,
+ *          width: width / 2
+ *        })
+ *      }),
+ *      zIndex: Infinity
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_POINT] =
+ *      styles[ol.geom.GeometryType.POINT];
+ *  styles[ol.geom.GeometryType.GEOMETRY_COLLECTION] =
+ *      styles[ol.geom.GeometryType.POLYGON].concat(
+ *          styles[ol.geom.GeometryType.POINT]
+ *      );
+ * ```
+ *
+ */
+export namespace style {
+    /**
+     * Manages the creation of image atlases.
+     *
+     * Images added to this manager will be inserted into an atlas, which
+     * will be used for rendering.
+     * The `size` given in the constructor is the size for the first
+     * atlas. After that, when new atlases are created, they will have
+     * twice the size as the latest atlas (until `maxSize` is reached).
+     *
+     * If an application uses many images or very large images, it is recommended
+     * to set a higher `size` value to avoid the creation of too many atlases.
+     *
+     * @struct
+     * @api
+     * @param opt_options Options.
+     */
+    class AtlasManager {
         /**
          * Manages the creation of image atlases.
          *
@@ -10583,377 +9750,351 @@ declare module ol {
          * If an application uses many images or very large images, it is recommended
          * to set a higher `size` value to avoid the creation of too many atlases.
          *
-         * @constructor
          * @struct
          * @api
-         * @param {olx.style.AtlasManagerOptions=} opt_options Options.
+         * @param opt_options Options.
          */
-        class AtlasManager {
-            /**
-             * Manages the creation of image atlases.
-             *
-             * Images added to this manager will be inserted into an atlas, which
-             * will be used for rendering.
-             * The `size` given in the constructor is the size for the first
-             * atlas. After that, when new atlases are created, they will have
-             * twice the size as the latest atlas (until `maxSize` is reached).
-             *
-             * If an application uses many images or very large images, it is recommended
-             * to set a higher `size` value to avoid the creation of too many atlases.
-             *
-             * @constructor
-             * @struct
-             * @api
-             * @param {olx.style.AtlasManagerOptions=} opt_options Options.
-             */
-            constructor(opt_options?: olx.style.AtlasManagerOptions);
-        }
+        constructor(opt_options?: olx.style.AtlasManagerOptions);
+    }
 
+    /**
+     * @classdesc
+     * Set circle style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Circle extends style.Image {
         /**
          * @classdesc
          * Set circle style for vector features.
          *
-         * @constructor
-         * @param {olx.style.CircleOptions=} opt_options Options.
-         * @extends {ol.style.Image}
+         * @param opt_options Options.
          * @api
          */
-        class Circle extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set circle style for vector features.
-             *
-             * @constructor
-             * @param {olx.style.CircleOptions=} opt_options Options.
-             * @extends {ol.style.Image}
-             * @api
-             */
-            constructor(opt_options?: olx.style.CircleOptions);
+        constructor(opt_options?: olx.style.CircleOptions);
 
-            /**
-             * Get the fill style for the circle.
-             * @return {ol.style.Fill} Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style for the circle.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): ol.style.Fill;
 
-            /**
-             * Get the image used to render the circle.
-             * @param {number} pixelRatio Pixel ratio.
-             * @return {HTMLCanvasElement} Canvas element.
-             * @api
-             */
-            getImage(pixelRatio: number): HTMLCanvasElement;
+        /**
+         * Get the image used to render the circle.
+         * @param pixelRatio Pixel ratio.
+         * @return Canvas element.
+         * @api
+         */
+        getImage(pixelRatio: number): HTMLCanvasElement;
 
-            /**
-             * Get the circle radius.
-             * @return {number} Radius.
-             * @api
-             */
-            getRadius(): number;
+        /**
+         * Get the circle radius.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
 
-            /**
-             * Get the stroke style for the circle.
-             * @return {ol.style.Stroke} Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
+        /**
+         * Get the stroke style for the circle.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): ol.style.Stroke;
 
-            /**
-             * Set the circle radius.
-             *
-             * @param {number} radius Circle radius.
-             * @api
-             */
-            setRadius(radius: number): void;
-        }
+        /**
+         * Set the circle radius.
+         *
+         * @param radius Circle radius.
+         * @api
+         */
+        setRadius(radius: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Set fill style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Fill {
         /**
          * @classdesc
          * Set fill style for vector features.
          *
-         * @constructor
-         * @param {olx.style.FillOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class Fill {
-            /**
-             * @classdesc
-             * Set fill style for vector features.
-             *
-             * @constructor
-             * @param {olx.style.FillOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.FillOptions);
-
-            /**
-             * Get the fill color.
-             * @return {ol.Color|ol.ColorLike} Color.
-             * @api
-             */
-            getColor(): (ol.Color | ol.ColorLike);
-
-            /**
-             * Set the color.
-             *
-             * @param {ol.Color|ol.ColorLike} color Color.
-             * @api
-             */
-            setColor(color: (ol.Color | ol.ColorLike)): void;
-        }
+        constructor(opt_options?: olx.style.FillOptions);
 
         /**
-         * Icon anchor units. One of 'fraction', 'pixels'.
-         * @enum {string}
+         * Get the fill color.
+         * @return Color.
+         * @api
          */
-        type IconAnchorUnits = "fraction" | "pixels";
+        getColor(): (ol.Color | ol.ColorLike);
 
         /**
-         * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'.
-         * @enum {string}
+         * Set the color.
+         *
+         * @param color Color.
+         * @api
          */
-        type IconOrigin = "bottom-left" | "bottom-right" | "top-left" | "top-right";
+        setColor(color: (ol.Color | ol.ColorLike)): void;
+    }
 
+    /**
+     * Icon anchor units. One of 'fraction', 'pixels'.
+     */
+    type IconAnchorUnits = "fraction" | "pixels";
+
+    /**
+     * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'.
+     */
+    type IconOrigin = "bottom-left" | "bottom-right" | "top-left" | "top-right";
+
+    /**
+     * @classdesc
+     * Set icon style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Icon extends style.Image {
         /**
          * @classdesc
          * Set icon style for vector features.
          *
-         * @constructor
-         * @param {olx.style.IconOptions=} opt_options Options.
-         * @extends {ol.style.Image}
+         * @param opt_options Options.
          * @api
          */
-        class Icon extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set icon style for vector features.
-             *
-             * @constructor
-             * @param {olx.style.IconOptions=} opt_options Options.
-             * @extends {ol.style.Image}
-             * @api
-             */
-            constructor(opt_options?: olx.style.IconOptions);
+        constructor(opt_options?: olx.style.IconOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getAnchor(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getAnchor(): number[];
 
-            /**
-             * Get the image icon.
-             * @param {number} pixelRatio Pixel ratio.
-             * @return {Image|HTMLCanvasElement} Image or Canvas element.
-             * @api
-             */
-            getImage(pixelRatio: number): (Image | HTMLCanvasElement);
+        /**
+         * Get the image icon.
+         * @param pixelRatio Pixel ratio.
+         * @return Image or Canvas element.
+         * @api
+         */
+        getImage(pixelRatio: number): (Image | HTMLCanvasElement);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getOrigin(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getOrigin(): number[];
 
-            /**
-             * Get the image URL.
-             * @return {string|undefined} Image src.
-             * @api
-             */
-            getSrc(): (string);
+        /**
+         * Get the image URL.
+         * @return Image src.
+         * @api
+         */
+        getSrc(): (string);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getSize(): ol.Size;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getSize(): ol.Size;
 
-            /**
-             * Load not yet loaded URI.
-             * When rendering a feature with an icon style, the vector renderer will
-             * automatically call this method. However, you might want to call this
-             * method yourself for preloading or other purposes.
-             * @api
-             */
-            load(): void;
-        }
+        /**
+         * Load not yet loaded URI.
+         * When rendering a feature with an icon style, the vector renderer will
+         * automatically call this method. However, you might want to call this
+         * method yourself for preloading or other purposes.
+         * @api
+         */
+        load(): void;
+    }
 
+    /**
+     * @classdesc
+     * A base class used for creating subclasses and not instantiated in
+     * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
+     * {@link ol.style.RegularShape}.
+     *
+     * @param options Options.
+     * @api
+     */
+    class Image {
         /**
          * @classdesc
          * A base class used for creating subclasses and not instantiated in
          * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
          * {@link ol.style.RegularShape}.
          *
-         * @constructor
-         * @param {ol.StyleImageOptions} options Options.
+         * @param options Options.
          * @api
          */
-        class Image {
-            /**
-             * @classdesc
-             * A base class used for creating subclasses and not instantiated in
-             * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
-             * {@link ol.style.RegularShape}.
-             *
-             * @constructor
-             * @param {ol.StyleImageOptions} options Options.
-             * @api
-             */
-            constructor(options: ol.StyleImageOptions);
+        constructor(options: ol.StyleImageOptions);
 
-            /**
-             * Get the symbolizer opacity.
-             * @return {number} Opacity.
-             * @api
-             */
-            getOpacity(): number;
+        /**
+         * Get the symbolizer opacity.
+         * @return Opacity.
+         * @api
+         */
+        getOpacity(): number;
 
-            /**
-             * Determine whether the symbolizer rotates with the map.
-             * @return {boolean} Rotate with map.
-             * @api
-             */
-            getRotateWithView(): boolean;
+        /**
+         * Determine whether the symbolizer rotates with the map.
+         * @return Rotate with map.
+         * @api
+         */
+        getRotateWithView(): boolean;
 
-            /**
-             * Get the symoblizer rotation.
-             * @return {number} Rotation.
-             * @api
-             */
-            getRotation(): number;
+        /**
+         * Get the symoblizer rotation.
+         * @return Rotation.
+         * @api
+         */
+        getRotation(): number;
 
-            /**
-             * Get the symbolizer scale.
-             * @return {number} Scale.
-             * @api
-             */
-            getScale(): number;
+        /**
+         * Get the symbolizer scale.
+         * @return Scale.
+         * @api
+         */
+        getScale(): number;
 
-            /**
-             * Determine whether the symbolizer should be snapped to a pixel.
-             * @return {boolean} The symbolizer should snap to a pixel.
-             * @api
-             */
-            getSnapToPixel(): boolean;
+        /**
+         * Determine whether the symbolizer should be snapped to a pixel.
+         * @return The symbolizer should snap to a pixel.
+         * @api
+         */
+        getSnapToPixel(): boolean;
 
-            /**
-             * Set the opacity.
-             *
-             * @param {number} opacity Opacity.
-             * @api
-             */
-            setOpacity(opacity: number): void;
+        /**
+         * Set the opacity.
+         *
+         * @param opacity Opacity.
+         * @api
+         */
+        setOpacity(opacity: number): void;
 
-            /**
-             * Set the rotation.
-             *
-             * @param {number} rotation Rotation.
-             * @api
-             */
-            setRotation(rotation: number): void;
+        /**
+         * Set the rotation.
+         *
+         * @param rotation Rotation.
+         * @api
+         */
+        setRotation(rotation: number): void;
 
-            /**
-             * Set the scale.
-             *
-             * @param {number} scale Scale.
-             * @api
-             */
-            setScale(scale: number): void;
-        }
+        /**
+         * Set the scale.
+         *
+         * @param scale Scale.
+         * @api
+         */
+        setScale(scale: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Set regular shape style for vector features. The resulting shape will be
+     * a regular polygon when `radius` is provided, or a star when `radius1` and
+     * `radius2` are provided.
+     *
+     * @param options Options.
+     * @api
+     */
+    class RegularShape extends style.Image {
         /**
          * @classdesc
          * Set regular shape style for vector features. The resulting shape will be
          * a regular polygon when `radius` is provided, or a star when `radius1` and
          * `radius2` are provided.
          *
-         * @constructor
-         * @param {olx.style.RegularShapeOptions} options Options.
-         * @extends {ol.style.Image}
+         * @param options Options.
          * @api
          */
-        class RegularShape extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set regular shape style for vector features. The resulting shape will be
-             * a regular polygon when `radius` is provided, or a star when `radius1` and
-             * `radius2` are provided.
-             *
-             * @constructor
-             * @param {olx.style.RegularShapeOptions} options Options.
-             * @extends {ol.style.Image}
-             * @api
-             */
-            constructor(options: olx.style.RegularShapeOptions);
+        constructor(options: olx.style.RegularShapeOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getAnchor(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getAnchor(): number[];
 
-            /**
-             * Get the angle used in generating the shape.
-             * @return {number} Shape's rotation in radians.
-             * @api
-             */
-            getAngle(): number;
+        /**
+         * Get the angle used in generating the shape.
+         * @return Shape's rotation in radians.
+         * @api
+         */
+        getAngle(): number;
 
-            /**
-             * Get the fill style for the shape.
-             * @return {ol.style.Fill} Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style for the shape.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): ol.style.Fill;
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getImage(pixelRatio: number): (HTMLCanvasElement | HTMLVideoElement | Image);
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getImage(pixelRatio: number): (HTMLCanvasElement | HTMLVideoElement | Image);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getOrigin(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getOrigin(): number[];
 
-            /**
-             * Get the number of points for generating the shape.
-             * @return {number} Number of points for stars and regular polygons.
-             * @api
-             */
-            getPoints(): number;
+        /**
+         * Get the number of points for generating the shape.
+         * @return Number of points for stars and regular polygons.
+         * @api
+         */
+        getPoints(): number;
 
-            /**
-             * Get the (primary) radius for the shape.
-             * @return {number} Radius.
-             * @api
-             */
-            getRadius(): number;
+        /**
+         * Get the (primary) radius for the shape.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
 
-            /**
-             * Get the secondary radius for the shape.
-             * @return {number} Radius2.
-             * @api
-             */
-            getRadius2(): number;
+        /**
+         * Get the secondary radius for the shape.
+         * @return Radius2.
+         * @api
+         */
+        getRadius2(): number;
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getSize(): ol.Size;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getSize(): ol.Size;
 
-            /**
-             * Get the stroke style for the shape.
-             * @return {ol.style.Stroke} Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
-        }
+        /**
+         * Get the stroke style for the shape.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): ol.style.Stroke;
+    }
 
+    /**
+     * @classdesc
+     * Set stroke style for vector features.
+     * Note that the defaults given are the Canvas defaults, which will be used if
+     * option is not defined. The `get` functions return whatever was entered in
+     * the options; they will not return the default.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Stroke {
         /**
          * @classdesc
          * Set stroke style for vector features.
@@ -10961,1100 +10102,1018 @@ declare module ol {
          * option is not defined. The `get` functions return whatever was entered in
          * the options; they will not return the default.
          *
-         * @constructor
-         * @param {olx.style.StrokeOptions=} opt_options Options.
+         * @param opt_options Options.
          * @api
          */
-        class Stroke {
-            /**
-             * @classdesc
-             * Set stroke style for vector features.
-             * Note that the defaults given are the Canvas defaults, which will be used if
-             * option is not defined. The `get` functions return whatever was entered in
-             * the options; they will not return the default.
-             *
-             * @constructor
-             * @param {olx.style.StrokeOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.StrokeOptions);
+        constructor(opt_options?: olx.style.StrokeOptions);
 
-            /**
-             * Get the stroke color.
-             * @return {ol.Color|string} Color.
-             * @api
-             */
-            getColor(): (ol.Color | string);
+        /**
+         * Get the stroke color.
+         * @return Color.
+         * @api
+         */
+        getColor(): (ol.Color | string);
 
-            /**
-             * Get the line cap type for the stroke.
-             * @return {string|undefined} Line cap.
-             * @api
-             */
-            getLineCap(): (string);
+        /**
+         * Get the line cap type for the stroke.
+         * @return Line cap.
+         * @api
+         */
+        getLineCap(): (string);
 
-            /**
-             * Get the line dash style for the stroke.
-             * @return {Array.<number>} Line dash.
-             * @api
-             */
-            getLineDash(): number[];
+        /**
+         * Get the line dash style for the stroke.
+         * @return Line dash.
+         * @api
+         */
+        getLineDash(): number[];
 
-            /**
-             * Get the line join type for the stroke.
-             * @return {string|undefined} Line join.
-             * @api
-             */
-            getLineJoin(): (string);
+        /**
+         * Get the line join type for the stroke.
+         * @return Line join.
+         * @api
+         */
+        getLineJoin(): (string);
 
-            /**
-             * Get the miter limit for the stroke.
-             * @return {number|undefined} Miter limit.
-             * @api
-             */
-            getMiterLimit(): (number);
+        /**
+         * Get the miter limit for the stroke.
+         * @return Miter limit.
+         * @api
+         */
+        getMiterLimit(): (number);
 
-            /**
-             * Get the stroke width.
-             * @return {number|undefined} Width.
-             * @api
-             */
-            getWidth(): (number);
+        /**
+         * Get the stroke width.
+         * @return Width.
+         * @api
+         */
+        getWidth(): (number);
 
-            /**
-             * Set the color.
-             *
-             * @param {ol.Color|string} color Color.
-             * @api
-             */
-            setColor(color: (ol.Color | string)): void;
+        /**
+         * Set the color.
+         *
+         * @param color Color.
+         * @api
+         */
+        setColor(color: (ol.Color | string)): void;
 
-            /**
-             * Set the line cap.
-             *
-             * @param {string|undefined} lineCap Line cap.
-             * @api
-             */
-            setLineCap(lineCap: (string)): void;
+        /**
+         * Set the line cap.
+         *
+         * @param lineCap Line cap.
+         * @api
+         */
+        setLineCap(lineCap: (string)): void;
 
-            /**
-             * Set the line dash.
-             *
-             * Please note that Internet Explorer 10 and lower [do not support][mdn] the
-             * `setLineDash` method on the `CanvasRenderingContext2D` and therefore this
-             * property will have no visual effect in these browsers.
-             *
-             * [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility
-             *
-             * @param {Array.<number>} lineDash Line dash.
-             * @api
-             */
-            setLineDash(lineDash: number[]): void;
+        /**
+         * Set the line dash.
+         *
+         * Please note that Internet Explorer 10 and lower [do not support][mdn] the
+         * `setLineDash` method on the `CanvasRenderingContext2D` and therefore this
+         * property will have no visual effect in these browsers.
+         *
+         * [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility
+         *
+         * @param lineDash Line dash.
+         * @api
+         */
+        setLineDash(lineDash: number[]): void;
 
-            /**
-             * Set the line join.
-             *
-             * @param {string|undefined} lineJoin Line join.
-             * @api
-             */
-            setLineJoin(lineJoin: (string)): void;
+        /**
+         * Set the line join.
+         *
+         * @param lineJoin Line join.
+         * @api
+         */
+        setLineJoin(lineJoin: (string)): void;
 
-            /**
-             * Set the miter limit.
-             *
-             * @param {number|undefined} miterLimit Miter limit.
-             * @api
-             */
-            setMiterLimit(miterLimit: (number)): void;
+        /**
+         * Set the miter limit.
+         *
+         * @param miterLimit Miter limit.
+         * @api
+         */
+        setMiterLimit(miterLimit: (number)): void;
 
-            /**
-             * Set the width.
-             *
-             * @param {number|undefined} width Width.
-             * @api
-             */
-            setWidth(width: (number)): void;
-        }
+        /**
+         * Set the width.
+         *
+         * @param width Width.
+         * @api
+         */
+        setWidth(width: (number)): void;
+    }
 
+    /**
+     * @classdesc
+     * Container for vector feature rendering styles. Any changes made to the style
+     * or its children through `set*()` methods will not take effect until the
+     * feature or layer that uses the style is re-rendered.
+     *
+     * @struct
+     * @param opt_options Style options.
+     * @api
+     */
+    class Style {
         /**
          * @classdesc
          * Container for vector feature rendering styles. Any changes made to the style
          * or its children through `set*()` methods will not take effect until the
          * feature or layer that uses the style is re-rendered.
          *
-         * @constructor
          * @struct
-         * @param {olx.style.StyleOptions=} opt_options Style options.
+         * @param opt_options Style options.
          * @api
          */
-        class Style {
-            /**
-             * @classdesc
-             * Container for vector feature rendering styles. Any changes made to the style
-             * or its children through `set*()` methods will not take effect until the
-             * feature or layer that uses the style is re-rendered.
-             *
-             * @constructor
-             * @struct
-             * @param {olx.style.StyleOptions=} opt_options Style options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.StyleOptions);
-
-            /**
-             * Clones the style.
-             * @return {ol.style.Style} The cloned style.
-             * @api
-             */
-            clone(): ol.style.Style;
-
-            /**
-             * Get the geometry to be rendered.
-             * @return {string|ol.geom.Geometry|ol.StyleGeometryFunction}
-             * Feature property or geometry or function that returns the geometry that will
-             * be rendered with this style.
-             * @api
-             */
-            getGeometry(): (string | ol.geom.Geometry | ol.StyleGeometryFunction);
-
-            /**
-             * Get the function used to generate a geometry for rendering.
-             * @return {!ol.StyleGeometryFunction} Function that is called with a feature
-             * and returns the geometry to render instead of the feature's geometry.
-             * @api
-             */
-            getGeometryFunction(): ol.StyleGeometryFunction;
-
-            /**
-             * Get the fill style.
-             * @return {ol.style.Fill} Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
-
-            /**
-             * Get the image style.
-             * @return {ol.style.Image} Image style.
-             * @api
-             */
-            getImage(): ol.style.Image;
-
-            /**
-             * Get the stroke style.
-             * @return {ol.style.Stroke} Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
-
-            /**
-             * Get the text style.
-             * @return {ol.style.Text} Text style.
-             * @api
-             */
-            getText(): ol.style.Text;
-
-            /**
-             * Get the z-index for the style.
-             * @return {number|undefined} ZIndex.
-             * @api
-             */
-            getZIndex(): (number);
-
-            /**
-             * Set the fill style.
-             * @param {ol.style.Fill} fill Fill style.
-             * @api
-             */
-            setFill(fill: ol.style.Fill): void;
-
-            /**
-             * Set a geometry that is rendered instead of the feature's geometry.
-             *
-             * @param {string|ol.geom.Geometry|ol.StyleGeometryFunction} geometry
-             *     Feature property or geometry or function returning a geometry to render
-             *     for this style.
-             * @api
-             */
-            setGeometry(geometry: (string | ol.geom.Geometry | ol.StyleGeometryFunction)): void;
-
-            /**
-             * Set the image style.
-             * @param {ol.style.Image} image Image style.
-             * @api
-             */
-            setImage(image: ol.style.Image): void;
-
-            /**
-             * Set the stroke style.
-             * @param {ol.style.Stroke} stroke Stroke style.
-             * @api
-             */
-            setStroke(stroke: ol.style.Stroke): void;
-
-            /**
-             * Set the text style.
-             * @param {ol.style.Text} text Text style.
-             * @api
-             */
-            setText(text: ol.style.Text): void;
-
-            /**
-             * Set the z-index.
-             *
-             * @param {number|undefined} zIndex ZIndex.
-             * @api
-             */
-            setZIndex(zIndex: (number)): void;
-        }
+        constructor(opt_options?: olx.style.StyleOptions);
 
         /**
-         * @classdesc
-         * Set text style for vector features.
-         *
-         * @constructor
-         * @param {olx.style.TextOptions=} opt_options Options.
+         * Clones the style.
+         * @return The cloned style.
          * @api
          */
-        class Text {
-            /**
-             * @classdesc
-             * Set text style for vector features.
-             *
-             * @constructor
-             * @param {olx.style.TextOptions=} opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.TextOptions);
+        clone(): ol.style.Style;
 
-            /**
-             * Get the font name.
-             * @return {string|undefined} Font.
-             * @api
-             */
-            getFont(): (string);
+        /**
+         * Get the geometry to be rendered.
+         * @return Feature property or geometry or function that returns the geometry that will
+         *     be rendered with this style.
+         * @api
+         */
+        getGeometry(): (string | ol.geom.Geometry | ol.StyleGeometryFunction);
 
-            /**
-             * Get the x-offset for the text.
-             * @return {number} Horizontal text offset.
-             * @api
-             */
-            getOffsetX(): number;
+        /**
+         * Get the function used to generate a geometry for rendering.
+         * @return Function that is called with a feature
+         * and returns the geometry to render instead of the feature's geometry.
+         * @api
+         */
+        getGeometryFunction(): ol.StyleGeometryFunction;
 
-            /**
-             * Get the y-offset for the text.
-             * @return {number} Vertical text offset.
-             * @api
-             */
-            getOffsetY(): number;
+        /**
+         * Get the fill style.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): ol.style.Fill;
 
-            /**
-             * Get the fill style for the text.
-             * @return {ol.style.Fill} Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the image style.
+         * @return Image style.
+         * @api
+         */
+        getImage(): ol.style.Image;
 
-            /**
-             * Determine whether the text rotates with the map.
-             * @return {boolean|undefined} Rotate with map.
-             * @api
-             */
-            getRotateWithView(): (boolean);
+        /**
+         * Get the stroke style.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): ol.style.Stroke;
 
-            /**
-             * Get the text rotation.
-             * @return {number|undefined} Rotation.
-             * @api
-             */
-            getRotation(): (number);
+        /**
+         * Get the text style.
+         * @return Text style.
+         * @api
+         */
+        getText(): ol.style.Text;
 
-            /**
-             * Get the text scale.
-             * @return {number|undefined} Scale.
-             * @api
-             */
-            getScale(): (number);
+        /**
+         * Get the z-index for the style.
+         * @return ZIndex.
+         * @api
+         */
+        getZIndex(): (number);
 
-            /**
-             * Get the stroke style for the text.
-             * @return {ol.style.Stroke} Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
+        /**
+         * Set the fill style.
+         * @param fill Fill style.
+         * @api
+         */
+        setFill(fill: ol.style.Fill): void;
 
-            /**
-             * Get the text to be rendered.
-             * @return {string|undefined} Text.
-             * @api
-             */
-            getText(): (string);
+        /**
+         * Set a geometry that is rendered instead of the feature's geometry.
+         *
+         * @param geometry
+         *     Feature property or geometry or function returning a geometry to render
+         *     for this style.
+         * @api
+         */
+        setGeometry(geometry: (string | ol.geom.Geometry | ol.StyleGeometryFunction)): void;
 
-            /**
-             * Get the text alignment.
-             * @return {string|undefined} Text align.
-             * @api
-             */
-            getTextAlign(): (string);
+        /**
+         * Set the image style.
+         * @param image Image style.
+         * @api
+         */
+        setImage(image: ol.style.Image): void;
 
-            /**
-             * Get the text baseline.
-             * @return {string|undefined} Text baseline.
-             * @api
-             */
-            getTextBaseline(): (string);
+        /**
+         * Set the stroke style.
+         * @param stroke Stroke style.
+         * @api
+         */
+        setStroke(stroke: ol.style.Stroke): void;
 
-            /**
-             * Set the font.
-             *
-             * @param {string|undefined} font Font.
-             * @api
-             */
-            setFont(font: (string)): void;
+        /**
+         * Set the text style.
+         * @param text Text style.
+         * @api
+         */
+        setText(text: ol.style.Text): void;
 
-            /**
-             * Set the x offset.
-             *
-             * @param {number} offsetX Horizontal text offset.
-             * @api
-             */
-            setOffsetX(offsetX: number): void;
-
-            /**
-             * Set the y offset.
-             *
-             * @param {number} offsetY Vertical text offset.
-             * @api
-             */
-            setOffsetY(offsetY: number): void;
-
-            /**
-             * Set the fill.
-             *
-             * @param {ol.style.Fill} fill Fill style.
-             * @api
-             */
-            setFill(fill: ol.style.Fill): void;
-
-            /**
-             * Set the rotation.
-             *
-             * @param {number|undefined} rotation Rotation.
-             * @api
-             */
-            setRotation(rotation: (number)): void;
-
-            /**
-             * Set the scale.
-             *
-             * @param {number|undefined} scale Scale.
-             * @api
-             */
-            setScale(scale: (number)): void;
-
-            /**
-             * Set the stroke.
-             *
-             * @param {ol.style.Stroke} stroke Stroke style.
-             * @api
-             */
-            setStroke(stroke: ol.style.Stroke): void;
-
-            /**
-             * Set the text.
-             *
-             * @param {string|undefined} text Text.
-             * @api
-             */
-            setText(text: (string)): void;
-
-            /**
-             * Set the text alignment.
-             *
-             * @param {string|undefined} textAlign Text align.
-             * @api
-             */
-            setTextAlign(textAlign: (string)): void;
-
-            /**
-             * Set the text baseline.
-             *
-             * @param {string|undefined} textBaseline Text baseline.
-             * @api
-             */
-            setTextBaseline(textBaseline: (string)): void;
-        }
+        /**
+         * Set the z-index.
+         *
+         * @param zIndex ZIndex.
+         * @api
+         */
+        setZIndex(zIndex: (number)): void;
     }
 
     /**
      * @classdesc
-     * Base class for tiles.
+     * Set text style for vector features.
      *
-     * @constructor
-     * @extends {ol.events.EventTarget}
-     * @param {ol.TileCoord} tileCoord Tile coordinate.
-     * @param {ol.Tile.State} state State.
+     * @param opt_options Options.
+     * @api
      */
-    class Tile extends ol.events.EventTarget {
+    class Text {
         /**
          * @classdesc
-         * Base class for tiles.
+         * Set text style for vector features.
          *
-         * @constructor
-         * @extends {ol.events.EventTarget}
-         * @param {ol.TileCoord} tileCoord Tile coordinate.
-         * @param {ol.Tile.State} state State.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State);
-
-        /**
-         * Get the tile coordinate for this tile.
-         * @return {ol.TileCoord} The tile coordinate.
+         * @param opt_options Options.
          * @api
          */
-        getTileCoord(): ol.TileCoord;
+        constructor(opt_options?: olx.style.TextOptions);
 
         /**
-         * Load the image or retry if loading previously failed.
-         * Loading is taken care of by the tile queue, and calling this method is
-         * only needed for preloading or for reloading in case of an error.
-         * @abstract
+         * Get the font name.
+         * @return Font.
          * @api
          */
-        load(): void;
-    }
+        getFont(): (string);
 
-    module Tile {
-        type State = number;
+        /**
+         * Get the x-offset for the text.
+         * @return Horizontal text offset.
+         * @api
+         */
+        getOffsetX(): number;
+
+        /**
+         * Get the y-offset for the text.
+         * @return Vertical text offset.
+         * @api
+         */
+        getOffsetY(): number;
+
+        /**
+         * Get the fill style for the text.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): ol.style.Fill;
+
+        /**
+         * Determine whether the text rotates with the map.
+         * @return Rotate with map.
+         * @api
+         */
+        getRotateWithView(): (boolean);
+
+        /**
+         * Get the text rotation.
+         * @return Rotation.
+         * @api
+         */
+        getRotation(): (number);
+
+        /**
+         * Get the text scale.
+         * @return Scale.
+         * @api
+         */
+        getScale(): (number);
+
+        /**
+         * Get the stroke style for the text.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): ol.style.Stroke;
+
+        /**
+         * Get the text to be rendered.
+         * @return Text.
+         * @api
+         */
+        getText(): (string);
+
+        /**
+         * Get the text alignment.
+         * @return Text align.
+         * @api
+         */
+        getTextAlign(): (string);
+
+        /**
+         * Get the text baseline.
+         * @return Text baseline.
+         * @api
+         */
+        getTextBaseline(): (string);
+
+        /**
+         * Set the font.
+         *
+         * @param font Font.
+         * @api
+         */
+        setFont(font: (string)): void;
+
+        /**
+         * Set the x offset.
+         *
+         * @param offsetX Horizontal text offset.
+         * @api
+         */
+        setOffsetX(offsetX: number): void;
+
+        /**
+         * Set the y offset.
+         *
+         * @param offsetY Vertical text offset.
+         * @api
+         */
+        setOffsetY(offsetY: number): void;
+
+        /**
+         * Set the fill.
+         *
+         * @param fill Fill style.
+         * @api
+         */
+        setFill(fill: ol.style.Fill): void;
+
+        /**
+         * Set the rotation.
+         *
+         * @param rotation Rotation.
+         * @api
+         */
+        setRotation(rotation: (number)): void;
+
+        /**
+         * Set the scale.
+         *
+         * @param scale Scale.
+         * @api
+         */
+        setScale(scale: (number)): void;
+
+        /**
+         * Set the stroke.
+         *
+         * @param stroke Stroke style.
+         * @api
+         */
+        setStroke(stroke: ol.style.Stroke): void;
+
+        /**
+         * Set the text.
+         *
+         * @param text Text.
+         * @api
+         */
+        setText(text: (string)): void;
+
+        /**
+         * Set the text alignment.
+         *
+         * @param textAlign Text align.
+         * @api
+         */
+        setTextAlign(textAlign: (string)): void;
+
+        /**
+         * Set the text baseline.
+         *
+         * @param textBaseline Text baseline.
+         * @api
+         */
+        setTextBaseline(textBaseline: (string)): void;
     }
+}
+
+/**
+ * @classdesc
+ * Base class for tiles.
+ *
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ */
+export class Tile extends events.EventTarget {
+    /**
+     * @classdesc
+     * Base class for tiles.
+     *
+     * @param tileCoord Tile coordinate.
+     * @param state State.
+     */
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State);
 
     /**
-     * @namespace ol.tilegrid
+     * Get the tile coordinate for this tile.
+     * @return The tile coordinate.
+     * @api
      */
-    module tilegrid {
-        /**
-         * Creates a tile grid with a standard XYZ tiling scheme.
-         * @param {olx.tilegrid.XYZOptions=} opt_options Tile grid options.
-         * @return {ol.tilegrid.TileGrid} Tile grid instance.
-         * @api
-         */
-        function createXYZ(opt_options?: olx.tilegrid.XYZOptions): ol.tilegrid.TileGrid;
+    getTileCoord(): ol.TileCoord;
 
+    /**
+     * Load the image or retry if loading previously failed.
+     * Loading is taken care of by the tile queue, and calling this method is
+     * only needed for preloading or for reloading in case of an error.
+     * @api
+     */
+    load(): void;
+}
+
+export namespace Tile {
+    type State = number;
+}
+
+export namespace tilegrid {
+    /**
+     * Creates a tile grid with a standard XYZ tiling scheme.
+     * @param opt_options Tile grid options.
+     * @return Tile grid instance.
+     * @api
+     */
+    function createXYZ(opt_options?: olx.tilegrid.XYZOptions): ol.tilegrid.TileGrid;
+
+    /**
+     * @classdesc
+     * Base class for setting the grid pattern for sources accessing tiled-image
+     * servers.
+     *
+     * @param options Tile grid options.
+     * @struct
+     * @api stable
+     */
+    class TileGrid {
         /**
          * @classdesc
          * Base class for setting the grid pattern for sources accessing tiled-image
          * servers.
          *
-         * @constructor
-         * @param {olx.tilegrid.TileGridOptions} options Tile grid options.
+         * @param options Tile grid options.
          * @struct
          * @api stable
          */
-        class TileGrid {
-            /**
-             * @classdesc
-             * Base class for setting the grid pattern for sources accessing tiled-image
-             * servers.
-             *
-             * @constructor
-             * @param {olx.tilegrid.TileGridOptions} options Tile grid options.
-             * @struct
-             * @api stable
-             */
-            constructor(options: olx.tilegrid.TileGridOptions);
+        constructor(options: olx.tilegrid.TileGridOptions);
 
-            /**
-             * Call a function with each tile coordinate for a given extent and zoom level.
-             *
-             * @param {ol.Extent} extent Extent.
-             * @param {number} zoom Zoom level.
-             * @param {function(ol.TileCoord)} callback Function called with each tile coordinate.
-             * @api
-             */
-            forEachTileCoord(extent: ol.Extent, zoom: number, callback: ((coords: ol.TileCoord) => any)): void;
+        /**
+         * Call a function with each tile coordinate for a given extent and zoom level.
+         *
+         * @param extent Extent.
+         * @param zoom Zoom level.
+         * @param callback Function called with each tile coordinate.
+         * @api
+         */
+        forEachTileCoord(extent: ol.Extent, zoom: number, callback: ((coords: ol.TileCoord) => any)): void;
 
-            /**
-             * Get the maximum zoom level for the grid.
-             * @return {number} Max zoom.
-             * @api
-             */
-            getMaxZoom(): number;
+        /**
+         * Get the maximum zoom level for the grid.
+         * @return Max zoom.
+         * @api
+         */
+        getMaxZoom(): number;
 
-            /**
-             * Get the minimum zoom level for the grid.
-             * @return {number} Min zoom.
-             * @api
-             */
-            getMinZoom(): number;
+        /**
+         * Get the minimum zoom level for the grid.
+         * @return Min zoom.
+         * @api
+         */
+        getMinZoom(): number;
 
-            /**
-             * Get the origin for the grid at the given zoom level.
-             * @param {number} z Z.
-             * @return {ol.Coordinate} Origin.
-             * @api stable
-             */
-            getOrigin(z: number): ol.Coordinate;
+        /**
+         * Get the origin for the grid at the given zoom level.
+         * @param z Z.
+         * @return Origin.
+         * @api stable
+         */
+        getOrigin(z: number): ol.Coordinate;
 
-            /**
-             * Get the resolution for the given zoom level.
-             * @param {number} z Z.
-             * @return {number} Resolution.
-             * @api stable
-             */
-            getResolution(z: number): number;
+        /**
+         * Get the resolution for the given zoom level.
+         * @param z Z.
+         * @return Resolution.
+         * @api stable
+         */
+        getResolution(z: number): number;
 
-            /**
-             * Get the list of resolutions for the tile grid.
-             * @return {Array.<number>} Resolutions.
-             * @api stable
-             */
-            getResolutions(): number[];
+        /**
+         * Get the list of resolutions for the tile grid.
+         * @return Resolutions.
+         * @api stable
+         */
+        getResolutions(): number[];
 
-            /**
-             * Get the extent of a tile coordinate.
-             *
-             * @param {ol.TileCoord} tileCoord Tile coordinate.
-             * @param {ol.Extent=} opt_extent Temporary extent object.
-             * @return {ol.Extent} Extent.
-             * @api
-             */
-            getTileCoordExtent(tileCoord: ol.TileCoord, opt_extent?: ol.Extent): ol.Extent;
+        /**
+         * Get the extent of a tile coordinate.
+         *
+         * @param tileCoord Tile coordinate.
+         * @param opt_extent Temporary extent object.
+         * @return Extent.
+         * @api
+         */
+        getTileCoordExtent(tileCoord: ol.TileCoord, opt_extent?: ol.Extent): ol.Extent;
 
-            /**
-             * Get the tile coordinate for the given map coordinate and resolution.  This
-             * method considers that coordinates that intersect tile boundaries should be
-             * assigned the higher tile coordinate.
-             *
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} resolution Resolution.
-             * @param {ol.TileCoord=} opt_tileCoord Destination ol.TileCoord object.
-             * @return {ol.TileCoord} Tile coordinate.
-             * @api
-             */
-            getTileCoordForCoordAndResolution(coordinate: ol.Coordinate, resolution: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
+        /**
+         * Get the tile coordinate for the given map coordinate and resolution.  This
+         * method considers that coordinates that intersect tile boundaries should be
+         * assigned the higher tile coordinate.
+         *
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param opt_tileCoord Destination ol.TileCoord object.
+         * @return Tile coordinate.
+         * @api
+         */
+        getTileCoordForCoordAndResolution(coordinate: ol.Coordinate, resolution: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
 
-            /**
-             * Get a tile coordinate given a map coordinate and zoom level.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} z Zoom level.
-             * @param {ol.TileCoord=} opt_tileCoord Destination ol.TileCoord object.
-             * @return {ol.TileCoord} Tile coordinate.
-             * @api
-             */
-            getTileCoordForCoordAndZ(coordinate: ol.Coordinate, z: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
+        /**
+         * Get a tile coordinate given a map coordinate and zoom level.
+         * @param coordinate Coordinate.
+         * @param z Zoom level.
+         * @param opt_tileCoord Destination ol.TileCoord object.
+         * @return Tile coordinate.
+         * @api
+         */
+        getTileCoordForCoordAndZ(coordinate: ol.Coordinate, z: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
 
-            /**
-             * Get the tile size for a zoom level. The type of the return value matches the
-             * `tileSize` or `tileSizes` that the tile grid was configured with. To always
-             * get an `ol.Size`, run the result through `ol.size.toSize()`.
-             * @param {number} z Z.
-             * @return {number|ol.Size} Tile size.
-             * @api stable
-             */
-            getTileSize(z: number): (number | ol.Size);
+        /**
+         * Get the tile size for a zoom level. The type of the return value matches the
+         * `tileSize` or `tileSizes` that the tile grid was configured with. To always
+         * get an `ol.Size`, run the result through `ol.size.toSize()`.
+         * @param z Z.
+         * @return Tile size.
+         * @api stable
+         */
+        getTileSize(z: number): (number | ol.Size);
 
-            /**
-             * @param {number} resolution Resolution.
-             * @param {number=} opt_direction If 0, the nearest resolution will be used.
-             *     If 1, the nearest lower resolution will be used. If -1, the nearest
-             *     higher resolution will be used. Default is 0.
-             * @return {number} Z.
-             * @api
-             */
-            getZForResolution(resolution: number, opt_direction?: number): number;
-        }
+        /**
+         * @param resolution Resolution.
+         * @param opt_direction If 0, the nearest resolution will be used.
+         *     If 1, the nearest lower resolution will be used. If -1, the nearest
+         *     higher resolution will be used. Default is 0.
+         * @return Z.
+         * @api
+         */
+        getZForResolution(resolution: number, opt_direction?: number): number;
+    }
 
+    /**
+     * @classdesc
+     * Set the grid pattern for sources accessing WMTS tiled-image servers.
+     *
+     * @param options WMTS options.
+     * @struct
+     * @api
+     */
+    class WMTS extends tilegrid.TileGrid {
         /**
          * @classdesc
          * Set the grid pattern for sources accessing WMTS tiled-image servers.
          *
-         * @constructor
-         * @extends {ol.tilegrid.TileGrid}
-         * @param {olx.tilegrid.WMTSOptions} options WMTS options.
+         * @param options WMTS options.
          * @struct
          * @api
          */
-        class WMTS extends ol.tilegrid.TileGrid {
-            /**
-             * @classdesc
-             * Set the grid pattern for sources accessing WMTS tiled-image servers.
-             *
-             * @constructor
-             * @extends {ol.tilegrid.TileGrid}
-             * @param {olx.tilegrid.WMTSOptions} options WMTS options.
-             * @struct
-             * @api
-             */
-            constructor(options: olx.tilegrid.WMTSOptions);
-
-            /**
-             * Get the list of matrix identifiers.
-             * @return {Array.<string>} MatrixIds.
-             * @api
-             */
-            getMatrixIds(): string[];
-
-            /**
-             * Create a tile grid from a WMTS capabilities matrix set.
-             * @param {Object} matrixSet An object representing a matrixSet in the
-             *     capabilities document.
-             * @param {ol.Extent=} opt_extent An optional extent to restrict the tile
-             *     ranges the server provides.
-             * @return {ol.tilegrid.WMTS} WMTS tileGrid instance.
-             * @api
-             */
-            static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
-        }
-    }
-
-    /**
-     * @typedef {string|Array.<string>|ol.Attribution|Array.<ol.Attribution>}
-     */
-    type AttributionLike = (string | string[] | ol.Attribution | ol.Attribution[]);
-
-    /**
-     * A function returning the canvas element (`{HTMLCanvasElement}`)
-     * used by the source as an image. The arguments passed to the function are:
-     * {@link ol.Extent} the image extent, `{number}` the image resolution,
-     * `{number}` the device pixel ratio, {@link ol.Size} the image size, and
-     * {@link ol.proj.Projection} the image projection. The canvas returned by
-     * this function is cached by the source. The this keyword inside the function
-     * references the {@link ol.source.ImageCanvas}.
-     *
-     * @typedef {function(this:ol.source.ImageCanvas, ol.Extent, number,
-     *     number, ol.Size, ol.proj.Projection): HTMLCanvasElement}
-     */
-    type CanvasFunctionType = (extent: ol.Extent, resolution: number, pixelRatio: number, size: ol.Size, proj: ol.proj.Projection) => HTMLCanvasElement;
-
-    /**
-     * A color represented as a short array [red, green, blue, alpha].
-     * red, green, and blue should be integers in the range 0..255 inclusive.
-     * alpha should be a float in the range 0..1 inclusive. If no alpha value is
-     * given then `1` will be used.
-     * @typedef {Array.<number>|Uint8Array|Uint8ClampedArray}
-     */
-    type Color = ([number, number, number, number] | Uint8Array | Uint8ClampedArray);
-
-    /**
-     * A type accepted by CanvasRenderingContext2D.fillStyle.
-     * Represents a color, pattern, or gradient.
-     *
-     * @typedef {string|CanvasPattern|CanvasGradient}
-     */
-    type ColorLike = (string | CanvasPattern | CanvasGradient);
-
-    /**
-     * An array of numbers representing an xy coordinate. Example: `[16, 48]`.
-     * @typedef {Array.<number>}
-     */
-    type Coordinate = [number, number];
-
-    /**
-     * A function that takes a {@link ol.Coordinate} and transforms it into a
-     * `{string}`.
-     *
-     * @typedef {function((ol.Coordinate|undefined)): string}
-     */
-    type CoordinateFormatType = (coords?: ol.Coordinate) => string;
-
-    /**
-     * A function that takes a {@link ol.MapBrowserEvent} and two
-     * {@link ol.Pixel}s and returns a `{boolean}`. If the condition is met,
-     * true should be returned.
-     * @typedef {function(ol.MapBrowserEvent, ol.Pixel, ol.Pixel):boolean}
-     */
-    type DragBoxEndConditionType = (event: ol.MapBrowserEvent, pixel1: ol.Pixel, pixel2: ol.Pixel) => boolean;
-
-    /**
-     * Function that takes coordinates and an optional existing geometry as
-     * arguments, and returns a geometry. The optional existing geometry is the
-     * geometry that is returned when the function is called without a second
-     * argument.
-     * @typedef {function(!(ol.Coordinate|Array.<ol.Coordinate>|
-     *     Array.<Array.<ol.Coordinate>>), ol.geom.SimpleGeometry=):
-     *     ol.geom.SimpleGeometry}
-     */
-    type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo?: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
-
-    /**
-     * A function that takes an {@link ol.MapBrowserEvent} and returns a
-     * `{boolean}`. If the condition is met, true should be returned.
-     *
-     * @typedef {function(ol.MapBrowserEvent): boolean}
-     */
-    type EventsConditionType = (event: ol.MapBrowserEvent) => boolean;
-
-    /**
-     * Key to use with {@link ol.Observable#unByKey}.
-     *
-     * @typedef {{bindTo: (Object|undefined),
-     *     boundListener: (ol.EventsListenerFunctionType|undefined),
-     *     callOnce: boolean,
-     *     deleteIndex: (number|undefined),
-     *     listener: ol.EventsListenerFunctionType,
-     *     target: (EventTarget|ol.events.EventTarget),
-     *     type: string}}
-     */
-    type EventsKey = Object;
-
-    /**
-     * An array of numbers representing an extent: `[minx, miny, maxx, maxy]`.
-     * @typedef {Array.<number>}
-     */
-    type Extent = [number, number, number, number];
-
-    /**
-     * {@link ol.source.Vector} sources use a function of this type to load
-     * features.
-     *
-     * This function takes an {@link ol.Extent} representing the area to be loaded,
-     * a `{number}` representing the resolution (map units per pixel) and an
-     * {@link ol.proj.Projection} for the projection  as arguments. `this` within
-     * the function is bound to the {@link ol.source.Vector} it's called from.
-     *
-     * The function is responsible for loading the features and adding them to the
-     * source.
-     * @typedef {function(this:ol.source.Vector, ol.Extent, number,
-     *                    ol.proj.Projection)}
-     */
-    type FeatureLoader = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => void;
-
-    /**
-     * A function that returns an array of {@link ol.style.Style styles} given a
-     * resolution. The `this` keyword inside the function references the
-     * {@link ol.Feature} to be styled.
-     *
-     * @typedef {function(this: ol.Feature, number):
-     *     (ol.style.Style|Array.<ol.style.Style>)}
-     */
-    type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
-
-    /**
-     * {@link ol.source.Vector} sources use a function of this type to get the url
-     * to load features from.
-     *
-     * This function takes an {@link ol.Extent} representing the area to be loaded,
-     * a `{number}` representing the resolution (map units per pixel) and an
-     * {@link ol.proj.Projection} for the projection  as arguments and returns a
-     * `{string}` representing the URL.
-     * @typedef {function(ol.Extent, number, ol.proj.Projection) : string}
-     */
-    type FeatureUrlFunction = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => string;
-
-    /**
-     * A function that takes an {@link ol.Image} for the image and a `{string}` for
-     * the src as arguments. It is supposed to make it so the underlying image
-     * {@link ol.Image#getImage} is assigned the content specified by the src. If
-     * not specified, the default is
-     *
-     *     function(image, src) {
-     *       image.getImage().src = src;
-     *     }
-     *
-     * Providing a custom `imageLoadFunction` can be useful to load images with
-     * post requests or - in general - through XHR requests, where the src of the
-     * image element would be set to a data URI when the content is loaded.
-     *
-     * @typedef {function(ol.Image, string)}
-     */
-    type ImageLoadFunctionType = (image: ol.Image, url: string) => void;
-
-    /**
-     * A function that takes an {@link ol.Extent} and a resolution as arguments, and
-     * returns an array of {@link ol.Extent} with the extents to load. Usually this
-     * is one of the standard {@link ol.loadingstrategy} strategies.
-     *
-     * @typedef {function(ol.Extent, number): Array.<ol.Extent>}
-     */
-    type LoadingStrategy = (extent: ol.Extent, resolution: number) => ol.Extent[];
-
-    type ModifyEventType = string;
-
-    /**
-     * An array with two elements, representing a pixel. The first element is the
-     * x-coordinate, the second the y-coordinate of the pixel.
-     * @typedef {Array.<number>}
-     */
-    type Pixel = [number, number];
-
-    /**
-     * Function to perform manipulations before rendering. This function is called
-     * with the {@link ol.Map} as first and an optional {@link olx.FrameState} as
-     * second argument. Return `true` to keep this function for the next frame,
-     * `false` to remove it.
-     * @typedef {function(ol.Map, ?olx.FrameState): boolean}
-     */
-    type PreRenderFunction = (map: ol.Map, state?: olx.FrameState) => boolean;
-
-    /**
-     * A projection as {@link ol.proj.Projection}, SRS identifier string or
-     * undefined.
-     * @typedef {ol.proj.Projection|string|undefined} ol.ProjectionLike
-     */
-    type ProjectionLike = (ol.proj.Projection | string | undefined);
-
-    /**
-     * A function that takes an array of input data, performs some operation, and
-     * returns an array of ouput data.
-     * For `pixel` type operations, the function will be called with an array of
-     * pixels, where each pixel is an array of four numbers (`[r, g, b, a]`) in the
-     * range of 0 - 255. It should return a single pixel array.
-     * For `'image'` type operations, functions will be called with an array of
-     * {@link ImageData https://developer.mozilla.org/en-US/docs/Web/API/ImageData}
-     * and should return a single {@link ImageData
-     * https://developer.mozilla.org/en-US/docs/Web/API/ImageData}.  The operations
-     * are called with a second "data" argument, which can be used for storage.  The
-     * data object is accessible from raster events, where it can be initialized in
-     * "beforeoperations" and accessed again in "afteroperations".
-     *
-     * @typedef {function((Array.<Array.<number>>|Array.<ImageData>), Object):
-     *     (Array.<number>|ImageData)}
-     */
-    type RasterOperation = (data: (number[][] | ImageData[]), obj: GlobalObject) => (number[] | ImageData);
-
-    /**
-     * A function that takes an {@link ol.Feature} or {@link ol.render.Feature} and
-     * an {@link ol.layer.Layer} and returns `true` if the feature may be selected
-     * or `false` otherwise.
-     * @typedef {function((ol.Feature|ol.render.Feature), ol.layer.Layer):
-     *     boolean}
-     */
-    type SelectFilterFunction = (feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => boolean;
-
-    /**
-     * An array of numbers representing a size: `[width, height]`.
-     * @typedef {Array.<number>}
-     */
-    type Size = [number, number];
-
-    /**
-     * @typedef {{attributions: (ol.AttributionLike|undefined),
-     *            extent: (null|ol.Extent|undefined),
-     *            logo: (string|olx.LogoOptions|undefined),
-     *            projection: ol.ProjectionLike,
-     *            resolutions: (Array.<number>|undefined),
-     *            state: (ol.source.State|undefined)}}
-     */
-    interface SourceImageOptions {
-        attributions?: ol.AttributionLike;
-        extent?: (ol.Extent);
-        logo?: (string | olx.LogoOptions);
-        projection: ol.ProjectionLike;
-        resolutions?: number[];
-        state?: ol.source.State;
-    }
-
-    /**
-     * @typedef {{attributions: (ol.AttributionLike|undefined),
-     *            logo: (string|olx.LogoOptions|undefined),
-     *            projection: ol.ProjectionLike,
-     *            state: (ol.source.State|undefined),
-     *            wrapX: (boolean|undefined)}}
-     */
-    interface SourceSourceOptions {
-        attributions?: ol.AttributionLike;
-        logo?: (string | olx.LogoOptions);
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        wrapX?: boolean;
-    }
-
-    /**
-     * @typedef {{attributions: (ol.AttributionLike|undefined),
-     *            cacheSize: (number|undefined),
-     *            extent: (ol.Extent|undefined),
-     *            logo: (string|olx.LogoOptions|undefined),
-     *            opaque: (boolean|undefined),
-     *            projection: ol.ProjectionLike,
-     *            state: (ol.source.State|undefined),
-     *            tileGrid: (ol.tilegrid.TileGrid|undefined),
-     *            tileLoadFunction: ol.TileLoadFunctionType,
-     *            tilePixelRatio: (number|undefined),
-     *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
-     *            url: (string|undefined),
-     *            urls: (Array.<string>|undefined),
-     *            wrapX: (boolean|undefined)}}
-     */
-    interface SourceUrlTileOptions {
-        attributions?: ol.AttributionLike;
-        cacheSize?: number;
-        extent?: ol.Extent;
-        logo?: (string | olx.LogoOptions);
-        opaque?: boolean;
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        tileGrid?: ol.tilegrid.TileGrid;
-        tileLoadFunction: ol.TileLoadFunctionType;
-        tilePixelRatio?: number;
-        tileUrlFunction?: ol.TileUrlFunctionType;
-        url?: string;
-        urls?: string[];
-        wrapX?: boolean;
-    }
-
-    /**
-     * @typedef {{attributions: (ol.AttributionLike|undefined),
-     *            cacheSize: (number|undefined),
-     *            extent: (ol.Extent|undefined),
-     *            logo: (string|olx.LogoOptions|undefined),
-     *            opaque: (boolean|undefined),
-     *            tilePixelRatio: (number|undefined),
-     *            projection: ol.ProjectionLike,
-     *            state: (ol.source.State|undefined),
-     *            tileGrid: (ol.tilegrid.TileGrid|undefined),
-     *            wrapX: (boolean|undefined)}}
-     */
-    interface SourceTileOptions {
-        attributions?: ol.AttributionLike;
-        cacheSize?: number;
-        extent?: ol.Extent;
-        logo?: (string | olx.LogoOptions);
-        opaque?: boolean;
-        tilePixelRatio?: number;
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        tileGrid?: ol.tilegrid.TileGrid;
-        wrapX?: boolean;
-    }
-
-    /**
-     * @typedef {{opacity: number,
-     *            rotateWithView: boolean,
-     *            rotation: number,
-     *            scale: number,
-     *            snapToPixel: boolean}}
-     */
-    interface StyleImageOptions {
-        opacity: number;
-        rotateWithView: boolean;
-        rotation: number;
-        scale: number;
-        snapToPixel: boolean;
-    }
-
-    /**
-     * A function that takes an {@link ol.Feature} and a `{number}` representing
-     * the view's resolution. The function should return a {@link ol.style.Style}
-     * or an array of them. This way e.g. a vector layer can be styled.
-     *
-     * @typedef {function((ol.Feature|ol.render.Feature), number):
-     *     (ol.style.Style|Array.<ol.style.Style>)}
-     */
-    type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
-
-    /**
-     * A function that takes an {@link ol.Feature} as argument and returns an
-     * {@link ol.geom.Geometry} that will be rendered and styled for the feature.
-     *
-     * @typedef {function((ol.Feature|ol.render.Feature)):
-     *     (ol.geom.Geometry|ol.render.Feature|undefined)}
-     */
-    type StyleGeometryFunction = (feature: (ol.Feature | ol.render.Feature)) => (ol.geom.Geometry | ol.render.Feature);
-
-    /**
-     * An array of three numbers representing the location of a tile in a tile
-     * grid. The order is `z`, `x`, and `y`. `z` is the zoom level.
-     * @typedef {Array.<number>} ol.TileCoord
-     */
-    type TileCoord = [number, number, number];
-
-    /**
-     * A function that takes an {@link ol.Tile} for the tile and a `{string}` for
-     * the url as arguments.
-     *
-     * @typedef {function(ol.Tile, string)}
-     */
-    type TileLoadFunctionType = (tile: ol.Tile, url: string) => void;
-
-    /**
-     * {@link ol.source.Tile} sources use a function of this type to get the url
-     * that provides a tile for a given tile coordinate.
-     *
-     * This function takes an {@link ol.TileCoord} for the tile coordinate, a
-     * `{number}` representing the pixel ratio and an {@link ol.proj.Projection} for
-     * the projection  as arguments and returns a `{string}` representing the tile
-     * URL, or undefined if no tile should be requested for the passed tile
-     * coordinate.
-     *
-     * @typedef {function(ol.TileCoord, number,
-     *           ol.proj.Projection): (string|undefined)}
-     */
-    type TileUrlFunctionType = (coords: ol.TileCoord, pixelRatio: number, proj: ol.proj.Projection) => string;
-
-    /**
-     * A transform function accepts an array of input coordinate values, an optional
-     * output array, and an optional dimension (default should be 2).  The function
-     * transforms the input coordinate values, populates the output array, and
-     * returns the output array.
-     *
-     * @typedef {function(Array.<number>, Array.<number>=, number=): Array.<number>}
-     */
-    type TransformFunction = (array: number[], out?: number[], dimension?: number) => number[];
-
-    /**
-     * Number of features; bounds/extent.
-     * @typedef {{numberOfFeatures: number,
-     *            bounds: ol.Extent}}
-     */
-    type WFSFeatureCollectionMetadata = Object;
-
-    /**
-     * Total deleted; total inserted; total updated; array of insert ids.
-     * @typedef {{totalDeleted: number,
-     *            totalInserted: number,
-     *            totalUpdated: number,
-     *            insertIds: Array.<string>}}
-     */
-    type WFSTransactionResponse = Object;
-
-    /**
-     * @constructor
-     * @extends {ol.Tile}
-     * @param {ol.TileCoord} tileCoord Tile coordinate.
-     * @param {ol.Tile.State} state State.
-     * @param {string} src Data source url.
-     * @param {ol.format.Feature} format Feature format.
-     * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-     */
-    class VectorTile extends ol.Tile {
-        /**
-         * @constructor
-         * @extends {ol.Tile}
-         * @param {ol.TileCoord} tileCoord Tile coordinate.
-         * @param {ol.Tile.State} state State.
-         * @param {string} src Data source url.
-         * @param {ol.format.Feature} format Feature format.
-         * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, format: ol.format.Feature, tileLoadFunction: ol.TileLoadFunctionType);
+        constructor(options: olx.tilegrid.WMTSOptions);
 
         /**
-         * Get the feature format assigned for reading this tile's features.
-         * @return {ol.format.Feature} Feature format.
+         * Get the list of matrix identifiers.
+         * @return MatrixIds.
          * @api
          */
-        getFormat(): ol.format.Feature;
+        getMatrixIds(): string[];
 
         /**
-         * @param {Array.<ol.Feature>} features Features.
+         * Create a tile grid from a WMTS capabilities matrix set.
+         * @param matrixSet An object representing a matrixSet in the
+         *     capabilities document.
+         * @param opt_extent An optional extent to restrict the tile
+         *     ranges the server provides.
+         * @return WMTS tileGrid instance.
          * @api
          */
-        setFeatures(features: ol.Feature[]): void;
-
-        /**
-         * Set the projection of the features that were added with {@link #setFeatures}.
-         * @param {ol.proj.Projection} projection Feature projection.
-         * @api
-         */
-        setProjection(projection: ol.proj.Projection): void;
-
-        /**
-         * Set the feature loader for reading this tile's features.
-         * @param {ol.FeatureLoader} loader Feature loader.
-         * @api
-         */
-        setLoader(loader: ol.FeatureLoader): void;
+        static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
     }
+}
 
+export type AttributionLike = (string | string[] | ol.Attribution | ol.Attribution[]);
+
+/**
+ * A function returning the canvas element (`{HTMLCanvasElement}`)
+ * used by the source as an image. The arguments passed to the function are:
+ * {@link ol.Extent} the image extent, `{number}` the image resolution,
+ * `{number}` the device pixel ratio, {@link ol.Size} the image size, and
+ * {@link ol.proj.Projection} the image projection. The canvas returned by
+ * this function is cached by the source. The this keyword inside the function
+ * references the {@link ol.source.ImageCanvas}.
+ *
+ */
+export type CanvasFunctionType = (extent: ol.Extent, resolution: number, pixelRatio: number, size: ol.Size, proj: ol.proj.Projection) => HTMLCanvasElement;
+
+/**
+ * A color represented as a short array [red, green, blue, alpha].
+ * red, green, and blue should be integers in the range 0..255 inclusive.
+ * alpha should be a float in the range 0..1 inclusive. If no alpha value is
+ * given then `1` will be used.
+ */
+export type Color = ([number, number, number, number] | Uint8Array | Uint8ClampedArray);
+
+/**
+ * A type accepted by CanvasRenderingContext2D.fillStyle.
+ * Represents a color, pattern, or gradient.
+ *
+ */
+export type ColorLike = (string | CanvasPattern | CanvasGradient);
+
+/**
+ * An array of numbers representing an xy coordinate. Example: `[16, 48]`.
+ */
+export type Coordinate = [number, number];
+
+/**
+ * A function that takes a {@link ol.Coordinate} and transforms it into a
+ * `{string}`.
+ *
+ */
+export type CoordinateFormatType = (coords?: ol.Coordinate) => string;
+
+/**
+ * A function that takes a {@link ol.MapBrowserEvent} and two
+ * {@link ol.Pixel}s and returns a `{boolean}`. If the condition is met,
+ * true should be returned.
+ */
+export type DragBoxEndConditionType = (event: ol.MapBrowserEvent, pixel1: ol.Pixel, pixel2: ol.Pixel) => boolean;
+
+/**
+ * Function that takes coordinates and an optional existing geometry as
+ * arguments, and returns a geometry. The optional existing geometry is the
+ * geometry that is returned when the function is called without a second
+ * argument.
+ */
+export type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo?: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
+
+/**
+ * A function that takes an {@link ol.MapBrowserEvent} and returns a
+ * `{boolean}`. If the condition is met, true should be returned.
+ *
+ */
+export type EventsConditionType = (event: ol.MapBrowserEvent) => boolean;
+
+/**
+ * Key to use with {@link ol.Observable#unByKey}.
+ *
+ */
+export type EventsKey = GlobalObject;
+
+/**
+ * An array of numbers representing an extent: `[minx, miny, maxx, maxy]`.
+ */
+export type Extent = [number, number, number, number];
+
+/**
+ * {@link ol.source.Vector} sources use a function of this type to load
+ * features.
+ *
+ * This function takes an {@link ol.Extent} representing the area to be loaded,
+ * a `{number}` representing the resolution (map units per pixel) and an
+ * {@link ol.proj.Projection} for the projection  as arguments. `this` within
+ * the function is bound to the {@link ol.source.Vector} it's called from.
+ *
+ * The function is responsible for loading the features and adding them to the
+ * source.
+ */
+export type FeatureLoader = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => void;
+
+/**
+ * A function that returns an array of {@link ol.style.Style styles} given a
+ * resolution. The `this` keyword inside the function references the
+ * {@link ol.Feature} to be styled.
+ *
+ */
+export type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
+
+/**
+ * {@link ol.source.Vector} sources use a function of this type to get the url
+ * to load features from.
+ *
+ * This function takes an {@link ol.Extent} representing the area to be loaded,
+ * a `{number}` representing the resolution (map units per pixel) and an
+ * {@link ol.proj.Projection} for the projection  as arguments and returns a
+ * `{string}` representing the URL.
+ */
+export type FeatureUrlFunction = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => string;
+
+/**
+ * A function that takes an {@link ol.Image} for the image and a `{string}` for
+ * the src as arguments. It is supposed to make it so the underlying image
+ * {@link ol.Image#getImage} is assigned the content specified by the src. If
+ * not specified, the default is
+ *
+ *     function(image, src) {
+ *       image.getImage().src = src;
+ *     }
+ *
+ * Providing a custom `imageLoadFunction` can be useful to load images with
+ * post requests or - in general - through XHR requests, where the src of the
+ * image element would be set to a data URI when the content is loaded.
+ *
+ */
+export type ImageLoadFunctionType = (image: ol.Image, url: string) => void;
+
+/**
+ * A function that takes an {@link ol.Extent} and a resolution as arguments, and
+ * returns an array of {@link ol.Extent} with the extents to load. Usually this
+ * is one of the standard {@link ol.loadingstrategy} strategies.
+ *
+ */
+export type LoadingStrategy = (extent: ol.Extent, resolution: number) => ol.Extent[];
+
+export type ModifyEventType = string;
+
+/**
+ * An array with two elements, representing a pixel. The first element is the
+ * x-coordinate, the second the y-coordinate of the pixel.
+ */
+export type Pixel = [number, number];
+
+/**
+ * Function to perform manipulations before rendering. This function is called
+ * with the {@link ol.Map} as first and an optional {@link olx.FrameState} as
+ * second argument. Return `true` to keep this function for the next frame,
+ * `false` to remove it.
+ */
+export type PreRenderFunction = (map: ol.Map, state?: olx.FrameState) => boolean;
+
+/**
+ * A projection as {@link ol.proj.Projection}, SRS identifier string or
+ * undefined.
+ */
+export type ProjectionLike = (ol.proj.Projection | string | undefined);
+
+/**
+ * A function that takes an array of input data, performs some operation, and
+ * returns an array of ouput data.
+ * For `pixel` type operations, the function will be called with an array of
+ * pixels, where each pixel is an array of four numbers (`[r, g, b, a]`) in the
+ * range of 0 - 255. It should return a single pixel array.
+ * For `'image'` type operations, functions will be called with an array of
+ * {@link ImageData https://developer.mozilla.org/en-US/docs/Web/API/ImageData}
+ * and should return a single {@link ImageData
+ * https://developer.mozilla.org/en-US/docs/Web/API/ImageData}.  The operations
+ * are called with a second "data" argument, which can be used for storage.  The
+ * data object is accessible from raster events, where it can be initialized in
+ * "beforeoperations" and accessed again in "afteroperations".
+ *
+ */
+export type RasterOperation = (data: (number[][] | ImageData[]), obj: GlobalObject) => (number[] | ImageData);
+
+/**
+ * A function that takes an {@link ol.Feature} or {@link ol.render.Feature} and
+ * an {@link ol.layer.Layer} and returns `true` if the feature may be selected
+ * or `false` otherwise.
+ */
+export type SelectFilterFunction = (feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => boolean;
+
+/**
+ * An array of numbers representing a size: `[width, height]`.
+ */
+export type Size = [number, number];
+
+export interface SourceImageOptions {
+    attributions?: ol.AttributionLike;
+    extent?: (ol.Extent);
+    logo?: (string | olx.LogoOptions);
+    projection: ol.ProjectionLike;
+    resolutions?: number[];
+    state?: ol.source.State;
+}
+
+export interface SourceSourceOptions {
+    attributions?: ol.AttributionLike;
+    logo?: (string | olx.LogoOptions);
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    wrapX?: boolean;
+}
+
+export interface SourceUrlTileOptions {
+    attributions?: ol.AttributionLike;
+    cacheSize?: number;
+    extent?: ol.Extent;
+    logo?: (string | olx.LogoOptions);
+    opaque?: boolean;
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    tileGrid?: ol.tilegrid.TileGrid;
+    tileLoadFunction: ol.TileLoadFunctionType;
+    tilePixelRatio?: number;
+    tileUrlFunction?: ol.TileUrlFunctionType;
+    url?: string;
+    urls?: string[];
+    wrapX?: boolean;
+}
+
+export interface SourceTileOptions {
+    attributions?: ol.AttributionLike;
+    cacheSize?: number;
+    extent?: ol.Extent;
+    logo?: (string | olx.LogoOptions);
+    opaque?: boolean;
+    tilePixelRatio?: number;
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    tileGrid?: ol.tilegrid.TileGrid;
+    wrapX?: boolean;
+}
+
+export interface StyleImageOptions {
+    opacity: number;
+    rotateWithView: boolean;
+    rotation: number;
+    scale: number;
+    snapToPixel: boolean;
+}
+
+/**
+ * A function that takes an {@link ol.Feature} and a `{number}` representing
+ * the view's resolution. The function should return a {@link ol.style.Style}
+ * or an array of them. This way e.g. a vector layer can be styled.
+ *
+ */
+export type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
+
+/**
+ * A function that takes an {@link ol.Feature} as argument and returns an
+ * {@link ol.geom.Geometry} that will be rendered and styled for the feature.
+ *
+ */
+export type StyleGeometryFunction = (feature: (ol.Feature | ol.render.Feature)) => (ol.geom.Geometry | ol.render.Feature);
+
+/**
+ * An array of three numbers representing the location of a tile in a tile
+ * grid. The order is `z`, `x`, and `y`. `z` is the zoom level.
+ */
+export type TileCoord = [number, number, number];
+
+/**
+ * A function that takes an {@link ol.Tile} for the tile and a `{string}` for
+ * the url as arguments.
+ *
+ */
+export type TileLoadFunctionType = (tile: ol.Tile, url: string) => void;
+
+/**
+ * {@link ol.source.Tile} sources use a function of this type to get the url
+ * that provides a tile for a given tile coordinate.
+ *
+ * This function takes an {@link ol.TileCoord} for the tile coordinate, a
+ * `{number}` representing the pixel ratio and an {@link ol.proj.Projection} for
+ * the projection  as arguments and returns a `{string}` representing the tile
+ * URL, or undefined if no tile should be requested for the passed tile
+ * coordinate.
+ *
+ */
+export type TileUrlFunctionType = (coords: ol.TileCoord, pixelRatio: number, proj: ol.proj.Projection) => string;
+
+/**
+ * A transform function accepts an array of input coordinate values, an optional
+ * output array, and an optional dimension (default should be 2).  The function
+ * transforms the input coordinate values, populates the output array, and
+ * returns the output array.
+ *
+ */
+export type TransformFunction = (array: number[], out?: number[], dimension?: number) => number[];
+
+/**
+ * Number of features; bounds/extent.
+ */
+export type WFSFeatureCollectionMetadata = GlobalObject;
+
+/**
+ * Total deleted; total inserted; total updated; array of insert ids.
+ */
+export type WFSTransactionResponse = GlobalObject;
+
+/**
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ * @param src Data source url.
+ * @param format Feature format.
+ * @param tileLoadFunction Tile load function.
+ */
+export class VectorTile extends Tile {
+    /**
+     * @param tileCoord Tile coordinate.
+     * @param state State.
+     * @param src Data source url.
+     * @param format Feature format.
+     * @param tileLoadFunction Tile load function.
+     */
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, format: ol.format.Feature, tileLoadFunction: ol.TileLoadFunctionType);
+
+    /**
+     * Get the feature format assigned for reading this tile's features.
+     * @return Feature format.
+     * @api
+     */
+    getFormat(): ol.format.Feature;
+
+    /**
+     * @param features Features.
+     * @api
+     */
+    setFeatures(features: ol.Feature[]): void;
+
+    /**
+     * Set the projection of the features that were added with {@link #setFeatures}.
+     * @param projection Feature projection.
+     * @api
+     */
+    setProjection(projection: ol.proj.Projection): void;
+
+    /**
+     * Set the feature loader for reading this tile's features.
+     * @param loader Feature loader.
+     * @api
+     */
+    setLoader(loader: ol.FeatureLoader): void;
+}
+
+/**
+ * @classdesc
+ * An ol.View object represents a simple 2D view of the map.
+ *
+ * This is the object to act upon to change the center, resolution,
+ * and rotation of the map.
+ *
+ * ### The view states
+ *
+ * An `ol.View` is determined by three states: `center`, `resolution`,
+ * and `rotation`. Each state has a corresponding getter and setter, e.g.
+ * `getCenter` and `setCenter` for the `center` state.
+ *
+ * An `ol.View` has a `projection`. The projection determines the
+ * coordinate system of the center, and its units determine the units of the
+ * resolution (projection units per pixel). The default projection is
+ * Spherical Mercator (EPSG:3857).
+ *
+ * ### The constraints
+ *
+ * `setCenter`, `setResolution` and `setRotation` can be used to change the
+ * states of the view. Any value can be passed to the setters. And the value
+ * that is passed to a setter will effectively be the value set in the view,
+ * and returned by the corresponding getter.
+ *
+ * But an `ol.View` object also has a *resolution constraint*, a
+ * *rotation constraint* and a *center constraint*.
+ *
+ * As said above, no constraints are applied when the setters are used to set
+ * new states for the view. Applying constraints is done explicitly through
+ * the use of the `constrain*` functions (`constrainResolution` and
+ * `constrainRotation` and `constrainCenter`).
+ *
+ * The main users of the constraints are the interactions and the
+ * controls. For example, double-clicking on the map changes the view to
+ * the "next" resolution. And releasing the fingers after pinch-zooming
+ * snaps to the closest resolution (with an animation).
+ *
+ * The *resolution constraint* snaps to specific resolutions. It is
+ * determined by the following options: `resolutions`, `maxResolution`,
+ * `maxZoom`, and `zoomFactor`. If `resolutions` is set, the other three
+ * options are ignored. See documentation for each option for more
+ * information.
+ *
+ * The *rotation constraint* snaps to specific angles. It is determined
+ * by the following options: `enableRotation` and `constrainRotation`.
+ * By default the rotation value is snapped to zero when approaching the
+ * horizontal.
+ *
+ * The *center constraint* is determined by the `extent` option. By
+ * default the center is not constrained at all.
+ *
+ * @param opt_options View options.
+ * @api stable
+ */
+export class View extends Object {
     /**
      * @classdesc
      * An ol.View object represents a simple 2D view of the map.
@@ -12107,329 +11166,256 @@ declare module ol {
      * The *center constraint* is determined by the `extent` option. By
      * default the center is not constrained at all.
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.ViewOptions=} opt_options View options.
+     * @param opt_options View options.
      * @api stable
      */
-    class View extends ol.Object {
-        /**
-         * @classdesc
-         * An ol.View object represents a simple 2D view of the map.
-         *
-         * This is the object to act upon to change the center, resolution,
-         * and rotation of the map.
-         *
-         * ### The view states
-         *
-         * An `ol.View` is determined by three states: `center`, `resolution`,
-         * and `rotation`. Each state has a corresponding getter and setter, e.g.
-         * `getCenter` and `setCenter` for the `center` state.
-         *
-         * An `ol.View` has a `projection`. The projection determines the
-         * coordinate system of the center, and its units determine the units of the
-         * resolution (projection units per pixel). The default projection is
-         * Spherical Mercator (EPSG:3857).
-         *
-         * ### The constraints
-         *
-         * `setCenter`, `setResolution` and `setRotation` can be used to change the
-         * states of the view. Any value can be passed to the setters. And the value
-         * that is passed to a setter will effectively be the value set in the view,
-         * and returned by the corresponding getter.
-         *
-         * But an `ol.View` object also has a *resolution constraint*, a
-         * *rotation constraint* and a *center constraint*.
-         *
-         * As said above, no constraints are applied when the setters are used to set
-         * new states for the view. Applying constraints is done explicitly through
-         * the use of the `constrain*` functions (`constrainResolution` and
-         * `constrainRotation` and `constrainCenter`).
-         *
-         * The main users of the constraints are the interactions and the
-         * controls. For example, double-clicking on the map changes the view to
-         * the "next" resolution. And releasing the fingers after pinch-zooming
-         * snaps to the closest resolution (with an animation).
-         *
-         * The *resolution constraint* snaps to specific resolutions. It is
-         * determined by the following options: `resolutions`, `maxResolution`,
-         * `maxZoom`, and `zoomFactor`. If `resolutions` is set, the other three
-         * options are ignored. See documentation for each option for more
-         * information.
-         *
-         * The *rotation constraint* snaps to specific angles. It is determined
-         * by the following options: `enableRotation` and `constrainRotation`.
-         * By default the rotation value is snapped to zero when approaching the
-         * horizontal.
-         *
-         * The *center constraint* is determined by the `extent` option. By
-         * default the center is not constrained at all.
-         *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.ViewOptions=} opt_options View options.
-         * @api stable
-         */
-        constructor(opt_options?: olx.ViewOptions);
+    constructor(opt_options?: olx.ViewOptions);
 
-        /**
-         * Animate the view. The view's center, zoom (or resolution), and
-         * rotation can be animated for smooth transitions between view states.
-         * @param {olx.AnimateOptions} var_args Animation options.
-         * @param {olx.AnimateOptions | (completed: boolean) => void } restArgs
-         * @api experimental
-         */
-        animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
+    /**
+     * Animate the view. The view's center, zoom (or resolution), and
+     * rotation can be animated for smooth transitions between view states.
+     * @param var_args Animation options.
+     * @param restArgs
+     * @api experimental
+     */
+    animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
 
-        /**
-         * Determine if the view is being animated.
-         * @return {boolean} The view is being animated.
-         * @api
-         */
-        getAnimating(): boolean;
+    /**
+     * Determine if the view is being animated.
+     * @return The view is being animated.
+     * @api
+     */
+    getAnimating(): boolean;
 
-        /**
-         * Determine if the user is interacting with the view, such as panning or zooming.
-         * @return {boolean} The view is being interacted with.
-         * @api
-         */
-        getInteracting(): boolean;
+    /**
+     * Determine if the user is interacting with the view, such as panning or zooming.
+     * @return The view is being interacted with.
+     * @api
+     */
+    getInteracting(): boolean;
 
-        /**
-         * Cancel any ongoing animations.
-         * @api
-         */
-        cancelAnimations(): void;
+    /**
+     * Cancel any ongoing animations.
+     * @api
+     */
+    cancelAnimations(): void;
 
-        /**
-         * Get the constrained center of this view.
-         * @param {ol.Coordinate|undefined} center Center.
-         * @return {ol.Coordinate|undefined} Constrained center.
-         * @api
-         */
-        constrainCenter(center?: ol.Coordinate): ol.Coordinate;
+    /**
+     * Get the constrained center of this view.
+     * @param center Center.
+     * @return Constrained center.
+     * @api
+     */
+    constrainCenter(center?: ol.Coordinate): ol.Coordinate;
 
-        /**
-         * Get the constrained resolution of this view.
-         * @param {number|undefined} resolution Resolution.
-         * @param {number=} opt_delta Delta. Default is `0`.
-         * @param {number=} opt_direction Direction. Default is `0`.
-         * @return {number|undefined} Constrained resolution.
-         * @api
-         */
-        constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
+    /**
+     * Get the constrained resolution of this view.
+     * @param resolution Resolution.
+     * @param opt_delta Delta. Default is `0`.
+     * @param opt_direction Direction. Default is `0`.
+     * @return Constrained resolution.
+     * @api
+     */
+    constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
 
-        /**
-         * Get the constrained rotation of this view.
-         * @param {number|undefined} rotation Rotation.
-         * @param {number=} opt_delta Delta. Default is `0`.
-         * @return {number|undefined} Constrained rotation.
-         * @api
-         */
-        constrainRotation(rotation?: number, opt_delta?: number): number;
+    /**
+     * Get the constrained rotation of this view.
+     * @param rotation Rotation.
+     * @param opt_delta Delta. Default is `0`.
+     * @return Constrained rotation.
+     * @api
+     */
+    constrainRotation(rotation?: number, opt_delta?: number): number;
 
-        /**
-         * Get the view center.
-         * @return {ol.Coordinate|undefined} The center of the view.
-         * @observable
-         * @api stable
-         */
-        getCenter(): ol.Coordinate;
+    /**
+     * Get the view center.
+     * @return The center of the view.
+     * @observable
+     * @api stable
+     */
+    getCenter(): ol.Coordinate;
 
-        /**
-         * Calculate the extent for the current view state and the passed size.
-         * The size is the pixel dimensions of the box into which the calculated extent
-         * should fit. In most cases you want to get the extent of the entire map,
-         * that is `map.getSize()`.
-         * @param {ol.Size=} size Box pixel size.
-         * @return {ol.Extent} Extent.
-         * @api stable
-         */
-        calculateExtent(size?: ol.Size): ol.Extent;
+    /**
+     * Calculate the extent for the current view state and the passed size.
+     * The size is the pixel dimensions of the box into which the calculated extent
+     * should fit. In most cases you want to get the extent of the entire map,
+     * that is `map.getSize()`.
+     * @param size Box pixel size.
+     * @return Extent.
+     * @api stable
+     */
+    calculateExtent(size?: ol.Size): ol.Extent;
 
-        /**
-         * Get the maximum resolution of the view.
-         * @return {number} The maximum resolution of the view.
-         * @api
-         */
-        getMaxResolution(): number;
+    /**
+     * Get the maximum resolution of the view.
+     * @return The maximum resolution of the view.
+     * @api
+     */
+    getMaxResolution(): number;
 
-        /**
-         * Get the minimum resolution of the view.
-         * @return {number} The minimum resolution of the view.
-         * @api
-         */
-        getMinResolution(): number;
+    /**
+     * Get the minimum resolution of the view.
+     * @return The minimum resolution of the view.
+     * @api
+     */
+    getMinResolution(): number;
 
-        /**
-         * Get the maximum zoom level for the view.
-         * @return {number} The maximum zoom level.
-         * @api
-         */
-        getMaxZoom(): number;
+    /**
+     * Get the maximum zoom level for the view.
+     * @return The maximum zoom level.
+     * @api
+     */
+    getMaxZoom(): number;
 
-        /**
-         * Set a new maximum zoom level for the view.
-         * @param {number} zoom The maximum zoom level.
-         * @api stable
-         */
-        setMaxZoom(zoom: number): void;
+    /**
+     * Set a new maximum zoom level for the view.
+     * @param zoom The maximum zoom level.
+     * @api stable
+     */
+    setMaxZoom(zoom: number): void;
 
-        /**
-         * Get the minimum zoom level for the view.
-         * @return {number} The minimum zoom level.
-         * @api
-         */
-        getMinZoom(): number;
+    /**
+     * Get the minimum zoom level for the view.
+     * @return The minimum zoom level.
+     * @api
+     */
+    getMinZoom(): number;
 
-        /**
-         * Set a new minimum zoom level for the view.
-         * @param {number} zoom The minimum zoom level.
-         * @api stable
-         */
-        setMinZoom(zoom: number): void;
+    /**
+     * Set a new minimum zoom level for the view.
+     * @param zoom The minimum zoom level.
+     * @api stable
+     */
+    setMinZoom(zoom: number): void;
 
-        /**
-         * Get the view projection.
-         * @return {ol.proj.Projection} The projection of the view.
-         * @api stable
-         */
-        getProjection(): ol.proj.Projection;
+    /**
+     * Get the view projection.
+     * @return The projection of the view.
+     * @api stable
+     */
+    getProjection(): ol.proj.Projection;
 
-        /**
-         * Get the view resolution.
-         * @return {number|undefined} The resolution of the view.
-         * @observable
-         * @api stable
-         */
-        getResolution(): number;
+    /**
+     * Get the view resolution.
+     * @return The resolution of the view.
+     * @observable
+     * @api stable
+     */
+    getResolution(): number;
 
-        /**
-         * Get the resolutions for the view. This returns the array of resolutions
-         * passed to the constructor of the {ol.View}, or undefined if none were given.
-         * @return {Array.<number>|undefined} The resolutions of the view.
-         * @api stable
-         */
-        getResolutions(): number[];
+    /**
+     * Get the resolutions for the view. This returns the array of resolutions
+     * passed to the constructor of the {ol.View}, or undefined if none were given.
+     * @return The resolutions of the view.
+     * @api stable
+     */
+    getResolutions(): number[];
 
-        /**
-         * Get the resolution for a provided extent (in map units) and size (in pixels).
-         * @param {ol.Extent} extent Extent.
-         * @param {ol.Size=} opt_size Box pixel size.
-         * @return {number} The resolution at which the provided extent will render at
-         *     the given size.
-         * @api
-         */
-        getResolutionForExtent(extent: ol.Extent, opt_size?: ol.Size): number;
+    /**
+     * Get the resolution for a provided extent (in map units) and size (in pixels).
+     * @param extent Extent.
+     * @param opt_size Box pixel size.
+     * @return The resolution at which the provided extent will render at
+     *     the given size.
+     * @api
+     */
+    getResolutionForExtent(extent: ol.Extent, opt_size?: ol.Size): number;
 
-        /**
-         * Get the view rotation.
-         * @return {number} The rotation of the view in radians.
-         * @observable
-         * @api stable
-         */
-        getRotation(): number;
+    /**
+     * Get the view rotation.
+     * @return The rotation of the view in radians.
+     * @observable
+     * @api stable
+     */
+    getRotation(): number;
 
-        /**
-         * Get the current zoom level.  If you configured your view with a resolutions
-         * array (this is rare), this method may return non-integer zoom levels (so
-         * the zoom level is not safe to use as an index into a resolutions array).
-         * @return {number|undefined} Zoom.
-         * @api
-         */
-        getZoom(): number;
+    /**
+     * Get the current zoom level.  If you configured your view with a resolutions
+     * array (this is rare), this method may return non-integer zoom levels (so
+     * the zoom level is not safe to use as an index into a resolutions array).
+     * @return Zoom.
+     * @api
+     */
+    getZoom(): number;
 
-        /**
-         * Get the zoom level for a resolution.
-         * @param {number} resolution The resolution.
-         * @return {number|undefined} The zoom level for the provided resolution.
-         * @api
-         */
-        getZoomForResolution(resolution: number): number;
+    /**
+     * Get the zoom level for a resolution.
+     * @param resolution The resolution.
+     * @return The zoom level for the provided resolution.
+     * @api
+     */
+    getZoomForResolution(resolution: number): number;
 
-        /**
-         * Get the resolution for a zoom level.
-         * @param {number} zoom Zoom level.
-         * @return {number} The view resolution for the provided zoom level.
-         * @api
-         */
-        getResolutionForZoom(zoom: number): number;
+    /**
+     * Get the resolution for a zoom level.
+     * @param zoom Zoom level.
+     * @return The view resolution for the provided zoom level.
+     * @api
+     */
+    getResolutionForZoom(zoom: number): number;
 
-        /**
-         * Fit the given geometry or extent based on the given map size and border.
-         * The size is pixel dimensions of the box to fit the extent into.
-         * In most cases you will want to use the map size, that is `map.getSize()`.
-         * Takes care of the map angle.
-         * @param {ol.geom.SimpleGeometry|ol.Extent} geometry Geometry.
-         * @param {olx.view.FitOptions=} opt_options Options.
-         * @api
-         */
-        fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
+    /**
+     * Fit the given geometry or extent based on the given map size and border.
+     * The size is pixel dimensions of the box to fit the extent into.
+     * In most cases you will want to use the map size, that is `map.getSize()`.
+     * Takes care of the map angle.
+     * @param geometry Geometry.
+     * @param opt_options Options.
+     * @api
+     */
+    fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
 
-        /**
-         * Center on coordinate and view position.
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @param {ol.Size} size Box pixel size.
-         * @param {ol.Pixel} position Position on the view to center on.
-         * @api
-         */
-        centerOn(coordinate: ol.Coordinate, size: ol.Size, position: ol.Pixel): void;
+    /**
+     * Center on coordinate and view position.
+     * @param coordinate Coordinate.
+     * @param size Box pixel size.
+     * @param position Position on the view to center on.
+     * @api
+     */
+    centerOn(coordinate: ol.Coordinate, size: ol.Size, position: ol.Pixel): void;
 
-        /**
-         * Rotate the view around a given coordinate.
-         * @param {number} rotation New rotation value for the view.
-         * @param {ol.Coordinate=} opt_anchor The rotation center.
-         * @api stable
-         */
-        rotate(rotation: number, opt_anchor?: ol.Coordinate): void;
+    /**
+     * Rotate the view around a given coordinate.
+     * @param rotation New rotation value for the view.
+     * @param opt_anchor The rotation center.
+     * @api stable
+     */
+    rotate(rotation: number, opt_anchor?: ol.Coordinate): void;
 
-        /**
-         * Set the center of the current view.
-         * @param {ol.Coordinate|undefined} center The center of the view.
-         * @observable
-         * @api stable
-         */
-        setCenter(center: ol.Coordinate): void;
+    /**
+     * Set the center of the current view.
+     * @param center The center of the view.
+     * @observable
+     * @api stable
+     */
+    setCenter(center: ol.Coordinate): void;
 
-        /**
-         * Set the resolution for this view.
-         * @param {number|undefined} resolution The resolution of the view.
-         * @observable
-         * @api stable
-         */
-        setResolution(resolution?: number): void;
+    /**
+     * Set the resolution for this view.
+     * @param resolution The resolution of the view.
+     * @observable
+     * @api stable
+     */
+    setResolution(resolution?: number): void;
 
-        /**
-         * Set the rotation for this view.
-         * @param {number} rotation The rotation of the view in radians.
-         * @observable
-         * @api stable
-         */
-        setRotation(rotation: number): void;
+    /**
+     * Set the rotation for this view.
+     * @param rotation The rotation of the view in radians.
+     * @observable
+     * @api stable
+     */
+    setRotation(rotation: number): void;
 
-        /**
-         * Zoom to a specific zoom level.
-         * @param {number} zoom Zoom level.
-         * @api stable
-         */
-        setZoom(zoom: number): void;
-    }
+    /**
+     * Zoom to a specific zoom level.
+     * @param zoom Zoom level.
+     * @api stable
+     */
+    setZoom(zoom: number): void;
 }
 
-/**
- * @namespace olx
- */
-declare module olx {
-    /**
-     * @namespace olx.animation
-     */
-    module animation {
-        /**
-         * @typedef {{resolution: number,
-         *     start: (number|undefined),
-         *     duration: (number|undefined),
-         *     easing: (function(number):number|undefined)}}
-         */
+export namespace olx {
+    export namespace animation {
         interface BounceOptions {
             resolution: number;
             start?: number;
@@ -12437,12 +11423,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-        /**
-         * @typedef {{source: ol.Coordinate,
-         *     start: (number|undefined),
-         *     duration: (number|undefined),
-         *     easing: (function(number):number|undefined)}}
-         */
         interface PanOptions {
             source: ol.Coordinate;
             start?: number;
@@ -12450,13 +11430,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-        /**
-         * @typedef {{rotation: (number|undefined),
-         *     anchor: (ol.Coordinate|undefined),
-         *     start: (number|undefined),
-         *     duration: (number|undefined),
-         *     easing: (function(number):number|undefined)}}
-         */
         interface RotateOptions {
             rotation?: number;
             anchor?: ol.Coordinate;
@@ -12465,12 +11438,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-        /**
-         * @typedef {{resolution: number,
-         *     start: (number|undefined),
-         *     duration: (number|undefined),
-         *     easing: (function(number):number|undefined)}}
-         */
         interface ZoomOptions {
             resolution: number;
             start?: number;
@@ -12498,20 +11465,7 @@ declare module olx {
         type AnimateCallback = (completed: boolean) => void;
     }
 
-    /**
-     * @namespace olx.control
-     */
-    module control {
-        /**
-         * @typedef {{className: (string|undefined),
-         *     collapsible: (boolean|undefined),
-         *     collapsed: (boolean|undefined),
-         *     tipLabel: (string|undefined),
-         *     label: (string|Node|undefined),
-         *     collapseLabel: (string|Node|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|undefined)}}
-         */
+    export namespace control {
         interface AttributionOptions {
             className?: string;
             target?: Element;
@@ -12523,25 +11477,12 @@ declare module olx {
             render?: ((event: ol.MapEvent) => any);
         }
 
-        /**
-         * @typedef {{element: (Element|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|string|undefined)}}
-         */
         interface ControlOptions {
             element?: Element;
             render?: ((event: ol.MapEvent) => any);
             target?: (Element | string);
         }
 
-        /**
-         * @typedef {{attribution: (boolean|undefined),
-         *     attributionOptions: (olx.control.AttributionOptions|undefined),
-         *     rotate: (boolean|undefined),
-         *     rotateOptions: (olx.control.RotateOptions|undefined),
-         *     zoom: (boolean|undefined),
-         *     zoomOptions: (olx.control.ZoomOptions|undefined)}}
-         */
         interface DefaultsOptions {
             attribution?: boolean;
             attributionOptions?: olx.control.AttributionOptions;
@@ -12551,15 +11492,6 @@ declare module olx {
             zoomOptions?: olx.control.ZoomOptions;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     label: (string|Node|undefined),
-         *     labelActive: (string|Node|undefined),
-         *     tipLabel: (string|undefined),
-         *     keys: (boolean|undefined),
-         *     target: (Element|undefined),
-         *     source: (Element|string|undefined)}}
-         */
         interface FullScreenOptions {
             className?: string;
             label?: (string | Node);
@@ -12570,14 +11502,6 @@ declare module olx {
             source?: (Element | string);
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     coordinateFormat: (ol.CoordinateFormatType|undefined),
-         *     projection: ol.ProjectionLike,
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|undefined),
-         *     undefinedHTML: (string|undefined)}}
-         */
         interface MousePositionOptions {
             className?: string;
             coordinateFormat?: ol.CoordinateFormatType;
@@ -12587,17 +11511,6 @@ declare module olx {
             undefinedHTML?: string;
         }
 
-        /**
-         * @typedef {{collapsed: (boolean|undefined),
-         *     collapseLabel: (string|Node|undefined),
-         *     collapsible: (boolean|undefined),
-         *     label: (string|Node|undefined),
-         *     layers: (Array.<ol.layer.Layer>|ol.Collection.<ol.layer.Layer>|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|undefined),
-         *     tipLabel: (string|undefined),
-         *     view: (ol.View|undefined)}}
-         */
         interface OverviewMapOptions {
             collapsed?: boolean;
             collapseLabel?: (string | Node);
@@ -12610,13 +11523,6 @@ declare module olx {
             view?: ol.View;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     minWidth: (number|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|undefined),
-         *     units: (ol.control.ScaleLine.Units|string|undefined)}}
-         */
         interface ScaleLineOptions {
             className?: string;
             minWidth?: number;
@@ -12625,16 +11531,6 @@ declare module olx {
             units?: (ol.control.ScaleLine.Units | string);
         }
 
-        /**
-         * @typedef {{duration: (number|undefined),
-         *     className: (string|undefined),
-         *     label: (string|Element|undefined),
-         *     tipLabel: (string|undefined),
-         *     target: (Element|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     resetNorth: (function()|undefined),
-         *     autoHide: (boolean|undefined)}}
-         */
         interface RotateOptions {
             className?: string;
             label?: (string | Element);
@@ -12646,16 +11542,6 @@ declare module olx {
             target?: Element;
         }
 
-        /**
-         * @typedef {{duration: (number|undefined),
-         *     className: (string|undefined),
-         *     zoomInLabel: (string|Node|undefined),
-         *     zoomOutLabel: (string|Node|undefined),
-         *     zoomInTipLabel: (string|undefined),
-         *     zoomOutTipLabel: (string|undefined),
-         *     delta: (number|undefined),
-         *     target: (Element|undefined)}}
-         */
         interface ZoomOptions {
             duration?: number;
             className?: string;
@@ -12667,13 +11553,6 @@ declare module olx {
             target?: Element;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     duration: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     render: (function(ol.MapEvent)|undefined)}}
-         */
         interface ZoomSliderOptions {
             className?: string;
             duration?: number;
@@ -12682,13 +11561,6 @@ declare module olx {
             render?: ((event: ol.MapEvent) => any);
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     target: (Element|undefined),
-         *     label: (string|Node|undefined),
-         *     tipLabel: (string|undefined),
-         *     extent: (ol.Extent|undefined)}}
-         */
         interface ZoomToExtentOptions {
             className?: string;
             target?: Element;
@@ -12698,26 +11570,12 @@ declare module olx {
         }
     }
 
-    /**
-     * @namespace olx.format
-     */
-    module format {
-        /**
-         * @typedef {{dataProjection: ol.ProjectionLike,
-         *     featureProjection: ol.ProjectionLike,
-         *     rightHanded: (boolean|undefined)}}
-         */
+    export namespace format {
         interface ReadOptions {
             dataProjection: ol.ProjectionLike;
             featureProjection: ol.ProjectionLike;
         }
 
-        /**
-         * @typedef {{dataProjection: ol.ProjectionLike,
-         *     featureProjection: ol.ProjectionLike,
-         *     rightHanded: (boolean|undefined),
-         *     decimals: (number|undefined)}}
-         */
         interface WriteOptions {
             dataProjection: ol.ProjectionLike;
             featureProjection?: ol.ProjectionLike;
@@ -12725,71 +11583,39 @@ declare module olx {
             decimals?: number;
         }
 
-        /**
-         * @typedef {{defaultDataProjection: ol.ProjectionLike,
-         *     geometryName: (string|undefined)}}
-         */
         interface GeoJSONOptions {
             defaultDataProjection: ol.ProjectionLike;
             featureProjection: ol.ProjectionLike;
             geometryName?: string;
         }
 
-        /**
-         * @typedef {{geometryName: (string|undefined)}}
-         */
         interface EsriJSONOptions {
             geometryName?: string;
         }
 
-        /**
-         * @typedef {{featureClass: (function((ol.geom.Geometry|Object.<string, *>)=)|
-         *         function(ol.geom.GeometryType,Array.<number>,
-         *             (Array.<number>|Array.<Array.<number>>),Object.<string, *>)|
-         *         undefined),
-         *     geometryName: (string|undefined),
-         *     layers: (Array.<string>|undefined),
-         *     layerName: (string|undefined)}}
-         */
         interface MVTOptions {
             featureClass?: (((geom: (ol.geom.Geometry | { [k: string]: any })) => any) | ((geom: ol.geom.GeometryType, arg2: number[],
-                           arg3: (number[] | number[][]),
-                           arg4: { [k: string]: any }) => any));
+                            arg3: (number[] | number[][]),
+                            arg4: { [k: string]: any }) => any));
             geometryName?: string;
             layerName?: string;
             layers?: string[];
         }
 
-        /**
-         * @typedef {{factor: (number|undefined),
-         *     geometryLayout: (ol.geom.GeometryLayout|undefined)}}
-         */
         interface PolylineOptions {
             factor?: number;
             geometryLayout?: ol.geom.GeometryLayout;
         }
 
-        /**
-         * @typedef {{defaultDataProjection: ol.ProjectionLike}}
-         */
         interface TopoJSONOptions {
             defaultDataProjection: ol.ProjectionLike;
         }
 
-        /**
-         * @typedef {{altitudeMode: (ol.format.IGCZ|undefined)}}
-         */
         /* tslint:disable-next-line:interface-name */
         interface IGCOptions {
             altitudeMode?: ol.format.IGCZ;
         }
 
-        /**
-         * @typedef {{extractStyles: (boolean|undefined),
-         *     defaultStyle: (Array.<ol.style.Style>|undefined),
-         *     showPointNames: (boolean|undefined),
-         *     writeStyles: (boolean|undefined)}}
-         */
         interface KMLOptions {
             extractStyles?: boolean;
             showPointNames?: boolean;
@@ -12797,16 +11623,6 @@ declare module olx {
             writeStyles?: boolean;
         }
 
-        /**
-         * @typedef {{featureNS: (Object.<string, string>|string|undefined),
-         *     featureType: (Array.<string>|string|undefined),
-         *     srsName: string,
-         *     surface: (boolean|undefined),
-         *     curve: (boolean|undefined),
-         *     multiCurve: (boolean|undefined),
-         *     multiSurface: (boolean|undefined),
-         *     schemaLocation: (string|undefined)}}
-         */
         interface GMLOptions {
             featureNS?: ({ [k: string]: string } | string);
             featureType?: (string[] | string);
@@ -12818,19 +11634,10 @@ declare module olx {
             schemaLocation?: string;
         }
 
-        /**
-         * @typedef {{readExtensions: (function(ol.Feature, Node)|undefined)}}
-         */
         interface GPXOptions {
             readExtensions?: ((feature: ol.Feature, node: Node) => any);
         }
 
-        /**
-         * @typedef {{featureNS: (Object.<string, string>|string|undefined),
-         *     featureType: (Array.<string>|string|undefined),
-         *     gmlFormat: (ol.format.GMLBase|undefined),
-         *     schemaLocation: (string|undefined)}}
-         */
         interface WFSOptions {
             featureNS?: ({ [k: string]: string } | string);
             featureType?: (string[] | string);
@@ -12838,22 +11645,6 @@ declare module olx {
             schemaLocation?: string;
         }
 
-        /**
-         * @typedef {{featureNS: string,
-         *     featurePrefix: string,
-         *     featureTypes: Array.<string>,
-         *     srsName: (string|undefined),
-         *     handle: (string|undefined),
-         *     outputFormat: (string|undefined),
-         *     maxFeatures: (number|undefined),
-         *     geometryName: (string|undefined),
-         *     propertyNames: (Array.<string>|undefined),
-         *     startIndex: (number|undefined),
-         *     count: (number|undefined),
-         *     bbox: (ol.Extent|undefined),
-         *     filter: (ol.format.ogc.filter.Filter|undefined),
-         *     resultType: (string|undefined)}}
-         */
         interface WFSWriteGetFeatureOptions {
             featureNS: string;
             featurePrefix: string;
@@ -12871,15 +11662,6 @@ declare module olx {
             resultType?: string;
         }
 
-        /**
-         * @typedef {{featureNS: string,
-         *     featurePrefix: string,
-         *     featureType: string,
-         *     srsName: (string|undefined),
-         *     handle: (string|undefined),
-         *     nativeElements: Array.<Object>,
-         *     gmlOptions: (olx.format.GMLOptions|undefined)}}
-         */
         interface WFSWriteTransactionOptions {
             featureNS: string;
             featurePrefix: string;
@@ -12890,30 +11672,18 @@ declare module olx {
             gmlOptions?: olx.format.GMLOptions;
         }
 
-        /**
-         * @typedef {{splitCollection: (boolean|undefined)}}
-         */
         interface WKTOptions {
             splitCollection?: boolean;
         }
 
-        /**
-         * @typedef {{
-         *     layers: (Array.<string>|undefined)
-         * }}
-         */
         interface WMSGetFeatureInfoOptions {
             layers?: string[];
         }
     }
 
-    /**
-     * @namespace olx.interaction
-     */
-    module interaction {
+    export namespace interaction {
         /**
          * Object literal with config options for interactions.
-         * @typedef {{handleEvent: function(ol.MapBrowserEvent):boolean}}
          */
         interface InteractionOptions {
             handleEvent: (event: ol.MapBrowserEvent) => boolean;
@@ -12921,16 +11691,6 @@ declare module olx {
 
         /**
          * Interactions for the map. Default is `true` for all options.
-         * @typedef {{altShiftDragRotate: (boolean|undefined),
-         *     doubleClickZoom: (boolean|undefined),
-         *     keyboard: (boolean|undefined),
-         *     mouseWheelZoom: (boolean|undefined),
-         *     shiftDragZoom: (boolean|undefined),
-         *     dragPan: (boolean|undefined),
-         *     pinchRotate: (boolean|undefined),
-         *     pinchZoom: (boolean|undefined),
-         *     zoomDelta: (number|undefined),
-         *     zoomDuration: (number|undefined)}}
          */
         interface DefaultsOptions {
             altShiftDragRotate?: boolean;
@@ -12946,34 +11706,18 @@ declare module olx {
             zoomDuration?: number;
         }
 
-        /**
-         * @typedef {{duration: (number|undefined),
-         *     delta: (number|undefined)}}
-         */
         interface DoubleClickZoomOptions {
             duration?: number;
             delta?: number;
         }
 
-        /**
-         * @typedef {{formatConstructors: (Array.<function(new: ol.format.Feature)>|undefined),
-         *     projection: ol.ProjectionLike,
-         *     target: (Element|undefined),
-         *     source: (ol.source.Vector|undefined)}}
-         */
         interface DragAndDropOptions {
-            formatConstructors?: Array<((n: ol.format.Feature) => any)>;
+            formatConstructors?: Array<typeof format.Feature>;
             projection: ol.ProjectionLike;
             target?: Element;
             source?: ol.source.Vector;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     minArea: (number|undefined),
-         *     boxEndCondition: (ol.DragBoxEndConditionType|undefined)}}
-         */
         interface DragBoxOptions {
             className?: string;
             condition?: ol.EventsConditionType;
@@ -12981,39 +11725,21 @@ declare module olx {
             boxEndCondition?: ol.DragBoxEndConditionType;
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     kinetic: (ol.Kinetic|undefined)}}
-         */
         interface DragPanOptions {
             condition?: ol.EventsConditionType;
             kinetic?: ol.Kinetic;
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     duration: (number|undefined)}}
-         */
         interface DragRotateAndZoomOptions {
             condition?: ol.EventsConditionType;
             duration?: number;
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     duration: (number|undefined)}}
-         */
         interface DragRotateOptions {
             condition?: ol.EventsConditionType;
             duration?: number;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     duration: (number|undefined),
-         *     out: (boolean|undefined)}}
-         */
         interface DragZoomOptions {
             className?: string;
             condition?: ol.EventsConditionType;
@@ -13021,23 +11747,6 @@ declare module olx {
             out?: boolean;
         }
 
-        /**
-         * @typedef {{clickTolerance: (number|undefined),
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     source: (ol.source.Vector|undefined),
-         *     snapTolerance: (number|undefined),
-         *     type: ol.geom.GeometryType,
-         *     maxPoints: (number|undefined),
-         *     minPoints: (number|undefined),
-         *     finishCondition: (ol.EventsConditionType|undefined),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     geometryFunction: (ol.DrawGeometryFunctionType|undefined),
-         *     geometryName: (string|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     freehandCondition: (ol.EventsConditionType|undefined),
-         *     freehand: (boolean|undefined)
-         *     wrapX: (boolean|undefined)}}
-         */
         interface DrawOptions {
             clickTolerance?: number;
             features?: ol.Collection<ol.Feature>;
@@ -13056,49 +11765,23 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     layers: (undefined|Array.<ol.layer.Layer>|function(ol.layer.Layer): boolean)
-         * }}
-         */
         interface TranslateOptions {
             features?: ol.Collection<ol.Feature>;
             layers?: (ol.layer.Layer[] | ((layer: ol.layer.Layer) => boolean));
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     duration: (number|undefined),
-         *     pixelDelta: (number|undefined)}}
-         */
         interface KeyboardPanOptions {
             condition?: ol.EventsConditionType;
             duration?: number;
             pixelDelta?: number;
         }
 
-        /**
-         * @typedef {{duration: (number|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     delta: (number|undefined)}}
-         */
         interface KeyboardZoomOptions {
             duration?: number;
             condition?: ol.EventsConditionType;
             delta?: number;
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     deleteCondition: (ol.EventsConditionType|undefined),
-         *     insertVertexCondition: (ol.EventsConditionType|undefined),
-         *     pixelTolerance: (number|undefined),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     wrapX: (boolean|undefined),
-         *     source: (ol.source.Vector|undefined)}}
-         */
         interface ModifyOptions {
             condition?: ol.EventsConditionType;
             deleteCondition?: ol.EventsConditionType;
@@ -13110,12 +11793,6 @@ declare module olx {
             source?: ol.source.Vector;
         }
 
-        /**
-         * @typedef {{constrainResolution: (boolean|undefined),
-         *     duration: (number|undefined),
-         *     timeout: (number|undefined),
-         *     useAnchor: (boolean|undefined)}}
-         */
         interface MouseWheelZoomOptions {
             constrainResolution?: boolean;
             duration?: number;
@@ -13123,31 +11800,16 @@ declare module olx {
             useAnchor?: boolean;
         }
 
-        /**
-         * @typedef {{threshold: (number|undefined),
-         *     duration: (number|undefined)}}
-         */
         interface PinchRotateOptions {
             duration?: number;
             threshold?: number;
         }
 
-        /**
-         * @typedef {{constrainResolution: (boolean|undefined)
-         *     duration: (number|undefined)}}
-         */
         interface PinchZoomOptions {
             constrainResolution?: boolean;
             duration?: number;
         }
 
-        /**
-         * @typedef {{handleDownEvent: (function(ol.MapBrowserPointerEvent):boolean|undefined),
-         *     handleDragEvent: (function(ol.MapBrowserPointerEvent)|undefined),
-         *     handleEvent: (function(ol.MapBrowserEvent):boolean|undefined),
-         *     handleMoveEvent: (function(ol.MapBrowserPointerEvent)|undefined),
-         *     handleUpEvent: (function(ol.MapBrowserPointerEvent):boolean|undefined)}}
-         */
         interface PointerOptions {
             handleDownEvent?: ((event: ol.MapBrowserPointerEvent) => boolean);
             handleDragEvent?: ((event: ol.MapBrowserPointerEvent) => boolean);
@@ -13156,19 +11818,6 @@ declare module olx {
             handleUpEvent?: ((event: ol.MapBrowserPointerEvent) => boolean);
         }
 
-        /**
-         * @typedef {{addCondition: (ol.EventsConditionType|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     layers: (undefined|Array.<ol.layer.Layer>|function(ol.layer.Layer): boolean),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     removeCondition: (ol.EventsConditionType|undefined),
-         *     toggleCondition: (ol.EventsConditionType|undefined),
-         *     multi: (boolean|undefined),
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     filter: (ol.SelectFilterFunction|undefined),
-         *     wrapX: (boolean|undefined),
-         *     hitTolerance: (number|undefined)}}
-         */
         interface SelectOptions {
             addCondition?: ol.EventsConditionType;
             condition?: ol.EventsConditionType;
@@ -13185,13 +11834,6 @@ declare module olx {
 
         /**
          * Options for snap
-         * @typedef {{
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     pixelTolerance: (number|undefined),
-         *     source: (ol.source.Vector|undefined),
-         *     edge: (boolean|undefined),
-         *     vertex: (boolean|undefined)
-         * }}
          */
         interface SnapOptions {
             features?: ol.Collection<ol.Feature>;
@@ -13202,18 +11844,7 @@ declare module olx {
         }
     }
 
-    /**
-     * @namespace olx.layer
-     */
-    module layer {
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     zIndex: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined)}}
-         */
+    export namespace layer {
         interface BaseOptions {
             opacity?: number;
             visible?: boolean;
@@ -13223,15 +11854,6 @@ declare module olx {
             maxResolution?: number;
         }
 
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     source: (ol.source.Source|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     zIndex: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined)}}
-         */
         interface LayerOptions {
             opacity?: number;
             source?: ol.source.Source;
@@ -13242,15 +11864,6 @@ declare module olx {
             maxResolution?: number;
         }
 
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     zIndex: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     layers: (Array.<ol.layer.Base>|ol.Collection.<ol.layer.Base>|undefined)}}
-         */
         interface GroupOptions {
             opacity?: number;
             visible?: boolean;
@@ -13261,20 +11874,6 @@ declare module olx {
             layers?: (ol.layer.Base[] | ol.Collection<ol.layer.Base>);
         }
 
-        /**
-         * @typedef {{gradient: (Array.<string>|undefined),
-         *     radius: (number|undefined),
-         *     blur: (number|undefined),
-         *     shadow: (number|undefined),
-         *     weight: (string|function(ol.Feature):number|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     opacity: (number|undefined),
-         *     source: (ol.source.Vector|undefined),
-         *     visible: (boolean|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface HeatmapOptions {
             gradient?: string[];
             radius?: number;
@@ -13290,16 +11889,6 @@ declare module olx {
             zIndex?: number;
         }
 
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     map: (ol.Map|undefined),
-         *     source: (ol.source.Image|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface ImageOptions {
             opacity?: number;
             source: ol.source.Image;
@@ -13311,18 +11900,6 @@ declare module olx {
             zIndex?: number;
         }
 
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     preload: (number|undefined),
-         *     source: (ol.source.Tile|undefined),
-         *     map: (ol.Map|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     useInterimTilesOnError: (boolean|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface TileOptions {
             opacity?: number;
             preload?: number;
@@ -13337,7 +11914,6 @@ declare module olx {
         }
 
         /**
-         * @enum {string}
          * Render mode for vector layers:
          *  * `'image'`: Vector layers are rendered as images. Great performance, but
          *    point symbols and texts are always rotated with the view and pixels are
@@ -13345,25 +11921,10 @@ declare module olx {
          *  * `'vector'`: Vector layers are rendered as vectors. Most accurate rendering
          *    even during animations, but slower performance.
          * Default is `vector`.
-         * @type {ol.layer.VectorRenderType|string|undefined}
          * @api
          */
         type VectorRenderType = "image" | "vector";
 
-        /**
-         * @typedef {{renderOrder: (function(ol.Feature, ol.Feature):number|null|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     opacity: (number|undefined),
-         *     renderBuffer: (number|undefined),
-         *     source: (ol.source.Vector|undefined),
-         *     map: (ol.Map|undefined),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     updateWhileAnimating: (boolean|undefined),
-         *     updateWhileInteracting: (boolean|undefined),
-         *     visible: (boolean|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface VectorOptions {
             renderMode?: (olx.layer.VectorRenderType | string);
             renderOrder?: (feature1: ol.Feature, feature2: ol.Feature) => number;
@@ -13382,22 +11943,6 @@ declare module olx {
             zIndex?: number;
         }
 
-        /**
-         * @typedef {{extent: (ol.Extent|undefined),
-         *     map: (ol.Map|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     opacity: (number|undefined),
-         *     renderBuffer: (number|undefined),
-         *     renderMode: (ol.layer.VectorTileRenderType|string|undefined),
-         *     renderOrder: (function(ol.Feature, ol.Feature):number|undefined),
-         *     source: (ol.source.VectorTile|undefined),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     updateWhileAnimating: (boolean|undefined),
-         *     updateWhileInteracting: (boolean|undefined),
-         *     visible: (boolean|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface VectorTileOptions {
             renderBuffer?: number;
             renderMode?: (ol.layer.VectorTileRenderType | string);
@@ -13416,40 +11961,15 @@ declare module olx {
         }
     }
 
-    /**
-     * @namespace olx.parser
-     */
-    module parser {
+    export namespace parser {
     }
-
-    /**
-     * @namespace olx.render
-     */
-    module render {
-        /**
-         * @typedef {{size: (ol.Size|undefined),
-         *     pixelRatio: (number|undefined)}}
-         */
+    export namespace render {
         interface ToContextOptions {
             size?: ol.Size;
             pixelRatio?: number;
         }
     }
-
-    /**
-     * @namespace olx.source
-     */
-    module source {
-        /**
-         * @typedef {{cacheSize: (number|undefined),
-         *     culture: (string|undefined),
-         *     key: string,
-         *     imagerySet: string,
-         *     maxZoom: (number|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
+    export namespace source {
         interface BingMapsOptions {
             cacheSize?: number;
             culture?: string;
@@ -13461,17 +11981,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     distance: (number|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     format: (ol.format.Feature|undefined),
-         *     geometryFunction: (undefined|function(ol.Feature):ol.geom.Point),
-         *     logo: (string|undefined),
-         *     projection: ol.ProjectionLike,
-         *     source: ol.source.Vector,
-         *     wrapX: (boolean|undefined)}}
-         */
         interface ClusterOptions {
             attributions?: ol.AttributionLike;
             distance?: number;
@@ -13486,12 +11995,6 @@ declare module olx {
 
         type TileJSON = JSON;
 
-        /**
-         * @typedef {{preemptive: (boolean|undefined),
-         *     jsonp: (boolean|undefined),
-         *     tileJSON: (TileJSON|undefined),
-         *     url: (string|undefined)}}
-         */
         interface TileUTFGridOptions {
             jsonp?: boolean;
             preemptive?: boolean;
@@ -13499,26 +12002,6 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *            cacheSize: (number|undefined),
-         *            crossOrigin: (null|string|undefined),
-         *            logo: (string|olx.LogoOptions|undefined),
-         *            opaque: (boolean|undefined),
-         *            projection: ol.ProjectionLike,
-         *            reprojectionErrorThreshold: (number|undefined),
-         *            state: (ol.source.State|undefined),
-         *            tileClass: (function(new: ol.ImageTile, ol.TileCoord,
-         *                                 ol.Tile.State, string, ?string,
-         *                                 ol.TileLoadFunctionType)|undefined),
-         *            tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *            tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *            tilePixelRatio: (number|undefined),
-         *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
-         *            url: (string|undefined),
-         *            urls: (Array.<string>|undefined),
-         *            wrapX: (boolean|undefined)}}
-         */
         interface TileImageOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13536,26 +12019,9 @@ declare module olx {
             url?: string;
             urls?: string[];
             wrapX?: boolean;
+            transition?: number;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *            cacheSize: (number|undefined),
-         *            format: (ol.format.Feature|undefined),
-         *            logo: (string|olx.LogoOptions|undefined),
-         *            overlaps: (boolean|undefined),
-         *            projection: ol.ProjectionLike,
-         *            state: (ol.source.State|undefined),
-         *            tileClass: (function(new: ol.VectorTile, ol.TileCoord,
-         *                 ol.Tile.State, string, ol.format.Feature,
-         *                 ol.TileLoadFunctionType)|undefined),
-         *            tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *            tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
-         *            url: (string|undefined),
-         *            urls: (Array.<string>|undefined),
-         *            wrapX: (boolean|undefined)}}
-         */
         interface VectorTileOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13573,18 +12039,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{url: (string|undefined),
-         *     displayDpi: (number|undefined),
-         *     metersPerUnit: (number|undefined),
-         *     hidpi: (boolean|undefined),
-         *     useOverlay: (boolean|undefined),
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     imageLoadFunction: (ol.ImageLoadFunctionType|undefined),
-         *     params: (Object|undefined)}}
-         */
         interface ImageMapGuideOptions {
             url?: string;
             displayDpi?: number;
@@ -13598,13 +12052,6 @@ declare module olx {
             params?: GlobalObject;
         }
 
-        /**
-         * @typedef {{cacheSize: (number|undefined),
-         *     layer: string,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined)}}
-         */
         interface MapQuestOptions {
             cacheSize?: number;
             layer: string;
@@ -13613,28 +12060,12 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{projection: ol.ProjectionLike,
-         *     tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface TileDebugOptions {
             projection: ol.ProjectionLike;
             tileGrid?: ol.tilegrid.TileGrid;
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     maxZoom: (number|undefined),
-         *     opaque: (boolean|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface OSMOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13647,17 +12078,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (Array.<ol.Attribution>|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     imageLoadFunction: (ol.ImageLoadFunctionType|undefined),
-         *     params: Object.<string,*>,
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     url: (string|undefined)}}
-         */
         interface ImageArcGISRestOptions {
             attributions?: ol.Attribution[];
             crossOrigin?: (string);
@@ -13670,15 +12090,6 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     canvasFunction: ol.CanvasFunctionType,
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     state: (ol.source.State|undefined)}}
-         */
         interface ImageCanvasOptions {
             attributions?: ol.AttributionLike;
             canvasFunction: ol.CanvasFunctionType;
@@ -13689,16 +12100,6 @@ declare module olx {
             state?: ol.source.State;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     renderBuffer: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     source: ol.source.Vector,
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined)}}
-         */
         interface ImageVectorOptions {
             attributions?: ol.AttributionLike;
             logo?: (string | olx.LogoOptions);
@@ -13711,11 +12112,6 @@ declare module olx {
         }
 
         /**
-         * @typedef {{sources: Array.<ol.source.Source>,
-         *     operation: (ol.RasterOperation|undefined),
-         *     lib: (Object|undefined),
-         *     threads: (number|undefined),
-         *     operationType: (ol.RasterOperationType|undefined)}}
          * @api
          */
         interface RasterOptions {
@@ -13726,19 +12122,6 @@ declare module olx {
             operationType?: ol.RasterOperationType;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     hidpi: (boolean|undefined),
-         *     serverType: (ol.source.wms.ServerType|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     imageLoadFunction: (ol.ImageLoadFunctionType|undefined),
-         *     params: Object.<string,*>,
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     url: (string|undefined)}}
-         */
         interface ImageWMSOptions {
             attributions?: ol.AttributionLike;
             crossOrigin?: (string);
@@ -13753,16 +12136,6 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{cacheSize: (number|undefined),
-         *     layer: string,
-         *     minZoom: (number|undefined),
-         *     maxZoom: (number|undefined),
-         *     opaque: (boolean|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined)}}
-         */
         interface StamenOptions {
             cacheSize?: number;
             layer: string;
@@ -13774,16 +12147,6 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     imageExtent: (ol.Extent),
-         *     imageLoadFunction: (ol.ImageLoadFunctionType|undefined),
-         *     imageSize: (ol.Size|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     projection: ol.ProjectionLike,
-         *     url: string}}
-         */
         interface ImageStaticOptions {
             attributions?: ol.AttributionLike;
             crossOrigin?: (string);
@@ -13795,20 +12158,6 @@ declare module olx {
             url: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     params: (Object.<string, *>|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *     projection: ol.ProjectionLike,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined),
-         *     urls: (Array.<string>|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface TileArcGISRestOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13821,19 +12170,10 @@ declare module olx {
             tileLoadFunction?: ol.TileLoadFunctionType;
             url?: string;
             wrapX?: boolean;
+            transition?: number;
             urls?: string[];
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     jsonp: (boolean|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: string,
-         *     wrapX: (boolean|undefined)}}
-         */
         interface TileJSONOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13843,25 +12183,9 @@ declare module olx {
             tileLoadFunction?: ol.TileLoadFunctionType;
             url: string;
             wrapX?: boolean;
+            transition?: number;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     params: Object.<string,*>,
-         *     crossOrigin: (null|string|undefined),
-         *     gutter: (number|undefined),
-         *     hidpi: (boolean|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *     projection: ol.ProjectionLike,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     serverType: (ol.source.wms.ServerType|string|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined),
-         *     urls: (Array.<string>|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface TileWMSOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13878,20 +12202,9 @@ declare module olx {
             url?: string;
             urls?: string[];
             wrapX?: boolean;
+            transition?: number;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     features: (Array.<ol.Feature>|ol.Collection.<ol.Feature>|undefined),
-         *     format: (ol.format.Feature|undefined),
-         *     loader: (ol.FeatureLoader|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     overlaps: (boolean|undefined),
-         *     strategy: (ol.LoadingStrategy|undefined),
-         *     url: (string|ol.FeatureUrlFunction|undefined),
-         *     useSpatialIndex: (boolean|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface VectorOptions {
             attributions?: ol.AttributionLike;
             features?: (ol.Feature[] | ol.Collection<ol.Feature>);
@@ -13905,30 +12218,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (string|null|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     tileGrid: ol.tilegrid.WMTS,
-         *     projection: ol.ProjectionLike,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     requestEncoding: (ol.source.WMTSRequestEncoding|string|undefined),
-         *     layer: string,
-         *     style: string,
-         *     tilePixelRatio: (number|undefined),
-         *     version: (string|undefined),
-         *     format: (string|undefined),
-         *     matrixSet: string,
-         *     dimensions: (!Object|undefined),
-         *     url: (string|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     urls: (Array.<string>|undefined),
-         *     tileClass: (function(new: ol.ImageTile, ol.TileCoord,
-         *                          ol.Tile.State, string, ?string,
-         *                          ol.TileLoadFunctionType)|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface WMTSOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13952,25 +12241,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     opaque: (boolean|undefined),
-         *     projection: ol.ProjectionLike,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     maxZoom: (number|undefined),
-         *     minZoom: (number|undefined),
-         *     tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     tilePixelRatio: (number|undefined),
-         *     tileSize: (number|ol.Size|undefined),
-         *     tileUrlFunction: (ol.TileUrlFunctionType|undefined),
-         *     url: (string|undefined),
-         *     urls: (Array.<string>|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface XYZOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13991,19 +12261,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     projection: ol.ProjectionLike,
-         *     maxZoom: (number|undefined),
-         *     minZoom: (number|undefined),
-         *     wrapX: (boolean|undefined),
-         *     config: (Object|undefined),
-         *     map: (string|undefined),
-         *     account: string}}
-         */
         interface CartoDBOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -14018,16 +12275,6 @@ declare module olx {
             account: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     url: !string,
-         *     tierSizeCalculation: (string|undefined),
-         *     size: ol.Size}}
-         */
         interface ZoomifyOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -14039,18 +12286,7 @@ declare module olx {
             size: ol.Size;
         }
     }
-
-    /**
-     * @namespace olx.style
-     */
-    module style {
-        /**
-         * @typedef {{fill: (ol.style.Fill|undefined),
-         *     radius: number,
-         *     snapToPixel: (boolean|undefined),
-         *     stroke: (ol.style.Stroke|undefined),
-         *     atlasManager: (ol.style.AtlasManager|undefined)}}
-         */
+    export namespace style {
         interface CircleOptions {
             fill?: ol.style.Fill;
             radius: number;
@@ -14059,32 +12295,10 @@ declare module olx {
             atlasManager?: ol.style.AtlasManager;
         }
 
-        /**
-         * @typedef {{color: (ol.Color|ol.ColorLike|undefined)}}
-         */
         interface FillOptions {
             color?: (ol.Color | ol.ColorLike);
         }
 
-        /**
-         * @typedef {{anchor: (Array.<number>|undefined),
-         *     anchorOrigin: (ol.style.IconOrigin|undefined),
-         *     anchorXUnits: (ol.style.IconAnchorUnits|undefined),
-         *     anchorYUnits: (ol.style.IconAnchorUnits|undefined),
-         *     color: (ol.Color|string|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     img: (Image|HTMLCanvasElement|undefined),
-         *     offset: (Array.<number>|undefined),
-         *     offsetOrigin: (ol.style.IconOrigin|undefined),
-         *     opacity: (number|undefined),
-         *     scale: (number|undefined),
-         *     snapToPixel: (boolean|undefined),
-         *     rotateWithView: (boolean|undefined),
-         *     rotation: (number|undefined),
-         *     size: (ol.Size|undefined),
-         *     imgSize: (ol.Size|undefined),
-         *     src: (string|undefined)}}
-         */
         interface IconOptions {
             anchor?: number[];
             anchorOrigin?: ol.style.IconOrigin;
@@ -14092,7 +12306,7 @@ declare module olx {
             anchorYUnits?: ol.style.IconAnchorUnits;
             color?: (ol.Color | string);
             crossOrigin?: (string);
-            img?: (any | HTMLCanvasElement);
+            img?: (HTMLImageElement | HTMLCanvasElement);
             offset?: number[];
             offsetOrigin?: ol.style.IconOrigin;
             opacity?: number;
@@ -14107,17 +12321,6 @@ declare module olx {
 
         /**
          * Specify radius for regular polygons, or radius1 and radius2 for stars.
-         * @typedef {{fill: (ol.style.Fill|undefined),
-         *     points: number,
-         *     radius: (number|undefined),
-         *     radius1: (number|undefined),
-         *     radius2: (number|undefined),
-         *     angle: (number|undefined),
-         *     snapToPixel: (boolean|undefined),
-         *     stroke: (ol.style.Stroke|undefined),
-         *     rotation: (number|undefined),
-         *     rotateWithView: (boolean|undefined),
-         *     atlasManager: (ol.style.AtlasManager|undefined)}}
          */
         interface RegularShapeOptions {
             fill?: ol.style.Fill;
@@ -14131,14 +12334,6 @@ declare module olx {
             rotation?: number;
         }
 
-        /**
-         * @typedef {{color: (ol.Color|string|undefined),
-         *     lineCap: (string|undefined),
-         *     lineJoin: (string|undefined),
-         *     lineDash: (Array.<number>|undefined),
-         *     miterLimit: (number|undefined),
-         *     width: (number|undefined)}}
-         */
         interface StrokeOptions {
             color?: ol.Color | string;
             lineCap?: string;
@@ -14153,29 +12348,9 @@ declare module olx {
          * `'line'` requires the underlying geometry to be a {@link ol.geom.LineString},
          * {@link ol.geom.Polygon}, {@link ol.geom.MultiLineString} or
          * {@link ol.geom.MultiPolygon}.
-         * @enum {string}
          */
         type TextPlacement = 'point' | 'line';
 
-        /**
-         * @typedef {{font: (string|undefined),
-         *     maxAngle: (number|undefined),
-         *     offsetX: (number|undefined),
-         *     offsetY: (number|undefined),
-         *     overflow: (boolean|undefined),
-         *     placement: (ol.style.TextPlacement|string|undefined),
-         *     scale: (number|undefined),
-         *     rotateWithView: (boolean|undefined),
-         *     rotation: (number|undefined),
-         *     text: (string|undefined),
-         *     textAlign: (string|undefined),
-         *     textBaseline: (string|undefined),
-         *     fill: (ol.style.Fill|undefined),
-         *     stroke: (ol.style.Stroke|undefined),
-         *     backgroundFill: (ol.style.Fill|undefined),
-         *     backgroundStroke: (ol.style.Stroke|undefined),
-         *     padding: (Array.<number>|undefined)}}
-         */
         interface TextOptions {
             font?: string;
             maxAngle?: boolean;
@@ -14196,14 +12371,6 @@ declare module olx {
             padding?: number[];
         }
 
-        /**
-         * @typedef {{geometry: (undefined|string|ol.geom.Geometry|ol.StyleGeometryFunction),
-         *     fill: (ol.style.Fill|undefined),
-         *     image: (ol.style.Image|undefined),
-         *     stroke: (ol.style.Stroke|undefined),
-         *     text: (ol.style.Text|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface StyleOptions {
             geometry?: (string | ol.geom.Geometry | ol.StyleGeometryFunction);
             fill?: ol.style.Fill;
@@ -14213,32 +12380,13 @@ declare module olx {
             zIndex?: number;
         }
 
-        /**
-         * @typedef {{initialSize: (number|undefined),
-         *     maxSize: (number|undefined),
-         *     space: (number|undefined)}}
-         */
         interface AtlasManagerOptions {
             initialSize?: number;
             maxSize?: number;
             space?: number;
         }
     }
-
-    /**
-     * @namespace olx.tilegrid
-     */
-    module tilegrid {
-        /**
-         * @typedef {{extent: (ol.Extent|undefined),
-         *     minZoom: (number|undefined),
-         *     origin: (ol.Coordinate|undefined),
-         *     origins: (Array.<ol.Coordinate>|undefined),
-         *     resolutions: !Array.<number>,
-         *     sizes: (Array.<ol.Size>|undefined),
-         *     tileSize: (number|ol.Size|undefined),
-         *     tileSizes: (Array.<number|ol.Size>|undefined)}}
-         */
+    export namespace tilegrid {
         interface TileGridOptions {
             extent?: ol.Extent;
             minZoom?: number;
@@ -14249,16 +12397,6 @@ declare module olx {
             tileSizes?: (Array<(number | ol.Size)>);
         }
 
-        /**
-         * @typedef {{extent: (ol.Extent|undefined),
-         *     origin: (ol.Coordinate|undefined),
-         *     origins: (Array.<ol.Coordinate>|undefined),
-         *     resolutions: !Array.<number>,
-         *     matrixIds: !Array.<string>,
-         *     sizes: (Array.<ol.Size>|undefined),
-         *     tileSize: (number|ol.Size|undefined),
-         *     tileSizes: (Array.<number|ol.Size>|undefined)}}
-         */
         interface WMTSOptions {
             extent?: ol.Extent;
             origin?: ol.Coordinate;
@@ -14271,12 +12409,6 @@ declare module olx {
             widths?: number[];
         }
 
-        /**
-         * @typedef {{extent: (ol.Extent|undefined),
-         *     maxZoom: (number|undefined),
-         *     minZoom: (number|undefined),
-         *     tileSize: (number|ol.Size|undefined)}}
-         */
         interface XYZOptions {
             extent?: ol.Extent;
             maxZoom?: number;
@@ -14285,27 +12417,15 @@ declare module olx {
         }
     }
 
-    /**
-     * @typedef {{html: string,
-     *     tileRanges: (Object.<string, Array.<ol.TileRange>>|undefined)}}
-     */
-    interface AttributionOptions {
+    export interface AttributionOptions {
         html: string;
     }
 
-    /**
-     * @typedef {{tracking: (boolean|undefined)}}
-     */
-    interface DeviceOrientationOptions {
+    export interface DeviceOrientationOptions {
         tracking?: boolean;
     }
 
-    /**
-     * @typedef {{tracking: (boolean|undefined),
-     *     trackingOptions: (PositionOptions|undefined),
-     *     projection: ol.ProjectionLike}}
-     */
-    interface GeolocationOptions {
+    export interface GeolocationOptions {
         tracking?: boolean;
         trackingOptions?: PositionOptions;
         projection: ol.ProjectionLike;
@@ -14313,20 +12433,13 @@ declare module olx {
 
     /**
      * Object literal with config options for the map logo.
-     * @typedef {{href: (string), src: (string)}}
      */
-    interface LogoOptions {
+    export interface LogoOptions {
         href: string;
         src: string;
     }
 
-    /**
-     * @typedef {{map: (ol.Map|undefined),
-     *     maxLines: (number|undefined),
-     *     strokeStyle: (ol.style.Stroke|undefined),
-     *     targetSize: (number|undefined)}}
-     */
-    interface GraticuleOptions {
+    export interface GraticuleOptions {
         map?: ol.Map;
         maxLines?: number;
         strokeStyle?: ol.style.Stroke;
@@ -14342,20 +12455,8 @@ declare module olx {
 
     /**
      * Object literal with config options for the map.
-     * @typedef {{controls: (ol.Collection.<ol.control.Control>|Array.<ol.control.Control>|undefined),
-     *     pixelRatio: (number|undefined),
-     *     interactions: (ol.Collection.<ol.interaction.Interaction>|Array.<ol.interaction.Interaction>|undefined),
-     *     keyboardEventTarget: (Element|Document|string|undefined),
-     *     layers: (Array.<ol.layer.Base>|ol.Collection.<ol.layer.Base>|undefined),
-     *     loadTilesWhileAnimating: (boolean|undefined),
-     *     loadTilesWhileInteracting: (boolean|undefined),
-     *     logo: (boolean|string|olx.LogoOptions|Element|undefined),
-     *     overlays: (ol.Collection.<ol.Overlay>|Array.<ol.Overlay>|undefined),
-     *     renderer: (ol.RendererType|Array.<ol.RendererType|string>|string|undefined),
-     *     target: (Element|string|undefined),
-     *     view: (ol.View|undefined)}}
      */
-    interface MapOptions {
+    export interface MapOptions {
         controls?: (ol.Collection<ol.control.Control> | ol.control.Control[]);
         pixelRatio?: number;
         interactions?: (ol.Collection<ol.interaction.Interaction> | ol.interaction.Interaction[]);
@@ -14372,18 +12473,8 @@ declare module olx {
 
     /**
      * Object literal with config options for the overlay.
-     * @typedef {{id: (number|string|undefined),
-     *     element: (Element|undefined),
-     *     offset: (Array.<number>|undefined),
-     *     position: (ol.Coordinate|undefined),
-     *     positioning: (ol.OverlayPositioning|string|undefined),
-     *     stopEvent: (boolean|undefined),
-     *     insertFirst: (boolean|undefined),
-     *     autoPan: (boolean|undefined),
-     *     autoPanAnimation: (olx.animation.PanOptions|undefined),
-     *     autoPanMargin: (number|undefined)}}
      */
-    interface OverlayOptions {
+    export interface OverlayOptions {
         id?: (number | string);
         element?: Element;
         offset?: number[];
@@ -14398,16 +12489,8 @@ declare module olx {
 
     /**
      * Object literal with config options for the projection.
-     * @typedef {{code: string,
-     *     units: (ol.proj.Units|string|undefined),
-     *     extent: (ol.Extent|undefined),
-     *     axisOrientation: (string|undefined),
-     *     global: (boolean|undefined),
-     *     metersPerUnit: (number|undefined),
-     *     worldExtent: (ol.Extent|undefined),
-     *     getPointResolution: (function(number, ol.Coordinate):number|undefined) }}
      */
-    interface ProjectionOptions {
+    export interface ProjectionOptions {
         code: string;
         units?: (ol.proj.Units | string);
         extent?: ol.Extent;
@@ -14418,18 +12501,7 @@ declare module olx {
         getPointResolution?: ((resolution: number, coords: ol.Coordinate) => number);
     }
 
-    module view {
-        /**
-         * @typedef {{
-         *     size: (ol.Size|undefined),
-         *     padding: (!Array.<number>|undefined),
-         *     constrainResolution: (boolean|undefined),
-         *     duration: (number|undefined),
-         *     nearest: (boolean|undefined),
-         *     maxZoom: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     easing: (function(t: number) => number) }}
-         */
+    export namespace view {
         interface FitOptions {
             size?: ol.Size;
             padding?: number[];
@@ -14445,22 +12517,8 @@ declare module olx {
 
     /**
      * Object literal with config options for the view.
-     * @typedef {{center: (ol.Coordinate|undefined),
-     *     constrainRotation: (boolean|number|undefined),
-     *     enableRotation: (boolean|undefined),
-     *     extent: (ol.Extent|undefined),
-     *     minResolution: (number|undefined),
-     *     maxResolution: (number|undefined),
-     *     minZoom: (number|undefined),
-     *     maxZoom: (number|undefined),
-     *     projection: ol.ProjectionLike,
-     *     resolution: (number|undefined),
-     *     resolutions: (Array.<number>|undefined),
-     *     rotation: (number|undefined),
-     *     zoom: (number|undefined),
-     *     zoomFactor: (number|undefined)}}
      */
-    interface ViewOptions {
+    export interface ViewOptions {
         center?: ol.Coordinate;
         constrainRotation?: (boolean | number);
         enableRotation?: boolean;
@@ -14480,56 +12538,22 @@ declare module olx {
     /**
      * Object literal with options for the {@link ol.Map#forEachFeatureAtPixel} and
      * {@link ol.Map#hasFeatureAtPixel} methods.
-     * @typedef {{layerFilter: ((function(ol.layer.Layer): boolean)|undefined),
-     *     hitTolerance: (number|undefined)}}
      */
-    interface AtPixelOptions {
+    export interface AtPixelOptions {
         layerFilter?: ((layer: ol.layer.Layer) => boolean);
         hitTolerance?: number;
     }
 
-    /**
-     * @typedef {{animate: boolean,
-     *     attributions: Object.<string, ol.Attribution>,
-     *     coordinateToPixelTransform: ol.Transform,
-     *     extent: (null|ol.Extent),
-     *     focus: ol.Coordinate,
-     *     index: number,
-     *     layerStates: Object.<number, ol.LayerState>,
-     *     layerStatesArray: Array.<ol.LayerState>,
-     *     logos: Object.<string, (string|Element)>,
-     *     pixelRatio: number,
-     *     pixelToCoordinateTransform: ol.Transform,
-     *     postRenderFunctions: Array.<ol.PostRenderFunction>,
-     *     size: ol.Size,
-     *     skippedFeatureUids: Object.<string, boolean>,
-     *     tileQueue: ol.TileQueue,
-     *     time: number,
-     *     usedTiles: Object.<string, Object.<string, ol.TileRange>>,
-     *     viewState: olx.ViewState,
-     *     viewHints: Array.<number>,
-     *     wantedTiles: !Object.<string, Object.<string, boolean>>}}
-     */
-    interface FrameState {
+    export interface FrameState {
         pixelRatio: number;
         time: number;
         viewState: olx.ViewState;
     }
 
-    /**
-     * @typedef {{center: ol.Coordinate,
-     *     projection: ol.proj.Projection,
-     *     resolution: number,
-     *     rotation: number}}
-     */
-    interface ViewState {
+    export interface ViewState {
         center: ol.Coordinate;
         projection: ol.proj.Projection;
         resolution: number;
         rotation: number;
     }
 }
-
-declare module "openlayers" {
-    export = ol;
-}
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index 2d2d22d411..fa42579ba9 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -1,74 +1,86 @@
+import * as ol from 'openlayers';
+
 // Basic type variables for test functions
 let anyValue: any;
-let numberValue: number;
 let booleanValue: boolean;
-let stringValue: string;
-let stringArray: string[];
+const canvas: HTMLCanvasElement = new HTMLCanvasElement();
+const domEventTarget: EventTarget = new EventTarget();
+const fn: () => void = () => {};
+const image: HTMLImageElement = new HTMLImageElement();
 let jsonValue: JSON;
-let domEventTarget: EventTarget;
-let fn: Function;
-let object: Object;
+const listener: ol.EventsListenerFunctionType = (evt) => {};
+const numberArray: number[] = [];
+let numberValue: number;
+let object: { [key: string]: any };
+let stringArray: string[];
+let stringValue: string;
 
 // Callback predefinitions for OpenLayers
-let preRenderFunction: ol.PreRenderFunction;
-let transformFunction: ol.TransformFunction;
 let coordinateFormatType: ol.CoordinateFormatType;
-let featureStyleFunction: ol.FeatureStyleFunction;
-let featureLoader: ol.FeatureLoader;
+const drawGeometryFunction: ol.DrawGeometryFunctionType = (coords, geo) => new ol.geom.SimpleGeometry();
 let easingFunction: (t: number) => number;
-let drawGeometryFunction: ol.DrawGeometryFunctionType;
+let featureLoader: ol.FeatureLoader;
+let featureStyleFunction: ol.FeatureStyleFunction;
+const preRenderFunction: ol.PreRenderFunction = (map, state) => false;
+let transformFunction: ol.TransformFunction;
 drawGeometryFunction([0, 0], new ol.geom.Point([0, 0]));
 drawGeometryFunction([0, 0]);
 
 // Type variables for OpenLayers
 let attribution: ol.Attribution;
-let boundingCoordinates: ol.Coordinate[];
+const boundingCoordinates: ol.Coordinate[] = [];
 let circle: ol.geom.Circle;
+let clusterSource: ol.source.Cluster;
 let color: ol.Color;
 let coordinate: ol.Coordinate;
 let coordinatesArray: ol.Coordinate[];
 let coordinatesArrayDim2: ol.Coordinate[][];
-let extent: ol.Extent;
-let olEvent: ol.events.Event;
-let eventKey: ol.EventsKey;
-let eventKeyArray: ol.EventsKey[];
+const eventKey: ol.EventsKey = {};
+const eventKeyArray: ol.EventsKey[] = [];
 let eventKeyMixed: ol.EventsKey | ol.EventsKey[];
-let eventTarget: ol.events.EventTarget;
+const eventTarget = new ol.events.EventTarget();
+let extent: ol.Extent;
 let feature: ol.Feature;
 let featureArray: ol.Feature[];
 let featureCollection: ol.Collection<ol.Feature>;
-let featureFormat: ol.format.Feature;
-let featureUrlFunction: ol.FeatureUrlFunction;
-let graticule: ol.Graticule;
+const featureFormat = new ol.format.Feature();
+const featureUrlFunction: ol.FeatureUrlFunction = (extent, resolution, proj) => stringValue;
 let geometriesArray: ol.geom.Geometry[];
 let geometry: ol.geom.Geometry;
 let geometryCollection: ol.geom.GeometryCollection;
 let geometryLayout: ol.geom.GeometryLayout;
 let geometryType: ol.geom.GeometryType;
+let graticule: ol.Graticule;
+const iconAnchorUnits: ol.style.IconAnchorUnits = 'fraction';
+const iconOrigin: ol.style.IconOrigin = 'bottom-left';
 let linearRing: ol.geom.LinearRing;
 let lineString: ol.geom.LineString;
 let loadingStrategy: ol.LoadingStrategy;
-let logoOptions: olx.LogoOptions;
-let mapBrowserEvent: ol.MapBrowserEvent;
+const logoOptions: ol.olx.LogoOptions = {href: stringValue, src: stringValue};
+let map: ol.Map;
 let multiLineString: ol.geom.MultiLineString;
 let multiPoint: ol.geom.MultiPoint;
 let multiPolygon: ol.geom.MultiPolygon;
-let pixel: ol.Pixel;
+const olEvent = new ol.events.Event(stringValue);
+const pixel: ol.Pixel = [numberValue, numberValue];
 let point: ol.geom.Point;
 let polygon: ol.geom.Polygon;
 let projection: ol.proj.Projection;
-let projectionLike: ol.ProjectionLike;
-let simpleGeometry: ol.geom.SimpleGeometry;
+const projectionLike: ol.ProjectionLike = stringValue;
+const simpleGeometry = new ol.geom.SimpleGeometry();
 let size: ol.Size;
-let style: ol.style.Style;
-let styleArray: ol.style.Style[];
-let styleFunction: ol.StyleFunction;
-let tilegrid: ol.tilegrid.TileGrid;
-let transformFn: ol.TransformFunction;
-let clusterSource: ol.source.Cluster;
-let vectorSource: ol.source.Vector;
-let units: ol.proj.Units;
+const style = new ol.style.Style();
+const styleArray: ol.style.Style[] = [];
+const styleFunction: ol.StyleFunction = (feature, resolution) => style;
 let styleRegularShape: ol.style.RegularShape;
+const tilegrid = new ol.tilegrid.TileGrid({resolutions: numberArray});
+const transformFn: ol.TransformFunction = (array, out, dimension) => numberArray;
+let units: ol.proj.Units;
+let vectorSource: ol.source.Vector;
+
+const viewState: ol.olx.ViewState = {center: coordinate, projection, resolution: numberValue, rotation: numberValue};
+const frameState: ol.olx.FrameState = {pixelRatio: numberValue, time: numberValue, viewState};
+const mapBrowserEvent = new ol.MapBrowserEvent(stringValue, map, event, booleanValue, frameState);
 
 //
 // ol.Attribution
@@ -149,7 +161,7 @@ circle = <ol.geom.Circle> circle.transform(projectionLike, projectionLike);
 //
 // ol.geom.Geometry
 //
-let geometryResult: ol.geom.Geometry;
+const geometryResult = new ol.geom.Geometry();
 coordinate = geometryResult.getClosestPoint(coordinate);
 geometryResult.getClosestPoint(coordinate, coordinate);
 extent = geometryResult.getExtent();
@@ -277,7 +289,7 @@ point.setCoordinates(coordinate, geometryLayout);
 //
 // ol.geom.Polygon
 //
-let localSphere: ol.Sphere;
+const localSphere = new ol.Sphere(numberValue);
 let linearRingsArray: ol.geom.LinearRing[];
 
 polygon = new ol.geom.Polygon(coordinatesArrayDim2);
@@ -315,7 +327,7 @@ simpleGeometry.translate(numberValue, numberValue);
 //
 // ol.source
 //
-let featureCallback: (f: ol.Feature) => any;
+const featureCallback = (f: ol.Feature) => anyValue;
 vectorSource = new ol.source.Vector({
     attributions: [attribution],
     features: featureCollection,
@@ -373,8 +385,8 @@ feature = new ol.Feature({
 feature = feature.clone();
 geometry = feature.getGeometry();
 stringValue = feature.getGeometryName();
-let featureGetId: string | number = feature.getId();
-let featureGetStyle: ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction = feature.getStyle();
+const featureGetId: string | number = feature.getId();
+const featureGetStyle: ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction = feature.getStyle();
 featureStyleFunction = feature.getStyleFunction();
 feature.setGeometry(geometry);
 feature.setGeometryName(stringValue);
@@ -485,21 +497,21 @@ view.setZoom(numberValue);
 //
 // ol.layer.Base
 //
-let baseLayer: ol.layer.Base = new ol.layer.Base({
+const baseLayer: ol.layer.Base = new ol.layer.Base({
     zIndex: 1
 });
 
 //
 // ol.layer.Group
 //
-let groupLayer: ol.layer.Group = new ol.layer.Group({
+const groupLayer: ol.layer.Group = new ol.layer.Group({
     zIndex: 2
 });
 
 //
 // ol.layer.Heatmap
 //
-let heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
+const heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
     source: new ol.source.Vector(),
     weight: '',
     zIndex: 1
@@ -508,7 +520,7 @@ let heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
 //
 // ol.layer.Image
 //
-let imageLayer: ol.layer.Image = new ol.layer.Image({
+const imageLayer: ol.layer.Image = new ol.layer.Image({
     source: new ol.source.Image({
         projection: ''
     }),
@@ -518,14 +530,14 @@ let imageLayer: ol.layer.Image = new ol.layer.Image({
 //
 // ol.layer.Layer
 //
-let layerLayer: ol.layer.Layer = new ol.layer.Layer({
+const layerLayer: ol.layer.Layer = new ol.layer.Layer({
     zIndex: 2
 });
 
 //
 // ol.layer.Tile
 //
-let tileLayer: ol.layer.Tile = new ol.layer.Tile({
+const tileLayer: ol.layer.Tile = new ol.layer.Tile({
     source: new ol.source.OSM(),
     zIndex: 0
 });
@@ -533,8 +545,8 @@ let tileLayer: ol.layer.Tile = new ol.layer.Tile({
 //
 // ol.layer.Vector
 //
-let vectorLayerRenderMode: olx.layer.VectorRenderType = 'image';
-let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
+const vectorLayerRenderMode: ol.olx.layer.VectorRenderType = 'image';
+const vectorLayer: ol.layer.Vector = new ol.layer.Vector({
     renderMode: vectorLayerRenderMode,
     source: new ol.source.Vector(),
     zIndex: -1
@@ -543,7 +555,7 @@ let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
 //
 // ol.layer.VectorTile
 //
-let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
+const vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
     renderOrder: () => 1,
     zIndex: 2
 });
@@ -551,7 +563,7 @@ let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
 //
 // ol.Object
 //
-let olObject: ol.Object = new ol.Object({
+const olObject: ol.Object = new ol.Object({
     a: numberValue,
     b: stringValue,
     c: booleanValue,
@@ -570,7 +582,7 @@ olObject.unset(stringValue, booleanValue);
 // ol.Observable
 //
 ol.Observable.unByKey(eventKey);
-let observable: ol.Observable = new ol.Observable();
+const observable: ol.Observable = new ol.Observable();
 observable.changed();
 observable.dispatchEvent({ type: stringValue });
 observable.dispatchEvent({ type: stringValue, target: domEventTarget });
@@ -579,17 +591,17 @@ observable.dispatchEvent({ type: stringValue, a: numberValue, b: stringValue, c:
 observable.dispatchEvent(olEvent);
 observable.dispatchEvent(stringValue);
 numberValue = observable.getRevision();
-eventKeyMixed = observable.on(stringValue, fn);
-eventKeyMixed = observable.on([stringValue, stringValue], fn, {});
-eventKeyMixed = observable.once(stringValue, fn);
-eventKeyMixed = observable.once([stringValue, stringValue], fn, {});
-observable.un(stringValue, fn);
-observable.un([stringValue, stringValue], fn, {});
+eventKeyMixed = observable.on(stringValue, listener);
+eventKeyMixed = observable.on([stringValue, stringValue], listener, {});
+eventKeyMixed = observable.once(stringValue, listener);
+eventKeyMixed = observable.once([stringValue, stringValue], listener, {});
+observable.un(stringValue, listener);
+observable.un([stringValue, stringValue], listener, {});
 
 //
 // ol.proj
 //
-let getPointResolutionFn: (n: number, c: ol.Coordinate) => number;
+const getPointResolutionFn = (n: number, c: ol.Coordinate) => numberValue;
 projection = new ol.proj.Projection({
     code: stringValue,
 });
@@ -609,7 +621,7 @@ projection.setWorldExtent(extent);
 // ol.Map
 //
 
-let map: ol.Map = new ol.Map({
+map = new ol.Map({
     view,
     layers: [tileLayer],
     target: stringValue
@@ -618,7 +630,7 @@ let map: ol.Map = new ol.Map({
 //
 // ol.source.ImageWMS
 //
-let imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
+const imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
     params: {},
     projection,
     serverType: stringValue,
@@ -638,7 +650,8 @@ let tileWMS: ol.source.TileWMS = new ol.source.TileWMS({
     params: {},
     projection,
     serverType: stringValue,
-    url: stringValue
+    url: stringValue,
+    transition: 0.5
 });
 
 // test without projection
@@ -653,7 +666,7 @@ stringValue = tileWMS.getGetFeatureInfoUrl([0, 0], 1, "EPSG:4326", {});
 //
 // ol.source.WMTS
 //
-let wmts: ol.source.WMTS = new ol.source.WMTS({
+const wmts: ol.source.WMTS = new ol.source.WMTS({
     layer: "",
     projection,
     matrixSet: "",
@@ -693,7 +706,7 @@ easingFunction = ol.easing.upAndDown;
 //
 // ol.Geolocation
 //
-let geolocation: ol.Geolocation = new ol.Geolocation({
+const geolocation: ol.Geolocation = new ol.Geolocation({
     projection
 });
 coordinate = geolocation.getPosition();
@@ -706,16 +719,16 @@ graticule = new ol.Graticule();
 graticule = new ol.Graticule({
     map,
 });
-let graticuleMap: ol.Map = graticule.getMap();
-let graticuleMeridians: ol.geom.LineString[] = graticule.getMeridians();
-let graticuleParallels: ol.geom.LineString[] = graticule.getParallels();
+const graticuleMap: ol.Map = graticule.getMap();
+const graticuleMeridians: ol.geom.LineString[] = graticule.getMeridians();
+const graticuleParallels: ol.geom.LineString[] = graticule.getParallels();
 graticule.setMap(graticuleMap);
 
 //
 // ol.DeviceOrientation
 //
 
-let deviceOrientation: ol.DeviceOrientation = new ol.DeviceOrientation({
+const deviceOrientation: ol.DeviceOrientation = new ol.DeviceOrientation({
     tracking: true,
 });
 numberValue = deviceOrientation.getHeading();
@@ -724,15 +737,15 @@ numberValue = deviceOrientation.getHeading();
 // ol.Overlay
 //
 
-let popup: ol.Overlay = new ol.Overlay({
+const popup: ol.Overlay = new ol.Overlay({
     element: document.getElementById('popup')
 });
 map.addOverlay(popup);
-let popupElement: Element = popup.getElement();
-let popupMap: ol.Map = popup.getMap();
-let popupOffset: number[] = popup.getOffset();
+const popupElement: Element = popup.getElement();
+const popupMap: ol.Map = popup.getMap();
+const popupOffset: number[] = popup.getOffset();
 coordinate = popup.getPosition();
-let popupPositioning: ol.OverlayPositioning = popup.getPositioning();
+const popupPositioning: ol.OverlayPositioning = popup.getPositioning();
 popup.setElement(popupElement);
 popup.setMap(popupMap);
 popup.setOffset(popupOffset);
@@ -744,7 +757,7 @@ popup.setPositioning(popupPositioning);
 // ol.format.GeoJSON
 //
 
-let geojsonOptions: olx.format.GeoJSONOptions;
+const geojsonOptions: ol.olx.format.GeoJSONOptions = {defaultDataProjection: projectionLike, featureProjection: projectionLike, geometryName: stringValue};
 geojsonOptions.defaultDataProjection = "EPSG";
 geojsonOptions.defaultDataProjection = projection;
 geojsonOptions.geometryName = "geom";
@@ -754,13 +767,13 @@ geojsonFormat = new ol.format.GeoJSON();
 geojsonFormat = new ol.format.GeoJSON(geojsonOptions);
 
 // Test options
-let readOptions: olx.format.ReadOptions;
+const readOptions: ol.olx.format.ReadOptions = {dataProjection: projectionLike, featureProjection: projectionLike};
 readOptions.dataProjection = "EPSG";
 readOptions.dataProjection = projection;
 readOptions.featureProjection = "EPSG";
 readOptions.featureProjection = projection;
 
-let writeOptions: olx.format.WriteOptions;
+const writeOptions: ol.olx.format.WriteOptions = {dataProjection: projectionLike, featureProjection: projectionLike, rightHanded: booleanValue, decimals: numberValue};
 writeOptions.dataProjection = "EPSG";
 writeOptions.dataProjection = projection;
 writeOptions.featureProjection = "EPSG";
@@ -884,17 +897,27 @@ withinFilter = ol.format.filter.within("geometry", geometry, "srs");
 //
 // ol.interactions
 //
-let modifyFeature: ol.interaction.Modify = new ol.interaction.Modify({
+const modifyFeature: ol.interaction.Modify = new ol.interaction.Modify({
     insertVertexCondition: ol.events.condition.never,
     features: new ol.Collection<ol.Feature>(featureArray),
 });
-let modifySource: ol.interaction.Modify = new ol.interaction.Modify({
+const modifySource: ol.interaction.Modify = new ol.interaction.Modify({
     insertVertexCondition: ol.events.condition.never,
     source: new ol.source.Vector({
         features: new ol.Collection<ol.Feature>(featureArray),
     }),
 });
 
+const dragAndDrop: ol.interaction.DragAndDrop = new ol.interaction.DragAndDrop({
+    formatConstructors: [ol.format.KML],
+    projection: projectionLike,
+    source: vectorSource,
+});
+
+const dragAndDropWithUndefined: ol.interaction.DragAndDrop = new ol.interaction.DragAndDrop({
+    projection: projectionLike,
+});
+
 let draw: ol.interaction.Draw = new ol.interaction.Draw({
     type: "Point",
     clickTolerance: numberValue,
@@ -918,7 +941,7 @@ draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunction
 });
-let styleFunctionAsStyle = (feature: ol.Feature, resolution: number): ol.style.Style => style;
+const styleFunctionAsStyle = (feature: ol.Feature, resolution: number): ol.style.Style => style;
 draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunctionAsStyle
@@ -932,13 +955,13 @@ ol.interaction.defaults({
     constrainResolution: booleanValue
 });
 
-let styleFunctionAsArray = (feature: ol.Feature, resolution: number): ol.style.Style[] => styleArray;
+const styleFunctionAsArray = (feature: ol.Feature, resolution: number): ol.style.Style[] => styleArray;
 draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunctionAsArray
 });
 
-let dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
+const dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
     className: stringValue,
     minArea: 10,
     condition: ol.events.condition.always,
@@ -950,7 +973,7 @@ let dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
 });
 polygon = dragbox.getGeometry();
 
-let interaction: ol.interaction.Interaction = new ol.interaction.Interaction({
+const interaction: ol.interaction.Interaction = new ol.interaction.Interaction({
     handleEvent: (e: ol.MapBrowserEvent) => {
         return booleanValue;
     }
@@ -963,17 +986,64 @@ const select: ol.interaction.Select = new ol.interaction.Select({
     layers: (layer: ol.layer.Layer) => true,
 });
 
-let pinchZoom: ol.interaction.PinchZoom = new ol.interaction.PinchZoom({
+const pinchZoom: ol.interaction.PinchZoom = new ol.interaction.PinchZoom({
     constrainResolution: booleanValue,
     duration: numberValue
 });
 
-let mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWheelZoom({
+const mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWheelZoom({
     constrainResolution: booleanValue,
     duration: numberValue,
     timeout: numberValue,
     useAnchor: booleanValue
 });
+
+//
+// ol.style.Icon
+//
+
+const iconWithUndefined = new ol.style.Icon({});
+let icon: ol.style.Icon;
+
+icon = new ol.style.Icon({
+    anchor: numberArray,
+    anchorOrigin: iconOrigin,
+    anchorXUnits: iconAnchorUnits,
+    anchorYUnits: iconAnchorUnits,
+    color: stringValue,
+    crossOrigin: stringValue,
+    img: image,
+    offset: numberArray,
+    offsetOrigin: iconOrigin,
+    opacity: numberValue,
+    scale: numberValue,
+    snapToPixel: booleanValue,
+    rotateWithView: booleanValue,
+    rotation: numberValue,
+    size,
+    imgSize: size,
+    src: stringValue,
+});
+icon = new ol.style.Icon({
+    anchor: numberArray,
+    anchorOrigin: iconOrigin,
+    anchorXUnits: iconAnchorUnits,
+    anchorYUnits: iconAnchorUnits,
+    color,
+    crossOrigin: stringValue,
+    img: canvas,
+    offset: numberArray,
+    offsetOrigin: iconOrigin,
+    opacity: numberValue,
+    scale: numberValue,
+    snapToPixel: booleanValue,
+    rotateWithView: booleanValue,
+    rotation: numberValue,
+    size,
+    imgSize: size,
+    src: stringValue,
+});
+
 //
 // ol.style.RegularShape
 //
@@ -987,7 +1057,7 @@ styleRegularShape = new ol.style.RegularShape({
 // ol.proj
 //
 
-let value = ol.proj.METERS_PER_UNIT['degrees'];
+const value = ol.proj.METERS_PER_UNIT['degrees'];
 
 numberValue = ol.Sphere.getArea(geometry, {
     projection,
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index 2effdd6100..70877b4c6c 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -1,15 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // It appears somewhat difficult to remove the Function and Object types
-        "ban-types": false,
-        // This currently fails for an option that does not appear to be in OL 4
-        "no-any-union": false,
-        // Not sure how to work around this, or if it's necessary to        
-        "no-declare-current-package": false,
-        "no-internal-module": false,
-        "no-redundant-jsdoc-2": false,
-        "no-single-declare-module": false,
         "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
         "no-unnecessary-qualifier": false,
diff --git a/types/optimize-css-assets-webpack-plugin/index.d.ts b/types/optimize-css-assets-webpack-plugin/index.d.ts
index 788b2e6a1f..79a510a12b 100644
--- a/types/optimize-css-assets-webpack-plugin/index.d.ts
+++ b/types/optimize-css-assets-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/NMFR/optimize-css-assets-webpack-plugin
 // Definitions by: Armando Meziat <https://github.com/odnamrataizem>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/p-event/p-event-tests.ts b/types/p-event/p-event-tests.ts
index d963e22bed..0295cdb34b 100644
--- a/types/p-event/p-event-tests.ts
+++ b/types/p-event/p-event-tests.ts
@@ -8,14 +8,14 @@ class MyEmitter extends events.EventEmitter {
 }
 
 class MyDomEmitter implements EventTarget {
-    addEventListener(type: 'foo', listener?: (event: Event) => void): void {
+    addEventListener(type: 'foo', listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void {
     }
 
     dispatchEvent(event: Event): boolean {
         return false;
     }
 
-    removeEventListener(type: 'foo', listener?: (event: Event) => void): void {
+    removeEventListener(type: 'foo', listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void {
     }
 }
 
diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index 3f57526a19..5b3e46a146 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -213,7 +213,7 @@ declare module paper {
          * @param angle - the angle of rotation measured in degrees
          * @param center - the anchor point to rotate around
          */
-        rotate(angle: number, center: Point): Matrix;
+        rotate(angle: number, center?: Point): Matrix;
 
         /**
          * Concatenates this transform with a rotation transformation around an anchor point.
@@ -1369,7 +1369,7 @@ declare module paper {
          * Rasterizes the item into a newly created Raster object. The item itself is not removed after rasterization.
          * @param resolution [optional] - the resolution of the raster in pixels per inch (DPI). If not specified, the value of view.resolution is used. default: view.resolution
          */
-        rasterize(resolution: number): Raster;
+        rasterize(resolution?: number): Raster;
 
         /**
          * Checks whether the item's geometry contains the given point.
@@ -3359,99 +3359,99 @@ declare module paper {
          * The view that this style belongs to.
          * Read only.
          */
-        view: View;
+        view?: View;
 
         /**
          * The color of the stroke.
          */
-        strokeColor: Color | string;
+        strokeColor?: Color | string;
 
         /**
          * The width of the stroke.
          */
-        strokeWidth: number;
+        strokeWidth?: number;
 
         /**
          * The shape to be used at the beginning and end of open Path items, when they have a stroke.
          * String('round', 'square', 'butt'
          */
-        strokeCap: string;
+        strokeCap?: string;
 
         /**
          * The shape to be used at the segments and corners of Path items when they have a stroke.
          * String('miter', 'round', 'bevel')
          */
-        strokeJoin: string;
+        strokeJoin?: string;
 
         /**
          * Specifies whether the stroke is to be drawn taking the current affine transformation into account (the default behavior), or whether it should appear as a non-scaling stroke.
          */
-        strokeScaling: boolean;
+        strokeScaling?: boolean;
 
         /**
          * The dash offset of the stroke.
          */
-        dashOffset: number;
+        dashOffset?: number;
 
         /**
          * Specifies an array containing the dash and gap lengths of the stroke.
          */
-        dashArray: number[];
+        dashArray?: number[];
 
         /**
          * The miter limit of the stroke. When two line segments meet at a sharp angle and miter joins have been specified for strokeJoin, it is possible for the miter to extend far beyond the strokeWidth of the path. The miterLimit imposes a limit on the ratio of the miter length to the strokeWidth.
          */
-        miterLimit: number;
+        miterLimit?: number;
 
         /**
          * The fill color.
          */
-        fillColor: Color | string;
+        fillColor?: Color | string;
 
         /**
          * The shadow color.
          */
-        shadowColor: Color | string;
+        shadowColor?: Color | string;
 
         /**
          * The shadow's blur radius.
          */
-        shadowBlur: number;
+        shadowBlur?: number;
 
         /**
          * The shadow's offset.
          */
-        shadowOffset: Point;
+        shadowOffset?: Point;
 
         /**
          * The color the item is highlighted with when selected. If the item does not specify its own color, the color defined by its layer is used instead.
          */
-        selectedColor: Color | string;
+        selectedColor?: Color | string;
 
         /**
          * The font-family to be used in text content. default 'sans-serif'
          */
-        fontFamily: string;
+        fontFamily?: string;
 
         /**
          * The font-weight to be used in text content.
          */
-        fontWeight: string | number;
+        fontWeight?: string | number;
 
         /**
          * The font size of text content, as {@Number} in pixels, or as {@String} with optional units 'px', 'pt' and 'em'.
          */
-        fontSize: string | number;
+        fontSize?: string | number;
 
         /**
          * The text leading of text content.
          */
-        leading: number | string;
+        leading?: number | string;
 
         /**
          * The justification of text paragraphs. default "left"
          */
-        justification: string;
+        justification?: string;
 
     }
     export interface IHSBColor {
diff --git a/types/pify/index.d.ts b/types/pify/index.d.ts
index fc4b13df5d..b0c8ce4b92 100644
--- a/types/pify/index.d.ts
+++ b/types/pify/index.d.ts
@@ -9,8 +9,8 @@ interface PromiseModule {
 
 interface PifyOptions {
     multiArgs?: boolean,
-    include?: [string | RegExp],
-    exclude?: [string | RegExp],
+    include?: Array<string | RegExp>,
+    exclude?: Array<string | RegExp>,
     excludeMain?: boolean,
     errorFirst?: boolean,
     promiseModule?: PromiseModule
diff --git a/types/pify/pify-tests.ts b/types/pify/pify-tests.ts
index 27022b7390..cadf3ba408 100644
--- a/types/pify/pify-tests.ts
+++ b/types/pify/pify-tests.ts
@@ -31,3 +31,20 @@ pify(fs.readFile, { promiseModule: Promise})('bar.txt').then((result: string) =>
 
 
 pify(fs.exists, { errorFirst: false })('foo.txt').then((result: boolean) => assert(result.toString(), true.toString()));
+
+// include/exclude with multiple entries
+const module = {
+    f1: (callback: Function) => callback(),
+    f2: (callback: Function) => callback(),
+    f3: (callback: Function) => callback(),
+};
+
+const include = pify(module, { include: ['f1', 'f2'] });
+if (include.f1 === module.f1) throw new Error();
+if (include.f2 === module.f2) throw new Error();
+if (include.f3 !== module.f3) throw new Error();
+
+const exclude = pify(module, { exclude: ['f1', 'f2'] });
+if (include.f1 !== module.f1) throw new Error();
+if (include.f2 !== module.f2) throw new Error();
+if (include.f3 === module.f3) throw new Error();
diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index f75bb4a1ca..f503867b5b 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -1428,9 +1428,11 @@ declare namespace PIXI {
 
         constructor(text: string, style: TextStyle, width: number, height: number, lines: number[], lineWidths: number[], lineHeight: number, maxLineWidth: number, fontProperties: any);
 
+        static addLine(line: string, newLine?: boolean): string;
         static measureText(text: string, style: TextStyle, wordWrap?: boolean, canvas?: HTMLCanvasElement): TextMetrics;
         static wordWrap(text: string, style: TextStyle, canvas?: HTMLCanvasElement): string;
         static measureFont(font: string): FontMetrics;
+        static getFromCache(key: string, letterSpacing: number, cache: any, context: CanvasRenderingContext2D): number;
     }
     interface FontMetrics {
         ascent: number;
@@ -2057,6 +2059,7 @@ declare namespace PIXI {
             type: string;
             data: InteractionData;
             stopPropagation(): void;
+            reset(): void;
         }
         class InteractionData {
             global: Point;
@@ -2076,8 +2079,8 @@ declare namespace PIXI {
             twist: number;
             tangentialPressure: number;
             readonly pointerID: number;
-            protected _copyEvent(event: Touch | MouseEvent | PointerEvent): void;
-            protected _reset(): void;
+            copyEvent(event: Touch | MouseEvent | PointerEvent): void;
+            reset(): void;
             getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
         }
         type InteractionPointerEvents = "pointerdown" | "pointercancel" | "pointerup" |
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 6e7c9a67bc..9fbbeaa92f 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for plotly.js 1.28
+// Type definitions for plotly.js 1.35
 // Project: https://plot.ly/javascript/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>
 // 				Martin Duparc <https://github.com/martinduparc>
 // 				Frederik Aalund <https://github.com/frederikaalund>
 // 				taoqf <https://github.com/taoqf>
 // 				Dadstart <https://github.com/Dadstart>
+// 				Jared Szechy <https://github.com/szechyjs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -24,9 +25,14 @@ export interface Point {
 }
 
 export interface PlotScatterDataPoint {
-	pointNumber: number;
-	curveNumber: number;
-	data: ScatterData;
+  curveNumber: number;
+  data: ScatterData;
+  pointIndex: number;
+  pointNumber: number;
+  x: number;
+  xaxis: LayoutAxis;
+  y: number;
+  yaxis: LayoutAxis;
 }
 
 export interface PlotMouseEvent {
@@ -105,6 +111,7 @@ export function extendTraces(root: Root, update: Data | Data[], indices: number
 export function prependTraces(root: Root, update: Data | Data[], indices: number | number[]): Promise<PlotlyHTMLElement>;
 export function toImage(root: Root, opts: ToImgopts): Promise<string>;
 export function downloadImage(root: Root, opts: DownloadImgopts): Promise<string>;
+export function react(root: Root, data: Data[], layout?: Partial<Layout>, config?: Partial<Config>): Promise<PlotlyHTMLElement>;
 
 // Layout
 export interface Layout {
@@ -112,7 +119,7 @@ export interface Layout {
 	titlefont: Partial<Font>;
 	autosize: boolean;
 	showlegend: boolean;
-	paper_bgcolor: Color;
+    paper_bgcolor: Color;
     plot_bgcolor: Color;
     separators: string;
     hidesources: boolean;
@@ -131,7 +138,7 @@ export interface Layout {
 	width: number;
 	hovermode: 'closest' | 'x' | 'y' | false;
 	hoverlabel: Partial<Label>;
-	calendar: Calendar;
+    calendar: Calendar;
     'xaxis.range': [Datum, Datum];
 	'xaxis.range[0]': Datum;
 	'xaxis.range[1]': Datum;
@@ -142,17 +149,17 @@ export interface Layout {
 	'xaxis.type': AxisType;
 	'xaxis.autorange': boolean;
 	'yaxis.autorange': boolean;
-	ternary: {}; // TODO
+    ternary: {}; // TODO
     geo: {}; // TODO
     mapbox: {}; // TODO
-	radialaxis: {}; // TODO
+    radialaxis: {}; // TODO
     angularaxis: {}; // TODO
     direction: 'clockwise' | 'counterclockwise';
     dragmode: 'zoom' | 'pan' | 'select' | 'lasso' | 'orbit' | 'turntable';
     orientation: number;
-    annotations: {}; // TODO
-	shapes: Array<Partial<Shape>>;
-    images: {}; // TODO
+    annotations: Array<Partial<Annotations>>;
+    shapes: Array<Partial<Shape>>;
+    images: Array<Partial<Image>>;
     updatemenus: {}; // TODO
     sliders: {}; // TODO
     legend: Partial<Legend>;
@@ -281,13 +288,61 @@ export interface Margin {
 	r: number;
 }
 
-export type ModeBarButtons = 'lasso2d' | 'select2d' | 'sendDataToCloud' | 'autoScale2d' |
+export type ModeBarDefaultButtons = 'lasso2d' | 'select2d' | 'sendDataToCloud' | 'autoScale2d' |
 	'zoom2d' | 'pan2d' | 'zoomIn2d' | 'zoomOut2d' | 'autoScale2d' | 'resetScale2d' |
 	'hoverClosestCartesian' | 'hoverCompareCartesian' | 'zoom3d' | 'pan3d' | 'orbitRotation' |
 	'tableRotation' | 'resetCameraDefault3d' | 'resetCameraLastSave3d' | 'hoverClosest3d' |
 	'zoomInGeo' | 'zoomOutGeo' | 'resetGeo' | 'hoverClosestGeo' | 'hoverClosestGl2d' |
 	'hoverClosestPie' | 'toggleHover' | 'toImage' | 'resetViews' | 'toggleSpikelines';
 
+export type ButtonClickEvent = (gd: PlotlyHTMLElement, ev: MouseEvent) => void;
+
+export interface Icon {
+	width: number;
+	path: string;
+	ascent: number;
+	descent: number;
+}
+
+export interface ModeBarButton {
+	/** name / id of the buttons (for tracking) */
+    name: string;
+
+	/**
+	 * text that appears while hovering over the button,
+	 * enter null, false or '' for no hover text
+	 */
+    title: string;
+
+	/**
+	 * svg icon object associated with the button
+	 * can be linked to Plotly.Icons to use the default plotly icons
+	 */
+    icon: string | Icon;
+
+	/** icon positioning */
+    gravity?: string;
+
+	/**
+	 * click handler associated with the button, a function of
+	 * 'gd' (the main graph object) and
+	 * 'ev' (the event object)
+	 */
+    click: ButtonClickEvent;
+
+	/**
+	 * attribute associated with button,
+	 * use this with 'val' to keep track of the state
+	 */
+    attr?: string;
+
+	/** initial 'attr' value, can be a function of gd */
+    val?: any;
+
+	/** is the button a toggle button? */
+	toggle?: boolean;
+}
+
 // Data
 
 export type Datum = string | number | Date;
@@ -343,7 +398,7 @@ export interface ScatterMarker {
 	cmax: boolean;
 	cmin: boolean;
 	autocolorscale: boolean;
-    reversescale: boolean;
+	reversescale: boolean;
 	opacity: number | number[];
 	size: number | number[];
 	maxdisplayed: number;
@@ -353,7 +408,7 @@ export interface ScatterMarker {
 	showscale: boolean;
 	line: Partial<ScatterMarkerLine>;
 	colorbar: {}; // TODO
-    gradient: {}; // TODO
+	gradient: {}; // TODO
 }
 
 export interface ScatterMarkerLine {
@@ -382,89 +437,116 @@ export interface Font {
 	color: string;
 }
 
+export interface Edits {
+	annotationPosition: boolean;
+	annotationTail: boolean;
+	annotationText: boolean;
+	axisTitleText: boolean;
+	colorbarPosition: boolean;
+	colorbarTitleText: boolean;
+	legendPosition: boolean;
+	legendText: boolean;
+	shapePosition: boolean;
+	titleText: boolean;
+}
+
 export interface Config {
-	// no interactivity, for export or image generation
+	/** no interactivity, for export or image generation */
 	staticPlot: boolean;
 
-	// we can edit titles, move annotations, etc
+	/** we can edit titles, move annotations, etc */
 	editable: boolean;
+	edits: Partial<Edits>;
 
-	// DO autosize once regardless of layout.autosize
-	// (use default width or height values otherwise)
+	/** DO autosize once regardless of layout.autosize (use default width or height values otherwise) */
 	autosizable: boolean;
 
-	// set the length of the undo/redo queue
+	/** set the length of the undo/redo queue */
 	queueLength: number;
 
-	// if we DO autosize, do we fill the container or the screen?
+	/** if we DO autosize, do we fill the container or the screen? */
 	fillFrame: boolean;
 
-	// if we DO autosize, set the frame margins in percents of plot size
+	/** if we DO autosize, set the frame margins in percents of plot size */
 	frameMargins: number;
 
-	// mousewheel or two-finger scroll zooms the plot
+	/** mousewheel or two-finger scroll zooms the plot */
 	scrollZoom: boolean;
 
-	// double click interaction (false, 'reset', 'autosize' or 'reset+autosize')
+	/** double click interaction (false, 'reset', 'autosize' or 'reset+autosize') */
 	doubleClick: 'reset+autosize' | 'reset' | 'autosize' | false;
 
-	// new users see some hints about interactivity
+	/** new users see some hints about interactivity */
 	showTips: boolean;
 
-	// link to open this plot in plotly
+	/** enable axis pan/zoom drag handles */
+	showAxisDragHandles: boolean;
+
+	/** enable direct range entry at the pan/zoom drag points (drag handles must be enabled above) */
+	showAxisRangeEntryBoxes: boolean;
+
+	/** link to open this plot in plotly */
 	showLink: boolean;
 
-	// if we show a link, does it contain data or just link to a plotly file?
+	/** if we show a link, does it contain data or just link to a plotly file? */
 	sendData: boolean;
 
-	// text appearing in the sendData link
+	/** text appearing in the sendData link */
 	linkText: string;
 
-	// false or function adding source(s) to linkText <text>
+	/** false or function adding source(s) to linkText <text> */
 	showSources: boolean;
 
-	// display the mode bar (true, false, or 'hover')
+	/** display the mode bar (true, false, or 'hover') */
 	displayModeBar: 'hover' | boolean;
 
-	// remove mode bar button by name
-	// (see ./components/modebar/buttons.js for the list of names)
-	modeBarButtonsToRemove: ModeBarButtons[];
+	/** remove mode bar button by name (see ./components/modebar/buttons.js for the list of names) */
+	modeBarButtonsToRemove: ModeBarDefaultButtons[];
 
-	// add mode bar button using config objects
-	// (see ./components/modebar/buttons.js for list of arguments)
-	modeBarButtonsToAdd: ModeBarButtons[];
+	/** add mode bar button using config objects (see ./components/modebar/buttons.js for list of arguments) */
+	modeBarButtonsToAdd: ModeBarDefaultButtons[] | ModeBarButton[];
 
-	// fully custom mode bar buttons as nested array,
-	// where the outer arrays represents button groups, and
-	// the inner arrays have buttons config objects or names of default buttons
-	// (see ./components/modebar/buttons.js for more info)
-	modeBarButtons: ModeBarButtons[][];
+	/**
+	 * fully custom mode bar buttons as nested array, where the outer
+	 * arrays represents button groups, and the inner arrays have
+	 * buttons config objects or names of default buttons
+	 * (see ./components/modebar/buttons.js for more info)
+	 */
+	modeBarButtons: ModeBarDefaultButtons[][] | ModeBarButton[][] | false;
 
-	// add the plotly logo on the end of the mode bar
+	/** add the plotly logo on the end of the mode bar */
 	displaylogo: boolean;
 
-	// increase the pixel ratio for Gl plot images
+	/** increase the pixel ratio for Gl plot images */
 	plotGlPixelRatio: number;
 
-	// function to add the background color to a different container
-	// or 'opaque' to ensure there's white behind it
-	setBackground: string | 'opaque';
+	/**
+	 * function to add the background color to a different container
+	 * or 'opaque' to ensure there's white behind it
+	 */
+	setBackground: string | 'opaque' | 'transparent';
 
-	// URL to topojson files used in geo charts
+	/** URL to topojson files used in geo charts */
 	topojsonURL: string;
 
-	// Mapbox access token (required to plot mapbox trace types)
-	// If using an Mapbox Atlas server, set this option to '',
-	// so that plotly.js won't attempt to authenticate to the public Mapbox server.
+	/**
+	 * Mapbox access token (required to plot mapbox trace types)
+	 * If using an Mapbox Atlas server, set this option to '',
+	 * so that plotly.js won't attempt to authenticate to the public Mapbox server.
+	 */
 	mapboxAccessToken: string;
 
-	// Turn all console logging on or off (errors will be thrown)
-	// This should ONLY be set via Plotly.setPlotConfig
-	logging: boolean;
+	/**
+	 * Turn all console logging on or off (errors will be thrown)
+	 * This should ONLY be set via Plotly.setPlotConfig
+	 */
+	logging: boolean | 0 | 1 | 2;
 
-	// Set global transform to be applied to all traces with no
-	// specification needed
+	/** Set global transform to be applied to all traces with no specification needed */
 	globalTransforms: any[];
+
+	/** Which localization should we use? Should be a string like 'en' or 'en-US' */
+	locale: string;
 }
 
 // Components
@@ -508,34 +590,279 @@ export interface Label {
 	font: Partial<Font>;
 }
 
-export interface Annotations extends Point, Label {
-	visible: boolean;
-	ax: number;
-	ay: number;
-	xanchor: 'auto' | 'left' | 'center' | 'right';
-	xshift: number;
-	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
-	yshift: number;
-	text: string;
-	textangle: string;
-	width: number;
-	height: number;
-	opacity: number;
-	align: 'left' | 'center' | 'right';
-	valign: 'top' | 'middle' | 'bottom';
-	borderpad: number;
-	borderwidth: number;
-	showarrow: boolean;
-	arrowcolor: string;
-	arrowhead: number;
-	arrowsize: number;
-	arrowwidth: number;
-	standoff: number;
-	hovertext: string;
-	hoverlabel: Partial<Label>;
+export interface Annotations extends Label {
+  /** Determines whether or not this annotation is visible. */
+  visible: boolean;
+
+  /**
+   * Sets the text associated with this annotation.
+   * Plotly uses a subset of HTML tags to do things like
+   * newline (<br>), bold (<b></b>), italics (<i></i>),
+   * hyperlinks (<a href='...'></a>). Tags <em>, <sup>, <sub>
+   * <span> are also supported.
+   */
+  text: string;
+
+  /** Sets the angle at which the `text` is drawn with respect to the horizontal. */
+  textangle: string;
+
+  /**
+   * Sets an explicit width for the text box. null (default) lets the
+   * text set the box width. Wider text will be clipped.
+   * There is no automatic wrapping; use <br> to start a new line.
+   */
+  width: number;
+
+  /**
+   * Sets an explicit height for the text box. null (default) lets the
+   * text set the box height. Taller text will be clipped.
+   */
+  height: number;
+
+  /** Sets the opacity of the annotation (text + arrow). */
+  opacity: number;
+
+  /**
+   * Sets the horizontal alignment of the `text` within the box.
+   * Has an effect only if `text` spans more two or more lines
+   * (i.e. `text` contains one or more <br> HTML tags) or if an
+   * explicit width is set to override the text width.
+   */
+  align: 'left' | 'center' | 'right';
+
+  /**
+   * Sets the vertical alignment of the `text` within the box.
+   * Has an effect only if an explicit height is set to override the text height.
+   */
+  valign: 'top' | 'middle' | 'bottom';
+
+  /** Sets the padding (in px) between the `text` and the enclosing border. */
+  borderpad: number;
+
+  /** Sets the width (in px) of the border enclosing the annotation `text`. */
+  borderwidth: number;
+
+  /**
+   * Determines whether or not the annotation is drawn with an arrow.
+   * If *true*, `text` is placed near the arrow's tail.
+   * If *false*, `text` lines up with the `x` and `y` provided.
+   */
+  showarrow: boolean;
+
+  /** Sets the color of the annotation arrow. */
+  arrowcolor: string;
+
+  /** Sets the end annotation arrow head style. */
+  arrowhead: number;
+
+  /** Sets the start annotation arrow head style. */
+  startarrowhead: number;
+
+  /** Sets the annotation arrow head position. */
+  arrowside: 'end' | 'start';
+
+  /**
+   * Sets the size of the end annotation arrow head, relative to `arrowwidth`.
+   * A value of 1 (default) gives a head about 3x as wide as the line.
+   */
+  arrowsize: number;
+
+  /**
+   * Sets the size of the start annotation arrow head, relative to `arrowwidth`.
+   * A value of 1 (default) gives a head about 3x as wide as the line.
+   */
+  startarrowsize: number;
+
+  /** Sets the width (in px) of annotation arrow line. */
+  arrowwidth: number;
+
+  /**
+   * Sets a distance, in pixels, to move the end arrowhead away from the
+   * position it is pointing at, for example to point at the edge of
+   * a marker independent of zoom. Note that this shortens the arrow
+   * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
+   * which moves everything by this amount.
+   */
+  standoff: number;
+
+  /**
+   * Sets a distance, in pixels, to move the start arrowhead away from the
+   * position it is pointing at, for example to point at the edge of
+   * a marker independent of zoom. Note that this shortens the arrow
+   * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
+   * which moves everything by this amount.
+   */
+  startstandoff: number;
+
+  /**
+   * Sets the x component of the arrow tail about the arrow head.
+   * If `axref` is `pixel`, a positive (negative)
+   * component corresponds to an arrow pointing
+   * from right to left (left to right).
+   * If `axref` is an axis, this is an absolute value on that axis,
+   * like `x`, NOT a relative value.
+   */
+  ax: number;
+
+  /**
+   * Sets the y component of the arrow tail about the arrow head.
+   * If `ayref` is `pixel`, a positive (negative)
+   * component corresponds to an arrow pointing
+   * from bottom to top (top to bottom).
+   * If `ayref` is an axis, this is an absolute value on that axis,
+   * like `y`, NOT a relative value.
+   */
+  ay: number;
+
+  /**
+   * Indicates in what terms the tail of the annotation (ax,ay)
+   * is specified. If `pixel`, `ax` is a relative offset in pixels
+   * from `x`. If set to an x axis id (e.g. *x* or *x2*), `ax` is
+   * specified in the same terms as that axis. This is useful
+   * for trendline annotations which should continue to indicate
+   * the correct trend when zoomed.
+   */
+  axref: 'pixel';
+
+  /**
+   * Indicates in what terms the tail of the annotation (ax,ay)
+   * is specified. If `pixel`, `ay` is a relative offset in pixels
+   * from `y`. If set to a y axis id (e.g. *y* or *y2*), `ay` is
+   * specified in the same terms as that axis. This is useful
+   * for trendline annotations which should continue to indicate
+   * the correct trend when zoomed.
+   */
+  ayref: 'pixel';
+
+  /**
+   * Sets the annotation's x coordinate axis.
+   * If set to an x axis id (e.g. *x* or *x2*), the `x` position refers to an x coordinate
+   * If set to *paper*, the `x` position refers to the distance from
+   * the left side of the plotting area in normalized coordinates
+   * where 0 (1) corresponds to the left (right) side.
+   */
+  xref: 'paper' | 'x';
+
+  /**
+   * Sets the annotation's x position.
+   * If the axis `type` is *log*, then you must take the log of your desired range.
+   * If the axis `type` is *date*, it should be date strings, like date data,
+   * though Date objects and unix milliseconds will be accepted and converted to strings.
+   * If the axis `type` is *category*, it should be numbers, using the scale where each
+   * category is assigned a serial number from zero in the order it appears.
+   */
+  x: number | string;
+
+  /**
+   * Sets the text box's horizontal position anchor
+   * This anchor binds the `x` position to the *left*, *center* or *right* of the annotation.
+   * For example, if `x` is set to 1, `xref` to *paper* and `xanchor` to *right* then the
+   * right-most portion of the annotation lines up with the right-most edge of the plotting area.
+   * If *auto*, the anchor is equivalent to *center* for data-referenced annotations or if there
+   * is an arrow, whereas for paper-referenced with no arrow, the anchor picked corresponds to the closest side.
+   */
+  xanchor: 'auto' | 'left' | 'center' | 'right';
+
+  /**
+   * Shifts the position of the whole annotation and arrow to the
+   * right (positive) or left (negative) by this many pixels.
+   */
+  xshift: number;
+
+  /**
+   * Sets the annotation's y coordinate axis.
+   * If set to an y axis id (e.g. *y* or *y2*), the `y` position refers to an y coordinate
+   * If set to *paper*, the `y` position refers to the distance from
+   * the bottom of the plotting area in normalized coordinates
+   * where 0 (1) corresponds to the bottom (top).
+   */
+  yref: 'paper' | 'y';
+
+  /**
+   * Sets the annotation's y position.
+   * If the axis `type` is *log*, then you must take the log of your desired range.
+   * If the axis `type` is *date*, it should be date strings, like date data,
+   * though Date objects and unix milliseconds will be accepted and converted to strings.
+   * If the axis `type` is *category*, it should be numbers, using the scale where each
+   * category is assigned a serial number from zero in the order it appears.
+   */
+  y: number | string;
+
+  /**
+   * Sets the text box's vertical position anchor
+   * This anchor binds the `y` position to the *top*, *middle* or *bottom* of the annotation.
+   * For example, if `y` is set to 1, `yref` to *paper* and `yanchor` to *top* then the
+   * top-most portion of the annotation lines up with the top-most edge of the plotting area.
+   * If *auto*, the anchor is equivalent to *middle* for data-referenced annotations or if
+   * there is an arrow, whereas for paper-referenced with no arrow, the anchor picked
+   * corresponds to the closest side.
+   */
+  yanchor: 'auto' | 'top' | 'middle' | 'bottom';
+
+  /**
+   * Shifts the position of the whole annotation and arrow up
+   * (positive) or down (negative) by this many pixels.
+   */
+  yshift: number;
+
+  /**
+   * Makes this annotation respond to clicks on the plot.
+   * If you click a data point that exactly matches the `x` and `y` values of this annotation,
+   * and it is hidden (visible: false), it will appear. In *onoff* mode, you must click the same
+   * point again to make it disappear, so if you click multiple points, you can show multiple
+   * annotations. In *onout* mode, a click anywhere else in the plot (on another data point or not)
+   * will hide this annotation. If you need to show/hide this annotation in response to different
+   * `x` or `y` values, you can set `xclick` and/or `yclick`. This is useful for example to label
+   * the side of a bar. To label markers though, `standoff` is preferred over `xclick` and `yclick`.
+   */
+  clicktoshow: false | 'onoff' | 'onout';
+
+  /**
+   * Toggle this annotation when clicking a data point whose `x` value
+   * is `xclick` rather than the annotation's `x` value.
+   */
+  xclick: any;
+
+  /**
+   * Toggle this annotation when clicking a data point whose `y` value
+   * is `yclick` rather than the annotation's `y` value.
+   */
+  yclick: any;
+
+  /**
+   * Sets text to appear when hovering over this annotation.
+   * If omitted or blank, no hover label will appear.
+   */
+  hovertext: string;
+
+  hoverlabel: Partial<Label>;
+
+  /**
+   * Determines whether the annotation text box captures mouse move and click events,
+   * or allows those events to pass through to data points in the plot that may be
+   * behind the annotation. By default `captureevents` is *false* unless `hovertext`
+   * is provided. If you use the event `plotly_clickannotation` without `hovertext`
+   * you must explicitly enable `captureevents`.
+   */
 	captureevents: boolean;
 }
 
+export interface Image {
+  visible: boolean;
+  source: string;
+  layer: 'above' | 'below';
+  sizex: number;
+  sizey: number;
+  sizing: 'fill' | 'contain' | 'stretch';
+  opacity: number;
+  x: number | string;
+  y: number | string;
+  xanchor: 'left' | 'center' | 'right';
+  yanchor: 'top' | 'middle' | 'bottom';
+  xref: 'paper' | 'x';
+  yref: 'paper' | 'y';
+}
+
 export interface Scene {
 	bgcolor: string;
 	camera: Partial<Camera>;
diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
new file mode 100644
index 0000000000..ba8e0e581a
--- /dev/null
+++ b/types/postman-collection/index.d.ts
@@ -0,0 +1,811 @@
+// Type definitions for postman-collection 3.0
+// Project: https://github.com/postmanlabs/postman-collection
+// Definitions by: Kyle Buzby <https://github.com/kbuzby>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+/// <reference types="node" />
+
+export interface PropertyBaseDefinition {
+    description?: string | DescriptionDefinition;
+}
+
+export class PropertyBase<TDefinition> implements PropertyBaseDefinition {
+    description?: string | DescriptionDefinition;
+
+    constructor(definition?: PropertyBaseDefinition | {info: PropertyBaseDefinition} | string);
+
+    findInParents(property: string, customizer?: (item: PropertyBase<PropertyBaseDefinition>) => boolean): PropertyBase<PropertyBaseDefinition> ;
+
+    findParentContaining(property: any, customizer: (item: PropertyBase<PropertyBaseDefinition>) => boolean): PropertyBase<PropertyBaseDefinition>;
+
+    forEachParent(iterator: (item: any) => void): void;
+    forEachParent(options: {withRoot: boolean}, iterator: (item: any) => void): void;
+
+    meta(): any;
+
+    parent(): PropertyBase<PropertyBaseDefinition> | undefined;
+
+    setParent(parent: PropertyBase<PropertyBaseDefinition>): void;
+
+    toJSON(): TDefinition;
+
+    static propertyIsMeta(_value: any, key: string): boolean;
+
+    static propertyUnprefixMeta(_value: any, key: string): string;
+
+    static toJSON(obj: any): any;
+}
+
+export interface PropertyDefinition extends PropertyBaseDefinition {
+    id?: string;
+    name?: string;
+    disabled?: boolean;
+}
+
+export class Property<TDefinition> extends PropertyBase<TDefinition> implements PropertyDefinition {
+    disabled: boolean;
+    id: string;
+    name: string;
+
+    constructor(definition?: TDefinition | {info: TDefinition, disabled: boolean});
+
+    describe(content: string, type?: string): void;
+
+    toObjectResolved(scope: {variables: VariableList} | null, overrides: any[], options?: {ignoreOwnVariables: boolean}): TDefinition;
+
+    static replaceSubstitutions(str: string, variables: VariableList | VariableList[]): string;
+
+    static replaceSubstitutionsIn<T>(obj: T, variables: VariableList[], mutate: boolean): T;
+}
+
+export interface CertificateDefinition extends PropertyDefinition {
+    matches?: string[] | UrlMatchPatternList;
+    key?: {src?: string} | string;
+    cert?: {src?: string} | string;
+    passphrase?: string;
+}
+
+export class Certificate extends Property<CertificateDefinition> implements CertificateDefinition {
+    cert: {src?: string};
+    key: {src?: string};
+    matches: UrlMatchPatternList;
+    passphrase: string;
+
+    constructor(options: CertificateDefinition);
+
+    canApplyTo(url: string | Url): boolean;
+
+    update(options: CertificateDefinition): void;
+
+    static isCertificate(obj: any): boolean;
+}
+
+export class PropertyList<TElement> extends PropertyBase<PropertyBaseDefinition> {
+    constructor(type: string, parent: any, populate: TElement[]);
+
+    add(item: TElement): void;
+
+    all(): TElement[];
+
+    append(item: TElement): void;
+
+    assimilate(source: PropertyList<TElement> | TElement[], prune: boolean): void;
+
+    clear(): void;
+
+    count(): number;
+
+    each(iterator: (item: TElement) => void, context?: any): void;
+
+    eachParent(iterator: (item: any) => void, context?: any): void;
+
+    filter(rule: (item: TElement) => boolean, context: any): TElement[];
+
+    find(rule: (item: TElement) => boolean, context: any): TElement;
+
+    get(key: string): TElement | undefined;
+
+    has(item: string | TElement, value?: any): boolean;
+
+    idx(index: number): TElement;
+
+    indexOf(item: string): number;
+
+    insert(item: TElement, before: TElement | string): void;
+
+    insertAfter(item: TElement, after: TElement | string): void;
+
+    map(iterator: (item: TElement) => any, context?: any): any;
+
+    one(id: string): TElement;
+
+    populate(items: TElement[]): void;
+
+    prepend(item: TElement): void;
+
+    remove(predicate: ((item: TElement) => boolean) | string | TElement, context: any): void;
+
+    repopulate(items: any): void;
+
+    toJSON(): any;
+
+    toObject(excludeDisabled?: boolean, caseSensitive?: boolean, multiValue?: boolean, sanitizeKeys?: boolean): any;
+
+    toString(): string;
+
+    upsert(item: TElement): boolean | null;
+
+    static isPropertyList(obj: any): boolean;
+}
+
+export class CertificateList extends PropertyList<Certificate> {
+    constructor(parent: any, list: CertificateDefinition[]);
+
+    resolveOne(url: string): CertificateDefinition;
+
+    static isCertificateList(obj: any): boolean;
+}
+
+export interface ItemGroupDefinition extends PropertyDefinition {
+    item?: Array<ItemDefinition | ItemGroupDefinition>;
+    auth?: RequestAuthDefinition;
+    event?: EventDefinition[];
+}
+
+export class ItemGroup<TItem> extends Property<ItemGroupDefinition> {
+    auth?: RequestAuth;
+    items: PropertyList<TItem>;
+    events: EventList;
+
+    constructor(definition?: ItemGroupDefinition);
+
+    authorizeRequestsUsing(type: string | RequestAuthDefinition, options?: VariableList): void;
+
+    forEachItem(callback: (el: TItem) => void): void;
+
+    forEachItemGroup(callback: (el: ItemGroup<TItem>) => void): void;
+
+    oneDeep(idOrName: string): TItem;
+
+    static isItemGroup(obj: any): boolean;
+}
+
+export interface CollectionDefinition extends ItemGroupDefinition {
+    info?: {
+        id?: string;
+        name?: string;
+        version?: string;
+    };
+    variable?: VariableDefinition;
+}
+
+export class Collection extends ItemGroup<Request> {
+    events: EventList;
+    variables: VariableList;
+    version?: Version;
+
+    constructor(definition?: CollectionDefinition, environments?: any[]);
+
+    syncVariablesFrom(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
+
+    syncVariablesTo(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
+
+    toJSON(): CollectionDefinition;
+
+    static isCollection(obj: any): boolean;
+}
+
+export interface CookieDefinition {
+    key?: string;
+    value?: string;
+    expires?: string | Date;
+    maxAge?: number;
+    domain: string;
+    path: string;
+    secure?: boolean;
+    httpOnly?: boolean;
+    hostOnly?: boolean;
+    session?: boolean;
+    extensions?: Array<{key: string; value: string}>;
+}
+
+export class Cookie extends PropertyBase<CookieDefinition> implements CookieDefinition {
+    domain: string;
+    expires: Date;
+    extensions?: Array<{key: string; value: string}>;
+    hostOnly?: boolean;
+    httpOnly?: boolean;
+    maxAge?: number;
+    path: string;
+    secure?: boolean;
+    session?: boolean;
+    value?: string;
+
+    constructor(options?: CookieDefinition);
+
+    update(options: CookieDefinition): void;
+
+    valueOf(): string;
+
+    static isCookie(obj: any): boolean;
+
+    static parse(str: string): CookieDefinition;
+
+    static splitParam(param: string): {key: string, value: string | boolean };
+}
+
+export class CookieList extends PropertyList<Cookie> {
+    constructor(parent: any, cookies: Cookie[]);
+
+    static isCookieList(obj: any): boolean;
+}
+
+export interface DescriptionDefinition {
+    content: string;
+    type?: string;
+}
+
+export class Description implements DescriptionDefinition {
+    content: string;
+    type: string;
+
+    constructor(definition?: DescriptionDefinition | string);
+
+    toJSON(): DescriptionDefinition;
+
+    toString(): string;
+
+    update(content: DescriptionDefinition): void;
+    update(content: string, type?: string): void;
+
+    static isDescription(obj: any): boolean;
+}
+
+export interface EventDefinition extends PropertyDefinition {
+    listen?: string;
+    script: string | string[] | ScriptDefinition | Script;
+}
+
+export class Event extends Property<EventDefinition> implements EventDefinition {
+    listen?: string;
+    script: Script;
+
+    constructor(definition: EventDefinition);
+
+    update(definition: EventDefinition): void;
+}
+
+export class EventList extends PropertyList<Event> {
+    constructor(parent: any, populate: Event[]);
+
+    listeners(name: string): Event[];
+
+    listenersOwn(name: string): Event[];
+
+    static isEventList(obj: any): boolean;
+}
+
+export interface FormParamDefinition extends PropertyDefinition {
+    key?: string;
+    value?: any;
+}
+
+export class FormParam extends Property<FormParamDefinition> implements FormParamDefinition {
+    key: string;
+    value: any;
+
+    constructor(options: FormParamDefinition);
+
+    toString(): string;
+
+    valueOf(): any;
+
+    // static parse(): void; // TODO not implemented yet
+}
+
+export interface HeaderDefinition extends PropertyDefinition {
+    key?: string;
+    value?: string;
+    system?: boolean;
+}
+
+export class Header extends Property<HeaderDefinition> implements HeaderDefinition {
+    key: string;
+    value: string;
+
+    constructor(options: string | HeaderDefinition, name?: string)
+
+    toString(): string;
+
+    update(options: HeaderDefinition): void;
+
+    valueOf(): string;
+
+    static create(value?: HeaderDefinition | string, name?: string): Header;
+
+    static isHeader(obj: any): boolean;
+
+    static parse(headerString: string): HeaderDefinition[];
+
+    static parseSingle(header: string): HeaderDefinition;
+
+    static unparse(headers: HeaderList | HeaderDefinition[], separator?: string): string;
+
+    static unparseSingle(header: HeaderDefinition): string;
+}
+
+export class HeaderList extends PropertyList<Header> {
+    constructor(parent: any, headers: Header[]);
+
+    contentSize(): number;
+
+    static isHeaderList(obj: any): boolean;
+}
+
+export interface ItemDefinition extends PropertyDefinition {
+    request?: RequestDefinition;
+    responses?: ResponseDefinition[];
+    events?: EventDefinition[];
+}
+
+export class Item extends Property<ItemDefinition> {
+    events: EventList;
+    request: Request;
+    responses: PropertyList<Response>;
+
+    constructor(definition?: ItemDefinition);
+
+    authorizeRequestUsing(type: string | RequestAuthDefinition, options?: VariableList): void;
+
+    getAuth(): RequestAuth;
+
+    getEvents(name?: string): Event[];
+
+    static isItem(obj: any): boolean;
+}
+
+export interface ProxyConfigDefinition extends PropertyDefinition {
+    match?: string | {pattern: string} | UrlMatchPattern;
+    host?: string;
+    port?: number;
+    tunnel?: boolean;
+}
+
+export class ProxyConfig extends Property<ProxyConfigDefinition> implements ProxyConfigDefinition {
+    host: string;
+    match: UrlMatchPattern;
+    port: number;
+    tunnel: boolean;
+
+    constructor(options?: ProxyConfigDefinition);
+
+    getProtocols(): string[];
+
+    getProxyUrl(): string;
+
+    test(urlStr?: string): boolean;
+
+    update(options: ProxyConfigDefinition): void;
+
+    updateProtocols(protocols: string[]): void;
+
+    static isProxyConfig(obj: any): boolean;
+}
+
+export class ProxyConfigList extends PropertyList<ProxyConfig> {
+    constructor(parent: any, populate: ProxyConfig[]);
+
+    resolve(url: string | Url): ProxyConfig;
+
+    static isProxyConfigList(obj: any): boolean;
+}
+
+export interface QueryParamDefinition extends PropertyDefinition {
+    key: string | null;
+    value: string | null;
+    system?: boolean;
+}
+
+export class QueryParam extends Property<QueryParamDefinition> implements QueryParamDefinition {
+    static _postman_propertyAllowsMultipleValues: boolean;
+    static _postman_propertyIndexKey: string;
+
+    key: string | null;
+    value: string | null;
+    system?: boolean;
+
+    constructor(options: QueryParamDefinition | string);
+
+    toString(): string;
+
+    update(param: string | {key: string, value?: string}): void;
+
+    valueOf(): string;
+
+    static parse(query: string): QueryParamDefinition[];
+
+    static parseSingle(param: string, idx: number, all: string[]): QueryParamDefinition;
+
+    static unparse(params: QueryParamDefinition[], options?: {encode?: boolean, ignoreDisabled?: boolean}): string;
+
+    static unparseSingle(obj: QueryParamDefinition, encode: boolean): string;
+}
+
+export interface RequestDefinition extends PropertyDefinition {
+    url: string | Url;
+    method?: string;
+    header?: HeaderDefinition;
+    body?: RequestBody;
+    auth?: RequestAuthDefinition;
+    proxy?: ProxyConfigDefinition;
+    certificate?: CertificateDefinition;
+}
+
+export class Request extends Property<RequestDefinition> implements RequestDefinition {
+    auth?: RequestAuth;
+    body?: RequestBody;
+    certificate?: Certificate;
+    headers: HeaderList;
+    method: string;
+    proxy?: ProxyConfig;
+    url: Url;
+
+    constructor(options: RequestDefinition | string);
+
+    addHeader(header: Header | HeaderDefinition): void;
+
+    addQueryParams(params: string | QueryParamDefinition[]): void;
+
+    authorizeUsing(type: string | RequestAuthDefinition | null, options?: VariableList): void;
+
+    clone(): Request;
+
+    forEachHeader(callback: (header: Header, context: Request) => void): void;
+
+    getHeaders(options?: {ignoreCase?: boolean, enabled?: boolean}): any;
+
+    removeHeader(toRemove: string | Header, options?: {ignoreCase: boolean}): void;
+
+    removeQueryParams(params: string | string[] | QueryParamDefinition[] | QueryParamDefinition): void;
+
+    toJSON(): RequestDefinition;
+
+    update(options: RequestDefinition): void;
+
+    upsertHeader(header: HeaderDefinition): void;
+
+    static isRequest(obj: any): boolean;
+}
+
+export interface RequestAuthDefinition extends PropertyDefinition {
+    type?: string;
+}
+
+export class RequestAuth extends Property<RequestAuthDefinition> implements RequestAuthDefinition {
+    type: string;
+
+    constructor(options: RequestAuthDefinition, parent?: Property<PropertyDefinition> | PropertyList<RequestAuth>);
+
+    clear(type: string): void;
+
+    current(): any;
+
+    parameters(): VariableList;
+
+    update(options: VariableList | Array<{key: string, value: string}> | {key: string, value: string}, type?: string): void;
+
+    use(type: string, options: VariableList | Array<{key: string, value: string}> | {key: string, value: string}): void;
+
+    static isValidType(type: any): boolean;
+}
+
+export interface RequestBodyDefinition extends PropertyBaseDefinition {
+    mode: string;
+    raw?: string;
+    urlencoded?: QueryParamDefinition[] | PropertyList<QueryParam> | string;
+    file?: string | {src: string};
+    formdata?: FormParamDefinition[] | PropertyList<FormParam>;
+}
+
+export class RequestBody extends PropertyBase<RequestBodyDefinition> implements RequestBodyDefinition {
+    static MODES: {
+        raw: string;
+        formdata: string;
+        urlencoded: string;
+        file: string;
+    };
+
+    file?: {src: string};
+    formdata?: PropertyList<FormParam>;
+    mode: string;
+    raw?: string;
+    urlencoded?: PropertyList<QueryParam>;
+
+    constructor(options: RequestBodyDefinition);
+
+    isEmpty(): boolean;
+
+    toString(): string;
+
+    update(options: RequestBodyDefinition): void;
+}
+
+export interface ResponseDefinition extends PropertyDefinition {
+    code: number;
+    header?: HeaderDefinition[];
+    cookie?: CookieDefinition[];
+    body?: string;
+    stream?: Buffer | Uint8Array;
+    responseTime: number;
+    originalRequest?: RequestDefinition;
+}
+
+export class Response extends Property<ResponseDefinition> implements ResponseDefinition {
+    body?: string;
+    code: number;
+    cookies: CookieList;
+    headers: HeaderList;
+    originalRequest?: Request;
+    responseTime: number;
+    status: string;
+    stream?: Buffer | Uint8Array;
+    responseSize?: number;
+
+    constructor(options: ResponseDefinition);
+
+    dataURI(): string;
+
+    details(): {name: string, detail: string, code: number, standardName: string} | undefined;
+
+    encoding(): {format: string, source: string};
+
+    json(reviver?: any, strict?: boolean): any;
+
+    reason(): string;
+
+    size(): number;
+
+    text(): string | undefined;
+
+    toJSON(): any;
+
+    update(options: ResponseDefinition): void;
+
+    static createFromNode(response: {
+        body: string | Buffer | Uint8Array,
+        headers?: HeaderDefinition[],
+        statusCode: number,
+        statusMessage?: string,
+        elapsedTime: number
+    }, cookies: CookieDefinition[]): Response;
+
+    static isResponse(obj: any): boolean;
+}
+
+export interface ScriptDefinition extends PropertyDefinition {
+    type?: string;
+    src?: string | Url;
+    exec?: string | string[];
+}
+
+export class Script extends Property<ScriptDefinition> implements ScriptDefinition {
+    exec?: string[];
+    src?: Url;
+    type: string;
+
+    constructor(options?: ScriptDefinition | string | string[]);
+
+    toSource(): string | undefined;
+
+    update(options: ScriptDefinition | string | string[]): void;
+
+    static isScript(obj: any): boolean;
+}
+
+export interface UrlDefinition extends PropertyBaseDefinition {
+    auth?: {user: string, password: string};
+    hash?: string;
+    host?: string[] | string;
+    path: string[] | string;
+    port?: string;
+    query?: QueryParamDefinition[] | PropertyList<QueryParam> | string;
+    variable?: VariableDefinition[];
+    protocol?: string;
+}
+
+export class Url extends PropertyBase<UrlDefinition> implements UrlDefinition {
+    auth?: {user: string, password: string};
+    hash?: string;
+    host?: string[];
+    path: string[];
+    port?: string;
+    protocol?: string;
+    query: PropertyList<QueryParam>;
+    variables: VariableList;
+
+    constructor(options: UrlDefinition | string);
+
+    addQueryParams(params: QueryParamDefinition[] | string): void;
+
+    getHost(): string;
+
+    getOAuth1BaseUrl(): string;
+
+    getPath(options?: {unresolved: boolean}): string;
+
+    getPathWithQuery(): string;
+
+    getQueryString(options?: {encode?: boolean, ignoredDisabled?: boolean}): string;
+
+    getRaw(): string;
+
+    getRemote(options?: {forcePort: boolean}): string;
+
+    removeQueryParams(params: QueryParamDefinition[] | QueryParamDefinition | string[] | string): void;
+
+    toString(forceProtocol?: boolean): string;
+
+    update(url: UrlDefinition | string): void;
+
+    static isUrl(obj: any): boolean;
+
+    static parse(url: string): UrlDefinition;
+}
+
+export class UrlMatchPattern {
+    pattern?: string;
+
+    constructor(options: string | {pattern: string});
+
+    createMatchPattern(): {protocols: string[], host: string, path: RegExp} | undefined;
+
+    getProtocols(): string[];
+
+    globPatternToRegexp(pattern: string): RegExp;
+
+    matchAbsoluteHostPattern(matchRegexObject: {protocols: string[], host: string, path: RegExp}, remote: string): boolean;
+
+    matchAnyHost(matchRegexObject: {protocols: string[], host: string, path: RegExp}): boolean;
+
+    matchSuffixHostPattern(matchRegexObject: {protocols: string[], host: string, path: RegExp}, remote: string): boolean;
+
+    test(urlStr: string): boolean;
+
+    testHost(host: string): boolean;
+
+    testPath(path: string): boolean;
+
+    testProtocol(protocol: string): boolean;
+
+    toJSON(): {pattern: string};
+
+    toString(): string;
+
+    update(options: {pattern: string}): void;
+
+    static MATCH_ALL_URLS: string;
+
+    static PROTOCOL_DELIMITER: string;
+}
+
+export class UrlMatchPatternList extends PropertyList<UrlMatchPattern> {
+    constructor(parent: Property<PropertyDefinition>, list: string[]);
+
+    test(urlStr: string): boolean;
+}
+
+export interface VariableDefinition extends PropertyDefinition {
+    value?: any;
+    type?: string;
+    key?: string;
+}
+
+export class Variable extends Property<VariableDefinition> implements VariableDefinition {
+    key?: string;
+    type: string;
+    value: any;
+
+    constructor(definition?: VariableDefinition | {[index: string]: VariableDefinition});
+
+    cast(value: any): any;
+
+    castIn(value: any): any;
+
+    castOut(value: any): any;
+
+    get(): any;
+
+    set(value: any): void;
+
+    toString(): string;
+
+    update(options: VariableDefinition): void;
+
+    valueOf(value: any): any;
+
+    valueType(typeName: string, _noCast: boolean): string;
+
+    static isVariable(obj: any): boolean;
+
+    static types: {
+        string: StringConstructor;
+        boolean: BooleanConstructor;
+        number: NumberConstructor;
+        json: {in: (val: any) => string, out: (val: string) => any};
+        any: {in: <T>(val: T) => T, out: <T>(val: T) => T};
+    };
+}
+
+export class VariableList extends PropertyList<Variable> {
+    constructor(parent: Property<PropertyDefinition>, populate: Variable[]);
+
+    replace(str: string, overrides?: VariableList): string;
+
+    substitute<T>(obj: T, overrides?: VariableList, mutate?: boolean): T;
+
+    syncFromObject(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
+
+    syncToObject(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
+
+    static isVariableList(obj: any): boolean;
+}
+
+export interface VariableScopeDefinition extends PropertyDefinition {
+    values?: VariableDefinition[];
+}
+
+export class VariableScope extends Property<VariableScopeDefinition> implements VariableScopeDefinition {
+    values?: VariableDefinition[];
+
+    constructor(definition: VariableScopeDefinition | VariableList | VariableDefinition[], layers?: VariableList[] | VariableList);
+
+    addLayer(list: VariableList): void;
+
+    clear(): void;
+
+    get(key: string): any;
+
+    has(variableName: string): boolean;
+
+    set(key: string, value: any, type: string): void;
+
+    syncVariablesFrom(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
+
+    syncVariablesTo(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
+
+    toJSON(): any;
+
+    toObject(excludeDisabled: boolean, caseSensitive: boolean): any;
+
+    unset(key: string): void;
+
+    variables(): {[key: string]: VariableDefinition};
+
+    static isVariableScope(obj: any): boolean;
+}
+
+export interface VersionDefinition extends PropertyBaseDefinition {
+    build?: string;
+    major?: string;
+    minor?: string;
+    patch?: string;
+    prerelease?: string;
+    raw?: string;
+    version?: string;
+}
+
+export class Version extends PropertyBase<VersionDefinition> implements VersionDefinition {
+    build?: string;
+    major?: string;
+    minor?: string;
+    patch?: string;
+    prerelease?: string;
+    raw?: string;
+    string?: string;
+
+    constructor(options?: VersionDefinition | string);
+
+    set(value?: VersionDefinition | string): void;
+
+    toString(): string;
+}
diff --git a/types/postman-collection/postman-collection-tests.ts b/types/postman-collection/postman-collection-tests.ts
new file mode 100644
index 0000000000..2574aa5917
--- /dev/null
+++ b/types/postman-collection/postman-collection-tests.ts
@@ -0,0 +1,869 @@
+import * as pmCollection from 'postman-collection';
+
+// PropertyBaseDefinition tests
+const pbDef: pmCollection.PropertyBaseDefinition = {};
+pbDef.description; // $ExpectType string | DescriptionDefinition | undefined
+
+// PropertyBase tests
+const PropertyBase = pmCollection.PropertyBase;
+
+let pb = new PropertyBase();
+pb = new PropertyBase("string definition");
+pb = new PropertyBase({description: "string description"});
+pb = new PropertyBase({info: {}});
+pb = new PropertyBase({info: {description: "string description"}});
+
+pb.description; // $ExpectType string | DescriptionDefinition | undefined
+pb.findInParents("string"); // $ExpectType PropertyBase<PropertyBaseDefinition>
+pb.findInParents("string", (el) => true); // $ExpectType PropertyBase<PropertyBaseDefinition>
+
+pb.findParentContaining("string", (el) => true); // $ExpectType PropertyBase<PropertyBaseDefinition>
+
+pb.forEachParent((el) => {}); // $ExpectType void
+pb.forEachParent({withRoot: true}, (el) => {}); // $ExpectType void
+
+pb.meta(); // $ExpectType any
+
+pb.parent(); // $ExpectType PropertyBase<PropertyBaseDefinition> | undefined
+
+pb.setParent(pb); // $ExpectType void
+
+pb.toJSON(); // $ExpectType {}
+
+PropertyBase.propertyIsMeta(null, "string"); // $ExpectType boolean
+
+PropertyBase.propertyUnprefixMeta(null, "_String"); // $ExpectType string
+
+PropertyBase.toJSON({}); // $ExpectType any
+
+// PropertyDefinition Tests
+const propDef: pmCollection.PropertyDefinition = {};
+propDef.id; // $ExpectType string | undefined
+propDef.name; // $ExpectType string | undefined
+propDef.disabled; // $$ExpectType boolean | undefined
+propDef.description; // $$ExpectType string | DescriptionDefinition | undefined
+
+// Property Tests
+const Property = pmCollection.Property;
+let p = new Property();
+p = new Property(propDef);
+p = new Property({info: propDef, disabled: true});
+
+p.id; // $ExpectType string
+p.name; // $ExpectType string
+p.disabled; // $ExpectType boolean
+
+p.describe("string"); // $ExpectType void
+p.describe("String", "string"); // $ExpectType void
+
+p.toObjectResolved(null, []); // $ExpectType {}
+p.toObjectResolved({variables: new pmCollection.VariableList(p, [])}, []); // $ExpectType {}
+p.toObjectResolved(null, [], {ignoreOwnVariables: true}); // $ExpectType {}
+
+Property.replaceSubstitutions("string", new pmCollection.VariableList(p, [])); // $ExpectType string
+Property.replaceSubstitutionsIn({}, [new pmCollection.VariableList(p, [])], false); // $ExpectType {}
+
+// CertificateDefinition Tests
+const certDef: pmCollection.CertificateDefinition = {};
+certDef.matches; // $ExpectType string[] | UrlMatchPatternList | undefined
+certDef.key; // $ExpectType string | { src?: string | undefined; } | undefined
+certDef.cert; // $ExpectType string | { src?: string | undefined; } | undefined
+certDef.passphrase; // $ExpectType string | undefined
+
+// Certificate Tests
+const certificate = new pmCollection.Certificate({});
+certificate.cert; // $ExpectType { src?: string | undefined; }
+certificate.key; // $ExpectType { src?: string | undefined; }
+certificate.matches; // $ExpectType UrlMatchPatternList
+certificate.passphrase; // $ExpectType string
+
+certificate.canApplyTo("string"); // $ExpectType boolean
+certificate.canApplyTo(new pmCollection.Url({host: "string", path: "string"})); // $ExpectType boolean
+
+certificate.update({}); // $ExpectType void
+
+pmCollection.Certificate.isCertificate(certificate); // $ExpectType boolean
+
+// PropertyList Tests
+const pList = new pmCollection.PropertyList<pmCollection.Certificate>("Certificate", null, []);
+pList.add(certificate); // $ExpectType void
+pList.all(); // $ExpectType Certificate[]
+pList.append(certificate); // $ExpectType void
+pList.assimilate(pList, false); // $ExpectType void
+pList.assimilate([certificate], false); // ExpectType void
+pList.clear(); // $ExpectType void
+pList.count(); // $ExpectType number
+pList.each((el: pmCollection.Certificate) => {}); // $ExpectType void
+pList.each((el: pmCollection.Certificate) => {}, pList); // $ExpectType void
+pList.eachParent((el: any) => {}); // $ExpectType void
+pList.eachParent((el: any) => {}, pList); // $ExpectType void
+pList.filter((el) => true, pList); // $ExpectType Certificate[]
+pList.find((el) => true, pList); // $ExpectType Certificate
+pList.get("string"); // $ExpectType Certificate | undefined
+pList.has("string"); // $ExpectType boolean
+pList.has("string", null); // $ExpectType boolean
+pList.has(certificate); // $ExpectType boolean
+pList.idx(1); // ExpectType Certificate
+pList.indexOf("string"); // ExpectType number
+pList.insert(certificate, "string"); // ExpectType void
+pList.insert(certificate, certificate); // ExpectType void
+pList.insertAfter(certificate, "string"); // ExpectType void
+pList.insertAfter(certificate, certificate); // ExpectType void
+pList.map((el) => el); // ExpectType any
+pList.map((el) => el, pList); // ExpectType any
+pList.one("string"); // ExpectType Certificate
+pList.populate([]); // ExpectType void
+pList.remove((el) => true, pList); // ExpectType void
+pList.remove("string", pList); // ExpectType void
+pList.remove(certificate, pList); // $ExpectType void
+pList.repopulate(null); // $ExpectType void
+pList.toJSON(); // $ExpectType any
+pList.toObject(true, true, true, true); // $ExpectType any
+pList.toString(); // $ExpectType string
+pList.upsert(certificate); // $ExpectType boolean | null
+pmCollection.PropertyList.isPropertyList(pList); // $ExpectType boolean
+
+// CertificateList Tests
+const certList = new pmCollection.CertificateList(null, [pList]);
+certList.resolveOne("string"); // $ExpectType CertificateDefinition
+pmCollection.CertificateList.isCertificateList(certList); // $ExpectType boolean
+
+// ItemGroupDefinition Tests
+const igDef: pmCollection.ItemGroupDefinition = {};
+igDef.item; // $ExpectType (ItemGroupDefinition | ItemDefinition)[] | undefined
+igDef.auth; // $ExpectType RequestAuthDefinition | undefined
+igDef.event; // $ExpectType EventDefinition[] | undefined
+
+// ItemGroup Tests
+const ig = new pmCollection.ItemGroup<pmCollection.Certificate>();
+ig.auth; // $ExpectType RequestAuth | undefined
+ig.items; // $ExpectType PropertyList<Certificate>
+ig.events; // $ExpectType EventList
+
+ig.authorizeRequestsUsing("string"); // $ExpectType void
+ig.authorizeRequestsUsing({}); // $ExpectType void
+ig.authorizeRequestsUsing("string", new pmCollection.VariableList(ig, [])); // $ExpectType void
+
+ig.forEachItem((el) => {}); // $ExpectType void
+ig.forEachItemGroup((el) => {}); // $ExpectType void
+
+ig.oneDeep("string"); // $ExpectType Certificate
+
+pmCollection.ItemGroup.isItemGroup(ig); // $ExpectType boolean
+
+// CollectionDefinition Tests
+const colDef: pmCollection.CollectionDefinition = {};
+colDef.info; // $ExpectType { id?: string | undefined; name?: string | undefined; version?: string | undefined; } | undefined
+colDef.variable; // $ExpectType VariableDefinition | undefined
+
+let collection: pmCollection.Collection;
+collection = new pmCollection.Collection();
+collection = new pmCollection.Collection({});
+collection = new pmCollection.Collection({}, []);
+
+collection.events; // $ExpectType EventList
+collection.variables; // $ExpectType VariableList
+collection.version; // $ExpectType Version | undefined
+
+collection.syncVariablesFrom({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+collection.syncVariablesFrom({}, true); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+collection.syncVariablesTo({}); // ExpectType $ExpectType { [key: string]: VariableDefinition; }
+
+collection.toJSON(); // $ExpectType CollectionDefinition
+
+pmCollection.Collection.isCollection(collection); // $ExpectType boolean
+
+// CookieDefinition Tests
+const cookieDef: pmCollection.CookieDefinition = {
+    domain: "string",
+    path: "string"
+};
+cookieDef.key; // $ExpectType string | undefined
+cookieDef.value; // ExpectType string | undefined
+cookieDef.expires; // $ExpectType string | Date | undefined
+cookieDef.maxAge; // $ExpectType number | undefined
+cookieDef.domain; // $ExpectType string
+cookieDef.path; // $ExpectType string
+cookieDef.secure; // $ExpectType boolean | undefined
+cookieDef.httpOnly; // $ExpectType boolean | undefined
+cookieDef.hostOnly; // $ExpectType boolean | undefined
+cookieDef.session; // $ExpectType boolean | undefined
+cookieDef.extensions; // $ExpectType { key: string; value: string; }[] | undefined
+
+// Cookie Tests
+
+let cookie = new pmCollection.Cookie();
+cookie = new pmCollection.Cookie(cookieDef);
+
+cookie.domain; // $ExpectType string
+cookie.expires; // $ExpectType Date
+cookie.extensions; // $ExpectType { key: string; value: string; }[] | undefined
+cookie.hostOnly; // $ExpectType boolean | undefined
+cookie.httpOnly; // $ExpectType boolean | undefined
+cookie.maxAge; // $ExpectType number | undefined
+cookie.path; // $ExpectType string
+cookie.secure; // $ExpectType boolean | undefined
+cookie.session; // $ExpectType boolean | undefined
+cookie.value; // $ExpectType string | undefined
+
+cookie.update(cookieDef); // $ExpectType void
+
+cookie.valueOf(); // $ExpectType string
+
+pmCollection.Cookie.isCookie({}); // $ExpectType boolean
+pmCollection.Cookie.parse("string"); // $ExpectType CookieDefinition
+pmCollection.Cookie.splitParam("string"); // $ExpectType { key: string; value: string | boolean; }
+
+// CookieList Tests
+
+const cookieList = new pmCollection.CookieList(null, [cookie]);
+
+pmCollection.CookieList.isCookieList(cookieList); // $ExpectType boolean
+
+// DescriptionDefinition Tests
+
+const descDef: pmCollection.DescriptionDefinition = {
+    content: "string",
+    type: "string"
+};
+descDef.content; // $ExpectType string
+descDef.type; // $ExpectType string | undefined
+
+// Description Tests
+
+let desc = new pmCollection.Description();
+desc = new pmCollection.Description("string");
+desc = new pmCollection.Description(descDef);
+
+desc.content; // $ExpectType string
+desc.type; // $ExpectType string
+
+desc.toJSON(); // $ExpectType DescriptionDefinition
+desc.toString(); // $ExpectType string
+desc.update("string"); // $ExpectType void
+desc.update("string", "string"); // $ExpectType void
+desc.update(descDef); // $ExpectType void
+
+pmCollection.Description.isDescription(desc); // $ExpectType boolean
+
+// EventDefinition Tests
+
+const eventDesc: pmCollection.EventDefinition = {
+    script: "string"
+};
+eventDesc.listen; // $ExpectType string | undefined
+eventDesc.script; // $ExpectType string | string[] | ScriptDefinition | Script
+
+// Event Tests
+
+const event = new pmCollection.Event(eventDesc);
+event.listen; // $ExpectType string | undefined
+event.script; // $ExpectType Script
+
+event.update(eventDesc); // $ExpectType void
+
+// EventList Tests
+
+const eventList = new pmCollection.EventList(null, [event]);
+eventList.listeners("string"); // $ExpectType Event[]
+eventList.listenersOwn("string"); // $ExpectType Event[]
+
+pmCollection.EventList.isEventList(eventList); // $ExpectType boolean
+
+// FormParamDefinition Tests
+
+const fpDef: pmCollection.FormParamDefinition = {};
+fpDef.key; // $ExpectType string | undefined
+fpDef.value; // $ExpectType any
+
+// FormParam Tests
+
+const fp = new pmCollection.FormParam(fpDef);
+fp.key; // $ExpectType string
+fp.value; // $ExpectType any
+
+fp.toString(); // $ExpectType string
+fp.valueOf(); // $ExpectType any
+
+// HeaderDefinition Tests
+
+const headerDef: pmCollection.HeaderDefinition = {
+    key: "string",
+    value: "string"
+};
+headerDef.key; // $ExpectType string | undefined
+headerDef.value; // $ExpectType string | undefined
+headerDef.system; // $ExpectType boolean | undefined
+
+// Header Tests
+
+let header = new pmCollection.Header("string");
+header = new pmCollection.Header("string", "string");
+header = new pmCollection.Header(headerDef);
+
+header.key; // $ExpectType string
+header.value; // $ExpectType string
+
+header.toString(); // $ExpectType string
+
+header.update(headerDef); // $ExpectType void
+
+header.valueOf(); // $ExpectType string
+
+pmCollection.Header.create("string"); // $ExpectType Header
+pmCollection.Header.create("string", "string"); // $ExpectType Header
+pmCollection.Header.create(headerDef, "string"); // $ExpectType Header
+
+pmCollection.Header.isHeader(header); // $ExpectType boolean
+
+pmCollection.Header.parse("string"); // $ExpectType HeaderDefinition[]
+
+pmCollection.Header.parseSingle("string"); // $ExpectType HeaderDefinition
+
+pmCollection.Header.unparse(new pmCollection.HeaderList(null, [header])); // $ExpectType string
+pmCollection.Header.unparse([headerDef]); // $ExpectType string
+pmCollection.Header.unparse([headerDef], "\n"); // $ExpectType string
+
+pmCollection.Header.unparseSingle(headerDef); // $ExpectType string
+
+// HeaderList Tests
+
+const headerList = new pmCollection.HeaderList(null, [header]);
+
+headerList.contentSize(); // $ExpectType number
+
+pmCollection.HeaderList.isHeaderList(headerList); // $ExpectType boolean
+
+// ItemDefinition Tests
+
+const itemDef: pmCollection.ItemDefinition = {};
+itemDef.request; // $ExpectType RequestDefinition | undefined
+itemDef.responses; // $ExpectType ResponseDefinition[] | undefined
+itemDef.events; // $ExpectType EventDefinition[] | undefined
+
+// Item Tests
+let item = new pmCollection.Item();
+item = new pmCollection.Item(itemDef);
+
+item.events; // $ExpectType EventList
+item.request; // $ExpectType Request
+item.responses; // $ExpectType PropertyList<Response>
+
+item.authorizeRequestUsing("string"); // $ExpectType void
+item.authorizeRequestUsing({}); // $ExpectType void
+item.authorizeRequestUsing("string", new pmCollection.VariableList(item, [])); // $ExpectType void
+
+item.getAuth(); // $ExpectType RequestAuth
+
+item.getEvents(); // $ExpectType Event[]
+item.getEvents("string"); // $ExpectType Event[]
+
+pmCollection.Item.isItem(item); // $ExpectType boolean
+
+// ProxyConfigDefinition Tests
+
+const proxyConfDef: pmCollection.ProxyConfigDefinition = {};
+proxyConfDef.match; // $ExpectType string | { pattern: string; } | UrlMatchPattern | undefined
+proxyConfDef.host; // $ExpectType string | undefined
+proxyConfDef.port; // $ExpectType number | undefined
+proxyConfDef.tunnel; // $ExpectType boolean | undefined
+
+// ProxyConfig Tests
+
+let proxyConf = new pmCollection.ProxyConfig();
+proxyConf = new pmCollection.ProxyConfig(proxyConfDef);
+
+proxyConf.host; // $ExpectType string
+proxyConf.match; // $ExpectType UrlMatchPattern
+proxyConf.port; // $ExpectType number
+proxyConf.tunnel; // $ExpectType boolean
+
+proxyConf.getProtocols(); // $ExpectType string[]
+
+proxyConf.getProxyUrl(); // $ExpectType string
+
+proxyConf.test("string"); // $ExpectType boolean
+
+proxyConf.update(proxyConfDef); // $ExpectType void
+
+proxyConf.updateProtocols(["string"]); // $ExpectType void
+
+pmCollection.ProxyConfig.isProxyConfig(proxyConf); // $ExpectType boolean
+
+// ProxyConfigList Tests
+
+const proxyConfigList = new pmCollection.ProxyConfigList(null, [proxyConf]);
+
+proxyConfigList.resolve("string"); // $ExpectType ProxyConfig
+proxyConfigList.resolve(new pmCollection.Url({host: "string", path: "string"})); // $ExpectType ProxyConfig
+
+pmCollection.ProxyConfigList.isProxyConfigList(proxyConfigList); // $ExpectType boolean
+
+// QueryParamDefinition Tests
+
+const qpDef: pmCollection.QueryParamDefinition = {
+    key: null,
+    value: null
+};
+qpDef.key; // $ExpectType string | null
+qpDef.value; // $ExpectType string | null
+qpDef.system; // $ExpectType boolean | undefined
+
+// QueryParam Tests
+
+let qp = new pmCollection.QueryParam("string");
+qp = new pmCollection.QueryParam(qpDef);
+
+qp.key; // $ExpectType string | null
+qp.value; // $ExpectType string | null
+qp.system; // $ExpectType boolean | undefined
+
+qp.toString(); // $ExpectType string
+
+qp.update("string"); // $ExpectType void
+qp.update({key: "string"}); // $ExpectType void
+qp.update({key: "string", value: "string"}); // $ExpectType void
+
+qp.valueOf(); // $ExpectType string
+
+pmCollection.QueryParam._postman_propertyAllowsMultipleValues; // $ExpectType boolean
+pmCollection.QueryParam._postman_propertyIndexKey; // $ExpectType string
+
+pmCollection.QueryParam.parse("string"); // $ExpectType QueryParamDefinition[]
+
+pmCollection.QueryParam.parseSingle("string", 1, ["string"]); // $ExpectType QueryParamDefinition
+
+pmCollection.QueryParam.unparse([qpDef]); // $ExpectType string
+pmCollection.QueryParam.unparse([qpDef], {encode: true}); // $ExpectType string
+pmCollection.QueryParam.unparse([qpDef], {encode: true, ignoreDisabled: true}); // $ExpectType string
+
+pmCollection.QueryParam.unparseSingle(qpDef, true); // $ExpectType string
+
+// RequestDefinition Tests
+
+const reqDef: pmCollection.RequestDefinition = {
+    url: "string"
+};
+reqDef.url; // $ExpectType string | Url
+reqDef.method; // $ExpectType string | undefined
+reqDef.header; // $ExpectType HeaderDefinition | undefined
+reqDef.body; // $ExpectType RequestBody | undefined
+reqDef.auth; // $ExpectType RequestAuthDefinition | undefined
+reqDef.proxy; // $ExpectType ProxyConfigDefinition | undefined
+reqDef.certificate; // $ExpectType CertificateDefinition | undefined
+
+// Request Tests
+let req = new pmCollection.Request("string");
+req = new pmCollection.Request(reqDef);
+
+req.auth; // $ExpectType RequestAuth | undefined
+req.body; // $ExpectType RequestBody | undefined
+req.certificate; // $ExpectType Certificate | undefined
+req.headers; // $ExpectType HeaderList
+req.method; // $ExpectType string
+req.proxy; // $ExpectType ProxyConfig | undefined
+req.url; // $ExpectType Url
+
+req.update(reqDef); // $ExpectType void
+
+req.authorizeUsing("string"); // $ExpectType void
+req.authorizeUsing({}); // $ExpectType void
+req.authorizeUsing(null); // $ExpectType void
+req.authorizeUsing("string", new pmCollection.VariableList(p, []));
+
+req.getHeaders(); // $ExpectType any
+req.getHeaders({ignoreCase: true}); // $ExpectType any
+req.getHeaders({enabled: true}); // $ExpectType any
+req.getHeaders({ignoreCase: true, enabled: true}); // $ExpectType any
+
+req.forEachHeader((header: pmCollection.Header, context: pmCollection.Request) => {}); // $ExpectType void
+
+req.addHeader(header); // $ExpectType void
+req.addHeader(headerDef); // $ExpectType void
+
+req.removeHeader("string"); // $ExpectType void
+req.removeHeader(header); // $ExpectType void
+req.removeHeader(header, {ignoreCase: true}); // $ExpectType void
+
+req.upsertHeader(headerDef); // $ExpectType void
+
+req.addQueryParams("string"); // $ExpectType void
+req.addQueryParams([qpDef]); // $ExpectType void
+
+req.removeQueryParams("string"); // $ExpectType void
+req.removeQueryParams(["string"]); // $ExpectType void
+req.removeQueryParams([qpDef]); // $ExpectType void
+req.removeQueryParams(qpDef); // $ExpectType void
+
+req.toJSON(); // $ExpectType RequestDefinition
+
+req.clone(); // $ExpectType Request
+
+pmCollection.Request.isRequest(req); // $ExpectType boolean
+
+// RequestAuthDefinition Tests
+
+const reqAuthDef: pmCollection.RequestAuthDefinition = {};
+reqAuthDef.type; // $ExpectType string | undefined
+
+// RequestAuth Tests
+
+let reqAuth = new pmCollection.RequestAuth(reqAuthDef);
+reqAuth = new pmCollection.RequestAuth(reqAuthDef, collection);
+
+reqAuth.type; // $ExpectType string
+
+reqAuth.update(new pmCollection.VariableList(collection, [])); // $ExpectType void
+reqAuth.update({key: "string", value: "string"}); // $ExpectType void
+reqAuth.update([{key: "string", value: "string"}]); // $ExpectType void
+reqAuth.update([{key: "string", value: "string"}], "string"); // $ExpectType void
+
+reqAuth.use("string", new pmCollection.VariableList(collection, [])); // $ExpectType void
+reqAuth.use("string", {key: "string", value: "string"}); // $ExpectType void
+reqAuth.use("string", [{key: "string", value: "string"}]); // $ExpectType void
+
+reqAuth.current(); // $ExpectType any
+
+reqAuth.parameters(); // $ExpectType VariableList
+
+reqAuth.clear("string"); // $ExpectType void
+
+pmCollection.RequestAuth.isValidType(reqAuth); // $ExpectType boolean
+
+// RequestBodyDefinition Tests
+
+const reqBodyDef: pmCollection.RequestBodyDefinition = {mode: 'raw'};
+reqBodyDef.mode; // $ExpectType string
+reqBodyDef.raw; // $ExpectType string | undefined
+reqBodyDef.urlencoded; // $ExpectType string | QueryParamDefinition[] | PropertyList<QueryParam> | undefined
+reqBodyDef.file; // $ExpectType string | { src: string; } | undefined
+reqBodyDef.formdata; // $ExpectType FormParamDefinition[] | PropertyList<FormParam> | undefined
+
+// RequestBody Tests
+
+const reqBody = new pmCollection.RequestBody(reqBodyDef);
+
+reqBody.file; // $ExpectType { src: string; } | undefined
+reqBody.formdata; // $ExpectType PropertyList<FormParam> | undefined
+reqBody.mode; // $ExpectType string
+reqBody.raw; // $ExpectType string | undefined
+reqBody.urlencoded; // $ExpectType PropertyList<QueryParam> | undefined
+
+reqBody.update(reqBodyDef); // $ExpectType void
+
+reqBody.toString(); // $ExpectType string
+
+reqBody.isEmpty(); // $ExpectType boolean
+
+pmCollection.RequestBody.MODES.raw; // $ExpectType string
+pmCollection.RequestBody.MODES.formdata; // $ExpectType string
+pmCollection.RequestBody.MODES.urlencoded; // $ExpectType string
+pmCollection.RequestBody.MODES.file; // $ExpectType string
+
+// ResponseDefinition Tests
+const respDef: pmCollection.ResponseDefinition = {code: 200, responseTime: 1};
+respDef.code; // $ExpectType number
+respDef.header; // $ExpectType HeaderDefinition[] | undefined
+respDef.cookie; // $ExpectType CookieDefinition[] | undefined
+respDef.body; // $ExpectType string | undefined
+respDef.stream; // $ExpectType Buffer | Uint8Array | undefined
+respDef.responseTime; // $ExpectType number
+respDef.originalRequest; // $ExpectType RequestDefinition | undefined
+
+// Response Tests
+const response = new pmCollection.Response(respDef);
+response.body; // $ExpectType string | undefined
+response.code; // $ExpectType number
+response.cookies; // $ExpectType CookieList
+response.headers; // $ExpectType HeaderList
+response.originalRequest; // $ExpectType Request | undefined
+response.responseTime; // $ExpectType number
+response.status; // $ExpectType string
+response.stream; // $ExpectType Buffer | Uint8Array | undefined
+response.responseSize; // $ExpectType number | undefined
+
+response.update(respDef); // $ExpectType void
+
+response.toJSON(); // $ExpectType any
+
+response.reason(); // ExpectType string | undefined
+
+response.details(); // $ExpectType { name: string; detail: string; code: number; standardName: string; } | undefined
+
+response.text(); // $ExpectType string | undefined
+
+response.json(); // $ExpectType any
+
+response.dataURI(); // $ExpectType string
+
+response.size(); // $ExpectType number
+
+response.encoding(); // $ExpectType { format: string; source: string; }
+
+pmCollection.Response.createFromNode({body: "string", statusCode: 200, elapsedTime: 1}, []); // $ExpectType Response
+
+pmCollection.Response.isResponse(response); // $ExpectType boolean
+
+// ScriptDefinition Tests
+
+const scriptDef: pmCollection.ScriptDefinition = {};
+scriptDef.type; // $ExpectType string | undefined
+scriptDef.src; // $ExpectType string | Url | undefined
+scriptDef.exec; // $ExpectType string | string[] | undefined
+
+// Script Tests
+
+let script = new pmCollection.Script();
+script = new pmCollection.Script(scriptDef);
+script = new pmCollection.Script("string");
+script = new pmCollection.Script(["string"]);
+
+script.exec; // $ExpectType string[] | undefined
+script.src; // $ExpectType Url | undefined
+script.type; // $ExpectType string
+
+script.update(scriptDef); // $ExpectType void
+script.update("string"); // $ExpectType void
+script.update(["string"]); // $ExpectType void
+
+script.toSource(); // $ExpectType string | undefined
+
+pmCollection.Script.isScript(script); // $ExpectType boolean
+
+// UrlDefinition Tests
+
+let urlDef: pmCollection.UrlDefinition = {
+    host: "string",
+    path: "string"
+};
+urlDef = {
+    host: ["string"],
+    path: ["string"]
+};
+
+urlDef.auth; // $ExpectType { user: string; password: string; } | undefined
+urlDef.hash; // $ExpectType string | undefined
+urlDef.host; // $ExpectType string | string[] | undefined
+urlDef.path; // $ExpectType string | string[]
+urlDef.port; // $ExpectType string | undefined
+urlDef.query; // $ExpectType string | QueryParamDefinition[] | PropertyList<QueryParam> | undefined
+urlDef.variable; // $ExpectType VariableDefinition[] | undefined
+urlDef.protocol; // $ExpectType string | undefined
+
+// Url Tests
+
+let url = new pmCollection.Url(urlDef);
+url = new pmCollection.Url("string");
+
+url.auth; // $ExpectType { user: string; password: string; } | undefined
+url.hash; // $ExpectType string | undefined
+url.host; // $ExpectType string[] | undefined
+url.path; // $ExpectType string[]
+url.port; // $ExpectType string | undefined
+url.protocol; // $ExpectType string | undefined
+url.query; // $ExpectType PropertyList<QueryParam>
+url.variables; // $ExpectType VariableList
+
+url.addQueryParams("string"); // $ExpectType void
+url.addQueryParams([qp, qpDef]); // $ExpectType void
+
+url.removeQueryParams("string"); // $ExpectType void
+url.removeQueryParams(["string"]); // $ExpectType void
+url.removeQueryParams(qp); // $ExpectType void
+url.removeQueryParams([qp]); // $ExpectType void
+
+url.getRaw(); // $ExpectType string
+
+url.toString(); // $ExpectType string
+url.toString(false); // $ExpectType string
+
+url.getPath(); // $ExpectType string
+url.getPath({unresolved: true}); // $ExpectType string
+
+url.getQueryString(); // $ExpectType string
+url.getQueryString({encode: true}); // $ExpectType string
+url.getQueryString({ignoredDisabled: true}); // $ExpectType string
+url.getQueryString({encode: true, ignoredDisabled: true}); // $ExpectType string
+
+url.getPathWithQuery(); // $ExpectType string
+
+url.getHost(); // $ExpectType string
+
+url.getRemote(); // $ExpectType string
+url.getRemote({forcePort: true}); // $ExpectType string
+
+url.getOAuth1BaseUrl(); // $ExpectType string
+
+pmCollection.Url.parse("string"); // $ExpectType UrlDefinition
+
+pmCollection.Url.isUrl(url); // $ExpectType boolean
+
+// UrlMatchPattern Tests
+let urlMatch = new pmCollection.UrlMatchPattern("string");
+urlMatch = new pmCollection.UrlMatchPattern({pattern: "string"});
+
+urlMatch.pattern; // $ExpectType string | undefined
+
+urlMatch.update({pattern: "string"}); // $ExpectType void
+
+urlMatch.createMatchPattern(); // $ExpectType { protocols: string[]; host: string; path: RegExp; } | undefined
+
+urlMatch.globPatternToRegexp("string"); // $ExpectType RegExp
+
+urlMatch.testProtocol("string"); // $ExpectType boolean
+
+urlMatch.getProtocols(); // $ExpectType string[]
+
+urlMatch.testHost("string"); // $ExpectType boolean
+
+urlMatch.matchAnyHost({protocols: [], host: "string", path: new RegExp('')}); // $ExpectType boolean
+
+urlMatch.matchSuffixHostPattern({protocols: [], host: "string", path: new RegExp('')}, "string"); // $ExpectType boolean
+
+urlMatch.matchAbsoluteHostPattern({protocols: [], host: "string", path: new RegExp('')}, "string"); // $ExpectType boolean
+
+urlMatch.testPath("string"); // $ExpectType boolean
+
+urlMatch.test("string"); // $ExpectType boolean
+
+urlMatch.toString(); // $ExpectType string
+
+urlMatch.toJSON(); // $ExpectType { pattern: string; }
+
+pmCollection.UrlMatchPattern.MATCH_ALL_URLS; // $ExpectType string
+
+pmCollection.UrlMatchPattern.PROTOCOL_DELIMITER; // $ExpectType string
+
+// UrlMatchPatternList Tests
+const urlMatchList = new pmCollection.UrlMatchPatternList(collection, []);
+
+urlMatchList.test("string"); // $ExpectType boolean
+
+// VariableDefinition Tests
+const varDef: pmCollection.VariableDefinition = {};
+varDef.value; // $ExpectType any
+varDef.type; // $ExpectType string | undefined
+varDef.key; // $ExpectType string | undefined
+
+// Variable Tests
+let variable = new pmCollection.Variable(varDef);
+variable = new pmCollection.Variable({key: varDef});
+
+variable.key; // $ExpectType string | undefined
+variable.type; // $ExpectType string
+variable.value; // $ExpectType any
+
+variable.get(); // $ExpectType any
+
+variable.set(null); // $ExpectType void
+
+variable.valueOf(null); // $ExpectType any
+
+variable.toString(); // $ExpectType string
+
+variable.cast({}); // $ExpectType any
+
+variable.castIn({}); // $ExpectType any
+
+variable.castOut({}); // $ExpectType any
+
+variable.valueType("string", true); // $ExpectType string
+
+variable.update(varDef); // $ExpectType void
+
+pmCollection.Variable.isVariable(variable); // $ExpectType boolean
+
+pmCollection.Variable.types.string; // $ExpectType StringConstructor
+pmCollection.Variable.types.boolean; // $ExpectType BooleanConstructor
+pmCollection.Variable.types.number; // $ExpectType NumberConstructor
+pmCollection.Variable.types.json; // $ExpectType { in: (val: any) => string; out: (val: string) => any; }
+pmCollection.Variable.types.any; // $ExpectType { in: <T>(val: T) => T; out: <T>(val: T) => T; }
+
+// VariableList Tests
+
+const vList = new pmCollection.VariableList(collection, [variable]);
+
+vList.replace("string"); // $ExpectType string
+vList.replace("string", vList); // $ExpectType string
+
+vList.substitute("string"); // $ExpectType "string"
+vList.substitute({}, vList); // $ExpectType {}
+vList.substitute(null, vList, false); // $ExpectType null
+
+vList.syncFromObject({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+vList.syncFromObject({}, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+vList.syncFromObject({}, false, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+vList.syncToObject(); // $ExpectType { [key: string]: VariableDefinition; }
+vList.syncToObject({key: varDef}); // $ExpectType { [key: string]: VariableDefinition; }
+
+pmCollection.VariableList.isVariableList(vList); // $ExpectType boolean
+
+// VariableScopeDefinition Tests
+const varScopeDef: pmCollection.VariableScopeDefinition = {};
+varScopeDef.values; // $ExpectType VariableDefinition[] | undefined
+
+// VariableScope Tests
+let varScope = new pmCollection.VariableScope(varScopeDef, []);
+varScope = new pmCollection.VariableScope(vList, []);
+varScope = new pmCollection.VariableScope([varDef], []);
+varScope = new pmCollection.VariableScope(varScopeDef, [vList]);
+
+varScope.values; // $ExpectType VariableDefinition[] | undefined
+
+varScope.variables(); // ExpectType { [key: string]: VariableDefinition; }
+
+varScope.toObject(false, false); // $ExpectType any
+
+varScope.has("string"); // $ExpectType boolean
+
+varScope.get("string"); // $ExpectType any
+
+varScope.set("string", {}, "any"); // $ExpectType void
+
+varScope.unset("string"); // $ExpectType void
+
+varScope.clear(); // $ExpectType void
+
+varScope.syncVariablesFrom({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+varScope.syncVariablesFrom({}, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+varScope.syncVariablesFrom({}, false, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+varScope.syncVariablesTo(); // $ExpectType { [key: string]: VariableDefinition; }
+varScope.syncVariablesTo({key: varDef}); // $ExpectType { [key: string]: VariableDefinition; }
+
+varScope.toJSON(); // $ExpectType any
+
+varScope.addLayer(vList); // $ExpectType void
+
+pmCollection.VariableScope.isVariableScope(varScope); // $ExpectType boolean
+
+// VersionDefinition Tests
+const verDef: pmCollection.VersionDefinition = {};
+verDef.build; // $ExpectType string | undefined
+verDef.major; // $ExpectType string | undefined
+verDef.minor; // $ExpectType string | undefined
+verDef.patch; // $ExpectType string | undefined
+verDef.prerelease; // $ExpectType string | undefined
+verDef.raw; // $ExpectType string | undefined
+verDef.version; // $ExpectType string | undefined
+
+// Version Tests
+let version = new pmCollection.Version();
+version = new pmCollection.Version(verDef);
+version = new pmCollection.Version("string");
+
+version.build; // $ExpectType string | undefined
+version.major; // $ExpectType string | undefined
+version.minor; // $ExpectType string | undefined
+version.patch; // $ExpectType string | undefined
+version.prerelease; // $ExpectType string | undefined
+version.raw; // $ExpectType string | undefined
+version.string; // $ExpectType string | undefined
+
+version.set(); // ExpectType void
+version.set(verDef); // $ExpectType void
+version.set("string"); // $ExpectType void
+
+version.toString(); // $ExpectType string
diff --git a/types/postman-collection/tsconfig.json b/types/postman-collection/tsconfig.json
new file mode 100644
index 0000000000..9b0b244020
--- /dev/null
+++ b/types/postman-collection/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "postman-collection-tests.ts"
+    ]
+}
diff --git a/types/postman-collection/tslint.json b/types/postman-collection/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/postman-collection/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/prismic-dom/index.d.ts b/types/prismic-dom/index.d.ts
new file mode 100644
index 0000000000..2849cc7791
--- /dev/null
+++ b/types/prismic-dom/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for prismic-dom 2.0
+// Project: https://github.com/prismicio/prismic-dom#readme
+// Definitions by: Nick Whyte <https://github.com/nickw444>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface RichText {
+    asHtml(richText: any, linkResolver?: (doc: any) => string): string;
+}
+
+export const RichText: RichText;
+
+declare const _default: { RichText: RichText };
+export default _default;
diff --git a/types/prismic-dom/prismic-dom-tests.ts b/types/prismic-dom/prismic-dom-tests.ts
new file mode 100644
index 0000000000..598573cced
--- /dev/null
+++ b/types/prismic-dom/prismic-dom-tests.ts
@@ -0,0 +1,3 @@
+import prismicDom = require("prismic-dom");
+
+const rendered: string = prismicDom.RichText.asHtml({});
diff --git a/types/prismic-dom/tsconfig.json b/types/prismic-dom/tsconfig.json
new file mode 100644
index 0000000000..0687e7ae0e
--- /dev/null
+++ b/types/prismic-dom/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "prismic-dom-tests.ts"
+    ]
+}
diff --git a/types/prismic-dom/tslint.json b/types/prismic-dom/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prismic-dom/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 081a62cbd7..9b4ebf5a24 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -15,8 +15,9 @@
 //                 Miika Hänninen <https://github.com/googol>
 //                 Nikita Moshensky <https://github.com/moshensky>
 //                 Ethan Resnick <https://github.com/ethanresnick>
+//                 Jack Leigh <https://github.com/leighman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 declare let R: R.Static;
 
@@ -679,7 +680,7 @@ declare namespace R {
          * on each element, and grouping the results according to values returned.
          */
         groupBy<T>(fn: (a: T) => string, list: ReadonlyArray<T>): { [index: string]: T[] };
-        groupBy<T>(fn: (a: T) => string): <T>(list: ReadonlyArray<T>) => { [index: string]: T[] };
+        groupBy<T>(fn: (a: T) => string): (list: ReadonlyArray<T>) => { [index: string]: T[] };
 
         /**
          * Takes a list and returns a list of lists where each sublist's elements are all "equal" according to the provided equality function
@@ -1802,7 +1803,7 @@ declare namespace R {
          * Note that the order of the output array is not guaranteed to be
          * consistent across different JS platforms.
          */
-        toPairs<F, S>(obj: { [k: string]: S } | { [k: number]: S }): Array<[F, S]>;
+        toPairs<S>(obj: { [k: string]: S } | { [k: number]: S }): Array<[string, S]>;
 
         /**
          * Converts an object into an array of key, value arrays.
@@ -1810,7 +1811,7 @@ declare namespace R {
          * Note that the order of the output array is not guaranteed to be
          * consistent across different JS platforms.
          */
-        toPairsIn<F, S>(obj: { [k: string]: S } | { [k: number]: S }): Array<[F, S]>;
+        toPairsIn<S>(obj: { [k: string]: S } | { [k: number]: S }): Array<[string, S]>;
 
         /**
          * Returns the string representation of the given value. eval'ing the output should
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index c32ab72028..933b468f09 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -664,6 +664,36 @@ interface Obj {
     byGrade(students);
 };
 
+() => {
+    interface MyObject {
+        id: string;
+        quantity: number;
+    }
+
+    const reduceWithCombinedQuantities = (items: MyObject[]) =>
+        items.reduce<MyObject>(
+            (acc, item) => ({...item, quantity: acc.quantity + item.quantity}),
+            {id: '', quantity: 0},
+        );
+
+    const combineMyObjects = R.pipe(
+        R.groupBy<MyObject>(s => s.id),
+        R.values,
+        R.map(reduceWithCombinedQuantities),
+    );
+
+    const combined = combineMyObjects([
+        {id: 'foo', quantity: 4},
+        {id: 'bar', quantity: 3},
+        {id: 'foo', quantity: 2},
+    ]);
+
+    return {
+        id: combined[0].id,
+        quantity: combined[0].quantity
+    };
+};
+
 () => {
     R.groupWith(R.equals)([0, 1, 1, 2, 3, 5, 8, 13, 21]);
 
@@ -1597,13 +1627,14 @@ class Rectangle {
 };
 
 () => {
-    const a = R.toPairs<string, number>({a: 1, b: 2, c: 3}); // => [['a', 1], ['b', 2], ['c', 3]]
+    const a = R.toPairs<number>({a: 1, b: 2, c: 3}); // => [['a', 1], ['b', 2], ['c', 3]]
+    const b = R.toPairs({1: 'a'}); // => [['1', 'something']]
 };
 
 () => {
     const f    = new F();
     const a1 = R.toPairsIn(f); // => [['x','X'], ['y','Y']]
-    const a2 = R.toPairsIn<string, string>(f); // => [['x','X'], ['y','Y']]
+    const a2 = R.toPairsIn<string>(f); // => [['x','X'], ['y','Y']]
 };
 
 () => {
diff --git a/types/react-avatar-editor/index.d.ts b/types/react-avatar-editor/index.d.ts
new file mode 100644
index 0000000000..a3bbf49f3b
--- /dev/null
+++ b/types/react-avatar-editor/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for react-avatar-editor 10.3
+// Project: https://github.com/mosch/react-avatar-editor
+// Definitions by: Diogo Corrêa <https://github.com/diogocorrea>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+
+export interface ImageState {
+    height: number;
+    width: number;
+    x: number;
+    y: number;
+    resource: ImageData;
+}
+
+export interface CroppedRect {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
+
+export interface AvatarEditorProps {
+    image: string | File;
+    width?: number;
+    height?: number;
+    border?: number | number[];
+    borderRadius?: number;
+    color?: number[];
+    style?: object;
+    scale?: number;
+    position?: object;
+    rotate?: number;
+    crossOrigin?: string;
+    disableDrop?: boolean;
+    onDropFile?(event: DragEvent): void;
+    onLoadFailure?(event: Event): void;
+    onLoadSuccess?(imgInfo: ImageState): void;
+    onImageReady?(event: Event): void;
+    onMouseUp?(): void;
+    onMouseMove?(event: Event): void;
+    onImageChange?(): void;
+    onPositionChange?(): void;
+}
+
+export default class AvatarEditor extends React.Component<AvatarEditorProps, any> {
+    static getImage(): HTMLCanvasElement;
+    static getImageScaledToCanvas(): HTMLCanvasElement;
+    static getCroppingRect(): CroppedRect;
+}
diff --git a/types/react-avatar-editor/react-avatar-editor-tests.tsx b/types/react-avatar-editor/react-avatar-editor-tests.tsx
new file mode 100644
index 0000000000..063d083f3f
--- /dev/null
+++ b/types/react-avatar-editor/react-avatar-editor-tests.tsx
@@ -0,0 +1,47 @@
+import * as React from "react";
+import AvatarEditor, { ImageState, CroppedRect } from "react-avatar-editor";
+
+const file: File = new File(["str"], "image.jpg");
+const image: ImageData = new ImageData(1, 2);
+const imageState: ImageState = {
+    height: 1,
+    width: 1,
+    x: 1,
+    y: 1,
+    resource: image
+};
+
+class AvatarEditorTest extends React.Component {
+    render() {
+        return (
+            <div>
+                <AvatarEditor image="" />
+                <AvatarEditor image={file} />
+                <AvatarEditor image="" width={1} />
+                <AvatarEditor image="" height={1} />
+                <AvatarEditor image="" border={1} />
+                <AvatarEditor image="" border={[1, 2]} />
+                <AvatarEditor image="" borderRadius={1} />
+                <AvatarEditor image="" color={[1]} />
+                <AvatarEditor image="" style={{}} />
+                <AvatarEditor image="" scale={1} />
+                <AvatarEditor image="" position={{}} />
+                <AvatarEditor image="" rotate={1} />
+                <AvatarEditor image="" crossOrigin="" />
+                <AvatarEditor image="" disableDrop={true} />
+                <AvatarEditor image="" onDropFile={event => {}} />
+                <AvatarEditor image="" onLoadFailure={event => {}} />
+                <AvatarEditor image="" onLoadSuccess={imageState => {}} />
+                <AvatarEditor image="" onImageReady={event => {}} />
+                <AvatarEditor image="" onMouseUp={() => {}} />
+                <AvatarEditor image="" onMouseMove={event => {}} />
+                <AvatarEditor image="" onImageChange={() => {}} />
+                <AvatarEditor image="" onPositionChange={() => {}} />
+            </div>
+        );
+    }
+}
+
+const getImage: HTMLCanvasElement = AvatarEditor.getImage();
+const getImageScaledToCanvas: HTMLCanvasElement = AvatarEditor.getImageScaledToCanvas();
+const getCroppingRect: CroppedRect = AvatarEditor.getCroppingRect();
diff --git a/types/react-avatar-editor/tsconfig.json b/types/react-avatar-editor/tsconfig.json
new file mode 100644
index 0000000000..b947d3271a
--- /dev/null
+++ b/types/react-avatar-editor/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-avatar-editor-tests.tsx"
+    ],
+    "compilerOptions": {
+        "jsx": "react",
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/react-avatar-editor/tslint.json b/types/react-avatar-editor/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-avatar-editor/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 3cb1c21605..1c81ffc3c8 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -9,6 +9,7 @@ import * as React from "react";
 interface ReactFacebookLoginProps {
     appId: string;
     callback(userInfo: ReactFacebookLoginInfo): void;
+    onFailure?(response: ReactFacebookFailureResponse): void;
 
     autoLoad?: boolean;
     buttonStyle?: React.CSSProperties;
@@ -33,6 +34,10 @@ interface ReactFacebookLoginProps {
     tag?: Node | React.Component<any>;
 }
 
+export interface ReactFacebookFailureResponse {
+    status?: string;
+}
+
 export interface ReactFacebookLoginInfo {
     id: string;
     name: string;
@@ -43,6 +48,9 @@ interface ReactFacebookLoginState {
     isProcessing?: boolean;
 }
 
-declare class ReactFacebookLogin extends React.Component<ReactFacebookLoginProps, ReactFacebookLoginState> { }
+declare class ReactFacebookLogin extends React.Component<
+    ReactFacebookLoginProps,
+    ReactFacebookLoginState
+> {}
 
 export default ReactFacebookLogin;
diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx
index 6aab1ccd71..d7b2ebcde8 100644
--- a/types/react-facebook-login/react-facebook-login-tests.tsx
+++ b/types/react-facebook-login/react-facebook-login-tests.tsx
@@ -1,12 +1,16 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
-import FacebookLogin, { ReactFacebookLoginInfo } from 'react-facebook-login';
+import FacebookLogin, { ReactFacebookLoginInfo, ReactFacebookFailureResponse } from 'react-facebook-login';
 
 const responseFacebook = (response: ReactFacebookLoginInfo) => {
     console.log(response);
 };
 
+const failureResponseFacebook = (response: ReactFacebookFailureResponse) => {
+    console.log(response);
+};
+
 const componentClicked = () => {
     console.log("component clicked");
 };
@@ -21,6 +25,17 @@ ReactDOM.render(
     document.getElementById('demo')
 );
 
+ReactDOM.render(
+    <FacebookLogin
+        appId="1088597931155576"
+        autoLoad={true}
+        fields="name,email,picture"
+        onClick={componentClicked}
+        callback={responseFacebook}
+        onFailure={failureResponseFacebook} />,
+    document.getElementById('demo')
+);
+
 ReactDOM.render(
     <FacebookLogin
         appId="1088597931155576"
diff --git a/types/react-geosuggest/index.d.ts b/types/react-geosuggest/index.d.ts
index 30db05ddb0..2537754b02 100644
--- a/types/react-geosuggest/index.d.ts
+++ b/types/react-geosuggest/index.d.ts
@@ -13,7 +13,7 @@ export default class Geosuggest extends Component<GeosuggestProps> {
     blur(): void;
     update(value: string): void;
     clear(): void;
-    selectSuggest(): void;
+    selectSuggest(value?: Suggest): void;
 }
 
 export interface GeosuggestProps extends InputHTMLAttributes<HTMLInputElement> {
diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
new file mode 100644
index 0000000000..9f99433cfa
--- /dev/null
+++ b/types/react-map-gl/index.d.ts
@@ -0,0 +1,257 @@
+// Type definitions for react-map-gl 3.2
+// Project: https://github.com/uber/react-map-gl#readme
+// Definitions by: Robert Imig <https://github.com/rimig>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+import * as MapboxGL from "mapbox-gl";
+import * as GeoJSON from "geojson";
+
+export interface Viewport {
+    bearing: number;
+    isDragging: boolean;
+    latitude: number;
+    longitude: number;
+    pitch?: number;
+    startBearing?: number;
+    startDragLngLat?: number[];
+    startPitch?: number;
+    zoom: number;
+}
+
+export interface StaticMapProps {
+    /**
+     *  Mapbox API access token for MapboxGL.
+     *  Required when using Mapbox vector tiles/styles Mapbox WebGL context creation option.
+     *  Useful when you want to export the canvas as a PNG
+     */
+    mapboxApiAccessToken: string;
+
+    /** The Mapbox style. A string url or a MapboxGL style object (regular JS object or Immutable.Map). */
+    mapStyle?: string; // TODO can also be immutable map
+
+    /** The width of the map. */
+    width: number;
+    /** The height of the map. */
+    height: number;
+    /** The latitude of the center of the map. */
+
+    latitude: number;
+    /** The longitude of the center of the map. */
+    longitude: number;
+    /** The tile zoom level of the map. Bounded implicitly by default minZoom and maxZoom of MapboxGL. */
+
+    zoom: number;
+    /** Specify the bearing of the viewport */
+    bearing?: number;
+    /** Specify the pitch of the viewport */
+    pitch?: number;
+    /** Altitude of the viewport camera. Default 1.5 "screen heights" */
+    altitude?: number; // Note: Non-public API, see https://github.com/mapbox/mapbox-gl-js/issues/1137
+
+    /**
+     *  Whether the map is visible.
+     *  Unmounting and re-mounting a Mapbox instance is known to be costly.
+     *  This option offers a way to hide a map using CSS style.
+     */
+    visible?: boolean;
+
+    /**
+     * Equivalent to Mapbox's preserveDrawingBuffer option.
+     * If true, the map's canvas can be exported to a PNG using map.getCanvas().toDataURL().
+     */
+    preserveDrawingBuffer?: boolean;
+
+    /** Show attribution control or not. */
+    attributionControl?: boolean;
+
+    /**
+     * If mapStyle is assigned an Immutable object, when the prop changes,
+     * StaticMap can diff between the two values and call the appropriate Mapbox API such as
+     * addLayer, removeLayer, setStyle, setData, etc.
+     *
+     * This allows apps to update data sources and layer styles efficiently.
+     * In use cases such as animation or dynamic showing/hiding layers, style diffing prevents the map
+     * from reloading and flickering when the map style changes.
+     *
+     * There are known issues with style diffing. As stopgap, use this option to prevent style diffing.
+     */
+    preventStyleDiffing?: boolean;
+
+    /**
+     * This prop is experimental.
+     * If true, when the map component is unmounted, instead of calling remove on the Mapbox map instance, save it for later reuse.
+     * This will avoid repeatedly creating new Mapbox map instances if possible.
+     * Applications that frequently mount and unmount maps may try this prop to help work around a mapbox-gl resource leak issue that can lead to a browser crash in certain situations.
+     */
+    resuseMaps?: boolean;
+
+    /**
+     * A callback run when the map emits a load event.
+     */
+    onLoad?: () => void;
+
+    /**
+     * A callback run when the map emits an error event.
+     */
+    onError?: () => void;
+}
+
+export class StaticMap extends React.Component<StaticMapProps> {
+    /**
+     * Returns the Mapbox instance if initialized. The Map instance will have full access to MapboxGL's API.
+     */
+    getMap(): MapboxGL.Map;
+
+    /**
+     * Use Mapbox's queryRenderedFeatures API to find features at point or in a bounding box.
+     * If the parameters argument is not specified, only queries the layers with the interactive property in the layer style.
+     */
+    queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: { layers?: string[], filter?: any[] }): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
+}
+
+export interface InteractiveMapProps extends StaticMapProps {
+    /** Max zoom level */
+    maxZoom?: number;
+    /** Min zoom level */
+    minZoom?: number;
+    /** Max pitch in degrees */
+    maxPitch?: number;
+    /** Min pitch in degrees */
+    minPitch?: number;
+
+    /** Scroll to zoom */
+    scrollZoom?: boolean;
+    /** Drag to pan */
+    dragPan?: boolean;
+    /** Drag to rotate */
+    dragRotate?: boolean;
+    /** Double click to zoom */
+    doubleClickZoom?: boolean;
+    /** Enable multitouch zoom. */
+    touchZoom?: boolean;
+    /** Enable multitouch rotate. */
+    touchRotate?: boolean;
+    /** Radius to detect features around a clicked point */
+    clickRadius?: number;
+
+    /**
+     * Callback that is fired when the user interacted with the map.
+     * The object passed to the callback contains viewport properties such as longitude, latitude, zoom etc.
+     *
+     * If the map is intended to be interactive, the app use this prop to listen to map updates and update the props accordingly.
+     */
+    onViewportChange?: (viewport: Viewport) => void;
+
+    /**
+     * Called when the map is hovered over.
+     * event - The mouse event.
+     * lngLat - The coordinates of the pointer
+     * features - The features under the pointer, using Mapbox's
+     * queryRenderedFeatures API:
+     * https://www.mapbox.com/mapbox-gl-js/api/#Map#queryRenderedFeatures
+     * To make a layer interactive, set the `interactive` property in the
+     * layer style to `true`. See Mapbox's style spec
+     * https://www.mapbox.com/mapbox-gl-style-spec/#layer-interactive
+     */
+    onHover?: (event: any, lngLat: number[], features: any) => void;
+
+    /**
+     * Called when the map is clicked.
+     * queryRenderedFeatures API:
+     * https://www.mapbox.com/mapbox-gl-js/api/#Map#queryRenderedFeatures
+     * To make a layer interactive, set the `interactive` property in the
+     * layer style to `true`. See Mapbox's style spec
+     * https://www.mapbox.com/mapbox-gl-style-spec/#layer-interactive
+     */
+    onClick?: (event: any, lngLat: number[], features: any) => void;
+
+    /** Accessor that returns a cursor style to show interactive state */
+    getCursor?: () => any;
+}
+
+export class InteractiveMap extends React.Component<InteractiveMapProps> {
+    _map: MapboxGL.Map;
+
+    /** Returns the Mapbox Map Instance */
+    getMap(): MapboxGL.Map;
+}
+
+/**
+ *
+ * React Map Overlays
+ *
+ */
+
+export interface BaseControlProps {
+    /** Event handling */
+    captureScroll?: boolean;
+    /** Stop map pan & rotate */
+    captureDrag?: boolean;
+    /** Stop map click */
+    captureClick?: boolean;
+    /** Stop map double click */
+    captureDoubleClick?: boolean;
+}
+
+export class BaseControl<T extends BaseControlProps> extends React.Component<T> { }
+
+/**
+ * Allows applications to overlay data on top of maps using a HTML container.
+ */
+export class HTMLOverlay extends BaseControl<HTMLOverlayProps> { }
+
+export interface HTMLRedrawOptions {
+    /** width {Number} - width of the viewport */
+    width: number;
+    /** height {Number} - height of the viewport */
+    height: number;
+    /** project {Function} - get screen position [x, y] from geo coordinates [lng, lat] */
+    project: (lnglat: number[]) => number[];
+    /** unproject {Function} - get geo coordinates [lng, lat] from screen position [x, y] */
+    unproject: (xy: number[]) => number[];
+}
+
+export interface HTMLOverlayProps extends BaseControlProps {
+    /**
+     * Called every time the map updates.
+     */
+    redraw: (opts: HTMLRedrawOptions) => void;
+    /** Additional css styles of the div container. */
+    style?: React.CSSProperties;
+}
+
+/**
+ * Allows applications to overlay data on top of maps using a canvas.
+ */
+export class CanvasOverlay extends BaseControl<CanvasOverlayProps> { }
+
+export interface CanvasRedrawOptions extends HTMLRedrawOptions {
+    /** ctx {CanvasRenderingContext2D} - rendering context of the canvas */
+    ctx: CanvasRenderingContext2D;
+}
+
+export interface CanvasOverlayProps extends BaseControlProps {
+    /**
+     * Called every time the map updates.
+     */
+    redraw: (opts: CanvasRedrawOptions) => void;
+}
+
+/**
+ * Allows applications to overlay data on top of maps using a SVG container.
+ */
+export class SVGOverlay extends BaseControl<SVGOverlayProps> { }
+
+// tslint:disable-next-line:no-empty-interface
+export interface SVGRedrawOptions extends HTMLRedrawOptions { }
+
+export interface SVGOverlayProps extends BaseControlProps {
+    /**
+     * Called every time the map updates.
+     */
+    redraw: (opts: SVGRedrawOptions) => void;
+    /** Additional css styles of the svg container. */
+    style?: React.CSSProperties;
+}
diff --git a/types/react-map-gl/react-map-gl-tests.tsx b/types/react-map-gl/react-map-gl-tests.tsx
new file mode 100644
index 0000000000..2fcb0157a2
--- /dev/null
+++ b/types/react-map-gl/react-map-gl-tests.tsx
@@ -0,0 +1,124 @@
+import * as React from "react";
+import {
+    Viewport,
+    StaticMapProps,
+    InteractiveMapProps,
+    InteractiveMap,
+    CanvasOverlay,
+    SVGOverlay,
+    HTMLOverlay,
+    HTMLOverlayProps,
+    CanvasRedrawOptions,
+    HTMLRedrawOptions,
+    SVGOverlayProps,
+    SVGRedrawOptions,
+    StaticMap
+} from 'react-map-gl';
+import * as MapboxGL from "mapbox-gl";
+
+interface MyMapState {
+    viewport: Viewport;
+}
+
+class MyMap extends React.Component<{}, MyMapState> {
+    state: MyMapState = {
+        viewport: {
+            bearing: 0,
+            isDragging: false,
+            latitude: 0,
+            longitude: 0,
+            zoom: 3,
+        }
+    };
+
+    private map: MapboxGL.Map;
+
+    render() {
+        return (
+            <div>
+                <InteractiveMap
+                    {...this.state.viewport}
+                    mapboxApiAccessToken="pk.test"
+                    height={400}
+                    width={400}
+                    ref={this.setRefInteractive}
+                >
+                    <CanvasOverlay
+                        redraw={(opts: CanvasRedrawOptions) => {
+                            const {
+                                ctx,
+                                height,
+                                project,
+                                unproject,
+                                width,
+                            } = opts;
+                            const xy: number[] = unproject(project([20, 20]));
+                            ctx.clearRect(0, 0, width, height);
+                        }}
+                    />
+                    <CanvasOverlay
+                        redraw={(opts: CanvasRedrawOptions) => {}}
+                        captureScroll={true}
+                        captureDrag={true}
+                        captureClick={true}
+                        captureDoubleClick={true}
+                    />
+                    <SVGOverlay
+                        redraw={() => {}}
+                    />
+                    <SVGOverlay
+                        redraw={(opts: SVGRedrawOptions) => {
+                            const {
+                                height,
+                                project,
+                                unproject,
+                                width,
+                            } = opts;
+                            const xy: number[] = unproject(project([20, 20]));
+                        }}
+                        captureScroll={true}
+                        captureDrag={true}
+                        captureClick={true}
+                        captureDoubleClick={true}
+                    />
+                    <HTMLOverlay
+                        redraw={() => {}}
+                    />
+                    <HTMLOverlay
+                        redraw={(opts: HTMLRedrawOptions) => {
+                            const {
+                                height,
+                                project,
+                                unproject,
+                                width,
+                            } = opts;
+                            const xy: number[] = unproject(project([20, 20]));
+                        }}
+                        style={{
+                            border: "2px solid black"
+                        }}
+                        captureScroll={true}
+                        captureDrag={true}
+                        captureClick={true}
+                        captureDoubleClick={true}
+                    />
+                </InteractiveMap>
+                <StaticMap
+                    {...this.state.viewport}
+                    mapboxApiAccessToken="pk.test"
+                    height={400}
+                    width={400}
+                    ref={this.setRefStatic}
+                />
+            </div>
+        );
+    }
+
+    private readonly setRefInteractive = (el: InteractiveMap) => {
+        this.map = el.getMap();
+    }
+
+    private readonly setRefStatic = (el: StaticMap) => {
+        this.map = el.getMap();
+    }
+}
diff --git a/types/react-map-gl/tsconfig.json b/types/react-map-gl/tsconfig.json
new file mode 100644
index 0000000000..d41854e1c5
--- /dev/null
+++ b/types/react-map-gl/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-map-gl-tests.tsx"
+    ]
+}
diff --git a/types/react-map-gl/tslint.json b/types/react-map-gl/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-map-gl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-auth0/index.d.ts b/types/react-native-auth0/index.d.ts
new file mode 100644
index 0000000000..153bfd65d9
--- /dev/null
+++ b/types/react-native-auth0/index.d.ts
@@ -0,0 +1,170 @@
+// Type definitions for react-native-auth0 1.2
+// Project: https://github.com/auth0/react-native-auth0
+// Definitions by: Andrea Ascari <https://github.com/ascariandrea>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * Auth
+ */
+
+export interface AuthorizationUrlParams {
+    responseType: string;
+    redirectUri: string;
+    state: string;
+}
+
+export interface CreateUserParams<T> {
+    email: string;
+    username?: string;
+    password: string;
+    connection: string;
+    metadata?: T;
+}
+
+export interface CreateUserResponse {
+    Id: string;
+    emailVerified: boolean;
+    email: string;
+}
+
+export interface ExchangeParams {
+    code: string;
+    redirectUri: string;
+    verifier: string;
+}
+
+export interface LogoutParams {
+    federated: boolean;
+    clientId?: string;
+    returnTo?: string;
+}
+
+export interface PasswordRealmParams {
+    username: string;
+    password: string;
+    realm: string;
+    audience?: string;
+    scope?: string;
+}
+
+export interface PasswordRealmResponse {
+    accessToken: string;
+    expiresIn: number;
+    idToken: string;
+    scope: string;
+    tokenType: "Bearer";
+}
+
+export interface RefreshTokenParams {
+    refreshToken: string;
+    scope?: string;
+}
+
+export interface RevokeParams {
+    refreshToken: string;
+}
+
+export interface UserInfoParams {
+    token: string;
+}
+
+export interface UserInfo {
+    email: string;
+    emailVerified: boolean;
+    name: string;
+    nickname: string;
+    picture: string;
+    sub: string;
+    updatedAt: string;
+}
+export class Auth {
+    authorizationUrl(params: AuthorizationUrlParams): string;
+    /* tslint:disable-next-line no-unnecessary-generics */
+    createUser<T>(user: CreateUserParams<T>): Promise<CreateUserResponse>;
+    exchange(params: ExchangeParams): Promise<string>;
+    logoutUrl(params: LogoutParams): string;
+    passwordRealm(params: PasswordRealmParams): Promise<PasswordRealmResponse>;
+
+    refreshToken(params: RefreshTokenParams): Promise<any>;
+    revoke(params: RevokeParams): Promise<any>;
+    userInfo(params: UserInfoParams): Promise<UserInfo>;
+}
+
+/**
+ * Users
+ */
+export interface Auth0User<T> {
+    created_at: string;
+    email: string;
+    emailVerified: boolean;
+    identities: any[];
+    last_ip?: string;
+    last_login?: string;
+    logins_count: number;
+    name: string;
+    nickname: string;
+    picture?: string;
+    updated_at: string;
+    userId: string;
+    userMetadata?: T;
+}
+
+export interface GetUserParams {
+    id: string;
+}
+
+export interface PatchUserParams<T> {
+    id: string;
+    metadata: T;
+}
+
+export class Users {
+    constructor(options: UsersOptions);
+    /* tslint:disable-next-line no-unnecessary-generics */
+    getUser<T>(parameters: GetUserParams): Promise<Auth0User<T>>;
+    patchUser<T>(parameters: PatchUserParams<T>): Promise<Auth0User<T>>;
+}
+
+export const users: Users;
+
+/**
+ * Web Auth
+ */
+export interface AuthorizeParams {
+    state?: string;
+    nonce?: string;
+    audience?: string;
+    scope?: string;
+}
+
+export interface ClearSessionParams {
+    federated: boolean;
+}
+
+export class WebAuth {
+    authorize(parameters: AuthorizeParams): Promise<any>;
+    clearSession(parameters?: ClearSessionParams): Promise<any>;
+}
+
+export interface UsersOptions {
+    baseUrl: Options["domain"];
+    token: string;
+}
+
+export interface Options {
+    domain: string;
+    clientId: string;
+}
+
+/**
+ * Auth0
+ */
+
+export default class Auth0 {
+    auth: Auth;
+    webAuth: WebAuth;
+    constructor(options: Options);
+
+    users(token: string): Users;
+}
diff --git a/types/react-native-auth0/react-native-auth0-tests.ts b/types/react-native-auth0/react-native-auth0-tests.ts
new file mode 100644
index 0000000000..3f659cbdee
--- /dev/null
+++ b/types/react-native-auth0/react-native-auth0-tests.ts
@@ -0,0 +1,67 @@
+import Auth0, { UserInfo } from "react-native-auth0";
+
+const auth0 = new Auth0({
+    domain: "definitely-typed",
+    clientId: "definitely-typed"
+});
+
+auth0.auth.createUser({
+    email: "me@example.com",
+    username: "johndoe",
+    password: "password",
+    connection: "db-connection"
+});
+
+auth0.auth.authorizationUrl({
+    responseType: "json",
+    redirectUri: "http://localhost:3000",
+    state: "my-state"
+});
+
+auth0.auth.exchange({
+    code: "my-code",
+    redirectUri: "http://localhost:3000",
+    verifier: "verifier"
+});
+
+auth0.auth.logoutUrl({
+    federated: true,
+    clientId: "client-id",
+    returnTo: "http://localhost:3000"
+});
+
+auth0.auth.passwordRealm({
+    username: "me@example.com",
+    password: "password",
+    realm: "realm",
+    audience: "user-info"
+});
+
+auth0.auth.refreshToken({
+    refreshToken: "refresh-token",
+    scope: "openid"
+});
+
+auth0.auth.revoke({
+    refreshToken: "refresh-token"
+});
+
+auth0.auth.userInfo({
+    token: "token"
+});
+
+auth0.webAuth.authorize({
+    state: "state",
+    nonce: "nonce",
+    scope: "openid"
+});
+
+auth0.webAuth.clearSession({ federated: false });
+auth0.webAuth.clearSession();
+
+auth0.users("token").getUser({ id: "userId" });
+
+auth0.users("token").patchUser<{ firstName: string; lastName: string }>({
+    id: "userId",
+    metadata: { firstName: "John", lastName: "Dow" }
+});
diff --git a/types/react-native-auth0/tsconfig.json b/types/react-native-auth0/tsconfig.json
new file mode 100644
index 0000000000..407210c6b1
--- /dev/null
+++ b/types/react-native-auth0/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "target": "es6",
+        "esModuleInterop": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "react-native-auth0-tests.ts"]
+}
diff --git a/types/react-native-auth0/tslint.json b/types/react-native-auth0/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-native-auth0/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-native-touch-id/index.d.ts b/types/react-native-touch-id/index.d.ts
index f1fc4f7a71..e222b87b59 100644
--- a/types/react-native-touch-id/index.d.ts
+++ b/types/react-native-touch-id/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for react-native-touch-id 3.0.0
+// Type definitions for react-native-touch-id 4.0.0
 // Project: https://github.com/naoufal/react-native-touch-id
 // Definitions by: huhuanming <https://github.com/huhuanming>
+//                 Nikolay Polukhin <https://github.com/gazaret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'react-native-touch-id' {
@@ -13,6 +14,11 @@ declare module 'react-native-touch-id' {
     details: any;
   }
 
-  export const isSupported: () => Promise<boolean | TouchIDError>;
-  export const authenticate: (reason: string) => Promise<boolean | TouchIDError>;
+  export interface AuthenticateConfig {
+    title: string;
+    color: string;
+  }
+
+  export const isSupported: () => Promise<boolean | string | TouchIDError>;
+  export const authenticate: (reason: string, config?: AuthenticateConfig) => Promise<boolean | TouchIDError>;
 }
diff --git a/types/react-native-touch-id/react-native-touch-id-tests.ts b/types/react-native-touch-id/react-native-touch-id-tests.ts
index 0b431ecc85..8ad30c1390 100644
--- a/types/react-native-touch-id/react-native-touch-id-tests.ts
+++ b/types/react-native-touch-id/react-native-touch-id-tests.ts
@@ -3,3 +3,8 @@ import { isSupported, authenticate, TouchIDError } from 'react-native-touch-id';
 isSupported().then((isOk: boolean) => {}).catch((error: TouchIDError) => {});
 
 authenticate('reason').then((isOk: boolean) => {}).catch((error: TouchIDError) => {});
+
+authenticate('reason', {
+    title: 'Authentication Required',
+    color: '#1306ff'
+}).then((isOk: boolean) => {}).catch((error: TouchIDError) => {});
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 01b7651dec..5abf96e04c 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -972,7 +972,7 @@ export interface TextInputIOSProperties {
      * Pressed key value is passed as an argument to the callback handler.
      * Fires before onChange callbacks.
      */
-    onKeyPress?: (key: string) => void;
+    onKeyPress?: (event: {nativeEvent: {key: string}}) => void;
 
     /**
      * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document
@@ -7737,7 +7737,7 @@ export interface EasingStatic {
     ease: EasingFunction;
     quad: EasingFunction;
     cubic: EasingFunction;
-    poly: EasingFunction;
+    poly(n: number): EasingFunction;
     sin: EasingFunction;
     circle: EasingFunction;
     exp: EasingFunction;
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index c4e396783f..64fedcb41d 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Huhuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
 //                 fangpenlin <https://github.com/fangpenlin>
-//                 abrahambotros <https://github.com/abrahambotros>
 //                 petejkim <https://github.com/petejkim>
 //                 Kyle Roach <https://github.com/iRoachie>
 //                 phanalpha <https://github.com/phanalpha>
@@ -14,6 +13,7 @@
 //                 Veit Lehmann: <https://github.com/levito>
 //                 Roberto Huertas: <https://github.com/robertohuertasm>
 //                 Steven Miller <https://github.com/YourGamesBeOver>
+//                 Ciaran Liedeman <https://github.com/cliedeman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -247,6 +247,25 @@ export interface NavigationUriAction extends NavigationUriActionPayload {
   type: 'Navigation/URI';
 }
 
+export interface NavigationPopActionPayload {
+  // n: the number of routes to pop of the stack
+  n?: number;
+  immediate?: boolean;
+}
+
+export interface NavigationPopAction extends NavigationPopActionPayload {
+  type: 'Navigation/POP';
+}
+
+export interface NavigationPopToTopActionPayload {
+  key?: string;
+  immediate?: boolean;
+}
+
+export interface NavigationPopToTopAction extends NavigationPopToTopActionPayload {
+  type: 'Navigation/POP_TO_TOP';
+}
+
 export interface NavigationStackViewConfig {
   mode?: 'card' | 'modal';
   headerMode?: HeaderMode;
@@ -287,7 +306,9 @@ export type NavigationStackAction =
   | NavigationNavigateAction
   | NavigationBackAction
   | NavigationSetParamsAction
-  | NavigationResetAction;
+  | NavigationResetAction
+  | NavigationPopAction
+  | NavigationPopToTopAction;
 
 export type NavigationTabAction =
   NavigationInitAction
@@ -399,12 +420,18 @@ export interface NavigationEventSubscription {
 export interface NavigationScreenProp<S> {
   state: S;
   dispatch: NavigationDispatch;
-  goBack: (routeKey?: (string | null)) => boolean;
-  navigate: (
-    routeName: string,
+  goBack: (routeKey?: string | null) => boolean;
+  navigate(options: {
+    routeName: string;
+    params?: NavigationParams;
+    action?: NavigationAction;
+    key?: string;
+  }): boolean;
+  navigate(
+    routeNameOrOptions: string,
     params?: NavigationParams,
-    action?: NavigationAction
-  ) => boolean;
+    action?: NavigationAction,
+  ): boolean;
   setParams: (newParams: NavigationParams) => boolean;
   addListener: (
     eventName: string,
@@ -575,6 +602,19 @@ export function StackNavigator(
   stackConfig?: StackNavigatorConfig,
 ): NavigationContainer;
 
+export interface SwitchNavigatorConfig {
+  initialRouteName: string;
+  resetOnBlur?: boolean;
+  paths?: NavigationPathsConfig;
+  backBehavior?: 'none' | 'intialRoute';
+}
+
+// Return createNavigationContainer
+export function SwitchNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  switchConfig?: SwitchNavigatorConfig
+): NavigationContainer;
+
 // DrawerItems
 export const DrawerItems: React.ReactType;
 
@@ -623,7 +663,7 @@ export interface TabViewConfig {
     showLabel?: boolean,
     style?: StyleProp<ViewStyle>,
     labelStyle?: StyleProp<TextStyle>,
-
+    iconStyle?: StyleProp<ViewStyle>,
     // Top
     showIcon?: boolean,
     upperCaseLabel?: boolean,
@@ -718,12 +758,16 @@ export namespace NavigationActions {
   const RESET: 'Navigation/RESET';
   const SET_PARAMS: 'Navigation/SET_PARAMS';
   const URI: 'Navigation/URI';
+  const POP: 'Navigation/POP';
+  const POP_TO_TOP: 'Navigation/POP_TO_TOP';
 
   function init(options?: NavigationInitActionPayload): NavigationInitAction;
   function navigate(options: NavigationNavigateActionPayload): NavigationNavigateAction;
   function reset(options: NavigationResetActionPayload): NavigationResetAction;
   function back(options?: NavigationBackActionPayload): NavigationBackAction;
   function setParams(options: NavigationSetParamsActionPayload): NavigationSetParamsAction;
+  function pop(options: NavigationPopActionPayload): NavigationPopAction;
+  function popToTop(options: NavigationPopToTopActionPayload): NavigationPopToTopAction;
 }
 
 /**
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 017a9b9153..69b51129b6 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -24,6 +24,8 @@ import {
     NavigationTransitionProps,
     StackNavigator,
     StackNavigatorConfig,
+    SwitchNavigator,
+    SwitchNavigatorConfig,
     TabBarTop,
     TabNavigator,
     TabNavigatorConfig,
@@ -32,6 +34,8 @@ import {
     HeaderBackButton,
     Header,
     NavigationParams,
+    NavigationPopAction,
+    NavigationPopToTopAction,
 } from 'react-navigation';
 
 // Constants
@@ -58,6 +62,7 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         return (
             <View>
                 <TouchableOpacity onPress={this.navigateToNextScreen} />
+                <TouchableOpacity onPress={this.navigateDifferentlyToNextScreen} />
             </View>
         );
     }
@@ -68,6 +73,13 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         };
         this.props.navigation.navigate(ROUTE_NAME_NEXT_SCREEN, params);
     }
+    private readonly navigateDifferentlyToNextScreen = (): void => {
+        const params = {
+            id: this.props.navigation.state.params && this.props.navigation.state.params.id,
+            name: this.props.navigation.state.params && this.props.navigation.state.params.s,
+        };
+        this.props.navigation.navigate({routeName: ROUTE_NAME_NEXT_SCREEN, params});
+    }
 }
 
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";
@@ -219,6 +231,30 @@ function renderAdvancedStackNavigator(): JSX.Element {
     );
 }
 
+/**
+ * Switch navigator.
+ */
+
+const switchNavigatorConfig: SwitchNavigatorConfig = {
+    initialRouteName: 'screen',
+    resetOnBlur: false,
+    backBehavior: 'none'
+};
+
+const BasicSwitchNavigator = SwitchNavigator(
+    routeConfigMap,
+    switchNavigatorConfig,
+);
+
+function renderBasicSwitchNavigator(): JSX.Element {
+    return (
+        <BasicSwitchNavigator
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
 /**
  * Drawer navigator.
  */
@@ -337,3 +373,13 @@ const setParamsAction: NavigationSetParamsAction = NavigationActions.setParams({
         foo: "bar"
     }
 });
+
+const popAction: NavigationPopAction = NavigationActions.pop({
+    n: 1,
+    immediate: true
+});
+
+const popToTopAction: NavigationPopToTopAction = NavigationActions.popToTop({
+    key: "foo",
+    immediate: true
+});
diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
new file mode 100644
index 0000000000..73a8e7ae55
--- /dev/null
+++ b/types/react-places-autocomplete/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for react-places-autocomplete 6.1
+// Project: https://github.com/kenny-hibino/react-places-autocomplete/
+// Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+//
+/// <reference types="googlemaps" />
+
+import * as React from "react";
+
+export interface formattedSuggestionType {
+    mainText: string;
+    secundaryText: string;
+}
+
+export interface PropTypes {
+    inputProps: {
+        value: string;
+        onChange: (value: string) => void;
+        type?: string;
+        name?: string;
+        placeholder?: string;
+        onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
+    };
+    onError?: (status: string, clearSuggestion: () => void) => void;
+    onSelect?: (address: string, placeID: string) => void;
+    renderSuggestion?: (suggestion: string, formattedSuggestion: formattedSuggestionType) => React.ReactNode;
+    classNames?: {
+        root?: string;
+        input?: string;
+        autocompleteContainer?: string;
+        autocompleteItem?: string;
+        autocompleteItemActive?: string;
+    };
+    styles?: {
+        root?: React.CSSProperties;
+        input?: React.CSSProperties;
+        autocompleteContainer?: React.CSSProperties;
+        autocompleteItem?: React.CSSProperties;
+        autocompleteItemActive?: React.CSSProperties;
+    };
+    options?: {
+        bounds?: google.maps.LatLngBounds | google.maps.LatLngBoundsLiteral;
+        componentRestrictions?: google.maps.GeocoderComponentRestrictions;
+        location?: google.maps.LatLng | google.maps.LatLngLiteral;
+        offset?: number | string;
+        radius?: number | string;
+        types?: string[];
+    };
+
+    debounce?: number;
+    highlightFirstSuggestion?: boolean;
+    renderFooter?: () => React.ReactNode;
+    shouldFetchSuggestions?: (value: string) => boolean;
+}
+
+export function geocodeByAddress(address: string, callback: (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => void): void;
+export function geocodeByPlaceId(placeId: string, callback: (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => void): void;
+
+export default class PlacesAutocomplete extends React.Component<PropTypes> {}
diff --git a/types/react-places-autocomplete/tsconfig.json b/types/react-places-autocomplete/tsconfig.json
new file mode 100644
index 0000000000..02dbd0279c
--- /dev/null
+++ b/types/react-places-autocomplete/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "files": ["index.d.ts"],
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  }
+}
diff --git a/types/react-places-autocomplete/tslint.json b/types/react-places-autocomplete/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-places-autocomplete/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/react-resize-detector/index.d.ts b/types/react-resize-detector/index.d.ts
new file mode 100644
index 0000000000..1bf1ebfb39
--- /dev/null
+++ b/types/react-resize-detector/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for react-resize-detector 2.1
+// Project: https://github.com/maslianok/react-resize-detector
+// Definitions by: Matthew James <https://github.com/matthew-matvei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+
+interface ReactResizeDetectorProps extends React.Props<ReactResizeDetector> {
+    /** Function that will be invoked with width and height arguments */
+    onResize: (width: number, height: number) => void;
+    /** Trigger onResize on height change. Default: false */
+    handleHeight?: boolean;
+    /** Trigger onResize on width change. Default: false */
+    handleWidth?: boolean;
+    /** Do not trigger onResize when a component mounts. Default: false */
+    skipOnMount?: boolean;
+    /** Id of the element we want to observe. If none provided, parentElement of the component will be used. Default: "" */
+    resizableElementId?: string;
+}
+
+declare class ReactResizeDetector extends React.PureComponent<ReactResizeDetectorProps> { }
+
+export default ReactResizeDetector;
diff --git a/types/react-resize-detector/react-resize-detector-tests.tsx b/types/react-resize-detector/react-resize-detector-tests.tsx
new file mode 100644
index 0000000000..33b4fcec40
--- /dev/null
+++ b/types/react-resize-detector/react-resize-detector-tests.tsx
@@ -0,0 +1,31 @@
+// Adapted from example provided at https://github.com/maslianok/react-resize-detector
+
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+
+import ReactResizeRouter from "react-resize-detector";
+
+class App extends React.PureComponent {
+    constructor(props: {}) {
+        super(props);
+
+        this.handleResize = this.handleResize.bind;
+    }
+
+    render(): JSX.Element {
+        return <div>
+            <div>Some child content</div>
+            <ReactResizeRouter
+                onResize={this.handleResize}
+                handleWidth
+                handleHeight
+                skipOnMount
+                resizableElementId="someElement" />
+        </div>;
+    }
+
+    private handleResize(width: number, height: number) {
+        console.log(`width = ${width}`);
+        console.log(`height = ${height}`);
+    }
+}
diff --git a/types/react-resize-detector/tsconfig.json b/types/react-resize-detector/tsconfig.json
new file mode 100644
index 0000000000..b6f1863fc0
--- /dev/null
+++ b/types/react-resize-detector/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-resize-detector-tests.tsx"
+    ]
+}
diff --git a/types/react-resize-detector/tslint.json b/types/react-resize-detector/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-resize-detector/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
new file mode 100644
index 0000000000..9164b409ce
--- /dev/null
+++ b/types/react-rnd/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for react-rnd 7.3
+// Project: https://github.com/bokuweb/react-rnd
+// Definitions by: Ragg <https://github.com/Ragg->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+import React = require('react');
+
+type CSSProperties = React.CSSProperties;
+
+declare namespace Rnd {
+    type Direction =
+        | 'bottom'
+        | 'bottomLeft'
+        | 'bottomRight'
+        | 'left'
+        | 'right'
+        | 'top'
+        | 'topLeft'
+        | 'topRight';
+
+    interface HandleClasses {
+        bottom?: string;
+        bottomLeft?: string;
+        bottomRight?: string;
+        left?: string;
+        right?: string;
+        top?: string;
+        topLeft?: string;
+        topRight?: string;
+    }
+
+    interface HandleStyles {
+        bottom?: CSSProperties;
+        bottomLeft?: CSSProperties;
+        bottomRight?: CSSProperties;
+        left?: CSSProperties;
+        right?: CSSProperties;
+        top?: CSSProperties;
+        topLeft?: CSSProperties;
+        topRight?: CSSProperties;
+    }
+
+    interface Position {
+        x: number;
+        y: number;
+    }
+
+    interface Size {
+        width: number;
+        height: number;
+    }
+
+    interface DraggableData {
+        node: HTMLElement;
+        x: number;
+        y: number;
+        deltaX: number;
+        deltaY: number;
+        lastX: number;
+        lastY: number;
+    }
+
+    type DraggableEventHandler = (e: MouseEvent | TouchEvent, data: DraggableData) => void|false;
+
+    type ResizeHandler = (
+        e: MouseEvent|TouchEvent,
+        direction: Direction,
+        ref: HTMLDivElement,
+        delta: Size,
+        position: Position
+    ) => void;
+
+    interface Options {
+        default: {
+            x?: number;
+            y?: number;
+            width?: number|string;
+            height?: number|string;
+        };
+        className: string;
+        style: any;
+        width: number|string;
+        height: number|string;
+        minWidth: number|string;
+        minHeight: number|string;
+        maxWidth: number|string;
+        maxHeight: number|string;
+        z: number;
+        resizeHandleClasses: HandleClasses;
+        resizeHandleStyles: HandleStyles;
+
+        lockAspectRatio: boolean;
+        enableResizing: boolean;
+
+        onResizeStart: () => void;
+        onResize: () => void;
+        onResizeStop: ResizeHandler;
+
+        onDragStart: DraggableEventHandler;
+        onDrag: DraggableEventHandler;
+        onDragStop: DraggableEventHandler;
+    }
+}
+
+declare class Rnd extends React.Component<Partial<Rnd.Options>> {}
+
+export = Rnd;
diff --git a/types/react-rnd/react-rnd-tests.tsx b/types/react-rnd/react-rnd-tests.tsx
new file mode 100644
index 0000000000..ee434117fe
--- /dev/null
+++ b/types/react-rnd/react-rnd-tests.tsx
@@ -0,0 +1,20 @@
+import React = require('react');
+import Rnd = require('react-rnd');
+
+const onResize: Rnd.ResizeHandler = (e, direction, ref, delta, position) => {
+    direction === 'right';
+    delta.width;
+    delta.height;
+    position.x;
+    position.y;
+};
+
+<Rnd
+    className="class"
+    lockAspectRatio
+    maxWidth={100}
+    enableResizing={false}
+    resizeHandleStyles={{
+        top: { background: '#000' }
+    }}
+/>;
diff --git a/types/react-rnd/tsconfig.json b/types/react-rnd/tsconfig.json
new file mode 100644
index 0000000000..61a1ff7b55
--- /dev/null
+++ b/types/react-rnd/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-rnd-tests.tsx"
+    ]
+}
diff --git a/types/react-rnd/tslint.json b/types/react-rnd/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-rnd/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index 7b299be3e9..17601361bd 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -33,10 +33,11 @@ export class AndroidBackButton extends React.Component<BackButtonProps> {}
 export class DeepLinking extends React.Component {}
 
 export interface LinkProps {
-  component?: React.Component;
+  component?: React.Component | React.ComponentClass;
   replace?: boolean;
   style?: any;
   to: H.LocationDescriptor;
+  [propName: string]: any;
 }
 
 export class Link extends React.Component<LinkProps> {}
diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index 084f878618..d256bb437e 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -130,6 +130,67 @@ export interface MenuRendererProps<TValue = OptionValues> {
     valueArray: Options<TValue>;
 }
 
+export interface OptionComponentProps<TValue = OptionValues> {
+    /**
+     * Classname(s) to apply to the option component.
+     */
+    className?: string;
+
+    /**
+     * Currently focused option.
+     */
+    focusOption?: Option<TValue>;
+
+    inputValue?: string;
+    instancePrefix?: string;
+
+    /**
+     * True if this option is disabled.
+     */
+    isDisabled?: boolean;
+
+    /**
+     * True if this option is focused.
+     */
+    isFocused?: boolean;
+
+    /**
+     * True if this option is selected.
+     */
+    isSelected?: boolean;
+
+    /**
+     * Callback to be invoked when this option is focused.
+     */
+    onFocus?: (option: Option<TValue>, event: any) => void;
+
+    /**
+     * Callback to be invoked when this option is selected.
+     */
+    onSelect?: (option: Option<TValue>, event: any) => void;
+
+    /**
+     * Option to be rendered by this component.
+     */
+    option: Option<TValue>;
+
+    /**
+     * Index of the option being rendered in the list
+     */
+    optionIndex?: number;
+
+    /**
+     * Callback to invoke when removing an option from a multi-selection. (Not necessarily the one
+     * being rendered)
+     */
+    removeValue?: (value: TValue | TValue[]) => void;
+
+    /**
+     * Callback to invoke to select an option. (Not necessarily the one being rendered)
+     */
+    selectValue?: (value: TValue | TValue[]) => void;
+}
+
 export interface ArrowRendererProps {
     /**
      * Arrow mouse down event handler.
@@ -388,7 +449,7 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
     /**
      * option component to render in dropdown
      */
-    optionComponent?: React.ComponentType<TValue>;
+    optionComponent?: React.ComponentType<OptionComponentProps<TValue>>;
     /**
      * function which returns a custom way to render the options in the menu
      */
diff --git a/types/react-select/react-select-tests.tsx b/types/react-select/react-select-tests.tsx
index b048343555..3635fe3145 100644
--- a/types/react-select/react-select-tests.tsx
+++ b/types/react-select/react-select-tests.tsx
@@ -339,6 +339,16 @@ describe("Examples", () => {
         />;
     });
 
+    it("Custom option component", () => {
+        class OptionComponent extends React.Component<ReactSelectModule.OptionComponentProps> {
+            render() {
+                return <div>{this.props.option.label}</div>;
+            }
+        }
+
+        <ReactSelect optionComponent={OptionComponent} />;
+    });
+
     it("Value render with custom value option", () => {
         const valueRenderer = (option: ReactSelectModule.Option<CustomValueType>): ReactSelectModule.HandlerRendererResult =>
             null;
diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index 851170036d..9963ebd69e 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -18,6 +18,12 @@ export interface SortStart {
 
 export type SortEvent = React.MouseEvent<any> | React.TouchEvent<any>;
 
+export type SortEventWithTag = SortEvent & {
+  target: {
+    tagName: string
+  }
+};
+
 export type SortStartHandler = (sort: SortStart, event: SortEvent) => void;
 
 export type SortMoveHandler = (event: SortEvent) => void;
@@ -45,7 +51,7 @@ export interface SortableContainerProps {
     pressDelay?: number;
     pressThreshold?: number;
     distance?: number;
-    shouldCancelStart?: (event: SortEvent) => boolean;
+    shouldCancelStart?: (event: SortEvent | SortEventWithTag) => boolean;
     onSortStart?: SortStartHandler;
     onSortMove?: SortMoveHandler;
     onSortEnd?: SortEndHandler;
diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 0b5baa5292..503b5f4e02 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -5,12 +5,12 @@
 // TypeScript Version: 2.6
 import * as React from 'react';
 
-export type ReactTableFunction = () => void;
+export type ReactTableFunction = (value?: any) => void;
 export type AccessorFunction = (row: object) => any;
 export type Accessor = string | string[] | object | AccessorFunction;
 export type Aggregator = (values: any, rows: any) => any;
 export type TableCellRenderer = ((data: any, column: any) => React.ReactNode) | React.ReactNode;
-export type FilterRender = (params: { column: Column, filter: any, onFilterChange: ReactTableFunction, key?: string }) => React.ReactElement<any>;
+export type FilterRender = (params: { column: Column, filter: any, onChange: ReactTableFunction, key?: string }) => React.ReactElement<any>;
 export type PivotRenderer = ((cellInfo: any) => React.ReactNode) | (() => any) | string | React.ReactNode;
 
 export type ComponentPropsGetter0 = (finalState: any, rowInfo: undefined, column: undefined, instance?: any) => object | undefined;
@@ -610,7 +610,7 @@ export interface RowRenderProps extends Partial<RowInfo> {
 }
 
 export interface RowInfo {
-    /** Original row from your data */
+    /** Materialized row of data */
     row: any;
 
     /** The post-accessed values from the original row */
diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index 3c21c15150..15c72616c0 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -11,7 +11,6 @@ export interface TruncateProps extends React.HTMLProps<Truncate> {
     ellipsis?: React.ReactNode;
     trimWhitespace?: boolean;
     onTruncate?(isTruncated: boolean): void;
-    trimWhitespace?: boolean;
 }
 
 declare class Truncate extends React.Component<TruncateProps> { }
diff --git a/types/react-truncate/react-truncate-tests.tsx b/types/react-truncate/react-truncate-tests.tsx
index 5a97f7183f..b0afc2b970 100644
--- a/types/react-truncate/react-truncate-tests.tsx
+++ b/types/react-truncate/react-truncate-tests.tsx
@@ -15,8 +15,8 @@ const TruncateTest: React.SFC = _ => (
             <div>Test string</div>
         </Truncate>
 
-	<Truncate trimWhitespace={true}>
+        <Truncate trimWhitespace={true}>
             <div>Test string</div>
-	</Truncate>
+        </Truncate>
     </div>
 );
diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
index fca818802f..78454990f7 100644
--- a/types/react-virtualized-select/index.d.ts
+++ b/types/react-virtualized-select/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.6
 
 import * as React from "react";
-import { ReactSelectProps } from "react-select";
+import { ReactSelectProps, ReactAsyncSelectProps, LoadOptionsHandler, OptionValues } from "react-select";
 import { ListProps } from "react-virtualized";
 
 export interface VirtualizedOptionRenderOptions<T> {
@@ -22,20 +22,15 @@ export interface VirtualizedOptionRenderOptions<T> {
     valueArray: T[];
 }
 
-/**
- * Dummy interface to allow `VirtualizedSelectProps` to have an `optionRenderer` type
- * incompatible with the one in `ReactSelectProps`.
- */
-interface VirtualizedSelectPropsBase extends ReactSelectProps {
-    optionRenderer?: any;
-}
-export interface VirtualizedSelectProps extends VirtualizedSelectPropsBase {
-    async?: boolean;
+export interface AdditionalVirtualizedSelectProps<TValue> {
     maxHeight?: number;
     optionHeight?: number;
-    optionRenderer?(options: VirtualizedOptionRenderOptions<any>): JSX.Element;
+    optionRenderer?(options: VirtualizedOptionRenderOptions<TValue>): JSX.Element;
     selectComponent?: React.ComponentClass<any> | React.StatelessComponent<any>;
 }
 
-declare class VirtualizedSelect extends React.PureComponent<VirtualizedSelectProps> {}
+type VirtualizedSelectProps<TValue = OptionValues> = (ReactAsyncSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue> & { async: true }) |
+    ReactSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue>;
+
+declare class VirtualizedSelect<TValue = OptionValues> extends React.PureComponent<VirtualizedSelectProps<TValue>> {}
 export default VirtualizedSelect;
diff --git a/types/react-virtualized-select/react-virtualized-select-tests.tsx b/types/react-virtualized-select/react-virtualized-select-tests.tsx
index 6fe469bade..380828e864 100644
--- a/types/react-virtualized-select/react-virtualized-select-tests.tsx
+++ b/types/react-virtualized-select/react-virtualized-select-tests.tsx
@@ -2,11 +2,28 @@ import * as React from "react";
 import Select from "react-select";
 import VirtualizedSelect from "react-virtualized-select";
 
-<VirtualizedSelect
-  async={true}
-  maxHeight={0}
-  optionHeight={0}
-  optionRenderer={() => <div/>}
-  selectComponent={Select}
-  options={[]}
-/>;
+/*Example TValue.*/
+interface Example {
+	name: string;
+}
+
+/*Example generic class.*/
+class ExampleSelectAsync extends VirtualizedSelect<Example> {
+}
+
+<div>
+	<VirtualizedSelect
+	  maxHeight={0}
+	  optionHeight={0}
+	  optionRenderer={() => <div/>}
+	  selectComponent={Select}
+	  options={[]}
+	/>
+	<ExampleSelectAsync async={true}
+	  maxHeight={0}
+	  optionHeight={0}
+	  optionRenderer={() => <div/>}
+	  selectComponent={Select}
+	  loadOptions={(input: string) => Promise.resolve([{name: 'Hi'}])}
+	/>
+</div>;
diff --git a/types/react-virtualized-select/tsconfig.json b/types/react-virtualized-select/tsconfig.json
index 677bdcf43d..b544360da3 100644
--- a/types/react-virtualized-select/tsconfig.json
+++ b/types/react-virtualized-select/tsconfig.json
@@ -8,6 +8,7 @@
         "jsx": "react",
         "noImplicitAny": true,
         "noImplicitThis": true,
+		"strictFunctionTypes": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index 9a6492f368..630e64df69 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -9,7 +9,7 @@ export type GridCellProps = {
     isScrolling: boolean;
     isVisible: boolean;
     key: string;
-    parent: Grid | List | Table;
+    parent: typeof Grid | typeof List | typeof Table;
     rowIndex: number;
     style: React.CSSProperties;
 };
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 6293d20c9e..8159c49ff2 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -5,6 +5,7 @@
 //                 Konstantin Nesterov <https://github.com/wasd171>
 //                 Szőke Szabolcs <https://github.com/szabolcsx>
 //                 Kræn Hansen <https://github.com/kraenhansen>
+//                 Steve Zhang <https://github.com/Stevearzh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 32d2ab7c0d..359090b5b2 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -6,7 +6,6 @@
 //                 Fábio Paiva <https://github.com/fabiopaiva>
 //                 FaithForHumans <https://github.com/FaithForHumans>
 //                 Kurt Preston <https://github.com/KurtPreston>
-//                 Kræn Hansen <https://github.com/kraenhansen>
 //                 Tim Chen <https://github.com/timc13>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index b6a9f21b14..edff2061b5 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -133,7 +133,7 @@ declare module 'recompose' {
     >;
 
     // withStateHandlers: https://github.com/acdlite/recompose/blob/master/docs/API.md#withstatehandlers
-    type StateHandler<TState> = (...payload: any[]) => TState | undefined;
+    type StateHandler<TState> = (...payload: any[]) => Partial<TState> | undefined;
     type StateHandlerMap<TState> = {
       [updaterName: string]: StateHandler<TState>;
     };
diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index 7a3c11af3f..a6c2b2e5bb 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -72,6 +72,7 @@ export class Field<P = GenericFieldHTMLAttributes | BaseFieldProps> extends Comp
 export interface WrappedFieldProps {
     input: WrappedFieldInputProps;
     meta: WrappedFieldMetaProps;
+    label?: string;
 }
 
 export interface WrappedFieldInputProps extends CommonFieldInputProps {
diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 8949fa6ec2..f4317ade87 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -109,6 +109,7 @@ interface MyFieldCustomProps {
 type MyFieldProps = MyFieldCustomProps & WrappedFieldProps;
 const MyField: React.StatelessComponent<MyFieldProps> = ({
     children,
+    label,
     input,
     meta,
     foo
diff --git a/types/redux-test-utils/index.d.ts b/types/redux-test-utils/index.d.ts
new file mode 100644
index 0000000000..2c5a36e441
--- /dev/null
+++ b/types/redux-test-utils/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for redux-test-utils 0.2
+// Project: https://github.com/Knegusen/redux-test-utils#readme
+// Definitions by: Huw Martin <https://github.com/huwmartin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { AnyAction, Store, Dispatch } from 'redux';
+
+export function createMockStore(
+  state?: any
+): mockStore<any>;
+
+export function createMockDispatch(): mockDispatch<any>;
+
+export interface mockStore<S> extends Store<S>, mockDispatch<S> {}
+
+export interface mockDispatch<S> {
+  dispatch: Dispatch<S>;
+  getActions: () => AnyAction[];
+  getAction: (type: any) => AnyAction | undefined;
+  isActionTypeDispatched: (type: any) => boolean;
+  isActionDispatched: (action: AnyAction) => boolean;
+}
diff --git a/types/redux-test-utils/package.json b/types/redux-test-utils/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/redux-test-utils/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/redux-test-utils/redux-test-utils-tests.ts b/types/redux-test-utils/redux-test-utils-tests.ts
new file mode 100644
index 0000000000..9fc8df2c13
--- /dev/null
+++ b/types/redux-test-utils/redux-test-utils-tests.ts
@@ -0,0 +1,37 @@
+import * as chai from 'chai';
+
+import { createMockStore, createMockDispatch } from 'redux-test-utils';
+
+const expect = chai.expect;
+const assert = chai.assert;
+
+function test_creatMockStore() {
+  const state = 'state';
+  const store = createMockStore(state);
+  const action = {
+    type: 'type',
+    data: 'data'
+  };
+  store.dispatch(action);
+
+  expect(store.getAction(action.type)).to.equal(action);
+  expect(store.getActions()).to.equal([action]);
+  expect(store.isActionDispatched(action)).to.be.true;
+  expect(store.isActionTypeDispatched(action.type)).to.be.true;
+  expect(store.getState()).to.be(state);
+}
+
+function test_createMockDispatch() {
+  const state = 'state';
+  const dispatchMock = createMockDispatch();
+  const action = {
+    type: 'type',
+    data: 'data',
+  };
+  dispatchMock.dispatch(action);
+
+  expect(dispatchMock.getAction(action.type)).to.equal(action);
+  expect(dispatchMock.getActions()).to.equal([action]);
+  expect(dispatchMock.isActionDispatched(action)).to.be.true;
+  expect(dispatchMock.isActionTypeDispatched(action.type)).to.be.true;
+}
diff --git a/types/redux-test-utils/tsconfig.json b/types/redux-test-utils/tsconfig.json
new file mode 100644
index 0000000000..5b074d5fa2
--- /dev/null
+++ b/types/redux-test-utils/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-test-utils-tests.ts"
+    ]
+}
diff --git a/types/redux-test-utils/tslint.json b/types/redux-test-utils/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-test-utils/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/relay-runtime/index.d.ts b/types/relay-runtime/index.d.ts
index 2348a4d06b..85a6c9c3ea 100644
--- a/types/relay-runtime/index.d.ts
+++ b/types/relay-runtime/index.d.ts
@@ -99,12 +99,12 @@ export interface PayloadError {
  *
  * May return an Observable or Promise of a raw server response.
  */
-export function FetchFunction(
+export type FetchFunction = (
     operation: RequestNode,
     variables: Variables,
     cacheConfig: CacheConfig,
     uploadables?: UploadableMap
-): ObservableFromValue<QueryPayload>;
+) => ObservableFromValue<QueryPayload>;
 
 /**
  * A function that executes a GraphQL subscription operation, returning one or
@@ -671,14 +671,14 @@ export interface RelayNetwork {
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayDefaultHandlerProvider
 // ~~~~~~~~~~~~~~~~~~~~~
-export function HandlerProvider(name: string): HandlerInterface | null;
+export type HandlerProvider = (name: string) => HandlerInterface | null;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayModernEnvironment
 // ~~~~~~~~~~~~~~~~~~~~~
 export interface EnvironmentConfig {
     configName?: string;
-    handlerProvider?: typeof HandlerProvider;
+    handlerProvider?: HandlerProvider;
     network: Network;
     store: Store;
 }
@@ -732,7 +732,7 @@ export class Network {
      * Creates an implementation of the `Network` interface defined in
      * `RelayNetworkTypes` given `fetch` and `subscribe` functions.
      */
-    static create(fetchFn: typeof FetchFunction, subscribeFn?: SubscribeFunction): RelayNetwork;
+    static create(fetchFn: FetchFunction, subscribeFn?: SubscribeFunction): RelayNetwork;
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~
diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index 4ef00ecb09..038a9d48e6 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for RethinkDB 2.3
 // Project: http://rethinkdb.com/
-// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>
+// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>, Adrian Farmadin <https://github.com/AdrianFarmadin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -40,6 +40,9 @@ declare module "rethinkdb" {
     export function asc(property: string): Sort;
     export function desc(property: string): Sort;
 
+    export function point(lng: number, lat: number): Point;
+    export function polygon(...point: Point[]): Polygon;
+
     export var count: Aggregator;
     export function sum(prop: string): Aggregator;
     export function avg(prop: string): Aggregator;
@@ -233,7 +236,13 @@ declare module "rethinkdb" {
          * See: https://rethinkdb.com/api/javascript/has_fields/
          */
         hasFields(...fields: string[]): T;
-    }
+    } 
+
+    interface Geometry { }
+
+    interface Point { }
+
+    interface Polygon extends Geometry { }
 
     interface Table extends Sequence, HasFields<Sequence> {
         indexCreate(name: string, index?: ExpressionFunction<any>): Operation<CreateResult>;
@@ -247,6 +256,7 @@ declare module "rethinkdb" {
         get<TObjectType extends object>(key: string): Operation<TObjectType | null> & Writeable;
         getAll(key: string, index?: Index): Sequence; // without index defaults to primary key
         getAll(...keys: string[]): Sequence;
+        getIntersecting(geometry: Geometry, index: Index): Sequence;
         wait(WaitOptions?: WaitOptions): WaitResult;
     }
 
diff --git a/types/roads/index.d.ts b/types/roads/index.d.ts
index 55028403b6..727bc1c819 100644
--- a/types/roads/index.d.ts
+++ b/types/roads/index.d.ts
@@ -11,6 +11,23 @@
 export type Keys = string;
 export type Option = {[k in Keys]: any};
 
+/**
+ * @param validOrigins An array of origin urls that can send requests to this API
+ * @param supportsCredentials A boolean, true if you want this endpoint to receive cookies
+ * @param responseHeaders An array of valid HTTP response headers
+ * @param requestHeaders An array of valid HTTP request headers
+ * @param validMethods An array of valid HTTP methods
+ * @param cacheMaxAge The maximum age to cache the cors information
+ */
+export interface Cors {
+    validOrigins: string[];
+    supportsCredentials?: boolean;
+    responseHeaders?: string[];
+    requestHeaders?: string[];
+    validMethods?: string[];
+    cacheMaxAge?: number;
+}
+
 /**
  * @param method The HTTP method that was provided to the request
  * @param url The URL that was provided to the request
@@ -126,10 +143,9 @@ export namespace middleware {
 
     /**
      * Middleware to Apply proper cors headers
-     * @param allow_origins Either * to allow all origins, or an explicit list of valid origins
-     * @param allow_headers A white list of headers that the client is allowed to send in their requests
+     * @param options Cors options
      */
-    function cors(allow_origins: string | string[], allow_headers?: string[]): any;
+    function cors(options: Cors): any;
 
     /**
      * Translate the request body into a usable value
diff --git a/types/roads/roads-tests.ts b/types/roads/roads-tests.ts
index 6914c3d218..9bc7f4e818 100644
--- a/types/roads/roads-tests.ts
+++ b/types/roads/roads-tests.ts
@@ -3,7 +3,14 @@ import { build, Road, middleware, integrations, Response, HttpError, PJAX } from
 const road = new Road();
 const router = new middleware.SimpleRouter(road);
 
-road.use(middleware.cors("*"));
+road.use(middleware.cors({
+    requestHeaders: ["content-type"],
+    responseHeaders: ["content-type"],
+    supportsCredentials: true,
+    validOrigins: ["http://localhost:8080"],
+    validMethods: ["GET", "POST"],
+    cacheMaxAge: 4
+}));
 
 road.use(middleware.killSlash);
 
diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index 51728127ea..1078b53573 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for rosie
 // Project: https://github.com/rosiejs/rosie
-// Definitions by: Abner Oliveira <https://github.com/abner>, Chris Grigg <https://github.com/subvertallchris>
+// Definitions by: Abner Oliveira <https://github.com/abner>,
+//                 Chris Grigg <https://github.com/subvertallchris>,
+//                 Alex Bukurov <https://github.com/abukurov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -191,7 +193,7 @@ declare namespace rosie {
      * @param {object=} options
      * @return {object}
      */
-    attributes(attributes: string, options?: { [k in keyof T]: T[k] }): T;
+    attributes(attributes?: { [k in keyof T]?: T[k] }, options?: any): T;
 
     /**
      * Generates values for all the registered options using the values given.
@@ -230,4 +232,4 @@ declare namespace rosie {
 declare var rosie: { Factory: rosie.IFactoryStatic };
 
 export = rosie;
-export as namespace Factory;
\ No newline at end of file
+export as namespace Factory;
diff --git a/types/rosie/rosie-tests.ts b/types/rosie/rosie-tests.ts
index 8d7c6d83b8..6c2152a9e7 100644
--- a/types/rosie/rosie-tests.ts
+++ b/types/rosie/rosie-tests.ts
@@ -47,10 +47,12 @@ const personFactory = Factory.define<Person>('Person').attr('firstName', 'John')
 // Building does not require the first (attributes) and second (options) arguments
 personFactory.build();
 personFactory.buildList(3);
+personFactory.attributes();
 
 // Building with attributes does not require the second (options) argument
 personFactory.build({ firstName: "John" });
 personFactory.buildList(3, { firstName: "John" });
+personFactory.attributes({ firstName: "John" });
 
 // It will automatically type up to five dependencies
 personFactory.attr('fullName', ['firstName'], firstName => firstName);
diff --git a/types/rsync/index.d.ts b/types/rsync/index.d.ts
index e86d22647a..b67932eb5a 100644
--- a/types/rsync/index.d.ts
+++ b/types/rsync/index.d.ts
@@ -48,7 +48,7 @@ interface Rsync {
         stdout: StreamDataHandler,
         stderr: StreamDataHandler
     ): child_process.ChildProcess;
-    
+
     // cwd
     cwd(cwd: string): string;
 
@@ -63,6 +63,7 @@ interface Rsync {
     quiet(): Rsync;
     dirs(): Rsync;
     links(): Rsync;
+    chmod(flags: string): Rsync;
     dry(): Rsync;
 
     // accessor methods
diff --git a/types/rsync/rsync-tests.ts b/types/rsync/rsync-tests.ts
index 41ec4dd9b1..fe9bf39558 100644
--- a/types/rsync/rsync-tests.ts
+++ b/types/rsync/rsync-tests.ts
@@ -114,6 +114,7 @@ rsync.shell('ssh')
     .quiet()
     .dirs()
     .links()
+    .chmod("ug=rwX")
     .dry();
 
 
@@ -152,4 +153,4 @@ rsync.include('/a/file')
   .include('/b/file');
 
 // as Array
-rsync.include(['/a/file', '/b/file']);
\ No newline at end of file
+rsync.include(['/a/file', '/b/file']);
diff --git a/types/seneca/index.d.ts b/types/seneca/index.d.ts
index ecf3c29096..4dfd82cb1c 100644
--- a/types/seneca/index.d.ts
+++ b/types/seneca/index.d.ts
@@ -1,7 +1,9 @@
 // Type definitions for seneca v2.1.0
 // Project: https://www.npmjs.com/package/seneca
 // Definitions by: Peter Snider <https://github.com/psnider>
+//                 Kevyn Bruyere <https://github.com/kevynb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/seneca
+// TypeScript Version: 2.3
 
 
 declare module "seneca" {
@@ -168,11 +170,21 @@ declare module "seneca" {
             sort$?: any;
         }
 
+        interface PartialMessagePayload {
+            transport$: object | {};
+            plugin$: any;
+            fatal$: boolean;
+            tx$: string;
+        }
 
+        type MessagePayload<T> = PartialMessagePayload & T;
 
         type Pattern = string | MinimalPattern;
         type GlobalErrorHandler = (error: Error) => void;
-        type AddCallback = (msg: any, respond: (error: Error | null, msg?: any) => void) => void;
+        type AddCallback<T = any> = (
+            msg: MessagePayload<T>,
+            respond: (error: Error | null, msg?: any) => void,
+        ) => void;
         type ActCallback = (error: Error | null, result?: any) => void;
         type CloseCallback = (optional: any, done: (error: Error) => void) => void;
         type DatabaseID = string;
@@ -199,10 +211,18 @@ declare module "seneca" {
 
             ready(callback: (error: Error) => void): void;
 
-            add(pattern: Pattern, action: AddCallback): this;
-            add(pattern: Pattern, paramspec: any, action: AddCallback): this;
-            act(pattern: Pattern, respond: ActCallback): void;
-            act(pattern: Pattern, msg: any, respond: ActCallback): void;
+            add<PatternType = any, CallBackParams = any>(
+                pattern: PatternType,
+                action: AddCallback<PatternType & CallBackParams>,
+            ): this;
+            add<PatternType = any, CallbackParams = any>(
+                pattern: PatternType,
+                paramspec: any,
+                action: AddCallback<PatternType & CallbackParams>,
+            ): this;
+
+            act<PatternWithArgs = Pattern>(pattern: PatternWithArgs, respond: ActCallback): void;
+            act<PatternWithArgs = Pattern>(pattern: PatternWithArgs, msg: any, respond: ActCallback): void;
             make(entity_canon: string, properties?: any): Entity;
             make(base: string, entity_canon: string, properties?: any): Entity;
             make(zone: string, base: string, entity_canon: string, properties?: any): Entity;
diff --git a/types/seneca/seneca-tests.ts b/types/seneca/seneca-tests.ts
index 6ff0331ff6..376cede3f1 100644
--- a/types/seneca/seneca-tests.ts
+++ b/types/seneca/seneca-tests.ts
@@ -126,3 +126,53 @@ seneca.act('cmd:salestax,net:100,country:US,state:NY', function (err, result) {
 seneca.act('cmd:salestax,net:100,country:IE,category:reduced', function (err, result) {
   console.log('IE: ' + result.total)
 })
+
+/** With Generic Type usage **/
+seneca.add<SalestaxPattern, SalestaxParams>({cmd: 'salestax'}, function(args, callback) {
+    var rate = 0.23;
+    var total = args.net * (1 + rate);
+    callback(null, {total: total});
+});
+
+seneca.act<SalesTaxRequest>({cmd: 'salestax', net: 100}, function(err, result) {
+    console.log(result.total);
+});
+
+seneca.add<ConfigPattern, ConfigParams>({cmd: 'config'}, function(args, callback) {
+    var config: any = {
+        // any added here due to following config[] access
+        rate: 0.23,
+    };
+    var value = config[args.prop];
+    callback(null, {value: value});
+});
+
+seneca.add<SalestaxPattern, SalestaxParams>({cmd: 'salestax'}, function(args, callback) {
+    seneca.act<ConfigRequest>({cmd: 'config', prop: 'rate'}, function(err, result) {
+        var rate = parseFloat(result.value);
+        var total = args.net * (1 + rate);
+        callback(null, {total: total});
+    });
+});
+
+
+interface SalestaxPattern {
+    cmd: 'salestax';
+}
+
+interface SalestaxParams {
+    net: number;
+}
+
+export interface SalesTaxRequest extends SalestaxPattern, SalestaxParams {}
+
+interface ConfigPattern {
+    cmd: 'config';
+}
+
+interface ConfigParams {
+    prop: string;
+}
+
+export interface ConfigRequest extends ConfigPattern, ConfigParams {}
+
diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 395f5b9d23..7d72a0b096 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sequelize 4.27.0
+// Type definitions for Sequelize 4.27.8
 // Project: http://sequelizejs.com
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
@@ -1894,8 +1894,8 @@ declare namespace sequelize {
      *
      * ```js
      * sequelize.define('model', {
- *   column: DataTypes.INTEGER
- * })
+     *   column: DataTypes.INTEGER
+     * })
      * ```
      * When defining a model you can just as easily pass a string as type, but often using the types defined here
      * is
@@ -1915,12 +1915,12 @@ declare namespace sequelize {
      *
      * ```js
      * sequelize.define('model', {
- *   uuid: {
- *     type: DataTypes.UUID,
- *     defaultValue: DataTypes.UUIDV1,
- *     primaryKey: true
- *   }
- * })
+     *   uuid: {
+     *     type: DataTypes.UUID,
+     *     defaultValue: DataTypes.UUIDV1,
+     *     primaryKey: true
+     *   }
+     * })
      * ```
      */
     interface DataTypes {
@@ -3136,11 +3136,11 @@ declare namespace sequelize {
         $ilike: string | WherePGStatement;
         $notLike: string | WherePGStatement;
         $notILike: string | WherePGStatement;
-        $between: [number, number];
+        $between: [number, number] | [Date, Date];
         "..": [number, number];
         $notBetween: [number, number];
         "!..": [number, number];
-        $overlap: [number, number];
+        $overlap: [number, number] | [string, string];
         "&&": [number, number];
         $contains: any;
         "@>": any;
@@ -3155,7 +3155,7 @@ declare namespace sequelize {
      * typesafety, but there is no way to pass the tests if we just remove it.
      */
     type WhereOptions<T> = {
-        [P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | Array<string | number> | null;
+        [P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | WhereNested | Array<string | number> | null;
     };
 
     /**
@@ -3445,7 +3445,7 @@ declare namespace sequelize {
     /**
  * Options for Model.upsert method
      */
-    interface UpsertOptions extends FieldsOptions, LoggingOptions, SearchPathOptions {
+    interface UpsertOptions extends FieldsOptions, LoggingOptions, SearchPathOptions, ReturningOptions {
     }
 
     /**
@@ -3611,12 +3611,12 @@ declare namespace sequelize {
         limit?: number;
 
         /**
-             * Transaction to run query under
+         * Transaction to run query under
          */
         transaction?: Transaction;
 
         /**
-        * If true, the updatedAt timestamp will not be updated.
+         * If true, the updatedAt timestamp will not be updated.
          */
         silent?: boolean;
     }
@@ -3655,6 +3655,13 @@ declare namespace sequelize {
         plain?: boolean;
     }
 
+    /**
+     * Models contains Model instances associated to their name
+     */
+    interface Models {
+        [index: string]: Model<any, any>;
+    }
+
     /**
      * A Model represents a table in the database. Sometimes you might also see it referred to as model, or simply
      * as factory. This class should _not_ be instantiated directly, it is created using `sequelize.define`, and
@@ -3667,6 +3674,11 @@ declare namespace sequelize {
          */
         Instance(): TInstance;
 
+        /**
+         * The singular name of the model
+         */
+        name: string;
+
         /**
          * Remove attribute from model definition
          *
@@ -3723,64 +3735,64 @@ declare namespace sequelize {
         addScope(name: string, scope: AnyFindOptions | Function, options?: AddScopeOptions): void;
 
         /**
-             * Add a new scope to the model. This is especially useful for adding scopes with includes, when the model you want to include is not available at the time this model is defined.
-             *
-             * By default this will throw an error if a scope with that name already exists. Pass `override: true` in the options object to silence this error.
-             *
-             * @param {String}          name The name of the scope. Use `defaultScope` to override the default scope
-             * @param {Object|Function} scope
-             * @param {Object}          [options]
-             * @param {Boolean}         [options.override=false]
-             */
+         * Add a new scope to the model. This is especially useful for adding scopes with includes, when the model you want to include is not available at the time this model is defined.
+         *
+         * By default this will throw an error if a scope with that name already exists. Pass `override: true` in the options object to silence this error.
+         *
+         * @param {String}          name The name of the scope. Use `defaultScope` to override the default scope
+         * @param {Object|Function} scope
+         * @param {Object}          [options]
+         * @param {Boolean}         [options.override=false]
+         */
         addScope(name: string, scope: AnyFindOptions | Function, options?: AddScopeOptions): void;
 
         /**
- * Apply a scope created in `define` to the model. First let's look at how to create scopes:
- * ```js
- * var Model = sequelize.define('model', attributes, {
- *   defaultScope: {
- *     where: {
- *       username: 'dan'
- *     },
- *     limit: 12
- *   },
- *   scopes: {
- *     isALie: {
- *       where: {
- *         stuff: 'cake'
- *       }
- *     },
- *     complexFunction: function(email, accessLevel) {
- *       return {
- *         where: {
- *           email: {
- *             $like: email
- *           },
- *           accesss_level {
- *             $gte: accessLevel
- *           }
- *         }
- *       }
- *     }
- *   }
- * })
- * ```
- * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
- * your query. Here's a couple of examples:
- * ```js
- * Model.findAll() // WHERE username = 'dan'
- * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
- * ```
- *
- * To invoke scope functions you can do:
- * ```js
- * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
- * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
- * ```
- *
- * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
- *     model will clear the previous scope.
- */
+         * Apply a scope created in `define` to the model. First let's look at how to create scopes:
+         * ```js
+         * var Model = sequelize.define('model', attributes, {
+         *   defaultScope: {
+         *     where: {
+         *       username: 'dan'
+         *     },
+         *     limit: 12
+         *   },
+         *   scopes: {
+         *     isALie: {
+         *       where: {
+         *         stuff: 'cake'
+         *       }
+         *     },
+         *     complexFunction: function(email, accessLevel) {
+         *       return {
+         *         where: {
+         *           email: {
+         *             $like: email
+         *           },
+         *           accesss_level {
+         *             $gte: accessLevel
+         *           }
+         *         }
+         *       }
+         *     }
+         *   }
+         * })
+         * ```
+         * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
+         * your query. Here's a couple of examples:
+         * ```js
+         * Model.findAll() // WHERE username = 'dan'
+         * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
+         * ```
+         *
+         * To invoke scope functions you can do:
+         * ```js
+         * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
+         * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
+         * ```
+         *
+         * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
+         *     model will clear the previous scope.
+         */
         scope(options?: string | ScopeOptions | AnyWhereOptions | Array<string | ScopeOptions | AnyWhereOptions>): Model<TInstance, TAttributes>;
 
         /**
@@ -3969,32 +3981,34 @@ declare namespace sequelize {
         findOrCreate(options: FindOrInitializeOptions<TAttributes>): Promise<[TInstance, boolean]>;
 
         /**
-             * A more performant findOrCreate that will not work under a transaction (at least not in postgres)
-             * Will execute a find call, if empty then attempt to create, if unique constraint then attempt to find again
-             */
+         * A more performant findOrCreate that will not work under a transaction (at least not in postgres)
+         * Will execute a find call, if empty then attempt to create, if unique constraint then attempt to find again
+         */
         findCreateFind<TCustomAttributes>(options: FindCreateFindOptions<TAttributes & TCustomAttributes>): Promise<[TInstance, boolean]>;
 
         /**
- * Insert or update a single row. An update will be executed if a row which matches the supplied values on
- * either the primary key or a unique key is found. Note that the unique index must be defined in your
- * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
- * because sequelize fails to identify the row that should be updated.
- *
- * **Implementation details:**
- *
- * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
- * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
- *   unique_constraint UPDATE
- * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
- * regardless
- *   of whether the row already existed or not
- *
- * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
- * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
- * whether the row was inserted or not.
- */
-        upsert(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
-        insertOrUpdate(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
+         * Insert or update a single row. An update will be executed if a row which matches the supplied values on
+         * either the primary key or a unique key is found. Note that the unique index must be defined in your
+         * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
+         * because sequelize fails to identify the row that should be updated.
+         *
+         * **Implementation details:**
+         *
+         * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
+         * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
+         *   unique_constraint UPDATE
+         * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
+         * regardless
+         *   of whether the row already existed or not
+         *
+         * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
+         * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
+         * whether the row was inserted or not.
+         */
+        upsert(values: TAttributes, options?: UpsertOptions & { returning: false | undefined }): Promise<boolean>;
+        upsert(values: TAttributes, options?: UpsertOptions & { returning: true }): Promise<[boolean, TInstance]>;
+        insertOrUpdate(values: TAttributes, options?: UpsertOptions & { returning: false | undefined }): Promise<boolean>;
+        insertOrUpdate(values: TAttributes, options?: UpsertOptions & { returning: true }): Promise<[boolean, TInstance]>;
 
         /**
          * Create and insert multiple instances in bulk.
@@ -4044,6 +4058,13 @@ declare namespace sequelize {
          */
         unscoped(): this;
 
+        /**
+         * Set associations with other models
+         *
+         * @param models
+         */
+        associate?(models: Models): void;
+
     }
 
     //
@@ -4062,12 +4083,12 @@ declare namespace sequelize {
         /**
          * A function that gets executed while running the query to log the sql.
          */
-        logging?: boolean | Function;            
+        logging?: boolean | Function;
 
         /**
          * An optional transaction to perform this query in
          */
-        transaction?: Transaction; 
+        transaction?: Transaction;
 
     }
 
@@ -4652,10 +4673,10 @@ declare namespace sequelize {
         bind?: Object | string[];
 
         /**
- * Force the query to use the write pool, regardless of the query type.
- *
- * Defaults to false
- */
+         * Force the query to use the write pool, regardless of the query type.
+         *
+         * Defaults to false
+         */
         useMaster?: boolean;
 
         /**
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index eea19959bd..5d1f6eed34 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -915,6 +915,8 @@ User.findAll( { where : { intVal : { '!..' : [8, 10] } } } );
 User.findAll( { where : { theDate : { between : ['2013-01-02', '2013-01-11'] } } } );
 User.findAll( { where : { theDate : { between : ['2013-01-02', '2013-01-11'] }, intVal : 10 } } );
 User.findAll( { where : { theDate : { between : ['2012-12-10', '2013-01-02'] } } } );
+User.findAll( { where : { theDate : { between : [1, 3] } } } );
+User.findAll( { where : { theDate : { between : [new Date(0), new Date(1000)] } } } );
 User.findAll( { where : { theDate : { nbetween : ['2013-01-04', '2013-01-20'] } } } );
 User.findAll( { order : [s.col( 'name' )] } );
 User.findAll( { order : [['theDate', 'DESC']] } );
@@ -948,6 +950,11 @@ User.findAll( { where: s.where(s.fn('lower', s.col('email')), s.fn('lower', 'TES
 User.findAll( { subQuery: false, include : [User], order : [[User, User, 'numYears', 'c']] } );
 User.findAll( { rejectOnEmpty: true });
 
+User.findAll( { where: { $and:[ { username: "user" }, { theDate: new Date() } ] } } );
+User.findAll( { where: { $or:[ { username: "user" }, { theDate: new Date() } ] } } );
+User.findAll( { where: { $and:[ { username: { $not: "user" } }, { theDate: new Date() } ] } } );
+User.findAll( { where: { $or:[ { username: { $not: "user" } }, { theDate: new Date() } ] } } );
+User.findAll( { where: { emails: { $overlap: ["me@mail.com", "you@mail.com"] } } } );
 
 User.findById( 'a string' );
 
@@ -1036,7 +1043,9 @@ findOrRetVal = User.findOrCreate( { where : { id : undefined }, defaults : { nam
 findOrRetVal = User.findOrCreate( { where : { email : 'unique.email.@d.com', companyId : Math.floor( Math.random() * 5 ) } } );
 findOrRetVal = User.findOrCreate( { where : { objectId : 1 }, defaults : { bool : false } } );
 
-User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) } );
+let upsertPromiseNoOptions: Bluebird<boolean> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) } );
+let upsertPromiseReturning: Bluebird<[boolean, AnyInstance]> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) }, { returning: true } );
+let upsertPromiseNotReturning: Bluebird<boolean> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) }, { returning: false } );
 
 User.bulkCreate( [{ aNumber : 10 }, { aNumber : 12 }] ).then( ( i ) => i[0].isNewRecord );
 User.bulkCreate( [{ username : 'bar' }, { username : 'bar' }, { username : 'bar' }] );
diff --git a/types/settings/index.d.ts b/types/settings/index.d.ts
new file mode 100644
index 0000000000..1c7ec115de
--- /dev/null
+++ b/types/settings/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for settings 0.1
+// Project: https://github.com/mgutz/node-settings
+// Definitions by: Shrey Jain <https://github.com/shreyjain1994>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// This wierd looking class definition is necessary since the function that the module
+// exposes NEEDS (will throw error otherwise) to be called with the `new` keyword
+// BUT returns a random object...not an instance of the class
+declare class Settings {
+    constructor(pathOrModule: Settings.PathOrModule, options?: Settings.Options);
+
+    [setting: string]: any;
+}
+
+declare namespace Settings {
+    interface Options {
+        env?: string;
+        root?: string;
+        defaults?: any;
+    }
+
+    type PathOrModule = string |
+        {
+            forceEnv?: string,
+            common: any, // error is thrown if 'common' object is not provided
+            [envName: string]: any
+        };
+}
+export = Settings;
diff --git a/types/settings/settings-tests.ts b/types/settings/settings-tests.ts
new file mode 100644
index 0000000000..e872298796
--- /dev/null
+++ b/types/settings/settings-tests.ts
@@ -0,0 +1,33 @@
+import Settings = require('settings');
+
+// works without options
+new Settings('foo');
+
+// works with path to module containing settings
+const settings = new Settings('./path/to/my/config');
+// any prop is accessible on returned value
+settings.hello = 'world';
+const foo = settings.bar;
+
+// works with settings object
+const settings2 = new Settings({
+    common: {setting: 'mySetting'}, production: {
+        hello: 'bar'
+    }
+});
+settings2.hello = 'world';
+
+// allows for forceEnv in settings object
+const settings3 = new Settings({
+    common: {},
+    forceEnv: 'production'
+});
+
+// allows options
+const settings4 = new Settings('./path/to/my/settings', {
+    root: 'someRoot',
+    env: 'development',
+    defaults: {
+        someSetting: 'settingValue'
+    }
+});
diff --git a/types/settings/tsconfig.json b/types/settings/tsconfig.json
new file mode 100644
index 0000000000..d565388a77
--- /dev/null
+++ b/types/settings/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "settings-tests.ts"
+  ]
+}
diff --git a/types/settings/tslint.json b/types/settings/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/settings/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index 69f4bc970a..432be5346d 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -382,14 +382,14 @@ declare namespace sharp {
          * @throws {Error} Invalid options
          * @returns A sharp instance that can be used to chain operations
          */
-        webp(options?: OutputOptions): SharpInstance;
+        webp(options?: WebpOptions): SharpInstance;
         /**
          * Use these TIFF options for output image.
          * @param options Output options.
          * @throws {Error} Invalid options
          * @returns A sharp instance that can be used to chain operations
          */
-        tiff(options?: OutputOptions): SharpInstance;
+        tiff(options?: TiffOptions): SharpInstance;
         /**
          * Force output to be raw, uncompressed uint8 pixel data.
          * @returns A sharp instance that can be used to chain operations
@@ -498,6 +498,28 @@ declare namespace sharp {
         optimizeScans?: boolean;
     }
 
+    interface WebpOptions extends OutputOptions {
+        /** Quality of alpha layer, number from 0-100 (optional, default 100) */
+        alphaQuality?: number;
+        /** Use lossless compression mode (optional, default false) */
+        lossless?: boolean;
+        /** Use near_lossless compression mode (optional, default false) */
+        nearLossless?: boolean;
+    }
+
+    interface TiffOptions extends OutputOptions {
+        /** Compression options: lzw, deflate, jpeg (optional, default 'jpeg') */
+        compression?: string;
+        /** Compression predictor options: none, horizontal, float (optional, default  'horizontal') */
+        predictor?: string;
+        /** Horizontal resolution in pixels/mm (optional, default 1.0) */
+        xres?: number;
+        /** Vertical resolution in pixels/mm (optional, default 1.0) */
+        yres?: number;
+        /** Squash 8-bit images down to 1 bit (optional, default false) */
+        squash?: boolean;
+    }
+
     interface PngOptions {
         /** Use progressive (interlace) scan (optional, default false) */
         progressive?: boolean;
diff --git a/types/showdown/index.d.ts b/types/showdown/index.d.ts
index 3a1accb411..948fd966ec 100644
--- a/types/showdown/index.d.ts
+++ b/types/showdown/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Showdown 1.7.2
+// Type definitions for Showdown 1.7.3
 // Project: https://github.com/coreyti/showdown
-// Definitions by: cbowdon <https://github.com/cbowdon>, Pei-Tang Huang <https://github.com/tan9>
+// Definitions by: cbowdon <https://github.com/cbowdon>, Pei-Tang Huang <https://github.com/tan9>, Ariel-Saldana <https://github.com/arielsaldana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = Showdown;
@@ -362,10 +362,21 @@ declare namespace Showdown {
          */
         new (converterOptions?: ConverterOptions): Converter;
     }
+    /** 
+     * Helper Interface 
+     */
+    interface Helper {
+        replaceRecursiveRegExp(...args: any[]): string;
+    }
 
     /** Constructor function for a Converter */
     var Converter: ConverterStatic;
 
+    /**
+     * Showdown helper
+     */
+    var helper: Helper;
+
     /**
      * Setting a "global" option affects all instances of showdown
      */
diff --git a/types/showdown/showdown-tests.ts b/types/showdown/showdown-tests.ts
index e0d9093bc1..09a04b920c 100644
--- a/types/showdown/showdown-tests.ts
+++ b/types/showdown/showdown-tests.ts
@@ -17,6 +17,8 @@ var preloadedExtensions = [ 'my-ext' ],
 var configuredConverter = new showdown.Converter();
     configuredConverter.addExtension({type: 'output', filter: (text, converter)=>{return text.replace('#', '*')}}, 'myext');
 
+console.log(showdown.helper);
+
 console.log(converter.makeHtml(exampleMarkdown));
 // should log '<h1 id="hellomarkdown">hello, markdown</h1>'
 
diff --git a/types/simple-websocket/index.d.ts b/types/simple-websocket/index.d.ts
new file mode 100644
index 0000000000..7e2ec0f6b8
--- /dev/null
+++ b/types/simple-websocket/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for simple-websocket 7.0
+// Project: https://github.com/feross/simple-websocket
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Duplex, DuplexOptions } from "stream";
+import WebSocket = require("ws");
+
+declare namespace Socket {
+  interface Options extends DuplexOptions {
+    /** websocket server url */
+    url?: string;
+    /** raw websocket instance to wrap */
+    socket?: WebSocket;
+  }
+}
+
+declare class Socket extends Duplex {
+  static WEBSOCKET_SUPPORT: boolean;
+
+  constructor(options: Socket.Options | string);
+
+  /** Send text/binary data to the WebSocket server */
+  send(chunk: any): void;
+
+  /** Destroy and cleanup this websocket connection */
+  destroy(err?: Error): void;
+}
+
+export = Socket;
diff --git a/types/simple-websocket/server.d.ts b/types/simple-websocket/server.d.ts
new file mode 100644
index 0000000000..72f4c59c30
--- /dev/null
+++ b/types/simple-websocket/server.d.ts
@@ -0,0 +1,70 @@
+/// <reference types="node" />
+
+import { EventEmitter } from "events";
+import * as http from "http";
+import * as net from "net";
+import WebSocket = require("ws");
+
+import Socket = require(".");
+
+declare namespace SocketServer {
+  type Options = WebSocket.ServerOptions;
+}
+
+declare class SocketServer extends EventEmitter {
+  options: SocketServer.Options;
+  path: string;
+  clients: Set<WebSocket>;
+
+  constructor(options?: SocketServer.Options, callback?: () => void);
+
+  close(cb?: (err?: Error) => void): void;
+  handleUpgrade(request: http.IncomingMessage, socket: net.Socket,
+      upgradeHead: Buffer, callback: (client: WebSocket) => void): void;
+  shouldHandle(request: http.IncomingMessage): boolean;
+
+  // Events
+  addListener(event: "connection", cb: (client: Socket) => void): this;
+  addListener(event: "error", cb: (err: Error) => void): this;
+  addListener(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  addListener(event: "listening", cb: () => void): this;
+  addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  emit(event: "connection", socket: Socket): boolean;
+  emit(event: "error", error: Error): boolean;
+  emit(event: "headers", headers: string[], request: http.IncomingMessage): boolean;
+  emit(event: "listening"): boolean;
+  emit(event: string | symbol, ...args: any[]): boolean;
+
+  on(event: "connection", cb: (socket: Socket, request: http.IncomingMessage) => void): this;
+  on(event: "error", cb: (error: Error) => void): this;
+  on(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  on(event: "listening", cb: () => void): this;
+  on(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  once(event: "connection", cb: (socket: Socket, request: http.IncomingMessage) => void): this;
+  once(event: "error", cb: (error: Error) => void): this;
+  once(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  once(event: "listening", cb: () => void): this;
+  once(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  prependListener(event: "connection", cb: (client: Socket) => void): this;
+  prependListener(event: "error", cb: (err: Error) => void): this;
+  prependListener(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  prependListener(event: "listening", cb: () => void): this;
+  prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  prependOnceListener(event: "connection", cb: (client: Socket) => void): this;
+  prependOnceListener(event: "error", cb: (err: Error) => void): this;
+  prependOnceListener(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  prependOnceListener(event: "listening", cb: () => void): this;
+  prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  removeListener(event: "connection", cb: (client: Socket) => void): this;
+  removeListener(event: "error", cb: (err: Error) => void): this;
+  removeListener(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  removeListener(event: "listening", cb: () => void): this;
+  removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+}
+
+export = SocketServer;
diff --git a/types/simple-websocket/simple-websocket-tests.ts b/types/simple-websocket/simple-websocket-tests.ts
new file mode 100644
index 0000000000..0a31b08f22
--- /dev/null
+++ b/types/simple-websocket/simple-websocket-tests.ts
@@ -0,0 +1,30 @@
+import Socket = require("simple-websocket");
+
+if (Socket.WEBSOCKET_SUPPORT) {
+  const socket = new Socket('ws://echo.websocket.org');
+  socket.on('connect', () => {
+    // socket is connected!
+    socket.send('sup!');
+  });
+
+  socket.on('data', (data: string | Buffer) => {
+    console.log('got message: ' + data);
+  });
+
+  socket.on('error', (err: Error) => {
+    socket.destroy(err);
+  });
+}
+
+import Server = require("simple-websocket/server");
+
+const server = new Server({ port: 8080 });
+
+server.on('connection', (socket: Socket) => {
+  socket.write('pong');
+  socket.on('data', (data: string | Buffer) => {});
+  socket.on('close', () => {});
+  socket.on('error', (err: Error) => {});
+});
+
+server.close();
diff --git a/types/simple-websocket/tsconfig.json b/types/simple-websocket/tsconfig.json
new file mode 100644
index 0000000000..06b0fdd9da
--- /dev/null
+++ b/types/simple-websocket/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "server.d.ts",
+        "simple-websocket-tests.ts"
+    ]
+}
diff --git a/types/simple-websocket/tslint.json b/types/simple-websocket/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/simple-websocket/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/snapsvg/test/3.ts b/types/snapsvg/test/3.ts
index a97caefa45..45e7024c0a 100644
--- a/types/snapsvg/test/3.ts
+++ b/types/snapsvg/test/3.ts
@@ -54,7 +54,7 @@ window.onload=()=>{
 
         var f = s.filter(Snap.filter.blur(5, 10));
         var shadow = s.filter(Snap.filter.shadow(0, 2, 3));
-        var filterChild = f.node.firstChild;
+        var filterChild = f.node.firstElementChild;
 
         var r = s.rect(100,100,100,100,20,20).attr({ stroke: '#123456', 'strokeWidth': 20, fill: 'red', filter:  f });
         Snap.animate( 0, 10, function( value ) { filterChild.attributes[0].value = value + ',' + value;  }, 1000 );
diff --git a/types/socket.io-redis/index.d.ts b/types/socket.io-redis/index.d.ts
index 3de732084b..0335dcb300 100644
--- a/types/socket.io-redis/index.d.ts
+++ b/types/socket.io-redis/index.d.ts
@@ -4,14 +4,10 @@
 //                 seeLuck <https://github.com/seeLuck>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import SocketIO = require("socket.io");
 
-/// <reference types="socket.io" />
-
-declare module 'socket.io-redis' {
-	let redis: SocketIORedisStatic;
-
-	export = redis;
-}
+declare const SocketIORedis: SocketIORedisStatic;
+export = SocketIORedis;
 
 interface SocketIORedisStatic {
 	/**
diff --git a/types/socket.io.users/index.d.ts b/types/socket.io.users/index.d.ts
index 053d80450c..bfc16cd5a4 100644
--- a/types/socket.io.users/index.d.ts
+++ b/types/socket.io.users/index.d.ts
@@ -4,15 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-/// <reference types="node" />
-
-/// <reference types="express-session" />
-/// <reference types="socket.io" />
-
-
 import { EventEmitter } from 'events';
 import { Application } from "express";
 import { SessionOptions } from "express-session";
+import SocketIO = require("socket.io");
 
 declare var CONNECTION_EVENTS: string[];
 declare var Middleware: () => (socket: SocketIO.Socket, next: () => any) => void;
diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index 0d77110716..1583eac66b 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -5,11 +5,8 @@
 
 ///<reference types="node" />
 
-declare module 'socket.io' {
-	var server: SocketIOStatic;
-
-	export = server;
-}
+declare const SocketIO: SocketIOStatic;
+export = SocketIO;
 
 interface SocketIOStatic {
 	/**
@@ -45,7 +42,6 @@ interface SocketIOStatic {
 }
 
 declare namespace SocketIO {
-
 	interface Server {
 		engine: { ws: any };
 
diff --git a/types/socket.io/socket.io-tests.ts b/types/socket.io/socket.io-tests.ts
index cd0cecf6cf..7bfddb1271 100644
--- a/types/socket.io/socket.io-tests.ts
+++ b/types/socket.io/socket.io-tests.ts
@@ -2,7 +2,7 @@ import socketIO = require('socket.io');
 
 function testUsingWithNodeHTTPServer() {
     var app = require('http').createServer(handler);
-    var io = socketIO(app);
+    var io: socketIO.Server = socketIO(app);
     var fs = require('fs');
 
     app.listen(80);
diff --git a/types/socketio-wildcard/index.d.ts b/types/socketio-wildcard/index.d.ts
index 3170a27ca5..76598d59ae 100644
--- a/types/socketio-wildcard/index.d.ts
+++ b/types/socketio-wildcard/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="socket.io" />
 /// <reference types="socket.io-client" />
+import SocketIO = require("socket.io");
 
 import EventEmitter = NodeJS.EventEmitter;
 import Socket = SocketIO.Socket;
diff --git a/types/steam-totp/index.d.ts b/types/steam-totp/index.d.ts
new file mode 100644
index 0000000000..a3ff963428
--- /dev/null
+++ b/types/steam-totp/index.d.ts
@@ -0,0 +1,67 @@
+// Type definitions for steam-totp 2.0
+// Project: https://github.com/DoctorMcKay/node-steam-totp
+// Definitions by: Max Uetrecht <https://github.com/phenomax>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+export type TimeOffsetFunction = () => number;
+
+/**
+ * Returns the current local Unix time
+ * @param [timeOffset=0] - This many seconds will be added to the returned time
+ * @returns the current local Unix time
+ */
+export function time(timeOffset?: number): number;
+
+/**
+ * Generate a Steam-style TOTP authentication code.
+ * @param secret - Your TOTP shared_secret as a Buffer, hex, or base64
+ * @param [timeOffset=0] - If you know how far off your clock is from the Steam servers, put the offset here in seconds
+ * @returns the generated auth code
+ */
+export function generateAuthCode(secret: string, timeOffset: number | TimeOffsetFunction): string;
+
+/**
+ * Generate a Steam-style TOTP authentication code.
+ * @param secret - Your TOTP shared_secret as a Buffer, hex, or base64
+ * @param [timeOffset=0] - If you know how far off your clock is from the Steam servers, put the offset here in seconds
+ * @returns the generated auth code
+ */
+export function getAuthCode(secret: string, timeOffset: number | TimeOffsetFunction): string;
+
+/**
+ * Generate a base64 confirmation key for use with mobile trade confirmations. The key can only be used once.
+ * @param identitySecret - The identity_secret that you received when enabling two-factor authentication
+ * @param time - The Unix time for which you are generating this secret. Generally should be the current time.
+ * @param tag - The tag which identifies what this request (and therefore key) will be for.
+ * "conf" to load the confirmations page, "details" to load details about a trade, "allow" to confirm a trade, "cancel" to cancel it.
+ * @returns the generated confirmation key
+ */
+export function generateConfirmationKey(identitySecret: Buffer | string, time: number, tag: string): string;
+
+/**
+ * Generate a base64 confirmation key for use with mobile trade confirmations. The key can only be used once.
+ * @param identitySecret - The identity_secret that you received when enabling two-factor authentication
+ * @param time - The Unix time for which you are generating this secret. Generally should be the current time.
+ * @param tag - The tag which identifies what this request (and therefore key) will be for.
+ * "conf" to load the confirmations page, "details" to load details about a trade, "allow" to confirm a trade, "cancel" to cancel it.
+ * @returns the generated confirmation key
+ */
+export function getConfirmationKey(identitySecret: Buffer | string, time: number, tag: string): string;
+
+/**
+ * Requests the time offset from the Steam API.
+ * @param callback - The result of the steam api request
+ * @param [timeOffset=0] - If you know how far off your clock is from the Steam servers, put the offset here in seconds
+ * @returns the time offset
+ */
+export function getTimeOffset(callback: (error: Error, offset?: number, elapsedTime?: number) => void): void;
+
+/**
+ * Get a standardized device ID based on your SteamID.
+ * @param steamID - Your SteamID, either as a string or as an object which has a toString() method that returns the SteamID
+ * @returns the device ID
+ */
+export function getDeviceID(steamID: string | object): string;
diff --git a/types/steam-totp/steam-totp-tests.ts b/types/steam-totp/steam-totp-tests.ts
new file mode 100644
index 0000000000..57702ccaaa
--- /dev/null
+++ b/types/steam-totp/steam-totp-tests.ts
@@ -0,0 +1,3 @@
+import steamTotp = require('steam-totp');
+
+const time: number = steamTotp.time();
diff --git a/types/steam-totp/tsconfig.json b/types/steam-totp/tsconfig.json
new file mode 100644
index 0000000000..01223cacba
--- /dev/null
+++ b/types/steam-totp/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "steam-totp-tests.ts"
+    ]
+}
diff --git a/types/steam-totp/tslint.json b/types/steam-totp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/steam-totp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
new file mode 100644
index 0000000000..e4a6e6a06f
--- /dev/null
+++ b/types/stellar-sdk/index.d.ts
@@ -0,0 +1,862 @@
+// Type definitions for stellar-sdk 0.8
+// Project: https://github.com/stellar/js-stellar-sdk
+// Definitions by: Carl Foster <https://github.com/carl-foster>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+export class Account {
+    constructor(accountId: string, sequence: string | number)
+    accountId(): string;
+    sequenceNumber(): string;
+    incrementSequenceNumber(): void;
+}
+
+export class CallBuilder<T extends Record> {
+    constructor(serverUrl: string)
+    call(): Promise<CollectionPage<T>>;
+    cursor(cursor: string): this;
+    limit(limit: number): this;
+    order(direction: 'asc' | 'desc'): this;
+    stream(options?: { onmessage?: () => void, onerror?: () => void }): () => void;
+}
+
+export interface CollectionPage<T extends Record> {
+    records: T[];
+    next: () => Promise<CollectionPage<T>>;
+    prev: () => Promise<CollectionPage<T>>;
+}
+
+export interface Record {
+    _links: {
+        [key: string]: RecordLink
+    };
+}
+
+export interface RecordLink {
+    href: string;
+    templated?: boolean;
+}
+
+/* Due to a bug with the recursive function requests */
+export interface CollectionRecord<T extends Record> {
+    _links: {
+        next: RecordLink
+        prev: RecordLink
+        self: RecordLink
+    };
+    _embedded: {
+        records: T[]
+    };
+}
+
+export interface CallFunctionTemplateOptions {
+    cursor?: string | number;
+    limit?: number;
+    order?: 'asc' | 'desc';
+}
+
+export type CallFunction<T extends Record> = () => Promise<T>;
+export type CallCollectionFunction<T extends Record> =
+    (options?: CallFunctionTemplateOptions) => Promise<CollectionRecord<T>>;
+
+export interface AccountRecord extends Record {
+    id: string;
+    paging_token: string;
+    account_id: string;
+    sequence: number;
+    subentry_count: number;
+    thresholds: {
+        low_threshold: number
+        med_threshold: number
+        high_threshold: number
+    };
+    flags: {
+        auth_required: boolean
+        auth_revocable: boolean
+    };
+    balances: Array<
+    {
+        balance: string
+        asset_type: 'native'
+    } |
+    {
+        balance: string
+        limit: string
+        asset_type: 'credit_alphanum4' | 'credit_alphanum12'
+        asset_code: string
+        asset_issuer: string
+    }
+    >;
+    signers: Array<
+    {
+        _key: string
+        weight: number
+    }
+    >;
+    data: {
+        [key: string]: string
+    };
+
+    effects: CallCollectionFunction<EffectRecord>;
+    offers: CallCollectionFunction<OfferRecord>;
+    operations: CallCollectionFunction<OperationRecord>;
+    payments: CallCollectionFunction<PaymentOperationRecord>;
+    trades: CallCollectionFunction<TradeRecord>;
+}
+
+export interface AssetRecord extends Record {
+    asset_type: 'credit_alphanum4' | 'credit_alphanum12';
+    asset_code: string;
+    asset_issuer: string;
+    paging_token: string;
+    amount: string;
+    num_accounts: number;
+    flags: {
+        auth_required: boolean
+        auth_revocable: boolean
+    };
+}
+
+export interface EffectRecord extends Record {
+    account: string;
+    paging_token: string;
+    starting_balance: string;
+    type_i: string;
+    type: string;
+
+    operation?: CallFunction<OperationRecord>;
+    precedes?: CallFunction<EffectRecord>;
+    succeeds?: CallFunction<EffectRecord>;
+}
+
+export interface LedgerRecord extends Record {
+    id: string;
+    paging_token: string;
+    hash: string;
+    prev_hash: string;
+    sequence: number;
+    transaction_count: number;
+    operation_count: number;
+    closed_at: string;
+    total_coins: string;
+    fee_pool: string;
+    base_fee: number;
+    base_reserve: string;
+    max_tx_set_size: number;
+    protocol_version: number;
+    header_xdr: string;
+    base_fee_in_stroops: number;
+    base_reserve_in_stroops: number;
+
+    effects: CallCollectionFunction<EffectRecord>;
+    operations: CallCollectionFunction<OperationRecord>;
+    self: CallFunction<LedgerRecord>;
+    transactions: CallCollectionFunction<TransactionRecord>;
+}
+
+export interface OfferRecord extends Record {
+    id: string;
+    paging_token: string;
+    seller_attr: string;
+    selling: Asset;
+    buying: Asset;
+    amount: string;
+    price_r: { numerator: number, denominator: number };
+    price: string;
+
+    seller?: CallFunction<AccountRecord>;
+}
+
+export interface BaseOperationRecord extends Record {
+    id: string;
+    paging_token: string;
+    type: string;
+    type_i: number;
+
+    self: CallFunction<OperationRecord>;
+    succeeds: CallFunction<OperationRecord>;
+    precedes: CallFunction<OperationRecord>;
+    effects: CallCollectionFunction<EffectRecord>;
+    transaction: CallFunction<TransactionRecord>;
+}
+
+export interface CreateAccountOperationRecord extends BaseOperationRecord {
+    type: 'create_account';
+    account: string;
+    funder: string;
+    starting_balance: string;
+}
+
+export interface PaymentOperationRecord extends BaseOperationRecord {
+    type: 'payment';
+    from: string;
+    to: string;
+    asset_type: string;
+    asset_code?: string;
+    asset_issuer?: string;
+    amount: string;
+
+    sender: CallFunction<AccountRecord>;
+    receiver: CallFunction<AccountRecord>;
+}
+
+export interface PathPaymentOperationRecord extends BaseOperationRecord {
+    type: 'path_payment';
+    from: string;
+    to: string;
+    asset_code?: string;
+    asset_issuer?: string;
+    asset_type: string;
+    amount: string;
+    source_asset_code?: string;
+    source_asset_issuer?: string;
+    source_asset_type: string;
+    source_max: string;
+    source_amount: string;
+}
+
+export interface ManageOfferOperationRecord extends BaseOperationRecord {
+    type: 'manage_offer';
+    offer_id: number;
+    amount: string;
+    buying_asset_code?: string;
+    buying_asset_issuer?: string;
+    buying_asset_type: string;
+    price: string;
+    price_r: { numerator: number, denominator: number };
+    selling_asset_code?: string;
+    selling_asset_issuer?: string;
+    selling_asset_type: string;
+}
+
+export interface PassiveOfferOperationRecord extends BaseOperationRecord {
+    type: 'create_passive_offer';
+    offer_id: number;
+    amount: string;
+    buying_asset_code?: string;
+    buying_asset_issuer?: string;
+    buying_asset_type: string;
+    price: string;
+    price_r: { numerator: number, denominator: number };
+    selling_asset_code?: string;
+    selling_asset_issuer?: string;
+    selling_asset_type: string;
+}
+
+export interface SetOptionsOperationRecord extends BaseOperationRecord {
+    type: 'set_options';
+    signer_key?: string;
+    signer_weight?: number;
+    master_key_weight?: number;
+    low_threshold?: number;
+    med_threshold?: number;
+    high_threshold?: number;
+    home_domain?: string;
+    set_flags: Array<(1 | 2)>;
+    set_flags_s: Array<('auth_required_flag' | 'auth_revocable_flag')>;
+    clear_flags: Array<(1 | 2)>;
+    clear_flags_s: Array<('auth_required_flag' | 'auth_revocable_flag')>;
+}
+
+export interface ChangeTrustOperationRecord extends BaseOperationRecord {
+    type: 'change_trust';
+    asset_code: string;
+    asset_issuer: string;
+    asset_type: string;
+    trustee: string;
+    trustor: string;
+    limit: string;
+}
+
+export interface AllowTrustOperationRecord extends BaseOperationRecord {
+    type: 'allow_trust';
+    asset_code: string;
+    asset_issuer: string;
+    asset_type: string;
+    authorize: boolean;
+    trustee: string;
+    trustor: string;
+}
+
+export interface AccountMergeOperationRecord extends BaseOperationRecord {
+    type: 'account_merge';
+    into: string;
+}
+
+export interface InflationOperationRecord extends BaseOperationRecord {
+    type: 'inflation';
+}
+
+export interface ManageDataOperationRecord extends BaseOperationRecord {
+    type: 'manage_data';
+    name: string;
+    value: string;
+}
+
+export type OperationRecord = CreateAccountOperationRecord
+    | PaymentOperationRecord
+    | PathPaymentOperationRecord
+    | ManageOfferOperationRecord
+    | PassiveOfferOperationRecord
+    | SetOptionsOperationRecord
+    | ChangeTrustOperationRecord
+    | AllowTrustOperationRecord
+    | AccountMergeOperationRecord
+    | InflationOperationRecord
+    | ManageDataOperationRecord;
+
+export interface OrderbookRecord extends Record {
+    bids: Array<{ price_r: {}, price: number, amount: string }>;
+    asks: Array<{ price_r: {}, price: number, amount: string }>;
+    selling: Asset;
+    buying: Asset;
+}
+
+export interface PaymentPathRecord extends Record {
+    path: Array<{
+        asset_code: string
+        asset_issuer: string
+        asset_type: string
+    }>;
+    source_amount: string;
+    source_asset_type: string;
+    source_asset_code: string;
+    source_asset_issuer: string;
+    destination_amount: string;
+    destination_asset_type: string;
+    destination_asset_code: string;
+    destination_asset_issuer: string;
+}
+
+export interface TradeRecord extends Record {
+    id: string;
+    paging_token: string;
+    ledger_close_time: string;
+    base_account: string;
+    base_amount: string;
+    base_asset_type: string;
+    base_asset_code: string;
+    base_asset_issuer: string;
+    counter_account: string;
+    counter_amount: string;
+    counter_asset_type: string;
+    counter_asset_code: string;
+    counter_asset_issuer: string;
+    base_is_seller: boolean;
+
+    base: CallFunction<AccountRecord>;
+    counter: CallFunction<AccountRecord>;
+    operation: CallFunction<OperationRecord>;
+}
+
+export interface TradeAggregationRecord extends Record {
+    timestamp: string;
+    trade_count: number;
+    base_volume: string;
+    counter_volume: string;
+    avg: string;
+    high: string;
+    low: string;
+    open: string;
+    close: string;
+}
+
+export interface TransactionRecord extends Record {
+    id: string;
+    paging_token: string;
+    hash: string;
+    ledger_attr: number;
+    created_at: string;
+    max_fee: number;
+    fee_paid: number;
+    operation_count: number;
+    result_code: number;
+    result_code_s: string;
+    source_account: string;
+    source_account_sequence: string;
+    envelope_xdr: string;
+    result_xdr: string;
+    result_meta_xdr: string;
+    memo: string;
+
+    account: CallFunction<AccountRecord>;
+    effects: CallCollectionFunction<EffectRecord>;
+    ledger: CallFunction<LedgerRecord>;
+    operations: CallCollectionFunction<OperationRecord>;
+    precedes: CallFunction<TransactionRecord>;
+    self: CallFunction<TransactionRecord>;
+    succeeds: CallFunction<TransactionRecord>;
+}
+
+export class AccountCallBuilder extends CallBuilder<AccountRecord> {
+    accountId(id: string): this;
+}
+export class AccountResponse implements AccountRecord {
+    _links: { [key: string]: { href: string } };
+    id: string;
+    paging_token: string;
+    account_id: string;
+    sequence: number;
+    subentry_count: number;
+    thresholds: {
+        low_threshold: number
+        med_threshold: number
+        high_threshold: number
+    };
+    flags: {
+        auth_required: boolean
+        auth_revocable: boolean
+    };
+    balances: Array<
+        {
+            balance: string
+            asset_type: 'native'
+        } |
+        {
+            balance: string
+            limit: string
+            asset_type: 'credit_alphanum4' | 'credit_alphanum12'
+            asset_code: string
+            asset_issuer: string
+        }
+        >;
+    signers: Array<
+        {
+            _key: string
+            weight: number
+        }
+        >;
+    data: {
+        [key: string]: string
+    };
+
+    effects: CallCollectionFunction<EffectRecord>;
+    offers: CallCollectionFunction<OfferRecord>;
+    operations: CallCollectionFunction<OperationRecord>;
+    payments: CallCollectionFunction<PaymentOperationRecord>;
+    trades: CallCollectionFunction<TradeRecord>;
+    constructor(response: AccountRecord)
+    accountId(): string;
+    sequenceNumber(): string;
+    incrementSequenceNumber(): void;
+}
+
+export class Asset {
+    static native(): Asset;
+    constructor(code: string, issuer: string)
+
+    getCode(): string;
+    getIssuer(): string;
+    getAssetType(): 'native' | 'credit_alphanum4' | 'credit_alphanum12';
+    isNative(): boolean;
+    equals(other: Asset): boolean;
+
+    code: string;
+    issuer: string;
+}
+
+export class AssetsCallBuilder extends CallBuilder<AssetRecord> {
+    forCode(value: string): this;
+    forIssuer(value: string): this;
+}
+
+export namespace Config {
+    function setAllowHttp(allow: boolean): void;
+    function isAllowHttp(): boolean;
+    function setDefault(): void;
+}
+
+export class EffectCallBuilder extends CallBuilder<EffectRecord> {
+    forAccount(accountId: string): this;
+    forLedger(sequence: string): this;
+    forOperation(operationId: number): this;
+    forTransaction(transactionId: string): this;
+}
+
+export interface FederationRecord {
+    account_id: string;
+    memo_type?: string;
+    memo?: string;
+}
+
+export interface FederationOptions {
+    allowHttp: boolean;
+}
+export class FederationServer {
+    static createForDomain(domain: string, options?: FederationOptions): Promise<FederationServer>;
+    static resolve(value: string, options?: FederationOptions): Promise<FederationRecord>;
+
+    constructor(serverURL: string, domain: string, options?: FederationOptions)
+    resolveAccountId(account: string): Promise<FederationRecord>;
+    resolveAddress(address: string): Promise<FederationRecord>;
+    resolveTransactionId(transactionId: string): Promise<FederationRecord>;
+}
+
+export class LedgerCallBuilder extends CallBuilder<LedgerRecord> { }
+
+export class Memo {
+    static fromXDRObject(memo: xdr.Memo): Memo;
+    static hash(hash: string): Memo;
+    static id(id: string): Memo;
+    static none(): Memo;
+    static return(hash: string): Memo;
+    static text(text: string): Memo;
+
+    constructor(type: 'MemoNone')
+    constructor(type: 'MemoID' | 'MemoText', value: string)
+    constructor(type: 'MemoHash' | 'MemoReturn', value: Buffer)
+
+    type: 'MemoNone' | 'MemoID' | 'MemoText' | 'MemoHash' | 'MemoReturn';
+    value: null | string | Buffer;
+
+    toXDRObject(): xdr.Memo;
+}
+
+export enum Networks {
+    PUBLIC = 'Public Global Stellar Network ; September 2015',
+    TESTNET = 'Test SDF Network ; September 2015',
+}
+
+export class Network {
+    static use(network: Network): void;
+    static usePublicNetwork(): void;
+    static useTestNetwork(): void;
+    static current(): Network;
+
+    constructor(passphrase: string)
+
+    networkPassphrase(): string;
+    networkId(): string;
+}
+
+export class OfferCallBuilder extends CallBuilder<OfferRecord> { }
+
+export type TransactionOperation =
+    Operation.CreateAccount
+    | Operation.Payment
+    | Operation.PathPayment
+    | Operation.CreatePassiveOffer
+    | Operation.ManageOffer
+    | Operation.SetOptions
+    | Operation.ChangeTrust
+    | Operation.AllowTrust
+    | Operation.AccountMerge
+    | Operation.Inflation
+    | Operation.ManageData;
+
+export enum OperationType {
+    createAccount = 'createAccount',
+    payment = 'payment',
+    pathPayment = 'pathPayment',
+    createPassiveOffer = 'createPassiveOffer',
+    manageOffer = 'manageOffer',
+    setOptions = 'setOptions',
+    changeTrust = 'changeTrust',
+    allowTrust = 'allowTrust',
+    accountMerge = 'accountMerge',
+    inflation = 'inflation',
+    manageData = 'manageData',
+}
+
+export namespace Operation {
+    interface Operation {
+        type: OperationType;
+        source: string | null;
+    }
+    interface AccountMerge extends Operation {
+        type: OperationType.accountMerge;
+        destination: string;
+    }
+    interface AccountMergeOptions {
+        destination: string;
+        source?: string;
+    }
+    function accountMerge(options: AccountMergeOptions): xdr.Operation<AccountMerge>;
+
+    interface AllowTrust extends Operation {
+        type: OperationType.allowTrust;
+        trustor: string;
+        assetCode: string;
+        authorize: boolean;
+    }
+    interface AllowTrustOptions {
+        trustor: string;
+        assetCode: string;
+        authorize: boolean;
+        source?: string;
+    }
+    function allowTrust(options: AllowTrustOptions): xdr.Operation<AllowTrust>;
+
+    interface ChangeTrust extends Operation {
+        type: OperationType.changeTrust;
+        line: Asset;
+        limit: string | number;
+    }
+    interface ChangeTrustOptions {
+        asset: Asset;
+        limit: string;
+        source?: string;
+    }
+    function changeTrust(options: ChangeTrustOptions): xdr.Operation<ChangeTrust>;
+
+    interface CreateAccount extends Operation {
+        type: OperationType.createAccount;
+        source: string;
+        destination: string;
+        startingBalance: string | number;
+    }
+    interface CreateAccountOptions {
+        destination: string;
+        startingBalance: string;
+        source?: string;
+    }
+    function createAccount(options: CreateAccountOptions): xdr.Operation<CreateAccount>;
+
+    interface CreatePassiveOffer extends Operation {
+        type: OperationType.createPassiveOffer;
+        selling: Asset;
+        buying: Asset;
+        amount: string | number;
+        price: string | number;
+    }
+    interface CreatePassiveOfferOptions {
+        selling: Asset;
+        buying: Asset;
+        amount: string;
+        price: number | string | object;
+        source?: string;
+    }
+    function createPassiveOffer(options: CreatePassiveOfferOptions): xdr.Operation<CreatePassiveOffer>;
+
+    interface Inflation extends Operation {
+        type: OperationType.inflation;
+    }
+    function inflation(options: { source?: string }): xdr.Operation<Inflation>;
+
+    interface ManageData extends Operation {
+        type: OperationType.manageData;
+        name: string;
+        value: string;
+    }
+    interface ManageDataOptions {
+        name: string;
+        value: string | Buffer;
+        source?: string;
+    }
+    function manageData(options: ManageDataOptions): xdr.Operation<ManageData>;
+
+    interface ManageOffer extends Operation {
+        type: OperationType.manageOffer;
+        selling: Asset;
+        buying: Asset;
+        amount: string | number;
+        price: string | number;
+        offerId: string;
+    }
+    interface ManageOfferOptions extends CreatePassiveOfferOptions {
+        offerId: number | string;
+    }
+    function manageOffer(options: ManageOfferOptions): xdr.Operation<ManageOffer>;
+
+    interface PathPayment extends Operation {
+        type: OperationType.pathPayment;
+        sendAsset: Asset;
+        sendMax: string | number;
+        destination: string;
+        destAsset: Asset;
+        destAmount: string | number;
+        path: Asset[];
+    }
+    interface PathPaymentOptions {
+        sendAsset: Asset;
+        sendMax: string;
+        destination: string;
+        destAsset: Asset;
+        destAmount: string;
+        path: Asset[];
+        source?: string;
+    }
+    function pathPayment(options: PathPaymentOptions): xdr.Operation<PathPayment>;
+
+    interface Payment extends Operation {
+        type: OperationType.payment;
+        destination: string;
+        asset: Asset;
+        amount: string | number;
+    }
+    interface PaymentOptions {
+        destination: string;
+        asset: Asset;
+        amount: string;
+        source?: string;
+    }
+    function payment(options: PaymentOptions): xdr.Operation<Payment>;
+
+    /*
+     * Required = 1 << 0
+     * Revocable = 1 << 1
+     * Immutable = 1 << 2
+     */
+    enum AuthFlags {
+        Required = 1,
+        Revocable = 2,
+        Immutable = 4,
+    }
+    interface Signer {
+        ed25519PublicKey?: string;
+        sha256Hash?: Buffer | string;
+        preAuthTx?: Buffer | string;
+        weight?: number | string;
+    }
+    interface SetOptions extends Operation {
+        type: OperationType.setOptions;
+        inflationDest?: string;
+        clearFlags?: AuthFlags;
+        setFlags?: AuthFlags;
+        masterWeight?: number | string;
+        lowThreshold?: number | string;
+        medThreshold?: number | string;
+        highThreshold?: number | string;
+        homeDomain?: string;
+        signer?: Signer;
+    }
+    interface SetOptionsOptions {
+        inflationDest?: string;
+        clearFlags?: AuthFlags;
+        setFlags?: AuthFlags;
+        masterWeight?: number | string;
+        lowThreshold?: number | string;
+        medThreshold?: number | string;
+        highThreshold?: number | string;
+        signer?: Signer;
+        homeDomain?: string;
+        source?: string;
+    }
+    function setOptions(options: SetOptionsOptions): xdr.Operation<SetOptions>;
+
+    function fromXDRObject<T extends Operation>(xdrOperation: xdr.Operation<T>): T;
+}
+
+export class OperationCallBuilder extends CallBuilder<OperationRecord> { }
+export class OrderbookCallBuilder extends CallBuilder<OrderbookRecord> { }
+export class PathCallBuilder extends CallBuilder<PaymentPathRecord> { }
+export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> { }
+
+export class Server {
+    constructor(serverURL: string, options?: { allowHttp: boolean })
+    accounts(): AccountCallBuilder;
+    assets(): AssetsCallBuilder;
+    effects(): EffectCallBuilder;
+    ledgers(): LedgerCallBuilder;
+    loadAccount(accountId: string): Promise<AccountResponse>;
+    offers(resource: string, ...parameters: string[]): OfferCallBuilder;
+    operations(): OperationCallBuilder;
+    orderbook(selling: Asset, buying: Asset): OrderbookCallBuilder;
+    paths(
+        source: string,
+        destination: string,
+        destinationAsset: Asset,
+        destinationAmount: string,
+    ): PathCallBuilder;
+    payments(): PaymentCallBuilder;
+    submitTransaction(transaction: Transaction): Promise<any>;
+    tradeAggregation(
+        base: Asset,
+        counter: Asset,
+        startTime: Date,
+        endTime: Date,
+        resolution: Date,
+    ): TradeAggregationCallBuilder;
+    trades(): TradesCallBuilder;
+    transactions(): TransactionCallBuilder;
+}
+
+export namespace StrKey {
+    function encodeEd25519PublicKey(data: Buffer): string;
+    function decodeEd25519PublicKey(data: string): Buffer;
+    function isValidEd25519PublicKey(Key: string): boolean;
+
+    function encodeEd25519SecretSeed(data: Buffer): string;
+    function decodeEd25519SecretSeed(data: string): Buffer;
+    function isValidEd25519SecretSeed(seed: string): boolean;
+
+    function encodePreAuthTx(data: Buffer): string;
+    function decodePreAuthTx(data: string): Buffer;
+
+    function encodeSha256Hash(data: Buffer): string;
+    function decodeSha256Hash(data: string): Buffer;
+}
+
+export class TradeAggregationCallBuilder extends CallBuilder<TradeAggregationRecord> { }
+export class TradesCallBuilder extends CallBuilder<TradeRecord> {
+    forAssetPair(base: Asset, counter: Asset): this;
+    forOffer(offerId: string): this;
+}
+
+export class Transaction {
+    constructor(envelope: string | xdr.TransactionEnvelope)
+    hash(): Buffer;
+    sign(...keypairs: Keypair[]): void;
+    signatureBase(): Buffer;
+    signHashX(preimage: Buffer | string): void;
+    toEnvelope(): xdr.TransactionEnvelope;
+
+    operations: TransactionOperation[];
+    sequence: number;
+    fee: number;
+    source: string;
+    memo: Memo;
+}
+
+export class TransactionBuilder {
+    constructor(sourceAccount: Account, options?: TransactionBuilder.TransactionBuilderOptions)
+    addOperation(operation: xdr.Operation<Operation.Operation>): this;
+    addMemo(memo: Memo): this;
+    build(): Transaction;
+}
+
+export namespace TransactionBuilder {
+    interface TransactionBuilderOptions {
+        fee?: number;
+        timebounds?: {
+            minTime?: number | string
+            maxTime?: number | string
+        };
+        memo?: Memo;
+    }
+}
+
+export class TransactionCallBuilder extends CallBuilder<TransactionRecord> {
+    transaction(transactionId: string): this;
+    forAccount(accountId: string): this;
+    forLedger(sequence: string | number): this;
+}
+
+export class Keypair {
+    static fromRawEd25519Seed(secretSeed: Buffer): Keypair;
+    static fromSecret(secretKey: string): Keypair;
+    static master(): Keypair;
+    static fromPublicKey(publicKey: string): Keypair;
+    static random(): Keypair;
+
+    constructor(keys: { type: 'ed25519', secretKey: string } | { type: 'ed25519', Key: string })
+
+    publicKey(): string;
+    secret(): string;
+    rawSecretKey(): Buffer;
+    canSign(): boolean;
+    sign(data: Buffer): Buffer;
+    verify(data: Buffer, signature: Buffer): boolean;
+}
+
+export namespace xdr {
+    class XDRStruct {
+        toXDR(): Buffer;
+    }
+    class Operation<T extends Operation.Operation> extends XDRStruct { }
+    class Asset extends XDRStruct { }
+    class Memo extends XDRStruct { }
+    class TransactionEnvelope extends XDRStruct { }
+}
diff --git a/types/stellar-sdk/stellar-sdk-tests.ts b/types/stellar-sdk/stellar-sdk-tests.ts
new file mode 100644
index 0000000000..4bd84ccc33
--- /dev/null
+++ b/types/stellar-sdk/stellar-sdk-tests.ts
@@ -0,0 +1,9 @@
+import * as StellarSdk from 'stellar-sdk';
+
+const sourceKey = StellarSdk.Keypair.random(); // $ExpectType Keypair
+const destKey = StellarSdk.Keypair.random();
+const account = new StellarSdk.Account(sourceKey.publicKey(), 1);
+const transaction = new StellarSdk.TransactionBuilder(account)
+    .addOperation(StellarSdk.Operation.accountMerge({destination: destKey.publicKey()}))
+    .build(); // $ExpectType () => Transaction
+transaction; // $ExpectType Transaction
diff --git a/types/stellar-sdk/tsconfig.json b/types/stellar-sdk/tsconfig.json
new file mode 100644
index 0000000000..12dfa57fa0
--- /dev/null
+++ b/types/stellar-sdk/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stellar-sdk-tests.ts"
+    ]
+}
diff --git a/types/stellar-sdk/tslint.json b/types/stellar-sdk/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/stellar-sdk/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/storybook__addon-actions/index.d.ts b/types/storybook__addon-actions/index.d.ts
index 9b7009fbad..2d5cc73ef8 100644
--- a/types/storybook__addon-actions/index.d.ts
+++ b/types/storybook__addon-actions/index.d.ts
@@ -7,5 +7,5 @@
 export type HandlerFunction = (...args: any[]) => undefined;
 export type DecoratorFunction = (args: any[]) => any[];
 
-export function decorateAction(decorators: DecoratorFunction[]): HandlerFunction;
+export function decorateAction(decorators: DecoratorFunction[]): (name: string) => HandlerFunction;
 export function action(name: string): HandlerFunction;
diff --git a/types/storybook__addon-actions/storybook__addon-actions-tests.tsx b/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
index 77ba80985b..b9c9bbba7f 100644
--- a/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
+++ b/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
@@ -19,3 +19,21 @@ storiesOf('Button', module)
           Hello World!
         </button>
     ));
+
+interface CustomComponentProps {
+    id: string;
+    setValues(id: string, values: string[]): void;
+}
+class CustomComponent extends React.Component<CustomComponentProps> {
+    setSomeValues = () => {
+        this.props.setValues(this.props.id, ['one', 'two', 'three']);
+    }
+    render() {
+        return <button onClick={this.setSomeValues}>Set some values</button>;
+    }
+}
+
+storiesOf('CustomComponent', module)
+    .add('decorated custom action', () => (
+        <CustomComponent id="test" setValues={firstArgAction('set-values')} />
+    ));
diff --git a/types/stream-to-promise/index.d.ts b/types/stream-to-promise/index.d.ts
new file mode 100644
index 0000000000..ee9688ffda
--- /dev/null
+++ b/types/stream-to-promise/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for stream-to-promise 2.2
+// Project: https://github.com/bendrucker/stream-to-promise
+// Definitions by: Alorel <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+/**
+ * Return a promise which resolves when the input stream ends
+ * @param stream The input stream
+ * @returns A promise containing the stream output as a buffer
+ */
+declare function streamToPromise(stream: NodeJS.ReadableStream): Promise<Buffer>;
+
+/**
+ * Return s promise which resolves when the input stream ends
+ * @param stream The input stream
+ */
+declare function streamToPromise(stream: NodeJS.WritableStream): Promise<void>;
+
+export = streamToPromise;
diff --git a/types/stream-to-promise/stream-to-promise-tests.ts b/types/stream-to-promise/stream-to-promise-tests.ts
new file mode 100644
index 0000000000..6ed2ee7b71
--- /dev/null
+++ b/types/stream-to-promise/stream-to-promise-tests.ts
@@ -0,0 +1,8 @@
+import stp = require('stream-to-promise');
+import * as fs from 'fs';
+
+const read = fs.createReadStream(__filename);
+const write = fs.createWriteStream(__filename);
+
+const read$: Promise<Buffer> = stp(read);
+const write$: Promise<void> = stp(write);
diff --git a/types/stream-to-promise/tsconfig.json b/types/stream-to-promise/tsconfig.json
new file mode 100644
index 0000000000..c8a17b114c
--- /dev/null
+++ b/types/stream-to-promise/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stream-to-promise-tests.ts"
+    ]
+}
diff --git a/types/stream-to-promise/tslint.json b/types/stream-to-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stream-to-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index f7003cc638..361ee4c86b 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -7,6 +7,7 @@
 //                 Brannon Jones <https://github.com/brannon>
 //                 Kyle Kamperschroer <https://github.com/kkamperschroer>
 //                 Kensuke Hoshikawa <https://github.com/starhoshi>
+//                 Thomas Bruun <https://github.com/bruun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -4783,6 +4784,12 @@ declare namespace Stripe {
              * This is the transaction number that appears on email receipts sent for this refund.
              */
             receipt_number: string;
+
+            /**
+             * Status of the refund. For credit card refunds, this can be succeeded or failed.
+             * For other types of refunds, it can be pending, succeeded, failed, or canceled.
+             */
+            status: "pending" | "succeeded" | "failed" | "canceled";
         }
 
         interface IRefundCreationOptions extends IDataOptionsWithMetadata {
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index cbc7ccfcb5..1e7b47a3c7 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -66,7 +66,7 @@ stripe.charges.create({
     });
 
     charge.refunds.retrieve("re_15jzA4Ee31JkLCeQcxbTbjaL").then(function (refund) {
-
+        var status: "pending" | "succeeded" | "failed" | "canceled" = refund.status;
     });
 
     charge.refunds.update("re_15jzA4Ee31JkLCeQcxbTbjaL", { metadata: { test: "data" } }).then(function (refund) {
diff --git a/types/stylelint-webpack-plugin/index.d.ts b/types/stylelint-webpack-plugin/index.d.ts
index dfaf0a4f05..21405d739d 100644
--- a/types/stylelint-webpack-plugin/index.d.ts
+++ b/types/stylelint-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JaKXz/stylelint-webpack-plugin
 // Definitions by: Arne Bahlo <https://github.com/bahlo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/swagger-express-validator/index.d.ts b/types/swagger-express-validator/index.d.ts
new file mode 100644
index 0000000000..e9e08347b9
--- /dev/null
+++ b/types/swagger-express-validator/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for swagger-express-validator 0.0
+// Project: https://github.com/gargol/swagger-express-validator
+// Definitions by: Pinguet62 <https://github.com/pinguet62>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Request, RequestHandler } from "express";
+
+declare function SwaggerExpressValidator(options: SwaggerExpressValidator.Options): RequestHandler;
+
+declare namespace SwaggerExpressValidator {
+    interface Options {
+        schema: string;
+        validateRequest?: boolean;
+        validateResponse?: boolean;
+        allowNullable?: boolean;
+        requestValidationFn?: (req: Request, data: any, errors: any) => void;
+        responseValidationFn?: (req: Request, data: any, errors: any) => void;
+    }
+
+    function validator(options: Options): RequestHandler;
+}
+
+export = SwaggerExpressValidator;
diff --git a/types/swagger-express-validator/swagger-express-validator-tests.ts b/types/swagger-express-validator/swagger-express-validator-tests.ts
new file mode 100644
index 0000000000..f41aa9e829
--- /dev/null
+++ b/types/swagger-express-validator/swagger-express-validator-tests.ts
@@ -0,0 +1,25 @@
+import { Request } from "express";
+import { Options } from "swagger-express-validator";
+import validator = require("swagger-express-validator");
+
+const options: Options = {
+    schema: 'string'
+};
+validator(options);
+
+// minimal required parameter
+validator({
+    schema: 'string'
+});
+
+// all parameters
+validator({
+    schema: 'string',
+    validateRequest: true,
+    validateResponse: true,
+    allowNullable: true,
+    requestValidationFn: (req: Request, data: any, errors: any) => {
+    },
+    responseValidationFn: (req: Request, data: any, errors: any) => {
+    }
+});
diff --git a/types/swagger-express-validator/tsconfig.json b/types/swagger-express-validator/tsconfig.json
new file mode 100644
index 0000000000..a831b44ee7
--- /dev/null
+++ b/types/swagger-express-validator/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "swagger-express-validator-tests.ts"
+    ]
+}
diff --git a/types/swagger-express-validator/tslint.json b/types/swagger-express-validator/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/swagger-express-validator/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/tapable/index.d.ts b/types/tapable/index.d.ts
index b291b4ae40..c044a245ce 100644
--- a/types/tapable/index.d.ts
+++ b/types/tapable/index.d.ts
@@ -1,14 +1,16 @@
-// Type definitions for tapable v0.2.5
+// Type definitions for tapable v1.0.0
 // Project: https://github.com/webpack/tapable.git
 // Definitions by: e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-declare abstract class Tapable {
+export declare abstract class Tapable {
     private _plugins: {
         [propName: string]: Tapable.Handler[]
     }
 
     /**
+     * @deprecated Tapable.plugin is deprecated. Use new API on `.hooks` instead
      * Register plugin(s)
      * This acts as the same as on() of EventEmitter, for registering a handler/listener to do something when the
      * signal/event happens.
@@ -18,9 +20,11 @@ declare abstract class Tapable {
      */
     plugin(names: string, handler: (this: this, ...args: any[]) => void): void;
 
+    /** @deprecated Tapable.plugin is deprecated. Use new API on `.hooks` instead */
     plugin(names: string[], handler: (this: this, ...args: any[]) => void): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * invoke all plugins with this attached.
      * This method is just to "apply" plugins' definition, so that the real event listeners can be registered into
      * registry. Mostly the `apply` method of a plugin is the main place to place extension logic.
@@ -28,6 +32,7 @@ declare abstract class Tapable {
     apply(...plugins: (((this: this) => any) | Tapable.Plugin)[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with all the rest arguments.
@@ -44,6 +49,7 @@ declare abstract class Tapable {
     applyPlugins2(name: string, param1: any, param2: any): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with the return value of the previous handler and all the rest arguments.
@@ -55,6 +61,7 @@ declare abstract class Tapable {
     applyPluginsWaterfall(name: string, init: any, ...args: any[]): any;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called ONLY with the return value of the previous handler.
@@ -66,6 +73,7 @@ declare abstract class Tapable {
     applyPluginsWaterfall0(name: string, init: any): any;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with all the rest arguments.
@@ -75,6 +83,7 @@ declare abstract class Tapable {
     applyPluginsBailResult(name: string, ...args: any[]): any;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with target param
@@ -88,6 +97,7 @@ declare abstract class Tapable {
     applyPluginsBailResult1(name: string, param: any): any;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * asynchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with all the rest arguments
@@ -101,6 +111,7 @@ declare abstract class Tapable {
     applyPluginsAsync(name: string, ...args: any[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * same as `applyPluginsAsync`
      * @see applyPluginsAsync
      * @alias Tapable.applyPluginsAsync
@@ -112,6 +123,7 @@ declare abstract class Tapable {
     applyPluginsAsyncSeries1(name: string, param: any, callback: Tapable.CallbackFunction): void
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * asynchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with all the rest arguments
@@ -127,6 +139,7 @@ declare abstract class Tapable {
     applyPluginsAsyncSeriesBailResult(name: string, ...args: any[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * asynchronously applies all registered handlers for target name(event id).
      *
      * @see applyPluginsAsyncSeriesBailResult
@@ -139,6 +152,7 @@ declare abstract class Tapable {
     applyPluginsAsyncSeriesBailResult1(name: string, param: any, callback: Tapable.CallbackFunction): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * Asynchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with the current value and a callback function with the signature (err: Error,
@@ -155,6 +169,7 @@ declare abstract class Tapable {
     applyPluginsAsyncWaterfall(name: string, init: any, callback: Tapable.CallbackFunction): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * applies all registered handlers for target name(event id) in parallel.
      *
      * The handlers are called with all the rest arguments
@@ -168,6 +183,7 @@ declare abstract class Tapable {
     applyPluginsParallel(name: string, ...args: any[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * applies all registered handlers for target name(event id) in parallel.
      *
      * The handlers are called with all the rest arguments
@@ -182,6 +198,7 @@ declare abstract class Tapable {
     applyPluginsParallelBailResult(name: string, ...args: any[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * applies all registered handlers for target name(event id) in parallel.
      *
      * @see applyPluginsParallelBailResult
@@ -210,4 +227,63 @@ declare namespace Tapable {
     }
 }
 
-export = Tapable
+type TapType = "sync" | "async" | "promise";
+
+export interface HookCompileOptions {
+    type: TapType;
+}
+
+export interface Tap {
+    name: string;
+    type: TapType;
+    fn: Function;
+    stage: number;
+    context: boolean;
+}
+
+export class Hook<T1 = any, T2 = any, T3 = any> {
+    constructor(...args: any[]);
+    taps: any[];
+    interceptors: any[];
+    call: (arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => any;
+    promise:(arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => Promise<any>;
+    callAsync: (arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => any;
+
+    compile(options: HookCompileOptions) : Function;
+    tap: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => any) => void;
+    tapAsync: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => void) => void;
+    tapPromise: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => Promise<any>) => void;
+    intercept: (interceptor: HookInterceptor) => void;
+}
+
+export class SyncHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class SyncBailHook <T1 = any, T2 = any, T3 = any>extends Hook<T1, T2, T3> {}
+export class SyncLoopHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class SyncWaterfallHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+
+export class AsyncParallelHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncParallelBailHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncSeriesHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncSeriesBailHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncSeriesWaterfallHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+
+export class HookInterceptor {
+    call: (...args: any[]) => void;
+    loop: (...args: any[]) => void;
+    tap: (tap: Tap) => void;
+    register: (tap: Tap) => Tap | undefined;
+    context: boolean;
+}
+
+export class HookMap<T1 = any, T2 = any, T3 = any> {
+    get: (key: any) => Hook<T1, T2, T3> | undefined;
+    for: (key: any) => Hook<T1, T2, T3>;
+    tap: (key: any, name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => any) => void;
+    tapAsync: (key: any, name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => void) => void;
+    tapPromise: (key: any, name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => Promise<any>) => void;
+    intercept: (interceptor: HookMapInterceptor<T1, T2, T3>) => void;
+}
+
+export class HookMapInterceptor<T1 = any, T2 = any, T3 = any> {
+    factory: (key: any, hook: Hook<T1, T2, T3>) => Hook<T1, T2, T3>;
+}
diff --git a/types/tapable/tapable-tests.ts b/types/tapable/tapable-tests.ts
index 60e299b4a0..4d82e60a66 100644
--- a/types/tapable/tapable-tests.ts
+++ b/types/tapable/tapable-tests.ts
@@ -1,4 +1,4 @@
-import Tapable = require('tapable');
+import {Tapable} from "tapable";
 
 class DllPlugin {
     apply(compiler: Compiler) {
diff --git a/types/tapable/v0/index.d.ts b/types/tapable/v0/index.d.ts
new file mode 100644
index 0000000000..b291b4ae40
--- /dev/null
+++ b/types/tapable/v0/index.d.ts
@@ -0,0 +1,213 @@
+// Type definitions for tapable v0.2.5
+// Project: https://github.com/webpack/tapable.git
+// Definitions by: e-cloud <https://github.com/e-cloud>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare abstract class Tapable {
+    private _plugins: {
+        [propName: string]: Tapable.Handler[]
+    }
+
+    /**
+     * Register plugin(s)
+     * This acts as the same as on() of EventEmitter, for registering a handler/listener to do something when the
+     * signal/event happens.
+     *
+     * @param names a string or an array of strings to generate the id(group name) of plugins
+     * @param handler a function which provides the plugin functionality *
+     */
+    plugin(names: string, handler: (this: this, ...args: any[]) => void): void;
+
+    plugin(names: string[], handler: (this: this, ...args: any[]) => void): void;
+
+    /**
+     * invoke all plugins with this attached.
+     * This method is just to "apply" plugins' definition, so that the real event listeners can be registered into
+     * registry. Mostly the `apply` method of a plugin is the main place to place extension logic.
+     */
+    apply(...plugins: (((this: this) => any) | Tapable.Plugin)[]): void;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with all the rest arguments.
+     *
+     * @param name - plugin group name
+     * @param args
+     */
+    applyPlugins(name: string, ...args: any[]): void;
+
+    applyPlugins0(name: string): void;
+
+    applyPlugins1(name: string, param: any): void;
+
+    applyPlugins2(name: string, param1: any, param2: any): void;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with the return value of the previous handler and all the rest arguments.
+     *
+     * `init` is used for the first handler.
+     *
+     * return the returned value of the last handler
+     */
+    applyPluginsWaterfall(name: string, init: any, ...args: any[]): any;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called ONLY with the return value of the previous handler.
+     *
+     * `init` is used for the first handler.
+     *
+     * return the returned value of the last handler
+     */
+    applyPluginsWaterfall0(name: string, init: any): any;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with all the rest arguments.
+     *
+     * If a handler returns something !== undefined, that value is returned and no more handlers will be applied.
+     */
+    applyPluginsBailResult(name: string, ...args: any[]): any;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with target param
+     *
+     * If a handler returns something !== undefined, the value is returned and no more handlers are applied.
+     *
+     * Note: the fundamental difference with `{@link applyPluginsBailResult}`, is that,
+     *       `{@link applyPluginsBailResult}` passes the arguments as arguments list for plugins
+     *       while `{@link applyPluginsBailResult1}` passes the arguments as single param(any type) for plugins
+     */
+    applyPluginsBailResult1(name: string, param: any): any;
+
+    /**
+     * asynchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with all the rest arguments
+     * and a callback function with the signature (err: Error) => void.
+     *
+     * The handlers are called in series, one at a time. After all handlers are applied, callback is called.
+     *
+     * If any handler invokes the (anonymous)callback with error, no more handlers will be called
+     * and the real callback is call with that error.
+     */
+    applyPluginsAsync(name: string, ...args: any[]): void;
+
+    /**
+     * same as `applyPluginsAsync`
+     * @see applyPluginsAsync
+     * @alias Tapable.applyPluginsAsync
+     * @param name
+     * @param args
+     */
+    applyPluginsAsyncSeries(name: string, ...args: any[]): void;
+
+    applyPluginsAsyncSeries1(name: string, param: any, callback: Tapable.CallbackFunction): void
+
+    /**
+     * asynchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with all the rest arguments
+     * and a callback function with the signature (...params) => void.
+     *
+     * Handlers must invoke the (anonymous)callback, otherwise the series is cut down and real callback won't be
+     * invoked.
+     *
+     * The order is defined by registration order not by speed of the handler function.
+     *
+     * If a handler returns something !== undefined, that value is returned and no more handlers will be applied.
+     */
+    applyPluginsAsyncSeriesBailResult(name: string, ...args: any[]): void;
+
+    /**
+     * asynchronously applies all registered handlers for target name(event id).
+     *
+     * @see applyPluginsAsyncSeriesBailResult
+     *
+     * Note: the fundamental difference with `{@link applyPluginsAsyncSeriesBailResult}`, is that,
+     *       `{@link applyPluginsAsyncSeriesBailResult}` passes the arguments as arguments list for plugins
+     *       while `{@link applyPluginsAsyncSeriesBailResult1}` passes the arguments as single param(any type)
+     *       and a callback for plugins
+     */
+    applyPluginsAsyncSeriesBailResult1(name: string, param: any, callback: Tapable.CallbackFunction): void;
+
+    /**
+     * Asynchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with the current value and a callback function with the signature (err: Error,
+     * nextValue: any) => void.
+     *
+     * `init` is used for the first handler. The rest handles are called with the value which previous handler uses
+     * to invoke the (anonymous)callback invoked
+     *
+     * After all handlers are applied, callback is called with the last value.
+     *
+     * If any handler invokes the (anonymous)callback with error, no more handlers will be called
+     * and the real callback is call with that error.
+     */
+    applyPluginsAsyncWaterfall(name: string, init: any, callback: Tapable.CallbackFunction): void;
+
+    /**
+     * applies all registered handlers for target name(event id) in parallel.
+     *
+     * The handlers are called with all the rest arguments
+     * and a callback function with the signature (err?: Error) => void.
+     *
+     * The callback function is called when all handlers call the callback without err.
+     *
+     * If any handler invokes the callback with err, callback is invoked with this error and the other handlers are
+     * skipped.
+     */
+    applyPluginsParallel(name: string, ...args: any[]): void;
+
+    /**
+     * applies all registered handlers for target name(event id) in parallel.
+     *
+     * The handlers are called with all the rest arguments
+     * and a callback function with the signature (currentResult?: []) => void.
+     *
+     * Handlers must call the callback.
+     *
+     * The first result (either error or value) with is not undefined is passed to the callback.
+     *
+     * The order is defined by registration not by speed of the handler function.
+     */
+    applyPluginsParallelBailResult(name: string, ...args: any[]): void;
+
+    /**
+     * applies all registered handlers for target name(event id) in parallel.
+     *
+     * @see applyPluginsParallelBailResult
+     *
+     * Note: the fundamental difference with `{@link applyPluginsParallelBailResult}`, is that,
+     *       `{@link applyPluginsParallelBailResult}` passes the arguments as arguments list for plugins
+     *       while `{@link applyPluginsParallelBailResult1}` passes the arguments as single param(any type)
+     *       and a callback for plugins
+     */
+    applyPluginsParallelBailResult1(name: string, param: any, callback: Tapable.CallbackFunction): void;
+
+    static mixin(proto: any): void;
+}
+
+declare namespace Tapable {
+    interface Handler {
+        (...args: any[]): void;
+    }
+
+    interface Plugin {
+        apply(...args: any[]): void;
+    }
+
+    interface CallbackFunction {
+        (err?: Error, result?: any, ...args: any[]): void;
+    }
+}
+
+export = Tapable
diff --git a/types/tapable/v0/tapable-tests.ts b/types/tapable/v0/tapable-tests.ts
new file mode 100644
index 0000000000..60e299b4a0
--- /dev/null
+++ b/types/tapable/v0/tapable-tests.ts
@@ -0,0 +1,45 @@
+import Tapable = require('tapable');
+
+class DllPlugin {
+    apply(compiler: Compiler) {
+        compiler.plugin('doSomething', function (...args: string[]) {
+            console.log(args);
+        });
+
+        compiler.plugin(['doSomething', 'doNothing'], function (...args: string[]) {
+            console.log(args);
+        });
+    }
+}
+
+class Compiler extends Tapable {
+    constructor(){
+        super()
+    }
+}
+
+const compiler = new Compiler();
+
+let callback: Tapable.CallbackFunction = function () {
+
+};
+
+compiler.apply(new DllPlugin());
+
+compiler.applyPlugins('doSomething', 'a', 'b');
+compiler.applyPlugins0('doSomething');
+compiler.applyPlugins1('doSomething', 'a');
+compiler.applyPlugins2('doSomething', 'a', 'b');
+compiler.applyPluginsWaterfall('doSomething', 'a', 'b');
+compiler.applyPluginsWaterfall0('doSomething', 'a');
+compiler.applyPluginsBailResult('doSomething', 'a', 'b');
+compiler.applyPluginsBailResult1('doSomething', ['a', 'b']);
+compiler.applyPluginsAsync('doSomething', 'a', 'b');
+compiler.applyPluginsAsyncSeries('doSomething', 'a', 'b');
+compiler.applyPluginsAsyncSeries1('doSomething', 'a', callback);
+compiler.applyPluginsAsyncSeriesBailResult('doSomething', 'a', 'b');
+compiler.applyPluginsAsyncSeriesBailResult1('doSomething', 'a', callback);
+compiler.applyPluginsAsyncWaterfall('doSomething', 'a', callback);
+compiler.applyPluginsParallel('doSomething', 'a', 'b');
+compiler.applyPluginsParallelBailResult('doSomething', 'a', 'b');
+compiler.applyPluginsParallelBailResult1('doSomething', 'a', callback);
diff --git a/types/tapable/v0/tsconfig.json b/types/tapable/v0/tsconfig.json
new file mode 100644
index 0000000000..aef97e4141
--- /dev/null
+++ b/types/tapable/v0/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "tapable": ["tapable/v0"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "tapable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/bingmaps/tslint.json b/types/tapable/v0/tslint.json
similarity index 100%
rename from types/bingmaps/tslint.json
rename to types/tapable/v0/tslint.json
diff --git a/types/tape/index.d.ts b/types/tape/index.d.ts
index 581a669606..936f2ac491 100644
--- a/types/tape/index.d.ts
+++ b/types/tape/index.d.ts
@@ -193,13 +193,13 @@ declare namespace tape {
          * expected, if present, must be a RegExp or Function, which is used to test the exception object.
          */
         throws(fn: () => void, msg?: string): void;
-        throws(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+        throws(fn: () => void, exceptionExpected: RegExp | Function, msg?: string): void;
 
         /**
          * Assert that the function call fn() does not throw an exception.
          */
         doesNotThrow(fn: () => void, msg?: string): void;
-        doesNotThrow(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+        doesNotThrow(fn: () => void, exceptionExpected: RegExp | Function, msg?: string): void;
 
         /**
          * Print a message without breaking the tap output.
diff --git a/types/tape/tape-tests.ts b/types/tape/tape-tests.ts
index 6f5ad605e5..0c67629f58 100644
--- a/types/tape/tape-tests.ts
+++ b/types/tape/tape-tests.ts
@@ -28,6 +28,12 @@ rs = tape.createStream(sopts);
 var htest: typeof tape;
 htest = tape.createHarness();
 
+class CustomException extends Error {
+  constructor(message?: string) {
+    super(message);
+  }
+}
+
 
 tape(name, (test: tape.Test) => {
 
@@ -146,11 +152,15 @@ tape(name, (test: tape.Test) => {
 	test.throws(fn, msg);
 	test.throws(fn, exceptionExpected);
 	test.throws(fn, exceptionExpected, msg);
+	test.throws(fn, CustomException);
+	test.throws(fn, CustomException, msg);
 
 	test.doesNotThrow(fn);
 	test.doesNotThrow(fn, msg);
 	test.doesNotThrow(fn, exceptionExpected);
 	test.doesNotThrow(fn, exceptionExpected, msg);
+	test.doesNotThrow(fn, CustomException);
+	test.doesNotThrow(fn, CustomException, msg);
 
 	test.test(name, (st) => {
 		t = st;
diff --git a/types/textarea-caret/index.d.ts b/types/textarea-caret/index.d.ts
new file mode 100644
index 0000000000..cf1cb3bb5d
--- /dev/null
+++ b/types/textarea-caret/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for textarea-caret 3.0
+// Project: https://github.com/component/textarea-caret-position
+// Definitions by: Brendan Forster <https://github.com/shiftkey>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+export = textarea_caret;
+
+interface Caret {
+    top: number;
+    left: number;
+    height: number;
+}
+
+interface Options {
+    debug?: boolean;
+}
+
+declare function textarea_caret(element: HTMLElement, position: number, options?: Options): Caret;
diff --git a/types/textarea-caret/textarea-caret-tests.ts b/types/textarea-caret/textarea-caret-tests.ts
new file mode 100644
index 0000000000..60de8a6acc
--- /dev/null
+++ b/types/textarea-caret/textarea-caret-tests.ts
@@ -0,0 +1,8 @@
+import getCaretCoordinates = require('textarea-caret');
+
+const element = document.querySelector('textarea');
+
+element!.addEventListener('input', function() {
+  const caret = getCaretCoordinates(this, this.selectionEnd);
+  console.log('(top, left, height) = (%s, %s, %s)', caret.top, caret.left, caret.height);
+});
diff --git a/types/textarea-caret/tsconfig.json b/types/textarea-caret/tsconfig.json
new file mode 100644
index 0000000000..db5d25647a
--- /dev/null
+++ b/types/textarea-caret/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "textarea-caret-tests.ts"
+    ]
+}
diff --git a/types/textarea-caret/tslint.json b/types/textarea-caret/tslint.json
new file mode 100644
index 0000000000..e0508241c7
--- /dev/null
+++ b/types/textarea-caret/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "indent": [true, "spaces", 4],
+        "max-line-length": [true, 100],
+        "no-any": true
+    }
+}
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index a5e2b6486c..31c8cbebe0 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -5020,10 +5020,10 @@ export class LineSegments extends Line {
 }
 
 export class Mesh extends Object3D {
-    constructor(geometry?: Geometry | BufferGeometry, material?: Material);
+    constructor(geometry?: Geometry | BufferGeometry, material?: Material | Material[]);
 
     geometry: Geometry|BufferGeometry;
-    material: Material;
+    material: Material | Material[];
     drawMode: TrianglesDrawModes;
     morphTargetInfluences?: number[];
     morphTargetDictionary?: { [key: string]: number; };
diff --git a/types/topojson/index.d.ts b/types/topojson/index.d.ts
index 67f71310d0..6330f23b1c 100644
--- a/types/topojson/index.d.ts
+++ b/types/topojson/index.d.ts
@@ -1,49 +1,217 @@
-// Type definitions for topojson 3.0
+// Type definitions for topojson 3.2
 // Project: https://github.com/topojson/topojson
 // Definitions by: Ricardo Mello <https://github.com/ricardo-mello>
-//                 Zhutian Chen  <https://github.com/chenzhutian>
+//                 Zhutian Chen <https://github.com/chenzhutian>
+//                 denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
 
-export function bbox(topology: any): any;
+import * as GeoJSON from "geojson";
 
-export function feature(topology: any, o: any): { features: any[]; type: string };
+export as namespace topojson;
 
-export function filter(topology: any, filter: any): any;
+// ---------------------------------------------------------------
+// TopoJSON Format Specification
+// ---------------------------------------------------------------
 
-export function filterAttached(topology: any): any;
+// See: https://github.com/topojson/topojson-specification/
 
-export function filterAttachedWeight(topology: any, minWeight: any, weight: any): any;
+// 2. TopoJSON Objects
+export interface TopoJSON {
+    type: "Topology" | GeoJSON.GeoJsonGeometryTypes | null;
+    bbox?: GeoJSON.BBox;
+}
 
-export function filterWeight(topology: any, minWeight: any, weight: any): any;
+// 2.1. Topology Objects
+export interface Topology<T extends Objects<Properties> = Objects<Properties>> extends TopoJSON {
+    type: "Topology";
+    objects: T;
+    arcs: Arc[];
+    transform?: Transform;
+}
 
-export function merge(topology: any, ...args: any[]): { type: any, coordinates: any[] };
+// 2.1.1. Positions
+export type Positions = number[]; // at least two elements
 
-export function mergeArcs(topology: any, objects: any): any;
+// 2.1.2. Transforms
+export interface Transform {
+    scale: [number, number];
+    translate: [number, number];
+}
 
-export function mesh(topology: any, ...args: any[]): { type: any; coordinates: any[]; };
+// 2.1.3. Arcs
+export type Arc = Positions[]; // at least two elements
 
-export function meshArcs(topology: any, object$$1: any, filter: any, ...args: any[]): { type: any; coordinates: any[]; };
+// 2.1.4. Arc Indexes
+export type ArcIndexes = number[];
 
-export function neighbors(objects: any): any[];
+// 2.1.5. Objects
+export type Properties = GeoJSON.GeoJsonProperties;
 
-export function planarRingArea(ring: any): any;
+export interface Objects<P extends Properties = {}> {
+    [key: string]: GeometryObject<P>;
+}
 
-export function planarTriangleArea(triangle: any): any;
+// 2.2. Geometry Objects
+export interface GeometryObjectA<P extends Properties = {}> extends TopoJSON {
+    type: GeoJSON.GeoJsonGeometryTypes | null;
+    id?: number | string;
+    properties?: P;
+}
 
-export function presimplify(topology: any, weight: any): any[];
+export type GeometryObject<P extends Properties = {}> =
+    Point<P> | MultiPoint<P> |
+    LineString<P> | MultiLineString<P> |
+    Polygon<P> | MultiPolygon<P> |
+    GeometryCollection<P> |
+    NullObject;
 
-export function quantile(topology: any, p: any): any;
+// 2.2.1. Point
+export interface Point<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "Point";
+    coordinates: Positions;
+}
 
-export function quantize(topology: any, transform: any): any;
+// 2.2.2. MultiPoint
+export interface MultiPoint<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiPoint";
+    coordinates: Positions[];
+}
 
-export function simplify(topology: any, minWeight: any): any;
+// 2.2.3. LineString
+export interface LineString<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "LineString";
+    arcs: ArcIndexes;
+}
 
-export function sphericalRingArea(ring: any, interior: any): any;
+// 2.2.4. MultiLineString
+export interface MultiLineString<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiLineString";
+    arcs: ArcIndexes[];
+}
 
-export function sphericalTriangleArea(t: any): any;
+// 2.2.5. Polygon
+export interface Polygon<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "Polygon";
+    arcs: ArcIndexes[];
+}
 
-export function topology(objects: any, quantization: any): any;
+// 2.2.6. MultiPolygon
+export interface MultiPolygon<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiPolygon";
+    arcs: ArcIndexes[][];
+}
 
-export function transform(transform: any): any;
+// 2.2.7. Geometry Collection
+export interface GeometryCollection<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "GeometryCollection";
+    geometries: Array<GeometryObject<P>>;
+}
 
-export function untransform(transform: any): any;
+// More
+export interface NullObject extends GeometryObjectA {
+    type: null;
+}
+
+export type OrNull<T extends Objects> = {
+    [P in keyof T]: T[P] | NullObject;
+};
+
+// ---------------------------------------------------------------
+// TopoJSON Server
+// ---------------------------------------------------------------
+
+export function topology(objects: {[k: string]: GeoJSON.GeoJsonObject}, quantization?: number): Topology;
+
+// ---------------------------------------------------------------
+// TopoJSON Simplify
+// ---------------------------------------------------------------
+
+export type Triangle = [[number, number], [number, number], [number, number]];
+export type TriangleWeighter = (triangle: Triangle) => number;
+export type Ring = Array<[number, number]>;
+export type RingWeighter = (triangle: Ring) => number;
+export type Filter = (ring: Ring, interior: boolean) => boolean;
+
+export function presimplify<T extends Objects>(topology: Topology<T>, weight?: TriangleWeighter): Topology<T>;
+
+export function simplify<T extends Objects>(topology: Topology<T>, minWeight?: number): Topology<T>;
+
+export function quantile(topology: Topology, p: number): number;
+
+export function filter<K extends Objects>(topology: Topology<K>, filter: Filter): Topology<OrNull<K>>;
+
+export function filterAttached(topology: Topology): Filter;
+
+export function filterAttachedWeight(topology: Topology, minWeight?: number, weight?: RingWeighter): Filter;
+
+export function filterWeight(topology: Topology, minWeight?: number, weight?: RingWeighter): Filter;
+
+export function planarRingArea(ring: Ring): number;
+
+export function planarTriangleArea(triangle: Triangle): number;
+
+export function sphericalRingArea(ring: Ring, interior: true): number;
+
+export function sphericalTriangleArea(triangle: Triangle): number;
+
+// ---------------------------------------------------------------
+// TopoJSON Client
+// ---------------------------------------------------------------
+
+export type Transformer = (point: number[], index?: boolean) => number[];
+
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: Point<P>): GeoJSON.Feature<GeoJSON.Point, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiPoint<P>): GeoJSON.Feature<GeoJSON.MultiPoint, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: LineString<P>): GeoJSON.Feature<GeoJSON.LineString, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiLineString<P>): GeoJSON.Feature<GeoJSON.MultiLineString, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: Polygon<P>): GeoJSON.Feature<GeoJSON.Polygon, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiPolygon<P>): GeoJSON.Feature<GeoJSON.MultiPolygon, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: GeometryCollection<P>): GeoJSON.FeatureCollection<GeoJSON.GeometryObject, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: GeometryObject<P>)
+    : GeoJSON.Feature<GeoJSON.GeometryObject, P> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject, P>;
+
+export function merge(topology: Topology, objects: Array<Polygon | MultiPolygon>): GeoJSON.MultiPolygon;
+
+export function mergeArcs(topology: Topology, objects: Array<Polygon | MultiPolygon>): MultiPolygon;
+
+export function mesh(topology: Topology, obj?: GeometryObject, filter?: (a: GeometryObject, b: GeometryObject) => boolean): GeoJSON.MultiLineString;
+
+export function meshArcs(topology: Topology, obj?: GeometryObject, filter?: (a: GeometryObject, b: GeometryObject) => boolean): MultiLineString;
+
+export function neighbors(objects: GeometryObject[]): number[][];
+
+export function bbox(topology: Topology): GeoJSON.BBox;
+
+export function quantize<T extends Objects>(topology: Topology<T>, transform: Transform | number): Topology<T>;
+
+export function transform(transform: Transform | null): Transformer;
+
+export function untransform(transform: Transform | null): Transformer;
+
+// ---------------------------------------------------------------
+// U.S. Atlas TopoJSON
+// ---------------------------------------------------------------
+
+export interface UsAtlas extends topojson.Topology {
+    objects: {
+        counties: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
+        states: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
+        nation: topojson.GeometryCollection;
+    };
+    bbox: [number, number, number, number];
+    transform: topojson.Transform;
+}
+
+// ---------------------------------------------------------------
+// World Atlas TopoJSON
+// ---------------------------------------------------------------
+
+export interface WorldAtlas extends topojson.Topology {
+    objects: {
+        countries: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
+        land: topojson.GeometryCollection;
+    };
+    bbox: [number, number, number, number];
+    transform: topojson.Transform;
+}
diff --git a/types/topojson/test/atlas-tests.ts b/types/topojson/test/atlas-tests.ts
new file mode 100644
index 0000000000..3cbb9c12f2
--- /dev/null
+++ b/types/topojson/test/atlas-tests.ts
@@ -0,0 +1,66 @@
+// Tests for: https://github.com/topojson/us-atlas and https://github.com/topojson/world-atlas
+
+const world: topojson.WorldAtlas = {
+    type: "Topology",
+    objects: {
+        countries: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "Polygon",
+                arcs: [[]],
+                id: "004",
+            }],
+        },
+        land: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "MultiPolygon",
+                arcs: [[[]]],
+            }],
+        },
+    },
+    arcs: [[]],
+    bbox: [-180, -85, 180, 83],
+    transform: {
+        scale: [0, 0],
+        translate: [-180, -85],
+    },
+};
+
+const us: topojson.UsAtlas = {
+    type: "Topology",
+    bbox: [-56, 12, 942, 596],
+    transform: {
+        scale: [0, 0],
+        translate: [-56, 12],
+    },
+    objects: {
+        counties: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "Polygon",
+                arcs: [[]],
+                id: "05089",
+            }],
+        },
+        states: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "MultiPolygon",
+                arcs: [[[]]],
+                id: "11",
+            }],
+        },
+        nation: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "MultiPolygon",
+                arcs: [[[]]],
+            }],
+        },
+    },
+    arcs: [[[]]],
+};
+
+// $ExpectError
+us.objects.xxx;
diff --git a/types/topojson/test/client-tests.ts b/types/topojson/test/client-tests.ts
new file mode 100644
index 0000000000..2e21e2b665
--- /dev/null
+++ b/types/topojson/test/client-tests.ts
@@ -0,0 +1,97 @@
+// Tests for: https://github.com/topojson/topojson-client
+
+let geoMP: GeoJSON.MultiPolygon;
+let geoMLS: GeoJSON.MultiLineString;
+let topoMP: topojson.MultiPolygon;
+let topoMLS: topojson.MultiLineString;
+let bbox: GeoJSON.BBox;
+let transformer: topojson.Transformer;
+let color: string;
+let size: number;
+
+interface TestProp {
+    color: string;
+    size: number;
+}
+
+const selectedGeometries: Array<topojson.Polygon | topojson.MultiPolygon> =
+    us.objects.states.geometries.filter((g) => ["be", 2, undefined].indexOf(g.id) >= 0);
+
+const topoWithProp = {
+    type: "Topology" as "Topology",
+    transform: {scale: [1, 1] as [number, number], translate: [0, 0] as [number, number]},
+    objects: {
+        foo: {type: "Polygon" as "Polygon", properties: {color: "orange", size: 42}, arcs: [[0]]},
+        bar: {type: "Polygon" as "Polygon", properties: {name: "hello"}, arcs: [[0]]},
+        more: {type: "Polygon" as "Polygon", arcs: [[0]]},
+        coll: {
+            type: "GeometryCollection" as "GeometryCollection", geometries: [
+                {type: "Polygon" as "Polygon", properties: {color: "orange", size: 42}, arcs: [[0]]},
+            ],
+        },
+    },
+    arcs: [
+        [[0, 0], [1, 0], [0, 1], [-1, 0], [0, -1]],
+        [[0, 0], [1, 0], [0, 1]],
+        [[1, 1], [-1, 0], [0, -1]],
+        [[1, 1]],
+        [[0, 0]]
+    ],
+};
+
+const featurePolygon: GeoJSON.Feature<GeoJSON.Polygon> =
+    topojson.feature(topoWithProp, topoWithProp.objects.foo);
+
+const featurePolygonWithProp: GeoJSON.Feature<GeoJSON.Polygon, TestProp> =
+    topojson.feature(topoWithProp, topoWithProp.objects.foo);
+
+const featureCollection: GeoJSON.FeatureCollection<GeoJSON.GeometryObject> =
+    topojson.feature(us, us.objects.counties);
+
+const featureObject: GeoJSON.Feature<GeoJSON.GeometryObject> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject, {}> =
+    topojson.feature(topoWithProp, topoWithProp.objects.foo as topojson.GeometryObject);
+
+const propColor = topojson.feature(topoWithProp, topoWithProp.objects.foo).properties;
+color = propColor.color;
+size = propColor.size;
+
+const propName = topojson.feature(topoWithProp, topoWithProp.objects.bar).properties;
+const aName: string = propName.name;
+
+const propCollection = topojson.feature(topoWithProp, topoWithProp.objects.coll).features[0].properties;
+color = propCollection.color;
+size = propCollection.size;
+
+const prop3: GeoJSON.GeoJsonProperties = topojson.feature(topoWithProp, topoWithProp.objects.more).properties;
+
+geoMP = topojson.merge(us, selectedGeometries);
+
+topoMP = topojson.mergeArcs(us, selectedGeometries);
+
+geoMLS = topojson.mesh(us);
+geoMLS = topojson.mesh(us, us.objects.states);
+geoMLS = topojson.mesh(us, us.objects.states, (a, b) => a !== b);
+
+topoMLS = topojson.meshArcs(us);
+topoMLS = topojson.meshArcs(us, us.objects.states);
+topoMLS = topojson.meshArcs(us, us.objects.states, (a, b) => a !== b);
+
+const n: number[][] = topojson.neighbors(world.objects.countries.geometries);
+
+// Transforms
+const usTransform: topojson.Transform = us.transform;
+
+bbox = topojson.bbox(us);
+bbox = topojson.bbox({type: "Topology", objects: {}, arcs: []});
+
+newUs = topojson.quantize(us, 1e4);
+newUs = topojson.quantize(us, {scale: [1, 1], translate: [0, 0]});
+newUs = topojson.quantize(us, us.transform);
+
+transformer = topojson.transform(null);
+transformer = topojson.transform({scale: [1, 1], translate: [0, 0]});
+transformer = topojson.transform(usTransform);
+
+transformer = topojson.untransform(null);
+transformer = topojson.untransform({scale: [1, 1], translate: [0, 0]});
+transformer = topojson.untransform(usTransform);
diff --git a/types/topojson/test/server-tests.ts b/types/topojson/test/server-tests.ts
new file mode 100644
index 0000000000..262fa8e6f5
--- /dev/null
+++ b/types/topojson/test/server-tests.ts
@@ -0,0 +1,14 @@
+// Tests for: https://github.com/topojson/topojson-server
+
+let topo: topojson.Topology;
+
+const aPoint: GeoJSON.Point = {type: "Point", coordinates: [30, 10]};
+const aPolygon: GeoJSON.Polygon = {type: "Polygon", coordinates: [[[30, 10], [40, 40], [20, 40], [30, 10]]]};
+
+const objects = {
+    aPoint,
+    aPolygon,
+};
+
+topo = topojson.topology(objects);
+topo = topojson.topology(objects, 1e4);
diff --git a/types/topojson/test/simplify-tests.ts b/types/topojson/test/simplify-tests.ts
new file mode 100644
index 0000000000..6347466236
--- /dev/null
+++ b/types/topojson/test/simplify-tests.ts
@@ -0,0 +1,92 @@
+// Tests for: https://github.com/topojson/topojson-simplify
+
+interface UsAtlasObjects extends topojson.Objects {
+    counties: {type: "GeometryCollection", geometries: Array<topojson.Polygon | topojson.MultiPolygon>};
+    states: {type: "GeometryCollection", geometries: Array<topojson.Polygon | topojson.MultiPolygon>};
+    nation: topojson.GeometryCollection;
+}
+
+interface UsEmpty extends topojson.Objects {
+    counties: topojson.NullObject;
+    states: topojson.NullObject;
+    nation: topojson.NullObject;
+}
+
+let aTopology: topojson.Topology;
+let presimplifiedUs: topojson.Topology<UsAtlasObjects>;
+let newUs: topojson.Topology<UsAtlasObjects>;
+let emptyUs: topojson.Topology<UsEmpty>;
+let geomCollection: topojson.GeometryCollection;
+let geomCollectionOrNull: topojson.GeometryCollection | topojson.NullObject;
+let aNullObject: topojson.NullObject;
+let filter: topojson.Filter;
+
+presimplifiedUs = topojson.presimplify(us);
+presimplifiedUs = topojson.presimplify(us, topojson.planarTriangleArea);
+presimplifiedUs = topojson.presimplify(us, topojson.sphericalTriangleArea);
+presimplifiedUs = topojson.presimplify(us, (points: Array<[number, number]>) => 1.5);
+
+geomCollection = topojson.presimplify(us).objects.counties;
+geomCollection = topojson.presimplify(us).objects.nation;
+geomCollection = topojson.presimplify(us).objects.states;
+
+let minWeight = topojson.quantile(presimplifiedUs, 0.5);
+
+newUs = topojson.simplify(presimplifiedUs);
+newUs = topojson.simplify(presimplifiedUs, 1.23);
+newUs = topojson.simplify(presimplifiedUs, minWeight);
+
+geomCollection = topojson.simplify(presimplifiedUs).objects.counties;
+geomCollection = topojson.simplify(presimplifiedUs).objects.nation;
+geomCollection = topojson.simplify(presimplifiedUs).objects.states;
+
+// Filtering
+
+filter = topojson.filterAttached(us);
+
+filter = topojson.filterAttachedWeight(us);
+filter = topojson.filterAttachedWeight(us, 0.5);
+filter = topojson.filterAttachedWeight(us, 0.5, topojson.planarRingArea);
+filter = topojson.filterAttachedWeight(us, 0.5, (points: Array<[number, number]>) => 1.5);
+
+filter = topojson.filterWeight(us);
+filter = topojson.filterWeight(us, 0.5);
+filter = topojson.filterWeight(us, 0.5, topojson.planarRingArea);
+filter = topojson.filterWeight(us, 0.5, (points: Array<[number, number]>) => 1.5);
+
+aTopology = topojson.filter(us, filter);
+newUs = topojson.filter(us, (ring: topojson.Ring, interior: boolean) => true) as topojson.UsAtlas;
+emptyUs = topojson.filter(us, () => false) as topojson.Topology<UsEmpty>;
+
+geomCollectionOrNull = topojson.filter(us, () => Math.random() > 0.9).objects.nation;
+aNullObject = topojson.filter(us, () => false).objects.nation as topojson.NullObject;
+geomCollection = topojson.filter(us, () => true).objects.nation as topojson.GeometryCollection;
+
+// Geometry
+
+let area: number;
+area = topojson.planarRingArea([[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]);
+area = topojson.planarTriangleArea([[0, 0], [0, 1], [1, 1]]);
+area = topojson.sphericalRingArea([[0, 0], [0, 90], [90, 180], [0, 0]], true);
+area = topojson.sphericalTriangleArea([[0, 0], [0, 90], [90, 180]]);
+
+// Fails
+
+interface MyAtlas extends topojson.Topology {
+    objects: {
+        obj: topojson.GeometryCollection;
+    };
+    more: "hello";
+}
+
+let myAtlas: MyAtlas = null as any; // shortcut...
+console.log(myAtlas.more);
+
+let s: string;
+// $ExpectError
+s = topojson.presimplify(myAtlas).more; // must fail
+// $ExpectError
+s = topojson.simplify(myAtlas).more; // must fail
+
+// // $ExpectError
+// area = topojson.planarTriangleArea([[0, 0], [0, 1], [1, 1], [1, 0]]); // must fail in 2.7
diff --git a/types/topojson/test/specification-tests.ts b/types/topojson/test/specification-tests.ts
new file mode 100644
index 0000000000..ccb4275468
--- /dev/null
+++ b/types/topojson/test/specification-tests.ts
@@ -0,0 +1,196 @@
+// Tests for: https://github.com/topojson/topojson-specification
+
+// Geometry Objects
+
+const point: topojson.Point = {
+    type: "Point",
+    coordinates: [0, 0],
+};
+
+const multiPoint: topojson.MultiPoint = {
+    type: "MultiPoint",
+    coordinates: [[0, 0]],
+};
+
+const lineString: topojson.LineString = {
+    type: "LineString",
+    arcs: [0],
+};
+
+const multiLineString: topojson.MultiLineString = {
+    type: "MultiLineString",
+    arcs: [[3], [4]],
+};
+
+const polygon: topojson.Polygon = {
+    type: "Polygon",
+    arcs: [[0]],
+};
+
+const multiPolygon: topojson.MultiPolygon = {
+    type: "MultiPolygon",
+    arcs: [[[0]]],
+};
+
+const geometryCollection: topojson.GeometryCollection = {
+    type: "GeometryCollection",
+    geometries: [
+        {type: "Polygon", arcs: [[0]]},
+        {type: "MultiPolygon", arcs: [[[0]]]},
+        {type: "GeometryCollection", geometries: [
+            {type: "Point", coordinates: [0, 0]}
+        ]}
+    ],
+};
+
+const nullObject: topojson.NullObject = {
+    type: null,
+};
+
+// Properties
+
+interface TestProp {
+    color: string;
+    size: number;
+}
+
+const pointWithProp: topojson.Point<TestProp> = {
+    type: "Point",
+    coordinates: [0, 0],
+    properties: {color: "orange", size: 42},
+};
+
+const str: string = pointWithProp.properties!.color;
+const nbr: number = pointWithProp.properties!.size;
+
+// Topology
+
+let topology: topojson.Topology;
+
+topology = {
+    type: "Topology",
+    objects: {},
+    arcs: [],
+};
+
+topology = {
+    type: "Topology",
+    bbox: [0, 0, 1, 1],
+    transform: {
+        scale: [1, 1],
+        translate: [0, 0],
+    },
+    objects: {
+        foo: {
+            type: "Polygon",
+            arcs: [[0]],
+        },
+    },
+    arcs: [[[0, 0], [1, 1]], [[1, 1], [-1, -1]]],
+};
+
+topology = {
+    type: "Topology",
+    transform: {
+        scale: [1, 1],
+        translate: [0, 0],
+    },
+    objects: {
+        point,
+        lineString,
+        multiLineString,
+        multiPoint,
+        polygon,
+        multiPolygon,
+        geometryCollection,
+        nullObject,
+    },
+    arcs: [
+        [[0, 0], [1, 0], [0, 1], [-1, 0], [0, -1]],
+        [[0, 0], [1, 0], [0, 1]],
+        [[1, 1], [-1, 0], [0, -1]],
+        [[1, 1]],
+        [[0, 0]]
+    ],
+};
+
+topology = {
+    type: "Topology",
+    objects: {
+        example: {
+            type: "GeometryCollection",
+            geometries: [
+            {
+                type: "Point",
+                properties: {
+                    prop0: "value0",
+                },
+                coordinates: [102, 0.5],
+            },
+            {
+                type: "LineString",
+                properties: {
+                    prop0: "value0",
+                    prop1: 0,
+                },
+                arcs: [0],
+            },
+            {
+                type: "Polygon",
+                properties: {
+                    prop0: "value0",
+                    prop1: {
+                        this: "that",
+                    },
+                },
+                arcs: [[-2]],
+            }
+            ],
+        },
+    },
+    arcs: [
+        [[102, 0], [103, 1], [104, 0], [105, 1]],
+        [[100, 0], [101, 0], [101, 1], [100, 1], [100, 0]]
+    ],
+};
+
+// Fails
+
+// $ExpectError
+topology = {
+    type: "Topology",
+    objects: {
+        foo: {
+            type: "hello", // must fail
+            arcs: [[0]],
+        },
+    },
+    arcs: [],
+};
+
+// $ExpectError
+topology = {
+    type: "Topology",
+    objects: {
+        foo: {
+            type: "Point",
+            // must fail:  Property 'coordinates' is missing in type '{ type: "Point"; }'.
+        },
+    },
+    arcs: [],
+};
+
+// $ExpectError
+topology = {
+    type: "Topology",
+    objects: {
+        foo: {
+            type: "GeometryCollection",
+            geometries: [
+                {type: "Polygon"}
+                // must fail: Property 'arcs' is missing in type '{ type: "Polygon"; }'
+            ],
+        },
+    },
+    arcs: [],
+};
diff --git a/types/topojson/topojson-tests.ts b/types/topojson/topojson-tests.ts
index 68171809d5..953fda4743 100644
--- a/types/topojson/topojson-tests.ts
+++ b/types/topojson/topojson-tests.ts
@@ -1,6 +1,4 @@
-import * as topojson from 'topojson';
+const hello = "world";
 
-// TODO: complete tests.
-
-topojson.feature(null, null); // $ExpectType { features: any[]; type: string; }
-topojson.mesh(null, null, (a: any, b: any) => a !== b); // $ExpectType { type: any; coordinates: any[]; }
+// NOTE: The standard bundle definition has no particular function.
+// See ./test/ for per bundle tests.
diff --git a/types/topojson/tsconfig.json b/types/topojson/tsconfig.json
index 339e9a307d..65b6cd1f07 100644
--- a/types/topojson/tsconfig.json
+++ b/types/topojson/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -19,6 +19,11 @@
     },
     "files": [
         "index.d.ts",
-        "topojson-tests.ts"
+        "topojson-tests.ts",
+        "test/atlas-tests.ts",
+        "test/client-tests.ts",
+        "test/server-tests.ts",
+        "test/simplify-tests.ts",
+        "test/specification-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/tracking/index.d.ts b/types/tracking/index.d.ts
index 5625a374b0..e1fc5691cb 100644
--- a/types/tracking/index.d.ts
+++ b/types/tracking/index.d.ts
@@ -8,10 +8,30 @@ declare namespace tracking {
     constructor(colours: string[]);
 
     static registerColor(name: string, predicate: (r: number, g: number, b: number) => boolean): void;
+
+    getColors(): string[];
+    getMinDimension(): number;
+    getMaxDimension(): number;
+    getMinGroupSize(): number;
+    setColors(colors: string[]): void;
+    setMinDimension(minDimension: number): void;
+    setMaxDimension(maxDimension: number): void;
+    setMinGroupSize(maxDimension: number): void;
   }
 
   export class ObjectTracker extends Tracker {
     constructor(objects: string[]);
+
+    getClassifiers(): number[];
+    getEdgesDensity(): number;
+    getInitialScale(): number;
+    getScaleFactor(): number;
+    getStepSize(): number;
+    setClassifiers(classifiers: number[]): void;
+    setEdgesDensity(edgesDensity: number): void;
+    setInitialScale(initialScale: number): void;
+    setScaleFactor(scaleFactor: number): void;
+    setStepSize(stepSize: number): void;
   }
 
   class Tracker {
diff --git a/types/trash/index.d.ts b/types/trash/index.d.ts
index 772b86c434..2da4838695 100644
--- a/types/trash/index.d.ts
+++ b/types/trash/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for trash 4.2
+// Type definitions for trash 4.3
 // Project: https://github.com/sindresorhus/trash#readme
 // Definitions by: Matthew James <https://github.com/matthew-matvei>
+//                 Keiichiro Amemiya <https://github.com/hoishin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface TrashOptions {
@@ -9,4 +10,4 @@ interface TrashOptions {
 
 declare function trash(iterable: Iterable<string>, opts?: TrashOptions): Promise<void>;
 
-export default trash;
+export = trash;
diff --git a/types/trash/trash-tests.ts b/types/trash/trash-tests.ts
index 88a29c80f4..d3722539ce 100644
--- a/types/trash/trash-tests.ts
+++ b/types/trash/trash-tests.ts
@@ -1,4 +1,4 @@
-import trash from "trash";
+import trash = require("trash");
 
 async function testTrashNoArgs() {
     await trash(["/path/to/item1", "/path/to/item2"]);
diff --git a/types/underscore/index.d.ts b/types/underscore/index.d.ts
index 72a2c23c33..8822deca98 100644
--- a/types/underscore/index.d.ts
+++ b/types/underscore/index.d.ts
@@ -856,7 +856,7 @@ declare module _ {
         * @param array Array to compact.
         * @return Copy of `array` without false values.
         **/
-        compact<T>(array: _.List<T>): T[];
+        compact<T>(array: _.List<T | null | undefined | false | "" | 0> | null | undefined): T[]
 
         /**
         * Flattens a nested array (the nesting can be to any depth). If you pass shallow, the array will
diff --git a/types/update-notifier/index.d.ts b/types/update-notifier/index.d.ts
index 11f6e5616e..98c71d87f6 100644
--- a/types/update-notifier/index.d.ts
+++ b/types/update-notifier/index.d.ts
@@ -1,17 +1,21 @@
-// Type definitions for update-notifier 2.0
+// Type definitions for update-notifier 2.2
 // Project: https://github.com/yeoman/update-notifier
-// Definitions by: vvakame <https://github.com/vvakame>, Noah Chen <https://github.com/nchen63>
+// Definitions by: vvakame <https://github.com/vvakame>
+//                 Noah Chen <https://github.com/nchen63>
+//                 Jason Dreyzehner <https://github.com/bitjson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = UpdateNotifier;
 
-declare function UpdateNotifier(settings?: UpdateNotifier.Settings): UpdateNotifier.UpdateNotifier;
+declare function UpdateNotifier(
+    settings?: UpdateNotifier.Settings
+): UpdateNotifier.UpdateNotifier;
 
 declare namespace UpdateNotifier {
     class UpdateNotifier {
         constructor(settings?: Settings);
 
-        update: UpdateInfo;
+        update?: UpdateInfo;
         check(): void;
         checkNpm(): void;
         notify(customMessage?: NotifyOptions): void;
@@ -19,7 +23,7 @@ declare namespace UpdateNotifier {
 
     interface Settings {
         pkg?: Package;
-        callback?(update?: UpdateInfo): any;
+        callback?(error: Error | null, update?: UpdateInfo): any;
         packageName?: string;
         packageVersion?: string;
         updateCheckInterval?: number; // in milliseconds, default 1000 * 60 * 60 * 24 (1 day)
diff --git a/types/update-notifier/update-notifier-tests.ts b/types/update-notifier/update-notifier-tests.ts
index fc55c3286a..c09fcf556a 100644
--- a/types/update-notifier/update-notifier-tests.ts
+++ b/types/update-notifier/update-notifier-tests.ts
@@ -1,16 +1,16 @@
-import UpdateNotifier = require("update-notifier");
+import UpdateNotifier = require('update-notifier');
 
 let notifier = UpdateNotifier();
 
 if (notifier.update) {
-	notifier.notify();
+    notifier.notify();
 }
 
 console.log(notifier.update);
 
 // Also exposed as a class
 notifier = new UpdateNotifier.UpdateNotifier({
-	updateCheckInterval: 1000 * 60 * 60 * 24 * 7 // 1 week
+    updateCheckInterval: 1000 * 60 * 60 * 24 * 7 // 1 week
 });
 
 if (notifier.update) {
@@ -27,7 +27,22 @@ if (notifier.update) {
             margin: 1,
             align: 'center',
             borderColor: 'yellow',
-            borderStyle: 'round',
-        },
+            borderStyle: 'round'
+        }
     });
 }
+
+// Using the callback option
+notifier = new UpdateNotifier.UpdateNotifier({
+    callback: (err, update) => {
+        if (err) throw err;
+        if (update) {
+            console.log(
+                update.current,
+                update.latest,
+                update.name,
+                update.type
+            );
+        }
+    }
+});
diff --git a/types/uws/index.d.ts b/types/uws/index.d.ts
index 6072c41534..20a024c1b8 100644
--- a/types/uws/index.d.ts
+++ b/types/uws/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for uWS 0.13
 // Project: https://github.com/uWebSockets/uWebSockets
 // Definitions by: York Yao <https://github.com/plantain-00>
+//                 Orblazer <https://github.com/orblazer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -59,13 +60,13 @@ declare class WebSocket extends events.EventEmitter {
     addEventListener(method: string, listener?: (...args: any[]) => void): void;
 
     // Events
-    on(event: 'error', cb: (err: Error) => void): this;
-    on(event: 'close', cb: (code: number, message: string) => void): this;
-    on(event: 'message', cb: (data: any, flags: { binary: boolean }) => void): this;
-    on(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
-    on(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
-    on(event: 'open', cb: () => void): this;
-    on(event: string, listener: (...args: any[]) => void): this;
+    on(event: 'error', cb: (this: this, err: Error) => void): this;
+    on(event: 'close', cb: (this: this, code: number, message: string) => void): this;
+    on(event: 'message', cb: (this: this, data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'ping', cb: (this: this, data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'pong', cb: (this: this, data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'open', cb: (this: this) => void): this;
+    on(event: string, listener: (this: this, ...args: any[]) => void): this;
 
     addListener(event: 'error', cb: (err: Error) => void): this;
     addListener(event: 'close', cb: (code: number, message: string) => void): this;
@@ -141,7 +142,7 @@ declare namespace WebSocket {
         // Events
         on(event: 'error', cb: (err: Error) => void): this;
         on(event: 'headers', cb: (headers: string[]) => void): this;
-        on(event: 'connection', cb: (client: WebSocket) => void): this;
+        on(event: 'connection', cb: (this: WebSocket, client: WebSocket) => void): this;
         on(event: string, listener: (...args: any[]) => void): this;
 
         addListener(event: 'error', cb: (err: Error) => void): this;
diff --git a/types/w3c-permissions/index.d.ts b/types/w3c-permissions/index.d.ts
new file mode 100644
index 0000000000..b7658c2e6c
--- /dev/null
+++ b/types/w3c-permissions/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for W3C Permissions API 1.0
+// Project: https://www.w3.org/TR/permissions/
+// Definitions by: Julien Bérubé <https://github.com/jberube>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// https://www.w3.org/TR/permissions/#permissions-interface
+declare class Permissions {
+    query(permissionDesc: PermissionDescriptor): Promise<PermissionStatus>;
+}
+
+// https://www.w3.org/TR/permissions/#status-of-a-permission
+type PermissionState = "granted" | "denied" | "prompt";
+
+// https://www.w3.org/TR/permissions/#permission-registry
+type PermissionName =
+    "geolocation" |
+    "notifications" |
+    "push" |
+    "midi" |
+    "camera" |
+    "microphone" |
+    "speaker" |
+    "device-info" |
+    "background-sync" |
+    "bluetooth" |
+    "persistent-storage" |
+    "ambient-light-sensor" |
+    "accelerometer" |
+    "gyroscope" |
+    "magnetometer" |
+    "clipboard";
+
+// https://www.w3.org/TR/permissions/#status-of-a-permission
+declare class PermissionStatus extends EventTarget {
+    readonly state: PermissionState;
+    onchange(): (this: this, ev: Event) => any;
+}
+
+// https://www.w3.org/TR/permissions/#permission-descriptor
+interface PermissionDescriptor {
+    name: string;
+}
+
+// https://www.w3.org/TR/permissions/#geolocation
+type GeolocationPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#notifications
+type NotificationsPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#push
+interface PushPermissionDescriptor extends PermissionDescriptor {
+    userVisibleOnly?: boolean;
+}
+
+// https://www.w3.org/TR/permissions/#midi
+interface MidiPermissionDescriptor extends PermissionDescriptor {
+    sysex: boolean;
+}
+
+// https://www.w3.org/TR/permissions/#media-devices
+interface DevicePermissionDescriptor extends PermissionDescriptor {
+    deviceId: string;
+}
+
+// https://www.w3.org/TR/permissions/#background-sync
+type BackgroundSyncPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#ambient-light-sensor
+type AmbientLightSensorPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#accelerometer
+type AccelerometerPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#gyroscope
+type GyroscopePermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#magnetometer
+type MagnetometerPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#clipboard
+type ClipboardPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#navigator-and-workernavigator-extension
+interface Navigator {
+    readonly permissions: Permissions;
+}
+
+// https://www.w3.org/TR/permissions/#navigator-and-workernavigator-extension
+interface WorkerNavigator {
+    readonly permissions: Permissions;
+}
diff --git a/types/w3c-permissions/tsconfig.json b/types/w3c-permissions/tsconfig.json
new file mode 100644
index 0000000000..1443bb27e1
--- /dev/null
+++ b/types/w3c-permissions/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "w3c-permissions-tests.ts"
+    ]
+}
diff --git a/types/w3c-permissions/tslint.json b/types/w3c-permissions/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/w3c-permissions/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/w3c-permissions/w3c-permissions-tests.ts b/types/w3c-permissions/w3c-permissions-tests.ts
new file mode 100644
index 0000000000..0cb878e2a7
--- /dev/null
+++ b/types/w3c-permissions/w3c-permissions-tests.ts
@@ -0,0 +1,45 @@
+// Modified from Permissions API spec: https://w3c.github.io/permissions/#examples
+// NOTE: Code kept as close to spec examples as possible
+
+// Example 3
+function showLocalNewsWithGeolocation() {}
+function showButtonToEnableLocalNews() {}
+
+const test = navigator.permissions.query({ name: "geolocation" }).then(({ state }) => {
+    switch (state) {
+      case "granted":
+        showLocalNewsWithGeolocation();
+        break;
+      case "prompt":
+        showButtonToEnableLocalNews();
+        break;
+      default:
+        // Don’t do anything if the permission was denied.
+        break;
+    }
+});
+
+// Example 4
+function updateNotificationButton(state: PermissionState) {
+    const button = document.getElementById('chat-notification-button');
+    if (button) {
+        button.setAttribute('disabled', state === 'denied' ? 'disabled' : '');
+    }
+}
+
+navigator.permissions.query({ name: 'notifications' }).then((result) => {
+    updateNotificationButton(result.state);
+    result.addEventListener('change', () => {
+        updateNotificationButton(result.state);
+    });
+});
+
+// Example 5
+Promise.all([
+    navigator.permissions.query({ name: "geolocation" }),
+    navigator.permissions.query({ name: "notifications" })
+])
+.then(([{ state: geoState }, { state: notifState }]) => {
+    console.log("Geolocation permission state is:", geoState);
+    console.log("Notifications permission state is:", notifState);
+});
diff --git a/types/w3c-screen-orientation/index.d.ts b/types/w3c-screen-orientation/index.d.ts
index 12954e6f59..7cac6c33f3 100644
--- a/types/w3c-screen-orientation/index.d.ts
+++ b/types/w3c-screen-orientation/index.d.ts
@@ -4,10 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 type OrientationType = "portrait-primary" | "portrait-secondary" | "landscape-primary" | "landscape-secondary";
-type OrientationLockType = "any" | "natural" | "landscape" | "portrait" | "portrait-primary" | "portrait-secondary" | "landscape-primary" | "landscape-secondary";
+type ScreenOrientationLockType = "any" | "natural" | "landscape" | "portrait" | "portrait-primary" | "portrait-secondary" | "landscape-primary" | "landscape-secondary";
 
 interface ScreenOrientation extends EventTarget {
-    lock(orientation: OrientationLockType): Promise<void>;
+    lock(orientation: ScreenOrientationLockType): Promise<void>;
     unlock(): void;
     readonly type: OrientationType;
     readonly angle: number;
diff --git a/types/webgl2/index.d.ts b/types/webgl2/index.d.ts
index 690f11cf50..8c59b117b3 100644
--- a/types/webgl2/index.d.ts
+++ b/types/webgl2/index.d.ts
@@ -288,7 +288,7 @@ interface WebGL2RenderingContext extends WebGLRenderingContext {
     // WebGL1:
     bufferData(target: number, size: number, usage: number): void;
     bufferData(target: number, srcData: ArrayBuffer | ArrayBufferView | null, usage: number): void;
-    bufferSubData(target: number, dstByteOffset: number, srcData: ArrayBuffer | ArrayBufferView): void;
+    bufferSubData(target: number, dstByteOffset: number, srcData: ArrayBuffer | ArrayBufferView | null): void;
     // WebGL2:
     bufferData(target: number, srcData: ArrayBufferView, usage: number, srcOffset: number,
         length?: number): void;
@@ -387,7 +387,7 @@ interface WebGL2RenderingContext extends WebGLRenderingContext {
     compressedTexImage2D(target: number, level: number, internalformat: number, width: number,
         height: number, border: number, imageSize: number, offset: number): void;
     compressedTexImage2D(target: number, level: number, internalformat: number, width: number,
-        height: number, border: number, srcData: ArrayBufferView,
+        height: number, border: number, srcData: ArrayBufferView | null,
         srcOffset?: number, srcLengthOverride?: number): void;
 
     compressedTexImage3D(target: number, level: number, internalformat: number, width: number,
@@ -400,7 +400,7 @@ interface WebGL2RenderingContext extends WebGLRenderingContext {
         width: number, height: number, format: number, imageSize: number, offset: number): void;
     compressedTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number,
         width: number, height: number, format: number,
-        srcData: ArrayBufferView,
+        srcData: ArrayBufferView | null,
         srcOffset?: number,
         srcLengthOverride?: number): void;
 
diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
new file mode 100644
index 0000000000..0dd0cc7f10
--- /dev/null
+++ b/types/webidl2/index.d.ts
@@ -0,0 +1,283 @@
+// Type definitions for webidl2 10.2
+// Project: https://github.com/w3c/webidl2.js#readme
+// Definitions by: Kagama Sascha Rosylight <https://github.com/saschanaz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace WebIDL2;
+
+export function parse(str: string, options?: ParseOptions): IDLRootType[];
+
+export type IDLRootType = InterfaceType | InterfaceMixinType | NamespaceType | CallbackType | DictionaryType | EnumType | TypedefType | ImplementsType | IncludesType;
+
+export type IDLInterfaceMemberType = OperationMemberType | AttributeMemberType | ConstantMemberType | DeclarationMemberType;
+
+export type IDLNamespaceMemberType = OperationMemberType | AttributeMemberType;
+
+export interface ParseOptions {
+    /** Boolean indicating whether the parser should accept typedefs as valid members of interfaces. */
+    allowNestedTypedefs?: boolean;
+}
+
+export interface WebIDLParseError {
+    /** the error message */
+    message: string;
+    /** the line at which the error occurred. */
+    line: number;
+    /** a short peek at the text at the point where the error happened */
+    input: string;
+    /** the five tokens at the point of error, as understood by the tokeniser */
+    tokens: ValueDescription[];
+
+    toString(): string;
+}
+
+// tslint:disable-next-line interface-name
+export interface IDLTypeDescription {
+    type: string;
+    /** Boolean indicating if it is a sequence. Same as generic === "sequence" */
+    sequence: boolean;
+    /** String indicating the generic type (e.g. "Promise", "sequence"). null otherwise. */
+    generic: string | null;
+    /** Boolean indicating whether this is nullable or not. */
+    nullable: boolean;
+    /** Boolean indicating whether this is a union type or not. */
+    union: boolean;
+    /**
+     * In most cases, this will just be a string with the type name.
+     * If the type is a union, then this contains an array of the types it unites.
+     * If it is a generic type, it contains the IDL type description for the type in the sequence,
+     * the eventual value of the promise, etc.
+     */
+    idlType: string | IDLTypeDescription | IDLTypeDescription[];
+}
+
+export interface InterfaceType {
+    type: "interface" | "callback interface";
+    /** The name of the interface */
+    name: string;
+    /** A boolean indicating whether it's a partial interface. */
+    partial: boolean;
+    /** An array of interface members (attributes, operations, etc.). Empty if there are none. */
+    members: IDLInterfaceMemberType[];
+    /** A string giving the name of an interface this one inherits from, null otherwise. */
+    inheritance: string | null;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface InterfaceMixinType {
+    type: "interface mixin";
+    /** The name of the interface mixin */
+    name: string;
+    /** A boolean indicating whether it's a partial interface mixin. */
+    partial: boolean;
+    /** An array of interface members (attributes, operations, etc.). Empty if there are none. */
+    members: IDLInterfaceMemberType[];
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface NamespaceType {
+    type: "namespace";
+    /** A boolean indicating whether it's a partial namespace. */
+    partial: boolean;
+    /** The enum's name. */
+    name: string;
+    /** An array of namespace members (attributes, operations). Empty if there are none. */
+    members: IDLNamespaceMemberType[];
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface CallbackType {
+    type: "callback";
+    /** The name of the callback. */
+    name: string;
+    /** An IDL Type describing what the callback returns. */
+    idlType: IDLTypeDescription;
+    /** A list of arguments, as in function paramters. */
+    arguments: Argument[];
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface DictionaryType {
+    type: "dictionary";
+    /** The dictionary name. */
+    name: string;
+    /** Boolean indicating whether it's a partial dictionary. */
+    partial: boolean;
+    /** An array of members (see below). */
+    members: DictionaryMemberType[];
+    /** A string indicating which dictionary is being inherited from, null otherwise. */
+    inheritance: string | null;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface DictionaryMemberType extends FieldType {
+    /** Boolean indicating whether this is a required field. */
+    required: boolean;
+    /** A default value, absent if there is none. */
+    default: ValueDescription | null;
+}
+
+export interface FieldType {
+    type: "field";
+    /** The name of the field. */
+    name: string;
+    /** An IDL Type describing what field's type. */
+    idlType: IDLTypeDescription;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+    /** A default value, absent if there is none. */
+    default: ValueDescription | null;
+}
+
+export interface EnumType {
+    type: "enum";
+    /** The enum's name. */
+    name: string;
+    /** An array of values (strings). */
+    values: Array<{ type: "string", value: string }>;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface TypedefType {
+    type: "typedef";
+    /** The typedef's name. */
+    name: string;
+    /** An IDL Type describing what typedef's type. */
+    idlType: IDLTypeDescription;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface ImplementsType {
+    type: "implements";
+    /** The interface that implements another. */
+    target: string;
+    /** The interface that is being implemented by the target. */
+    implements: string;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface IncludesType {
+    type: "includes";
+    /** The interface that includes an interface mixin. */
+    target: string;
+    /** The interface mixin that is being included by the target. */
+    includes: string;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface OperationMemberType {
+    type: "operation";
+    /** True if a getter operation. */
+    getter: boolean;
+    /** True if a setter operation. */
+    setter: boolean;
+    /** True if a deleter operation. */
+    deleter: boolean;
+    /** True if a static operation. */
+    static: boolean;
+    /** True if a stringifier operation. */
+    stringifier: boolean;
+    /** An IDL Type of what the operation returns. If a stringifier, may be absent. */
+    idlType: IDLTypeDescription | null;
+    /** The name of the operation. If a stringifier, may be null. */
+    name: string | null;
+    /** An array of arguments for the operation. */
+    arguments: Argument[] | null;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface AttributeMemberType {
+    type: "attribute";
+    /** The attribute's name. */
+    name: string;
+    /** True if it's a static attribute. */
+    static: boolean;
+    /** True if it's a stringifier attribute. */
+    stringifier: boolean;
+    /** True if it's an inherit attribute. */
+    inherit: boolean;
+    /** True if it's a read-only attribute. */
+    readonly: boolean;
+    /** An IDL Type for the attribute. */
+    idlType: IDLTypeDescription;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface ConstantMemberType {
+    type: "const";
+    /** Whether its type is nullable. */
+    nullable: boolean;
+    /** The type of the constant (a simple type, the type name). */
+    idlType: string;
+    /** The name of the constant. */
+    name: string;
+    /** The constant value */
+    value: ValueDescription;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface Argument {
+    default: ValueDescription;
+    /** True if the argument is optional. */
+    optional: boolean;
+    /** True if the argument is variadic. */
+    variadic: boolean;
+    /** An IDL Type describing the type of the argument. */
+    idlType: IDLTypeDescription;
+    /** The argument's name. */
+    name: string;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface ExtendedAttributes {
+    /** The extended attribute's name. */
+    name: string;
+    /** If the extended attribute takes arguments or if its right-hand side does they are listed here. */
+    arguments: Argument[];
+    /** If there is a right-hand side, this will capture its type ("identifier" or "identifier-list") and its value. */
+    rhs: ExtendedAttributeRightHandSideIdentifier | ExtendedAttributeRightHandSideIdentifierList;
+}
+
+export interface Token {
+    type: "float" | "integer" | "identifier" | "string" | "whitespace" | "other";
+    value: string;
+}
+
+export interface ExtendedAttributeRightHandSideIdentifier {
+    type: "identifier";
+    value: string;
+}
+
+export interface ExtendedAttributeRightHandSideIdentifierList {
+    type: "identifier-list";
+    value: string[];
+}
+
+export interface ValueDescription {
+    type: "string" | "number" | "boolean" | "null" | "Infinity" | "NaN" | "sequence";
+    value: string | any[] | null;
+    negative: boolean | null;
+}
+
+export interface DeclarationMemberType {
+    type: "iterable" | "legacyiterable" | "setlike" | "maplike";
+    /** An array with one or more IDL Types representing the declared type arguments. */
+    idlType: IDLTypeDescription[];
+    /** Whether the maplike or setlike is declared as read only. */
+    readonly: boolean;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
diff --git a/types/webidl2/tsconfig.json b/types/webidl2/tsconfig.json
new file mode 100644
index 0000000000..04827a6268
--- /dev/null
+++ b/types/webidl2/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "webidl2-tests.ts"
+    ]
+}
diff --git a/types/webidl2/tslint.json b/types/webidl2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webidl2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webidl2/webidl2-tests.ts b/types/webidl2/webidl2-tests.ts
new file mode 100644
index 0000000000..61b437f563
--- /dev/null
+++ b/types/webidl2/webidl2-tests.ts
@@ -0,0 +1,144 @@
+import * as webidl2 from "webidl2";
+
+const parsed = webidl2.parse("");
+
+for (const rootType of parsed) {
+    if (rootType.type !== "implements" && rootType.type !== "includes") {
+        console.log(rootType.name);
+    }
+    switch (rootType.type) {
+        case "interface":
+            console.log(rootType.inheritance);
+            logMembers(rootType.members);
+            console.log(rootType.partial);
+            break;
+        case "interface mixin":
+            logMembers(rootType.members);
+            console.log(rootType.partial);
+            break;
+        case "namespace":
+            console.log(rootType.partial);
+            logNamespaceMembers(rootType.members);
+            break;
+        case "callback interface":
+            logMembers(rootType.members);
+            console.log(rootType.partial);
+            break;
+        case "callback":
+            logArguments(rootType.arguments);
+            break;
+        case "dictionary":
+            console.log(rootType.inheritance);
+            for (const member of rootType.members) {
+                console.log(member.required, member.default);
+            }
+            break;
+        case "enum":
+            for (const v of rootType.values) {
+                console.log(v.type);
+                console.log(v.value);
+            }
+            break;
+        case "typedef":
+            logIdlType(rootType.idlType);
+            break;
+        case "implements":
+            console.log(rootType.target);
+            console.log(rootType.implements);
+            break;
+        case "includes":
+            console.log(rootType.target);
+            console.log(rootType.includes);
+            break;
+    }
+
+    logExtAttrs(rootType.extAttrs);
+}
+
+function logMembers(members: webidl2.IDLInterfaceMemberType[]) {
+    for (const member of members) {
+        switch (member.type) {
+            case "operation":
+            case "attribute":
+                logNamespaceMembers([member]);
+                break;
+            case "const":
+                console.log(member.name);
+                console.log(member.value);
+                console.log(member.nullable);
+                break;
+            case "iterable":
+                console.log(member.readonly);
+                break;
+            case "legacyiterable":
+                console.log(member.readonly);
+                break;
+            case "setlike":
+                console.log(member.readonly);
+                break;
+            case "maplike":
+                console.log(member.readonly);
+                break;
+        }
+        logIdlType(member.idlType);
+        logExtAttrs(member.extAttrs);
+    }
+}
+
+function logNamespaceMembers(members: webidl2.IDLNamespaceMemberType[]) {
+    for (const member of members) {
+        if (member.type === "operation") {
+            console.log(member.name);
+            console.log(member.getter, member.setter, member.deleter);
+            console.log(member.static, member.stringifier);
+        } else if (member.type === "attribute") {
+            console.log(member.name);
+            console.log(member.static, member.stringifier, member.readonly, member.inherit);
+        }
+    }
+}
+
+function logExtAttrs(extAttrs: webidl2.ExtendedAttributes[]) {
+    console.log(extAttrs[0].name);
+    logArguments(extAttrs[0].arguments);
+    const { rhs } = extAttrs[0];
+    if (rhs.type === "identifier") {
+        console.log(rhs);
+    } else {
+        for (const v of rhs.value) {
+            console.log(v);
+        }
+    }
+}
+
+function logArguments(args: webidl2.Argument[]) {
+    for (const arg of args) {
+        console.log(arg.name);
+        console.log(arg.default, arg.optional, arg.variadic);
+        logIdlType(arg.idlType);
+        logExtAttrs(arg.extAttrs);
+    }
+}
+
+function logIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTypeDescription[] | null) {
+    if (!idlType) {
+        return;
+    }
+    if (typeof idlType === "string") {
+        console.log(idlType);
+        return;
+    }
+    if (Array.isArray(idlType)) {
+        for (const t of idlType) {
+            logEachType(t);
+        }
+        return;
+    }
+    logEachType(idlType);
+
+    function logEachType(t: webidl2.IDLTypeDescription) {
+        console.log(t.type);
+        console.log(t.generic, t.nullable, t.sequence, t.union);
+        logIdlType(t.idlType);
+    }
+}
diff --git a/types/webpack-bundle-analyzer/index.d.ts b/types/webpack-bundle-analyzer/index.d.ts
index 3f856a7328..6b2db94b65 100644
--- a/types/webpack-bundle-analyzer/index.d.ts
+++ b/types/webpack-bundle-analyzer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/th0r/webpack-bundle-analyzer
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 
diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index 05aa4e5845..a5b8349faa 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mozilla-neutrino/webpack-chain
 // Definitions by: Eirikur Nilsson <https://github.com/eirikurn>, Paul Sachs <https://github.com/psachs21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 import * as https from 'https';
diff --git a/types/webpack-chunk-hash/index.d.ts b/types/webpack-chunk-hash/index.d.ts
index f499a00dc9..f6ef6ea08b 100644
--- a/types/webpack-chunk-hash/index.d.ts
+++ b/types/webpack-chunk-hash/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/alexindigo/webpack-chunk-hash#readme
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/webpack-cleanup-plugin/index.d.ts b/types/webpack-cleanup-plugin/index.d.ts
index a6efd31af7..4cac414a3a 100644
--- a/types/webpack-cleanup-plugin/index.d.ts
+++ b/types/webpack-cleanup-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gpbl/webpack-cleanup-plugin#readme
 // Definitions by: Luka Maljic <https://github.com/malj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 export = WebpackCleanupPlugin;
diff --git a/types/webpack-dev-middleware/index.d.ts b/types/webpack-dev-middleware/index.d.ts
index cc3e7e03dd..6a7d1bc4b3 100644
--- a/types/webpack-dev-middleware/index.d.ts
+++ b/types/webpack-dev-middleware/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 //                 reduckted <https://github.com/reduckted>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 import * as loglevel from 'loglevel';
diff --git a/types/webpack-dev-middleware/v1/index.d.ts b/types/webpack-dev-middleware/v1/index.d.ts
index e88cec98ef..af97857a45 100644
--- a/types/webpack-dev-middleware/v1/index.d.ts
+++ b/types/webpack-dev-middleware/v1/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 //                 reduckted <https://github.com/reduckted>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { NextHandleFunction } from 'connect';
 import * as webpack from 'webpack';
diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts
index c6bab12c3b..4dc419bd3a 100644
--- a/types/webpack-dev-server/index.d.ts
+++ b/types/webpack-dev-server/index.d.ts
@@ -5,7 +5,7 @@
 //                 Zheyang Song <https://github.com/ZheyangSong>
 //                 Alan Agius <https://github.com/alan-agius4>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 import * as core from 'express-serve-static-core';
diff --git a/types/webpack-dotenv-plugin/index.d.ts b/types/webpack-dotenv-plugin/index.d.ts
index b8cfb33ef8..086b0c4fda 100644
--- a/types/webpack-dotenv-plugin/index.d.ts
+++ b/types/webpack-dotenv-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nwinch/webpack-dotenv-plugin#readme
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 
diff --git a/types/webpack-fail-plugin/index.d.ts b/types/webpack-fail-plugin/index.d.ts
index 2db28733c2..095a5ec7f0 100644
--- a/types/webpack-fail-plugin/index.d.ts
+++ b/types/webpack-fail-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/TiddoLangerak/webpack-fail-plugin
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack-hot-middleware/index.d.ts b/types/webpack-hot-middleware/index.d.ts
index d1a591801a..ca0abd7d69 100644
--- a/types/webpack-hot-middleware/index.d.ts
+++ b/types/webpack-hot-middleware/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/glenjamin/webpack-hot-middleware#readme
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>, Ron Martinez <https://github.com/icylace>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { NextHandleFunction } from 'connect';
 import * as webpack from 'webpack';
diff --git a/types/webpack-manifest-plugin/index.d.ts b/types/webpack-manifest-plugin/index.d.ts
index cb61e42c18..22cf2e6eba 100644
--- a/types/webpack-manifest-plugin/index.d.ts
+++ b/types/webpack-manifest-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/danethurber/webpack-manifest-plugin
 // Definitions by: Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/webpack-merge/index.d.ts b/types/webpack-merge/index.d.ts
index 23caff9575..e612105c3c 100644
--- a/types/webpack-merge/index.d.ts
+++ b/types/webpack-merge/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/survivejs/webpack-merge
 // Definitions by: Simon Hartcher <https://github.com/deevus>, Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Configuration } from 'webpack';
 
diff --git a/types/webpack-merge/v0/index.d.ts b/types/webpack-merge/v0/index.d.ts
index 4cf82afd88..8be5346ee3 100644
--- a/types/webpack-merge/v0/index.d.ts
+++ b/types/webpack-merge/v0/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/survivejs/webpack-merge
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack-node-externals/index.d.ts b/types/webpack-node-externals/index.d.ts
index c93d3edecf..88f871cef5 100644
--- a/types/webpack-node-externals/index.d.ts
+++ b/types/webpack-node-externals/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/liady/webpack-node-externals
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { ExternalsFunctionElement } from 'webpack';
 
diff --git a/types/webpack-notifier/index.d.ts b/types/webpack-notifier/index.d.ts
index 372b4f2b1c..429d511bab 100644
--- a/types/webpack-notifier/index.d.ts
+++ b/types/webpack-notifier/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Turbo87/webpack-notifier#readme
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/webpack-stream/index.d.ts b/types/webpack-stream/index.d.ts
index 19159f402d..99b0f4fd93 100644
--- a/types/webpack-stream/index.d.ts
+++ b/types/webpack-stream/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/shama/webpack-stream
 // Definitions by: Ian Clanton-Thuon <https://github.com/iclanton>, Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/webpack-validator/index.d.ts b/types/webpack-validator/index.d.ts
index 242a71e6f4..198efa2c1f 100644
--- a/types/webpack-validator/index.d.ts
+++ b/types/webpack-validator/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/js-dxtools/webpack-validator
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 809c024ceb..2277ec2867 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack 4.0
+// Type definitions for webpack 4.1
 // Project: https://github.com/webpack/webpack
 // Definitions by: Qubo <https://github.com/tkqubo>
 //                 Benjamin Lim <https://github.com/bumbleblym>
@@ -10,12 +10,15 @@
 //                 Alan Agius <https://github.com/alan-agius4>
 //                 Spencer Elliott <https://github.com/elliottsj>
 //                 Jason Cheatham <https://github.com/jason0x43>
+//                 Dennis George <https://github.com/dennispg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
-import Tapable = require('tapable');
+import { Tapable, HookMap,
+         SyncBailHook, SyncHook, SyncLoopHook, SyncWaterfallHook,
+         AsyncParallelBailHook, AsyncParallelHook, AsyncSeriesBailHook, AsyncSeriesHook, AsyncSeriesWaterfallHook } from 'tapable';
 import * as UglifyJS from 'uglify-js';
 import { RawSourceMap } from 'source-map';
 
@@ -131,7 +134,7 @@ declare namespace webpack {
     }
 
     interface Output {
-        /** The output directory as absolute path (required). */
+        /** The output directory as absolute path. */
         path?: string;
         /** The filename of the entry chunk as relative path inside the output.path directory. */
         filename?: string;
@@ -187,8 +190,14 @@ declare namespace webpack {
         sourcePrefix?: string;
         /** This option enables cross-origin loading of chunks. */
         crossOriginLoading?: string | boolean;
+        /** The encoding to use when generating the hash, defaults to 'hex' */
+        hashDigest?: 'hex' | 'latin1' | 'base64';
+        /** The prefix length of the hash digest to use, defaults to 20. */
+        hashDigestLength?: number;
         /** Algorithm used for generation the hash (see node.js crypto package) */
         hashFunction?: string | ((algorithm: string, options?: any) => any);
+        /** An optional salt to update the hash via Node.JS' hash.update. */
+        hashSalt?: string;
         /** An expression which is used to address the global object/scope in runtime code. */
         globalObject?: string;
     }
@@ -598,7 +607,358 @@ declare namespace webpack {
             portableRecords?: boolean;
         }
     }
+    namespace compilation {
+        class Asset {
+        }
 
+        class Module {
+        }
+
+        class Record {
+        }
+
+        class Chunk {
+            constructor(name: string);
+            id: any;
+            ids: any;
+            debugId: number;
+            name: any;
+            entryModule: any;
+            files: any[];
+            rendered: boolean;
+            hash: any;
+            renderedHash: any;
+            chunkReason: any;
+            extraAsync: boolean;
+
+            hasRuntime(): boolean;
+            canBeInitial(): boolean;
+            isOnlyInitial(): boolean;
+            hasEntryModule(): boolean;
+
+            addModule(module: any): boolean;
+            removeModule(module: any): boolean;
+            setModules(modules: any): void;
+            getNumberOfModules(): number;
+            modulesIterable: any[];
+
+            addGroup(chunkGroup: any): boolean;
+            removeGroup(chunkGroup: any): boolean;
+            isInGroup(chunkGroup: any): boolean;
+            getNumberOfGroups(): number;
+            groupsIterable: any[];
+
+            compareTo(otherChunk: any): -1 | 0 | 1;
+            containsModule(module: any): boolean;
+            getModules(): any[];
+            getModulesIdent(): any[];
+            remove(reason: any): void;
+            moveModule(module: any, otherChunk: any): void;
+            integrate(otherChunk: any, reason: any): boolean;
+            split(newChunk: any): void;
+            isEmpty(): boolean;
+            updateHash(hash: any): void;
+            canBeIntegrated(otherChunk: any): boolean;
+            addMultiplierAndOverhead(size: number, options: any): number;
+            modulesSize(): number;
+            size(options: any): number;
+            integratedSize(otherChunk: any, options: any): number;
+            // tslint:disable-next-line:ban-types
+            sortModules(sortByFn: Function): void;
+            getAllAsyncChunks(): Set<any>;
+            getChunkMaps(realHash: any): { hash: any, name: any };
+            // tslint:disable-next-line:ban-types
+            getChunkModuleMaps(filterFn: Function): { id: any, hash: any };
+            // tslint:disable-next-line:ban-types
+            hasModuleInGraph(filterFn: Function, filterChunkFn: Function): boolean;
+            toString(): string;
+        }
+
+        class ChunkGroup {
+        }
+
+        class ChunkHash {
+        }
+
+        class Dependency {
+            constructor();
+            getResourceIdentifier(): any;
+            getReference(): any;
+            getExports(): any;
+            getWarnings(): any;
+            getErrors(): any;
+            updateHash(hash: any): void;
+            disconnect(): void;
+            static compare(a: any, b: any): any;
+        }
+
+        interface NormalModuleFactoryHooks {
+            resolver: SyncWaterfallHook;
+            factory: SyncWaterfallHook;
+            beforeResolve: AsyncSeriesWaterfallHook;
+            afterResolve: AsyncSeriesWaterfallHook;
+            createModule: SyncBailHook;
+            module: SyncWaterfallHook;
+            createParser: HookMap;
+            parser: HookMap;
+            createGenerator: HookMap;
+            generator: HookMap;
+        }
+
+        class NormalModuleFactory extends Tapable {
+            hooks: NormalModuleFactoryHooks;
+        }
+
+        interface ContextModuleFactoryHooks {
+            beforeResolve: AsyncSeriesWaterfallHook;
+            afterResolve: AsyncSeriesWaterfallHook;
+            contextModuleFiles: SyncWaterfallHook;
+            alternatives: AsyncSeriesWaterfallHook;
+        }
+
+        class ContextModuleFactory extends Tapable {
+            hooks: ContextModuleFactoryHooks;
+        }
+
+        class DllModuleFactory extends Tapable {
+            hooks: {};
+        }
+
+        interface CompilationHooks {
+            buildModule: SyncHook<Module>;
+            rebuildModule: SyncHook<Module>;
+            failedModule: SyncHook<Module, Error>;
+            succeedModule: SyncHook<Module>;
+
+            finishModules: SyncHook<Module[]>;
+            finishRebuildingModule: SyncHook<Module>;
+
+            unseal: SyncHook;
+            seal: SyncHook;
+
+            optimizeDependenciesBasic: SyncBailHook<Module[]>;
+            optimizeDependencies: SyncBailHook<Module[]>;
+            optimizeDependenciesAdvanced: SyncBailHook<Module[]>;
+            afterOptimizeDependencies: SyncHook<Module[]>;
+
+            optimize: SyncHook;
+
+            optimizeModulesBasic: SyncBailHook<Module[]>;
+            optimizeModules: SyncBailHook<Module[]>;
+            optimizeModulesAdvanced: SyncBailHook<Module[]>;
+            afterOptimizeModules: SyncHook<Module[]>;
+
+            optimizeChunksBasic: SyncBailHook<Chunk[], ChunkGroup[]>;
+            optimizeChunks: SyncBailHook<Chunk[], ChunkGroup[]>;
+            optimizeChunksAdvanced: SyncBailHook<Chunk[], ChunkGroup[]>;
+            afterOptimizeChunks: SyncHook<Chunk[], ChunkGroup[]>;
+
+            optimizeTree: AsyncSeriesHook<Chunk[], Module[]>;
+            afterOptimizeTree: SyncHook<Chunk[], Module[]>;
+
+            optimizeChunkModulesBasic: SyncBailHook<Chunk[], Module[]>;
+            optimizeChunkModules: SyncBailHook<Chunk[], Module[]>;
+            optimizeChunkModulesAdvanced: SyncBailHook<Chunk[], Module[]>;
+            afterOptimizeChunkModules: SyncHook<Chunk[], Module[]>;
+            shouldRecord: SyncBailHook;
+
+            reviveModules: SyncHook<Module[], Record[]>;
+            optimizeModuleOrder: SyncHook<Module[]>;
+            advancedOptimizeModuleOrder: SyncHook<Module[]>;
+            beforeModuleIds: SyncHook<Module[]>;
+            moduleIds: SyncHook<Module[]>;
+            optimizeModuleIds: SyncHook<Module[]>;
+            afterOptimizeModuleIds: SyncHook<Module[]>;
+
+            reviveChunks: SyncHook<Chunk[], Record[]>;
+            optimizeChunkOrder: SyncHook<Chunk[]>;
+            beforeChunkIds: SyncHook<Chunk[]>;
+            optimizeChunkIds: SyncHook<Chunk[]>;
+            afterOptimizeChunkIds: SyncHook<Chunk[]>;
+
+            recordModules: SyncHook<Module[], Record[]>;
+            recordChunks: SyncHook<Chunk[], Record[]>;
+
+            beforeHash: SyncHook;
+            afterHash: SyncHook;
+
+            recordHash: SyncHook<Record[]>;
+
+            record: SyncHook<Compilation, Record[]>;
+
+            beforeModuleAssets: SyncHook;
+            shouldGenerateChunkAssets: SyncBailHook;
+            beforeChunkAssets: SyncHook;
+            additionalChunkAssets: SyncHook<Chunk[]>;
+
+            records: SyncHook<Compilation, Record[]>;
+
+            additionalAssets: AsyncSeriesHook;
+            optimizeChunkAssets: AsyncSeriesHook<Chunk[]>;
+            afterOptimizeChunkAssets: SyncHook<Chunk[]>;
+            optimizeAssets: AsyncSeriesHook<Asset[]>;
+            afterOptimizeAssets: SyncHook<Asset[]>;
+
+            needAdditionalSeal: SyncBailHook;
+            afterSeal: AsyncSeriesHook;
+
+            chunkHash: SyncHook<Chunk, ChunkHash>;
+            moduleAsset: SyncHook<Module, string>;
+            chunkAsset: SyncHook<Chunk, string>;
+
+            assetPath: SyncWaterfallHook<string>;
+
+            needAdditionalPass: SyncBailHook;
+            childCompiler: SyncHook;
+
+            normalModuleLoader: SyncHook<any, Module>;
+
+            optimizeExtractedChunksBasic: SyncBailHook<Chunk[]>;
+            optimizeExtractedChunks: SyncBailHook<Chunk[]>;
+            optimizeExtractedChunksAdvanced: SyncBailHook<Chunk[]>;
+            afterOptimizeExtractedChunks: SyncHook<Chunk[]>;
+        }
+
+        interface CompilationModule {
+            module: any;
+            issuer: boolean;
+            build: boolean;
+            dependencies: boolean;
+        }
+
+        class MainTemplate extends Tapable {}
+        class ChunkTemplate extends Tapable {}
+        class HotUpdateChunkTemplate extends Tapable {}
+        class RuntimeTemplate {}
+
+        interface ModuleTemplateHooks {
+            content: SyncWaterfallHook;
+            module: SyncWaterfallHook;
+            render: SyncWaterfallHook;
+            package: SyncWaterfallHook;
+            hash: SyncHook;
+        }
+
+        class ModuleTemplate extends Tapable {
+            hooks: ModuleTemplateHooks;
+        }
+
+        class Compilation extends Tapable {
+            hooks: CompilationHooks;
+            compiler: Compiler;
+
+            resolverFactory: any;
+            inputFileSystem: any;
+            requestShortener: any;
+
+            outputOptions: any;
+            bail: any;
+            profile: any;
+            performance: any;
+
+            mainTemplate: MainTemplate;
+            chunkTemplate: ChunkTemplate;
+            hotUpdateChunkTemplate: HotUpdateChunkTemplate;
+            runtimeTemplate: RuntimeTemplate;
+            moduleTemplates: {
+                javascript: ModuleTemplate;
+                webassembly: ModuleTemplate;
+            };
+
+            entries: any[];
+            _preparedEntrypoints: any[];
+            entrypoints: Map<any, any>;
+            chunks: any[];
+            chunkGroups: any[];
+            namedChunkGroups: Map<any, any>;
+            namedChunks: Map<any, any>;
+            modules: any[];
+            _modules: Map<any, any>;
+            cache: any;
+            records: any;
+            nextFreeModuleIndex: any;
+            nextFreeModuleIndex2: any;
+            additionalChunkAssets: any[];
+            assets: any;
+            errors: any[];
+            warnings: any[];
+            children: any[];
+            dependencyFactories: Map<typeof Dependency, Tapable>;
+            dependencyTemplates: Map<typeof Dependency, Tapable>;
+            childrenCounters: any;
+            usedChunkIds: any;
+            usedModuleIds: any;
+            getStats(): Stats;
+            addModule(module: CompilationModule, cacheGroup: any): any;
+            // getModule(module)
+            // findModule(identifier)
+            // waitForBuildingFinished(module, callback)
+            // buildModule(module, optional, origin, dependencies, thisCallback)
+            // processModuleDependencies(module, callback)
+            // addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback)
+            // tslint:disable-next-line:ban-types
+            addEntry(context: any, entry: any, name: any, callback: Function): void;
+            // prefetch(context, dependency, callback)
+            // rebuildModule(module, thisCallback)
+            // finish()
+            // unseal()
+            // seal(callback)
+            // sortModules(modules)
+            // reportDependencyErrorsAndWarnings(module, blocks)
+            // addChunkInGroup(name, module, loc, request)
+            // addChunk(name)
+            // assignIndex(module)
+            // assignDepth(module)
+            // processDependenciesBlocksForChunkGroups(inputChunkGroups)
+            // removeReasonsOfDependencyBlock(module, block)
+            // patchChunksAfterReasonRemoval(module, chunk)
+            // removeChunkFromDependencies(block, chunk)
+            // applyModuleIds()
+            // applyChunkIds()
+            // sortItemsWithModuleIds()
+            // sortItemsWithChunkIds()
+            // summarizeDependencies()
+            // createHash()
+            // modifyHash(update)
+            // createModuleAssets()
+            // createChunkAssets()
+            getPath(filename: string, data: {hash?: any, chunk?: any, filename?: string, basename?: string, query?: any}): string;
+            // createChildCompiler(name, outputOptions, plugins)
+            // checkConstraints()
+
+            /**
+             * @deprecated Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead
+             */
+            applyPlugins(name: string, ...args: any[]): void;
+        }
+
+        interface CompilerHooks {
+            shouldEmit: SyncBailHook<Compilation>;
+            done: AsyncSeriesHook<Stats>;
+            additionalPass: AsyncSeriesHook;
+            beforeRun: AsyncSeriesHook<Compilation>;
+            run: AsyncSeriesHook<Compilation>;
+            emit: AsyncSeriesHook<Compilation>;
+            afterEmit: AsyncSeriesHook<Compilation>;
+            thisCompilation: SyncHook<Compilation, { normalModuleFactory: NormalModuleFactory }>;
+            compilation: SyncHook<Compilation, { normalModuleFactory: NormalModuleFactory }>;
+            normalModuleFactory: SyncHook<NormalModuleFactory>;
+            contextModuleFactory: SyncHook<ContextModuleFactory>;
+            beforeCompile: AsyncSeriesHook<{}>;
+            compile: SyncHook<{}>;
+            make: AsyncParallelHook<Compilation>;
+            afterCompile: AsyncSeriesHook<Compilation>;
+            watchRun: AsyncSeriesHook<Compiler>;
+            failed: SyncHook<Error>;
+            invalid: SyncHook<string, Date>;
+            watchClose: SyncHook;
+            environment: SyncHook;
+            afterEnvironment: SyncHook;
+            afterPlugins: SyncHook<Compiler>;
+            afterResolvers: SyncHook<Compiler>;
+            entryOption: SyncBailHook;
+        }
+    }
     // tslint:disable-next-line:interface-name
     interface ICompiler {
         run(handler: ICompiler.Handler): void;
@@ -634,6 +994,9 @@ declare namespace webpack {
     class Compiler extends Tapable implements ICompiler {
         constructor();
 
+        hooks: compilation.CompilerHooks;
+        _pluginCompat: SyncBailHook<compilation.Compilation>;
+
         name: string;
         options: Configuration;
         outputFileSystem: any;
diff --git a/types/webpack/v3/index.d.ts b/types/webpack/v3/index.d.ts
index d6102808b6..7f943d4151 100644
--- a/types/webpack/v3/index.d.ts
+++ b/types/webpack/v3/index.d.ts
@@ -126,9 +126,9 @@ declare namespace webpack {
     }
 
     interface Output {
-        /** The output directory as absolute path (required). */
+        /** The output directory as absolute path */
         path?: string;
-        /** The filename of the entry chunk as relative path inside the output.path directory. */
+        /** (Required) The filename of the entry chunk as relative path inside the output.path directory. */
         filename?: string;
         /** The filename of non-entry chunks as relative path inside the output.path directory. */
         chunkFilename?: string;
@@ -182,6 +182,14 @@ declare namespace webpack {
         sourcePrefix?: string;
         /** This option enables cross-origin loading of chunks. */
         crossOriginLoading?: string | boolean;
+        /** The encoding to use when generating the hash, defaults to 'hex' */
+        hashDigest?: 'hex' | 'latin1' | 'base64';
+        /** The prefix length of the hash digest to use, defaults to 20. */
+        hashDigestLength?: number;
+        /** Algorithm used for generation the hash (see node.js crypto package) */
+        hashFunction?: string | ((algorithm: string, options?: any) => any);
+        /** An optional salt to update the hash via Node.JS' hash.update. */
+        hashSalt?: string;
     }
 
     interface BaseModule {
diff --git a/types/webpack/v3/tsconfig.json b/types/webpack/v3/tsconfig.json
index a6671e38b4..0ef8b21875 100644
--- a/types/webpack/v3/tsconfig.json
+++ b/types/webpack/v3/tsconfig.json
@@ -16,7 +16,8 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "webpack": ["webpack/v3"]
+            "webpack": ["webpack/v3"],
+            "tapable": ["tapable/v0"]
         }
     },
     "files": [
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 46a9fb0ca0..8fe0ab1e4d 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -1,4 +1,5 @@
 import webpack = require('webpack');
+import { Tapable } from 'tapable';
 import { RawSourceMap } from 'source-map';
 
 const {
@@ -99,7 +100,9 @@ configuration = {
         path: path.join(__dirname, "assets", "[hash]"),
         publicPath: "assets/[hash]/",
         filename: "output.[hash].bundle.js",
-        chunkFilename: "[id].[hash].bundle.js"
+        chunkFilename: "[id].[hash].bundle.js",
+        hashFunction: 'sha256',
+        hashDigestLength: 64,
     }
 };
 
@@ -580,3 +583,79 @@ configuration = {
 };
 
 plugin = new webpack.SplitChunksPlugin({ chunks: "async", minChunks: 2 });
+
+class SingleEntryDependency extends webpack.compilation.Dependency {}
+class MultiEntryDependency extends webpack.compilation.Dependency {}
+class MultiModuleFactory extends Tapable {}
+class MultiEntryPlugin extends webpack.Plugin {
+    apply(compiler: webpack.Compiler) {
+        compiler.hooks.compilation.tap(
+            "MultiEntryPlugin",
+            (compilation, { normalModuleFactory }) => {
+                compilation.dependencyFactories.set(MultiEntryDependency, new MultiModuleFactory());
+            }
+        );
+        compiler.hooks.make.tapAsync(
+            "MultiEntryPlugin",
+            (compilation, callback) => {
+                const dep = new MultiEntryPlugin();
+                compilation.addEntry("", {}, "", () => {});
+            }
+        );
+    }
+}
+
+class IgnorePlugin extends webpack.Plugin {
+    checkIgnore(result: any) {
+    }
+
+    apply(compiler: webpack.Compiler) {
+        compiler.hooks.normalModuleFactory.tap("IgnorePlugin", nmf => {
+            nmf.hooks.beforeResolve.tap("IgnorePlugin", this.checkIgnore);
+        });
+        compiler.hooks.contextModuleFactory.tap("IgnorePlugin", cmf => {
+            cmf.hooks.beforeResolve.tap("IgnorePlugin", this.checkIgnore);
+        });
+    }
+}
+
+class DllEntryDependency extends webpack.compilation.Dependency {}
+class DllModuleFactory extends Tapable {}
+class DllEntryPlugin extends webpack.Plugin {
+	apply(compiler: webpack.Compiler) {
+		compiler.hooks.compilation.tap(
+			"DllEntryPlugin",
+			(compilation, { normalModuleFactory }) => {
+				const dllModuleFactory = new DllModuleFactory();
+				compilation.dependencyFactories.set(
+					DllEntryDependency,
+					dllModuleFactory
+				);
+				compilation.dependencyFactories.set(
+					SingleEntryDependency,
+					normalModuleFactory
+				);
+			}
+		);
+		compiler.hooks.make.tapAsync("DllEntryPlugin", (compilation, callback) => {
+			compilation.addEntry("", new DllEntryDependency(), "", callback);
+		});
+	}
+}
+
+class BannerPlugin extends webpack.Plugin {
+	apply(compiler: webpack.Compiler) {
+        compiler.hooks.compilation.tap("BannerPlugin", compilation  => {
+            compilation.hooks.optimizeChunkAssets.tap("BannerPlugin", chunks => {
+                for (const chunk of chunks) {
+                    if (!chunk.canBeInitial()) {
+                        continue;
+                    }
+                    for (const file of chunk.files) {
+                        compilation.getPath("", {});
+                    }
+                }
+            });
+        });
+    }
+}
diff --git a/types/websocket/index.d.ts b/types/websocket/index.d.ts
index f67a5da142..0087c7a3d1 100644
--- a/types/websocket/index.d.ts
+++ b/types/websocket/index.d.ts
@@ -62,8 +62,8 @@ export interface IConfig {
 }
 
 export interface IServerConfig extends IConfig {
-    /** The http server instance to attach to */
-    httpServer: http.Server;
+    /** The http or https server instance(s) to attach to */
+    httpServer: http.Server | https.Server | (http.Server | https.Server)[];
 
     /**
      * The maximum allowed received frame size in bytes.
diff --git a/types/webvr-api/index.d.ts b/types/webvr-api/index.d.ts
index 6300d12b78..afebeda0a9 100644
--- a/types/webvr-api/index.d.ts
+++ b/types/webvr-api/index.d.ts
@@ -3,203 +3,195 @@
 // Definitions by: six a <https://github.com/lostfictions>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare class VRDisplay extends EventTarget {
-  isConnected: boolean;
-  isPresenting: boolean;
 
-  /**
-   * Dictionary of capabilities describing the VRDisplay.
-   */
-  capabilities: VRDisplayCapabilities;
+interface VRDisplay extends EventTarget {
+    /**
+     * Dictionary of capabilities describing the VRDisplay.
+     */
+    readonly capabilities: VRDisplayCapabilities;
 
-  /**
-   * If this VRDisplay supports room-scale experiences, the optional
-   * stage attribute contains details on the room-scale parameters.
-   */
-  stageParameters: VRStageParameters;
+    /**
+     * z-depth defining the far plane of the eye view frustum
+     * enables mapping of values in the render target depth
+     * attachment to scene coordinates. Initially set to 10000.0.
+     */
+    depthFar: number;
 
-  /* Return the current VREyeParameters for the given eye. */
-  getEyeParameters(whichEye: VREye): VREyeParameters;
+    /**
+     * z-depth defining the near plane of the eye view frustum
+     * enables mapping of values in the render target depth
+     * attachment to scene coordinates. Initially set to 0.01.
+     */
+    depthNear: number;
 
-  /**
-   * An identifier for this distinct VRDisplay. Used as an
-   * association point in the Gamepad API.
-   */
-  displayId: number;
+    /**
+     * An identifier for this distinct VRDisplay. Used as an
+     * association point in the Gamepad API.
+     */
+    readonly displayId: number;
 
-  /**
-   * A display name, a user-readable name identifying it.
-   */
-  displayName: string;
+    /**
+     * A display name, a user-readable name identifying it.
+     */
+    readonly displayName: string;
+    readonly isConnected: boolean;
+    readonly isPresenting: boolean;
 
-  /**
-   * Populates the passed VRFrameData with the information required to render
-   * the current frame.
-   */
-  getFrameData(frameData: VRFrameData): boolean;
+    /**
+     * If this VRDisplay supports room-scale experiences, the optional
+     * stage attribute contains details on the room-scale parameters.
+     */
+    readonly stageParameters: VRStageParameters | null;
 
-  /**
-   * Return a VRPose containing the future predicted pose of the VRDisplay
-   * when the current frame will be presented. The value returned will not
-   * change until JavaScript has returned control to the browser.
-   *
-   * The VRPose will contain the position, orientation, velocity,
-   * and acceleration of each of these properties.
-   */
-  getPose(): VRPose;
+    /**
+     * Passing the value returned by `requestAnimationFrame` to
+     * `cancelAnimationFrame` will unregister the callback.
+     */
+    cancelAnimationFrame(handle: number): void;
 
-  /**
-   * Return the current instantaneous pose of the VRDisplay, with no
-   * prediction applied.
-   */
-  getImmediatePose(): VRPose;
+    /**
+     * Stops presenting to the VRDisplay.
+     */
+    exitPresent(): Promise<void>;
 
-  /**
-   * Reset the pose for this display, treating its current position and
-   * orientation as the "origin/zero" values. VRPose.position,
-   * VRPose.orientation, and VRStageParameters.sittingToStandingTransform may be
-   * updated when calling resetPose(). This should be called in only
-   * sitting-space experiences.
-   */
-  resetPose(): void;
+    /* Return the current VREyeParameters for the given eye. */
+    getEyeParameters(whichEye: string): VREyeParameters;
 
-  /**
-   * z-depth defining the near plane of the eye view frustum
-   * enables mapping of values in the render target depth
-   * attachment to scene coordinates. Initially set to 0.01.
-   */
-  depthNear: number;
+    /**
+     * Populates the passed VRFrameData with the information required to render
+     * the current frame.
+     */
+    getFrameData(frameData: VRFrameData): boolean;
 
-  /**
-   * z-depth defining the far plane of the eye view frustum
-   * enables mapping of values in the render target depth
-   * attachment to scene coordinates. Initially set to 10000.0.
-   */
-  depthFar: number;
+    /**
+     * Get the layers currently being presented.
+     */
+    getLayers(): VRLayer[];
 
-  /**
-   * The callback passed to `requestAnimationFrame` will be called
-   * any time a new frame should be rendered. When the VRDisplay is
-   * presenting the callback will be called at the native refresh
-   * rate of the HMD. When not presenting this function acts
-   * identically to how window.requestAnimationFrame acts. Content should
-   * make no assumptions of frame rate or vsync behavior as the HMD runs
-   * asynchronously from other displays and at differing refresh rates.
-   */
-  requestAnimationFrame(callback: FrameRequestCallback): number;
+    /**
+     * Return a VRPose containing the future predicted pose of the VRDisplay
+     * when the current frame will be presented. The value returned will not
+     * change until JavaScript has returned control to the browser.
+     *
+     * The VRPose will contain the position, orientation, velocity,
+     * and acceleration of each of these properties.
+     */
+    getPose(): VRPose;
 
-  /**
-   * Passing the value returned by `requestAnimationFrame` to
-   * `cancelAnimationFrame` will unregister the callback.
-   */
-  cancelAnimationFrame(handle: number): void;
+    /**
+     * Return the current instantaneous pose of the VRDisplay, with no
+     * prediction applied.
+     */
+    getImmediatePose(): VRPose;
 
-  /**
-   * Begin presenting to the VRDisplay. Must be called in response to a user gesture.
-   * Repeat calls while already presenting will update the VRLayers being displayed.
-   */
-  requestPresent(layers: Array<VRLayer>): Promise<void>;
+    /**
+     * The callback passed to `requestAnimationFrame` will be called
+     * any time a new frame should be rendered. When the VRDisplay is
+     * presenting the callback will be called at the native refresh
+     * rate of the HMD. When not presenting this function acts
+     * identically to how window.requestAnimationFrame acts. Content should
+     * make no assumptions of frame rate or vsync behavior as the HMD runs
+     * asynchronously from other displays and at differing refresh rates.
+     */
+    requestAnimationFrame(callback: FrameRequestCallback): number;
 
-  /**
-   * Stops presenting to the VRDisplay.
-   */
-  exitPresent(): Promise<void>;
+    /**
+     * Begin presenting to the VRDisplay. Must be called in response to a user gesture.
+     * Repeat calls while already presenting will update the VRLayers being displayed.
+     */
+    requestPresent(layers: VRLayer[]): Promise<void>;
 
-  /**
-   * Get the layers currently being presented.
-   */
-  getLayers(): Array<VRLayer>;
+    /**
+     * Reset the pose for this display, treating its current position and
+     * orientation as the "origin/zero" values. VRPose.position,
+     * VRPose.orientation, and VRStageParameters.sittingToStandingTransform may be
+     * updated when calling resetPose(). This should be called in only
+     * sitting-space experiences.
+     */
+    resetPose(): void;
 
-  /**
-   * The VRLayer provided to the VRDisplay will be captured and presented
-   * in the HMD. Calling this function has the same effect on the source
-   * canvas as any other operation that uses its source image, and canvases
-   * created without preserveDrawingBuffer set to true will be cleared.
-   */
-  submitFrame(pose?: VRPose): void;
+    /**
+     * The VRLayer provided to the VRDisplay will be captured and presented
+     * in the HMD. Calling this function has the same effect on the source
+     * canvas as any other operation that uses its source image, and canvases
+     * created without preserveDrawingBuffer set to true will be cleared.
+     */
+    submitFrame(pose?: VRPose): void;
 }
 
-type VRSource = HTMLCanvasElement;
-
-
-type VRLayer = {
-  source?: VRSource;
-
-  leftBounds?: Array<number>;
-  rightBounds?: Array<number>;
+declare var VRDisplay: {
+    prototype: VRDisplay;
+    new(): VRDisplay;
 };
 
+interface VRLayer {
+    leftBounds?: number[] | null;
+    rightBounds?: number[] | null;
+    source?: HTMLCanvasElement | null;
+}
+
 interface VRDisplayCapabilities {
-  hasPosition: boolean;
-  hasOrientation: boolean;
-  hasExternalDisplay: boolean;
-  canPresent: boolean;
-  maxLayers: number;
-}
-
-type VREye = "left" | "right";
-
-interface VRFieldOfView {
-  upDegrees: number;
-  rightDegrees: number;
-  downDegrees: number;
-  leftDegrees: number;
-}
-
-interface VRPose {
-  timestamp: number;
-
-  position: Float32Array;
-  linearVelocity: Float32Array;
-  linearAcceleration: Float32Array;
-
-  orientation: Float32Array;
-  angularVelocity: Float32Array;
-  angularAcceleration: Float32Array;
-}
-
-declare class VRFrameData {
-  timestamp: number; // Should be DOMHighResTimeStamp
-
-  leftProjectionMatrix: Float32Array;
-  leftViewMatrix: Float32Array;
-
-  rightProjectionMatrix: Float32Array;
-  rightViewMatrix: Float32Array;
-
-  pose: VRPose;
+    readonly canPresent: boolean;
+    readonly hasExternalDisplay: boolean;
+    readonly hasOrientation: boolean;
+    readonly hasPosition: boolean;
+    readonly maxLayers: number;
 }
 
 interface VREyeParameters {
-  offset: Float32Array;
+    /** @deprecated */
+    readonly fieldOfView: VRFieldOfView;
+    readonly offset: Float32Array;
+    readonly renderHeight: number;
+    readonly renderWidth: number;
+}
 
-  fieldOfView: VRFieldOfView;
+interface VRFieldOfView {
+    readonly downDegrees: number;
+    readonly leftDegrees: number;
+    readonly rightDegrees: number;
+    readonly upDegrees: number;
+}
 
-  renderWidth: number;
-  renderHeight: number;
+interface VRFrameData {
+    readonly leftProjectionMatrix: Float32Array;
+    readonly leftViewMatrix: Float32Array;
+    readonly pose: VRPose;
+    readonly rightProjectionMatrix: Float32Array;
+    readonly rightViewMatrix: Float32Array;
+    readonly timestamp: number;
+}
+
+interface VRPose {
+    readonly angularAcceleration: Float32Array | null;
+    readonly angularVelocity: Float32Array | null;
+    readonly linearAcceleration: Float32Array | null;
+    readonly linearVelocity: Float32Array | null;
+    readonly orientation: Float32Array | null;
+    readonly position: Float32Array | null;
+    readonly timestamp: number;
 }
 
 interface VRStageParameters {
-  sittingToStandingTransform: Float32Array;
-
-  sizeX: number;
-  sizeZ: number;
+    sittingToStandingTransform?: Float32Array;
+    sizeX?: number;
+    sizeY?: number;
 }
 
 interface Navigator {
-  getVRDisplays(): Promise<Array<VRDisplay>>;
-  activeVRDisplays: Array<VRDisplay>;
+    getVRDisplays(): Promise<VRDisplay[]>;
+    readonly activeVRDisplays: ReadonlyArray<VRDisplay>;
 }
 
 interface Window {
-  onvrdisplayconnected: (ev: Event) => any;
-  onvrdisplaydisconnected: (ev: Event) => any;
-  onvrdisplaypresentchange: (ev: Event) => any;
-  addEventListener(type: "vrdisplayconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
-  addEventListener(type: "vrdisplaydisconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
-  addEventListener(type: "vrdisplaypresentchange", listener: (ev: Event) => any, useCapture?: boolean): void;
+    onvrdisplayconnected: ((this: Window, ev: Event) => any) | null;
+    onvrdisplaydisconnected: ((this: Window, ev: Event) => any) | null;
+    onvrdisplaypresentchange: ((this: Window, ev: Event) => any) | null;
+    addEventListener(type: "vrdisplayconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaydisconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaypresentchange", listener: (ev: Event) => any, useCapture?: boolean): void;
 }
 
 interface Gamepad {
-  displayId: number;
+    readonly displayId: number;
 }
diff --git a/types/wicg-mediasession/index.d.ts b/types/wicg-mediasession/index.d.ts
index ac08c8ef4f..05a769b2a2 100644
--- a/types/wicg-mediasession/index.d.ts
+++ b/types/wicg-mediasession/index.d.ts
@@ -19,10 +19,10 @@ interface MediaSession {
   // Current media session playback state.
   playbackState: MediaSessionPlaybackState;
   // Current media session meta data.
-  metadata?: MediaMetadata|null;
+  metadata: MediaMetadata|null;
 
   // Set/Unset actions handlers.
-  setActionHandler(action: MediaSessionAction, listener?: () => void): void;
+  setActionHandler(action: MediaSessionAction, listener: (() => void)|null): void;
 }
 
 interface MediaImage {
diff --git a/types/winston-syslog/index.d.ts b/types/winston-syslog/index.d.ts
new file mode 100644
index 0000000000..816274ded8
--- /dev/null
+++ b/types/winston-syslog/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for winston-syslog 1.0
+// Project: https://github.com/indexzero/winston-syslog#readme
+// Definitions by: Chris Barth <https://github.com/cjbarth>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as winston from "winston";
+export interface SyslogTransportOptions extends winston.GenericTextTransportOptions {
+	host?: string;
+	port?: number;
+	path?: string;
+	protocol?: string;
+	pid?: number;
+	facility?: string;
+	localhost?: string;
+	type?: string;
+	app_name?: string;
+	eol?: string;
+}
+export class Syslog extends winston.Transport implements winston.TransportInstance {
+}
+declare module "winston" {
+	interface Transports {
+		Syslog: Syslog;
+	}
+}
diff --git a/types/winston-syslog/tsconfig.json b/types/winston-syslog/tsconfig.json
new file mode 100644
index 0000000000..e11a89c680
--- /dev/null
+++ b/types/winston-syslog/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "esModuleInterop": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "winston-syslog-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/winston-syslog/tslint.json b/types/winston-syslog/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/winston-syslog/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/winston-syslog/winston-syslog-tests.ts b/types/winston-syslog/winston-syslog-tests.ts
new file mode 100644
index 0000000000..a08b80b045
--- /dev/null
+++ b/types/winston-syslog/winston-syslog-tests.ts
@@ -0,0 +1,35 @@
+import winston = require('winston');
+import { SyslogTransportOptions } from 'winston-syslog';
+
+const str = "";
+const bool  = true;
+const num = 1;
+const obj: any = {};
+
+const syslogOptions: SyslogTransportOptions = {
+    host: str,
+    port: num,
+    path: str,
+    protocol: str,
+    pid: num,
+    facility: str,
+    localhost: str,
+    type: str,
+    app_name: str,
+    eol: str,
+    json: bool,
+    colorize: bool,
+    colors: str,
+    prettyPrint: bool,
+    showLevel: bool,
+    label: str,
+    depth: num,
+};
+
+winston.add(winston.transports.Syslog, syslogOptions);
+
+const logger: winston.LoggerInstance = new (winston.Logger)({
+  transports: [
+    new (winston.transports.Syslog)(syslogOptions),
+  ]
+});
diff --git a/types/zipkin-context-cls/package.json b/types/zipkin-context-cls/package.json
index 371d115490..07bdb0d223 100644
--- a/types/zipkin-context-cls/package.json
+++ b/types/zipkin-context-cls/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "zipkin": "^0.11.2"
+    "zipkin": ">=0.11.0"
   }
 }
diff --git a/types/zipkin-instrumentation-express/package.json b/types/zipkin-instrumentation-express/package.json
index 371d115490..07bdb0d223 100644
--- a/types/zipkin-instrumentation-express/package.json
+++ b/types/zipkin-instrumentation-express/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "zipkin": "^0.11.2"
+    "zipkin": ">=0.11.0"
   }
 }
diff --git a/types/zipkin-transport-http/package.json b/types/zipkin-transport-http/package.json
index 371d115490..07bdb0d223 100644
--- a/types/zipkin-transport-http/package.json
+++ b/types/zipkin-transport-http/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "zipkin": "^0.11.2"
+    "zipkin": ">=0.11.0"
   }
 }